From nobody Sun Sep 29 04:01:55 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 4XGVrh02T6z5YGl3; Sun, 29 Sep 2024 04:01:56 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XGVrg557xz4c5L; Sun, 29 Sep 2024 04:01:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727582515; 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=ATABQh8ysEftMvMakaUEVjNirc+E+lAdZa4mabF0NH8=; b=L6LUlLiJmmu6B/93ZqyzJjXoP4zYErdRuhL8Oc24+fH3SMyK1kpjbdWqBzXQ40E1fyDO4T B0OC5lHa5syefGkQslw1L8DpbETXFSzMdftXISWkJp1LXrupWPyJ+rEgr4n5/tZLw4M3OH 3RytmDJXA0yRzh4Pfl/vHR7k+E9dxtIL6m2hMtwKn3oQpeVAg511a+4HAgysCssCnIi/R2 Zgx5nhSJFtizB1AemTTxvqf0OcdyJtVY1V+GYOpUe2Jc29KxYza2iS868mJMJNjecATyCU 5D5LMlO8NMV8KFzaICHCrh9/oC2XqCCPkJJhONVlxl0mn6E2K6ImlM0RZLKnLQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727582515; 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=ATABQh8ysEftMvMakaUEVjNirc+E+lAdZa4mabF0NH8=; b=SsbjLBgUetigsnotTu5kIxYk+Ul+2oesjbKRb/5HPTh9ODbMHonafmiJiiw1wP1yufImC2 YyYxX7HkE7fgERM7uzRh1ujAMpE7TxYRKcnNWoOMfiuDiEq7+fuCOuRHdhwaadS+Vsgoaa TMHcKVYao6rn5iIG4KufFaYU+NSmuKaggTROr3J84cGK3y2SfHXL1XfDLuEqoYYnyr19jX 1mlwm112Ti0uYnhsyICe5C9/6pfhjnjg1lcFC/4SvnQ/Yca02FCQgSDrEnlMBoRdG1nAuj 6QU/ECXDrSEXDgZk8bdEt41mxRqMaxKpZIE6A+tWAwfk6gkmxcdpNXDv3P5U0Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727582515; a=rsa-sha256; cv=none; b=r9aaAYkFCWi4FfeVxxX3IlKbQ2t0jxQuqtEA2SqZ+euEsZotl25qqDVFtdF+FHSgaVidZx +fpRor8IpS9J4citA535OgZcj3by3VR9Tj/q6O9jZVldr2NkxhCAM7dira6/b/KalgYZXK 2lAR2D+nqOTTOmSVUssVFbPQbDs+9IYRLvCpCrGo5Xp/4W2DO0N6ZG2QyQEIsO5Ahab9oV d2MPn+ypGbSbJYbVAUYx4TmbQa5BP8u0n9xAtPkx0jDiuixg8Y6xdRvUfEUiG0j2e7ENAW NXJxgnHTfp0v9bZT5C/n8L4KZdIAf3euP4G9nMj00/ucbFhv+pvhQaFMJBE3+w== 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 4XGVrg4frqztHh; Sun, 29 Sep 2024 04:01:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48T41tU2080391; Sun, 29 Sep 2024 04:01:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48T41t5r080388; Sun, 29 Sep 2024 04:01:55 GMT (envelope-from git) Date: Sun, 29 Sep 2024 04:01:55 GMT Message-Id: <202409290401.48T41t5r080388@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: 73f5d59061ab - stable/13 - 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/13 X-Git-Reftype: branch X-Git-Commit: 73f5d59061ab5f4d8a7e0bc0fb6483a21c2d99cb Auto-Submitted: auto-generated The branch stable/13 has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=73f5d59061ab5f4d8a7e0bc0fb6483a21c2d99cb commit 73f5d59061ab5f4d8a7e0bc0fb6483a21c2d99cb Author: Fuqian Huang AuthorDate: 2024-05-28 05:40:12 +0000 Commit: Kevin Bowling CommitDate: 2024-09-29 03:59:23 +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 b4d4c20350ac..0da1c3153caf 100644 --- a/sys/dev/qlxge/qls_os.c +++ b/sys/dev/qlxge/qls_os.c @@ -162,20 +162,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", @@ -199,15 +199,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", @@ -385,9 +385,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__,