From: JB Tsai <jb.tsai@mediatek.com>
To: <nbd@nbd.name>, <lorenzo@kernel.org>
Cc: <linux-wireless@vger.kernel.org>,
<linux-mediatek@lists.infradead.org>, <Sean.Wang@mediatek.com>,
<Quan.Zhou@mediatek.com>, <Ryder.Lee@mediatek.com>,
<litien.chang@mediatek.com>, <Charlie-cy.Wu@mediatek.com>,
<jb.tsai@mediatek.com>
Subject: [PATCH] wifi: mt76: mt7922: only check CLC hw encap type on MT7922
Date: Thu, 10 Sep 2026 17:28:55 +0800 [thread overview]
Message-ID: <20260910092855.1689679-1-jb.tsai@mediatek.com> (raw)
From: Charlie-cy Wu <Charlie-cy.Wu@mediatek.com>
The hw type encap field in the CLC header is only populated on MT7922.
On other chips the EEPROM MT_EE_HW_TYPE read is skipped, leaving
hw_encap as 0, so the POWER and REGD entries are compared against a
bogus value and dropped, leaving those CLC tables empty.
Read MT_EE_HW_TYPE and run the header sanity check only on MT7922, and
accept the CLC entries as-is on the other chips.
Fixes: 31bc74e462b1 ("wifi: mt76: mt7921: add CLC regulatory domain support")
Signed-off-by: Charlie-cy Wu <Charlie-cy.Wu@mediatek.com>
---
.../net/wireless/mediatek/mt76/mt7921/mcu.c | 18 ++++++++++--------
1 file changed, 10 insertions(+), 8 deletions(-)
diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/mcu.c b/drivers/net/wireless/mediatek/mt76/mt7921/mcu.c
index c6af7f00ca59..0092a90eb7fb 100644
--- a/drivers/net/wireless/mediatek/mt76/mt7921/mcu.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7921/mcu.c
@@ -423,7 +423,7 @@ static int mt7921_load_clc(struct mt792x_dev *dev, const char *fw_name)
if (!mt7921_regd_clc_supported(dev))
return 0;
- if (mt76_is_mmio(&dev->mt76)) {
+ if (is_mt7922(&dev->mt76) && mt76_is_mmio(&dev->mt76)) {
ret = mt7921_mcu_read_eeprom(dev, MT_EE_HW_TYPE, &hw_encap);
if (ret)
return ret;
@@ -471,14 +471,16 @@ static int mt7921_load_clc(struct mt792x_dev *dev, const char *fw_name)
if (phy->clc[clc->idx])
continue;
- /* header content sanity */
- if (clc->idx == MT7921_CLC_POWER &&
- u8_get_bits(clc->type, MT_EE_HW_TYPE_ENCAP) != hw_encap)
- continue;
+ /* header content sanity, only MT7922 encodes hw type in CLC */
+ if (is_mt7922(&dev->mt76)) {
+ if (clc->idx == MT7921_CLC_POWER &&
+ u8_get_bits(clc->type, MT_EE_HW_TYPE_ENCAP) != hw_encap)
+ continue;
- if (clc->idx == MT7921_CLC_REGD &&
- u8_get_bits(clc->type, MT_EE_HW_TYPE_ENCAP) != hw_encap)
- continue;
+ if (clc->idx == MT7921_CLC_REGD &&
+ u8_get_bits(clc->type, MT_EE_HW_TYPE_ENCAP) != hw_encap)
+ continue;
+ }
phy->clc[clc->idx] = devm_kmemdup(mdev->dev, clc,
le32_to_cpu(clc->len),
--
2.18.0
reply other threads:[~2026-09-10 9:29 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=20260910092855.1689679-1-jb.tsai@mediatek.com \
--to=jb.tsai@mediatek.com \
--cc=Charlie-cy.Wu@mediatek.com \
--cc=Quan.Zhou@mediatek.com \
--cc=Ryder.Lee@mediatek.com \
--cc=Sean.Wang@mediatek.com \
--cc=linux-mediatek@lists.infradead.org \
--cc=linux-wireless@vger.kernel.org \
--cc=litien.chang@mediatek.com \
--cc=lorenzo@kernel.org \
--cc=nbd@nbd.name \
/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