From: Ian Rogers <irogers@google.com>
To: Andrew Lunn <andrew+netdev@lunn.ch>,
"David S. Miller" <davem@davemloft.net>,
Eric Dumazet <edumazet@kernel.org>,
Jakub Kicinski <kuba@kernel.org>, Paolo Abeni <pabeni@redhat.com>
Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org,
llvm@lists.linux.dev, Elkin Cruz <elkin@google.com>,
Ian Rogers <irogers@google.com>
Subject: [PATCH net] qed: Fix missing bar_id comparison in qed_hw_bar_size()
Date: Thu, 19 Nov 2026 09:04:12 -0800 [thread overview]
Message-ID: <20261119170412.1511344-1-irogers@google.com> (raw)
When PGLUE_B_REG_PF_BAR{0,1}_SIZE reads back as 0 on older management
firmware with multi-hwfn devices, qed_hw_bar_size() logs that it assumes
256 KiB for GRC (BAR_ID_0) and 512 KiB for DB (BAR_ID_1), but evaluates:
return BAR_ID_0 ? 256 * 1024 : 512 * 1024;
Because BAR_ID_0 is enum constant 0, the ternary condition is always
false and qed_hw_bar_size() unconditionally returns 512 KiB even for
BAR_ID_0, doubling the computed GRC BAR offset for the second hardware
function.
Compare bar_id == BAR_ID_0 as intended (matching the bar_reg selection
at the top of qed_hw_bar_size()).
Found by enabling Clang's -Wunreachable-code on an x86_64 allyesconfig
build, with AI coding assistant help to audit the warning and prepare
the fix. Build-tested with Clang; not runtime-tested on QLogic hardware.
Fixes: c2035eea3e9e ("qed: Correct BAR sizes for older MFW")
Signed-off-by: Ian Rogers <irogers@google.com>
---
drivers/net/ethernet/qlogic/qed/qed_dev.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/ethernet/qlogic/qed/qed_dev.c b/drivers/net/ethernet/qlogic/qed/qed_dev.c
index dd75c47758e1..3e84f53dfb50 100644
--- a/drivers/net/ethernet/qlogic/qed/qed_dev.c
+++ b/drivers/net/ethernet/qlogic/qed/qed_dev.c
@@ -1264,11 +1264,11 @@ static u32 qed_hw_bar_size(struct qed_hwfn *p_hwfn,
if (p_hwfn->cdev->num_hwfns > 1) {
DP_INFO(p_hwfn,
"BAR size not configured. Assuming BAR size of 256kB for GRC and 512kB for DB\n");
- return BAR_ID_0 ? 256 * 1024 : 512 * 1024;
+ return bar_id == BAR_ID_0 ? 256 * 1024 : 512 * 1024;
} else {
DP_INFO(p_hwfn,
"BAR size not configured. Assuming BAR size of 512kB for GRC and 512kB for DB\n");
- return 512 * 1024;
+ return 512 * 1024;
}
}
--
2.56.1.708.g77570a6a1d-goog
reply other threads:[~2026-11-19 17:04 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20261119170412.1511344-1-irogers@google.com \
--to=irogers@google.com \
--cc=andrew+netdev@lunn.ch \
--cc=davem@davemloft.net \
--cc=edumazet@kernel.org \
--cc=elkin@google.com \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=llvm@lists.linux.dev \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox