From nobody Tue May 28 05:32:52 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 4VpLkr6yM0z5Lflk; Tue, 28 May 2024 05:32:52 +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 4VpLkr67glz4kdR; Tue, 28 May 2024 05:32:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716874372; 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=QHPDn68Ex9B6pV7YSGbk5DU20tJ4YIxoK2pF1vuuUW4=; b=ogfedscfiSudNQ1AY/W76Y+o1t9N6TwMcMjwlYf7PClKaX0sm9oZRrchoJ7a4Tg5eHW+IO EX1vCx1tPO9MJkohOsX7pOCWEqr15hjidNjMAtRbkDgcYZoaAXX6VaglmXGaZGb1I3RYEp c5lNx5ASi0uWtF+D0rDZUvd6jQfCTNVBPD7U8PlCeSwQ9y+Hx+PVix5OAticsaMjultyiJ lbGvzpzeHO63T8xLRCwX9+t1yLRQ4/Vj110OQ3fFuibZ1ympOyf1MLZCQLnhvg4pRTKsW+ SnyzK9oj1fttO16GozqD58LdLMMyBp2QOwMkbwned9opDnTFsZC6L9HsSyImpA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1716874372; a=rsa-sha256; cv=none; b=FZYBqBkNEzmtFFFzI5jUJhpr/7b67yJWwVcqb8/1dBNHPCV+hRlBD5BamMc3A/j7+xOTN2 OMx5g9gJrLaK9ONah6fXwMYt/g+D+b+OwrHc9breJ1z/o79U298ciQHMxrh0rIDKIVcg3q 6wfgHtoRi1kfTB2ncK6OtvBpVkqceWKHT2G0uRXGFuhepPwfBz5oERgjg1TGvLNm/90fNX 4wfQLLkKeCEQINNp0UyfwzMlFT+bypg5kvk6SXNy1p9l7F+6N4ETO8y1hqT5xKmdQSbDsF uNOwna8OBdJdsY8b+LKrIIy4cb/x9b4Ernm27B3gNMxvGlBsSYO8IZmHKNHqxA== 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=1716874372; 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=QHPDn68Ex9B6pV7YSGbk5DU20tJ4YIxoK2pF1vuuUW4=; b=eCoE7JGsotcgTHkgHA3TYFkf0phpp49stX43JcVA35qBZ/IsVkhYTaKeaUQoiacQkagtMT ARm6akyXP8xO9d0w08EgkA+eJh3mzNIaeVYVBFX+bsKjS8HQePkAhGGs1c3/9CBHVVReiy ssL0f3GQ97wmAlFC1HSzcEF6e5iEzchtQy3GesTFqmiG80SShp6iMt/t28cbGtMO5c3ozG wnGqSoByfaqNv70Alv/lXR642m3WV+nWhLNBz+QqYqXoccwzfAcnXzKTRynoNPmacgvNsg fkRD8dZ/02aAjZ1iMJ8mY4UVaRevMZaTemJ4VCUmWs4i29K20VvbT8SK/NrSOg== 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 4VpLkr5kykz1FXg; Tue, 28 May 2024 05:32:52 +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 44S5WqdP034964; Tue, 28 May 2024 05:32:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44S5WqtR034961; Tue, 28 May 2024 05:32:52 GMT (envelope-from git) Date: Tue, 28 May 2024 05:32:52 GMT Message-Id: <202405280532.44S5WqtR034961@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kevin Bowling Subject: git: 3d6c7ee87e9d - main - 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/main X-Git-Reftype: branch X-Git-Commit: 3d6c7ee87e9d7f3c8f617c3803af3effa8eb8a16 Auto-Submitted: auto-generated The branch main has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=3d6c7ee87e9d7f3c8f617c3803af3effa8eb8a16 commit 3d6c7ee87e9d7f3c8f617c3803af3effa8eb8a16 Author: Fuqian Huang AuthorDate: 2024-05-28 05:31:03 +0000 Commit: Kevin Bowling CommitDate: 2024-05-28 05:32:16 +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 MFC after: 1 week --- 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);