From nobody Sun Sep 29 04:01:54 2024 X-Original-To: dev-commits-src-all@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 4XGVrf5LtCz5YGsq; Sun, 29 Sep 2024 04:01:54 +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 4XGVrf4SBzz4cVD; Sun, 29 Sep 2024 04:01:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727582514; 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=3nCpH39+bek8a/lLvU9ODqKnZUL+/Do1DrfVHFKlu+o=; b=ITbPrTNA9tNHMzYM6UXBw5APSq5+zuGeYxJKnKXmVcx1QmztGo3C+w/mB9+GlhyID6aJjx EzRF4ErH2PpgnlyWevPBbM8UYbJSDWI9dzXh/KDSfJ9TmLWrTeoUorWJrojNggfrKVZi3o LiPjH/K8ZTObNGBNr98GBqTGZ+BsMhwnMb7sQb5YhBqOm+fsICf+Sy109Br3FBLpTFENQO i4BkaOaQpI93kpYmkgeuHir3xQFa83/Yu53gEYwi51hamC9u7SmP9RcB45aPJY7OkS/yUQ /Y0f74cEMAnJmXCaUDrsvqHPG0yZ8nt9dfsiHkLKjXwYZH0Oz58vCWDIuijTVg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727582514; 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=3nCpH39+bek8a/lLvU9ODqKnZUL+/Do1DrfVHFKlu+o=; b=RaHg2np+MbLCiK8pSDYW1WuFW3qf7JNae8xVOQxmFXJ2g7FOfDzXbwmAr9iUa8vmllRe7a xaw00iys55FfvtHvXJ2ppSs6iENrcynRXhkqDZY59DMPRHRBbFo4LcLbwQBtYMR5KwQPSf twxXYsDFKBiPUcYxXLvG6dcDMIBLRrGD2Brj9a3/zSk0BSt03hL5Ind+YREXfmwoCqtvHd TnnBuwUAGWhQacG7hu8QOz25zYX6lxP9hAkMMwsMoP748Epox/n6Fh0FcFJPGxWZE1N5UE L4tjOnxl/07ZPln3eIyuIxOkOEOQdy6WW7KE064vg6GYYQaNKGFX5l3GjsAvuQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727582514; a=rsa-sha256; cv=none; b=EcWkWn/77c+zmYuEQCEX00e+PNd7ZvgstGvcOcden1ktKeLNZP2/djMfuAQxSsdnfvRjn9 IUJEbbUpKMp1eb5uluHEAR7fZqx9+bN+lHQZY2IVU8Q80D6YPgVkR4NauGmG8eWdP14GuK aGbmO0VKsJZeEJdGu/8ptYh5pub7L4yUqpFM2MdF3km433J610h2ttfyoseSFIUF6PO16R zL8CvA/2I+enXoO51cHxeJlLZBu0y4Y1tAU8Oy085NdLG3RO3IZQPtT+9rQZi6jA9ez2pX LDdCBTrRwJ+NvFgcOLbLuM4jG2ESSXqlRRaDZjYerASwBUv02HP3QpHD7/ekaQ== 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 4XGVrf44T0ztK7; Sun, 29 Sep 2024 04:01:54 +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 48T41sk1080349; Sun, 29 Sep 2024 04:01:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48T41stC080346; Sun, 29 Sep 2024 04:01:54 GMT (envelope-from git) Date: Sun, 29 Sep 2024 04:01:54 GMT Message-Id: <202409290401.48T41stC080346@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: eee19d438424 - stable/13 - qlxgbe: fix debug prints in ql_os.c List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: eee19d4384241fe47281da90b56cec91348636c8 Auto-Submitted: auto-generated The branch stable/13 has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=eee19d4384241fe47281da90b56cec91348636c8 commit eee19d4384241fe47281da90b56cec91348636c8 Author: Fuqian Huang AuthorDate: 2024-05-28 05:31:03 +0000 Commit: Kevin Bowling CommitDate: 2024-09-29 03:59:10 +0000 qlxgbe: fix debug prints in ql_os.c QL_DPRINT2 checks the debug level first and then prints. Replace device_printf with QL_DPRINT2 to check debug level first before printing out the kernel pointers. PR: 238655 (cherry picked from commit 3d6c7ee87e9d7f3c8f617c3803af3effa8eb8a16) --- sys/dev/qlxgbe/ql_os.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/sys/dev/qlxgbe/ql_os.c b/sys/dev/qlxgbe/ql_os.c index c1fbdf60c0aa..5e241f11b938 100644 --- a/sys/dev/qlxgbe/ql_os.c +++ b/sys/dev/qlxgbe/ql_os.c @@ -326,7 +326,7 @@ static int qla_pci_attach(device_t dev) { qla_host_t *ha = NULL; - uint32_t rsrc_len; + uint32_t rsrc_len __unused; int i; uint32_t num_rcvq = 0; @@ -409,10 +409,10 @@ qla_pci_attach(device_t dev) __func__); goto qla_pci_attach_err; } - device_printf(dev, "%s: ha %p pci_func 0x%x rsrc_count 0x%08x" + QL_DPRINT2(ha, (dev, "%s: ha %p pci_func 0x%x rsrc_count 0x%08x" " msix_count 0x%x pci_reg %p pci_reg1 %p num_rcvq = %d\n", __func__, ha, ha->pci_func, rsrc_len, ha->msix_count, - ha->pci_reg, ha->pci_reg1, num_rcvq); + ha->pci_reg, ha->pci_reg1, num_rcvq)); if ((ha->msix_count < 64) || (num_rcvq != 32)) { if (ha->hw.num_sds_rings > 15) { @@ -1279,9 +1279,9 @@ qla_send(qla_host_t *ha, struct mbuf **m_headp, uint32_t txr_idx, "mbuf = %p\n", __func__, __LINE__, txr_idx, tx_idx,\ ha->tx_ring[txr_idx].tx_buf[tx_idx].m_head)); - device_printf(ha->pci_dev, "%s [%d]: txr_idx = %d tx_idx = %d " + QL_DPRINT2(ha, (ha->pci_dev, "%s [%d]: txr_idx = %d tx_idx = %d " "mbuf = %p\n", __func__, __LINE__, txr_idx, tx_idx, - ha->tx_ring[txr_idx].tx_buf[tx_idx].m_head); + ha->tx_ring[txr_idx].tx_buf[tx_idx].m_head)); if (m_head) m_freem(m_head);