From nobody Fri Jun 07 05:49:44 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VwVdj2mRpz5MKpS; Fri, 07 Jun 2024 05:49:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VwVdj0zLvz4gb3; Fri, 7 Jun 2024 05:49:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717739385; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Rqx81+TN1F5GZn8XhnQ2+2+Oex85EzRUIuxgjBxiHww=; b=kpxxxpHGgNGuMyGV4JY0GTBJV9xpsqxnUGMnGzt5RfMedn8nHKz3pUYJvPQmu7pXTPzPNg 6JF6DRxt/B8aqX0hspHwalpNRVRtmiwtOnhTwF6r/p2a41pMwrbo3wKnWw9CakLoQ0bPkh NthzDHrxitJSSTqW2kqpT3PnacWC+WfSdHAXp4tCEAw5CDG29BDL5GM5+qmAo6LCG6p28O N7nMtwC8xIFR2fzBR2e7CamgCu2Tc1DrC8Joh1qFcuDiL2ke4l1t5wWo3PVu8kQJjkzxbe t6BONUdbfFgDiudNXFUvbQBunyuhNlXB0sj6YDjf6vor2ajZE/8uzCFcHvQ1Gg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1717739385; a=rsa-sha256; cv=none; b=wmdM813qylcpIN/uD7xg+lM2AxTtp9pohlL8v9DRstQPmkJV3OJBJSLKdnO1Yy0q4342XF mGiSbCtOw9PQ/w2QVjOjOuZ2N74POWSg/pXM7bah7enKKk/iMiOB6hMLBo2NpFWL7sdj4D QSfxe1acnv5bUBYtif+9bbnlXdp3Kdd1hop5Dre7JyyJli+Yd8gc++vr1LsViRRnfaReuw Y+hyT0YTkcZof2Ceo1aV8UehoYgNVpZE9bm5XJUCcJMfHhII/oAAYHvSqNJBwZfhCxmEkF EHmAWlj3kHPOqg78UwA6o2bNTOB0srqAl2G3ydHQOWCVMt/VTY6nSjG/3uAnAQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717739385; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Rqx81+TN1F5GZn8XhnQ2+2+Oex85EzRUIuxgjBxiHww=; b=ATjNWUDOEoSVKsuEoVFQEUsQw8w5OyR39z2d1JPBaHUOxsWnp2DSymwQ7UFNjPXM6k6Gen TjN1hMpj3Fq8EOOACP3DyYrc0SlLC7CrmgzP86fdN6L+WaesFCCocMgUD3LFDGaLBtnoSB EoMxdVzMSR8tLsjrkSrj2lWuWU+9m6D5jSTRwUn1wpKwdR7NjTm0GeEa5MteEUcqqT/zLc h9myl1efUXbHr/B7p4DSVtsD5CGMWUxzXeRvgmk9GINr+AMJ0uvN5zrqyJRzmGPZ3fIIPl d3r/NSIy9cNPT+zwGJEcZwhvI4wbhbeyMju9qAMBB24M4e0T/aK1jRCdXj/DoQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VwVdj0ZqCz1H2l; Fri, 7 Jun 2024 05:49:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 4575niu8058905; Fri, 7 Jun 2024 05:49:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4575nin8058902; Fri, 7 Jun 2024 05:49:44 GMT (envelope-from git) Date: Fri, 7 Jun 2024 05:49:44 GMT Message-Id: <202406070549.4575nin8058902@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kevin Bowling Subject: git: 265ca6efb443 - stable/14 - qlxge: replace device_printf with QL_DPRINT2 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kbowling X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 265ca6efb443dadd1d1fac3c807d45223c648779 Auto-Submitted: auto-generated The branch stable/14 has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=265ca6efb443dadd1d1fac3c807d45223c648779 commit 265ca6efb443dadd1d1fac3c807d45223c648779 Author: Fuqian Huang AuthorDate: 2024-05-28 05:40:12 +0000 Commit: Kevin Bowling CommitDate: 2024-06-07 05:48:05 +0000 qlxge: replace device_printf with QL_DPRINT2 QL_DPRINT2 checks the debug level first before printing. Replace device_printf with QL_DPRINT2 to check debug level first before printing out the kernel pointers. PR: 238656 (cherry picked from commit ae389777583dca0e354fdd43aca3413e209160f4) --- sys/dev/qlxge/qls_os.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/sys/dev/qlxge/qls_os.c b/sys/dev/qlxge/qls_os.c index 8c110540a042..a1ce1c637e1c 100644 --- a/sys/dev/qlxge/qls_os.c +++ b/sys/dev/qlxge/qls_os.c @@ -160,20 +160,20 @@ qls_sysctl_get_drvr_stats(SYSCTL_HANDLER_ARGS) ha = (qla_host_t *)arg1; for (i = 0; i < ha->num_tx_rings; i++) { - device_printf(ha->pci_dev, + QL_DPRINT2((ha->pci_dev, "%s: tx_ring[%d].tx_frames= %p\n", __func__, i, - (void *)ha->tx_ring[i].tx_frames); + (void *)ha->tx_ring[i].tx_frames)); - device_printf(ha->pci_dev, + QL_DPRINT2((ha->pci_dev, "%s: tx_ring[%d].tx_tso_frames= %p\n", __func__, i, - (void *)ha->tx_ring[i].tx_tso_frames); + (void *)ha->tx_ring[i].tx_tso_frames)); - device_printf(ha->pci_dev, + QL_DPRINT2((ha->pci_dev, "%s: tx_ring[%d].tx_vlan_frames= %p\n", __func__, i, - (void *)ha->tx_ring[i].tx_vlan_frames); + (void *)ha->tx_ring[i].tx_vlan_frames)); device_printf(ha->pci_dev, "%s: tx_ring[%d].txr_free= 0x%08x\n", @@ -197,15 +197,15 @@ qls_sysctl_get_drvr_stats(SYSCTL_HANDLER_ARGS) } for (i = 0; i < ha->num_rx_rings; i++) { - device_printf(ha->pci_dev, + QL_DPRINT2((ha->pci_dev, "%s: rx_ring[%d].rx_int= %p\n", __func__, i, - (void *)ha->rx_ring[i].rx_int); + (void *)ha->rx_ring[i].rx_int)); - device_printf(ha->pci_dev, + QL_DPRINT2((ha->pci_dev, "%s: rx_ring[%d].rss_int= %p\n", __func__, i, - (void *)ha->rx_ring[i].rss_int); + (void *)ha->rx_ring[i].rss_int)); device_printf(ha->pci_dev, "%s: rx_ring[%d].lbq_next= 0x%08x\n", @@ -383,9 +383,9 @@ qls_pci_attach(device_t dev) ha->msix_count = qls_get_msix_count(ha); - device_printf(dev, "\n%s: ha %p pci_func 0x%x msix_count 0x%x" + QL_DPRINT2((dev, "\n%s: ha %p pci_func 0x%x msix_count 0x%x" " pci_reg %p pci_reg1 %p\n", __func__, ha, - ha->pci_func, ha->msix_count, ha->pci_reg, ha->pci_reg1); + ha->pci_func, ha->msix_count, ha->pci_reg, ha->pci_reg1)); if (pci_alloc_msix(dev, &ha->msix_count)) { device_printf(dev, "%s: pci_alloc_msi[%d] failed\n", __func__,