From nobody Fri Jun 07 05:49:43 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 4VwVdh2qMHz5MKgg; Fri, 07 Jun 2024 05:49:44 +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 4VwVdh0QgDz4gjJ; Fri, 7 Jun 2024 05:49:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717739384; 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=CL60ozGrt6/Lm938+y5Vt+eBySNyfG5I39rcNb85Iew=; b=KEMJjp8fSDGvEKveo45TJ7yrzC2HURkPpo0Hgg7HuVQs7CvqQgu4THg8sNzM8ppqRQnWRI 48qZ4r5hJUK/Bn8gvCdjNDOs9wJDWzgM/36idn04q10BLKZDmY2nvLItyu8quunmaL4sj8 uouRqha+95UyvaIDBJ03xzUgxZSic6MgWvRu75rti84lKxoEUjWCi1e+55Sjp3hd7epmFN TXZwN7ujtipT4AGWG2IIYRrvQQDtjG8cDbofgb9sSVSl95GPfr/ZvHk6ixtxhsKmFxQtwY lsiS/J3JIHL6GLKGG49W6gAi0hHoMrUWQ5/EmPNFZBaN1WA996Q0Xj9SmhvQ2g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1717739384; a=rsa-sha256; cv=none; b=c17mt7ZkKNw2n6lSJRMwrFK+mdoNHCerQQNnF0bOFWScio06Q3cPG7tlHj9suks9zEZOMc WFvqLtWrs8rluXcJ4ZlXRTB+PjUp+Li0P/tzwgMknc7L46iFSwBayUA6E5iw8bOi1yolYd HFz/IeeqPHKeCSNr2y7N0LhlIjUUBY63bTIKs8ZKCmtINO3LKO6nHjTmyAokIz+uf3+l5A jPorxBIn/HxKm2h2e3Io4yA0hEbKkm9BoS7zSN8qaRbyGw4PLOPmKHjrQS5vCSAGAeh2+T agoiGapCmUqDdJTgTabd5iUoHtqpVL2MCUHg2KVz0CiGCBqlzyxC5bqJsSBfYQ== 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=1717739384; 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=CL60ozGrt6/Lm938+y5Vt+eBySNyfG5I39rcNb85Iew=; b=JoSuG1rV1oy1KTdZYkN2JQTVLAr7XVOLi3Sg9m9zCTSh7dRLsI4jFWmmt6C8sp+Q6uxTt/ OkGQNe6vuTLNShhAc49cdPHcYIiOy5RVvx9kxtJ/YZybY99EFxKOE2fVj5+tCZIuZdJB+i tbJhF2TO4eBdyzXkv/Ncfrtaj7FQOGoSBv6WiAm3l07ZygGyd6UsG4bPvP0BsZWc/EfvE5 0gPIwFrZRxNr6bwn651woZSMGKSrxTEmCLYHR4IV+3ZHn0YVH8IEoMN5VBxg2eoXiuLYob aAr6n9KZ8Za27+h7A7TP9cq4aLCJ4XNEACm4eZDJncno+eTP29AmCAhwgA+D8w== 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 4VwVdg6hpsz1H7c; Fri, 7 Jun 2024 05:49:43 +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 4575nhPc058863; Fri, 7 Jun 2024 05:49:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4575nhn7058860; Fri, 7 Jun 2024 05:49:43 GMT (envelope-from git) Date: Fri, 7 Jun 2024 05:49:43 GMT Message-Id: <202406070549.4575nhn7058860@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: 748fa70c5d12 - stable/14 - 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/14 X-Git-Reftype: branch X-Git-Commit: 748fa70c5d12d163e496d033bfd0a5e5919f2df9 Auto-Submitted: auto-generated The branch stable/14 has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=748fa70c5d12d163e496d033bfd0a5e5919f2df9 commit 748fa70c5d12d163e496d033bfd0a5e5919f2df9 Author: Fuqian Huang AuthorDate: 2024-05-28 05:31:03 +0000 Commit: Kevin Bowling CommitDate: 2024-06-07 05:47:32 +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 d20e7a103d02..0b3b2ca7954f 100644 --- a/sys/dev/qlxgbe/ql_os.c +++ b/sys/dev/qlxgbe/ql_os.c @@ -322,7 +322,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; @@ -405,10 +405,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) { @@ -1274,9 +1274,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);