* [PATCH v8] wifi: mt76: mt7915: add wds support when wed is enabled
@ 2025-03-05 11:09 Shengyu Qu
2025-03-06 2:27 ` Ping-Ke Shih
0 siblings, 1 reply; 3+ messages in thread
From: Shengyu Qu @ 2025-03-05 11:09 UTC (permalink / raw)
To: nbd, lorenzo, ryder.lee, shayne.chen, sean.wang, johannes,
matthias.bgg, angelogioacchino.delregno, miriam.rachel.korenblit,
nicolas.cavallari, howard-yh.hsu, greearb, christophe.jaillet,
benjamin-jw.lin, mingyen.hsieh, quic_adisi, deren.wu,
chui-hao.chiu, gustavoars, bo.jiao, sujuan.chen, linux-wireless,
linux-kernel, linux-arm-kernel, linux-mediatek
Cc: Shengyu Qu
The current WED only supports 256 wcid, whereas mt7986 can support up to
512 entries, so firmware provides a rule to get sta_info by DA when wcid
is set to 0x3ff by txd. Also, WED provides a register to overwrite txd
wcid, that is, wcid[9:8] can be overwritten by 0x3 and wcid[7:0] is set
to 0xff by host driver.
However, firmware is unable to get sta_info from DA as DA != RA for
4addr cases, so firmware and wifi host driver both use wcid (256 - 271)
and (768 ~ 783) for sync up to get correct sta_info.
Currently WDS+WED config is completely broken on MT7986/7981 devices if
without this patch.
Tested-by: Sujuan Chen <sujuan.chen@mediatek.com>
Co-developed-by: Bo Jiao <bo.jiao@mediatek.com>
Signed-off-by: Bo Jiao <bo.jiao@mediatek.com>
Signed-off-by: Sujuan Chen <sujuan.chen@mediatek.com>
Signed-off-by: Shengyu Qu <wiagn233@outlook.com>
---
Changes since v1:
- Drop duplicate setting in mmio
- Reduce the patch size by redefining mt76_wcid_alloc
Changes since v2:
- Rework wds wcid getting flow
Changes since v3:
- Rebase to next-20240703
- Sync with downstream patch
Changes since v4:
- Rebase to next-20240802
Changes since v5:
- Fixed build test error reported by robot
- Rebase to next-20240805
Changes since v6:
- Fix potential race conditions on tx/rx packets during the transition
- Rebase to Felix's newest codebase
Changes since v7:
- Fix build fail
---
drivers/net/wireless/mediatek/mt76/mt76.h | 9 ++++
.../net/wireless/mediatek/mt76/mt7915/main.c | 45 +++++++++++++++++--
.../net/wireless/mediatek/mt76/mt7915/mcu.c | 18 ++++++--
.../net/wireless/mediatek/mt76/mt7915/mcu.h | 1 +
drivers/net/wireless/mediatek/mt76/util.c | 37 +++++++++++++--
drivers/net/wireless/mediatek/mt76/util.h | 7 ++-
6 files changed, 106 insertions(+), 11 deletions(-)
diff --git a/drivers/net/wireless/mediatek/mt76/mt76.h b/drivers/net/wireless/mediatek/mt76/mt76.h
index 132148f7b1070..638ee9fae0c73 100644
--- a/drivers/net/wireless/mediatek/mt76/mt76.h
+++ b/drivers/net/wireless/mediatek/mt76/mt76.h
@@ -28,6 +28,9 @@
#define MT76_TOKEN_FREE_THR 64
+#define MT76_WED_WDS_MIN 256
+#define MT76_WED_WDS_MAX 272
+
#define MT_QFLAG_WED_RING GENMASK(1, 0)
#define MT_QFLAG_WED_TYPE GENMASK(4, 2)
#define MT_QFLAG_WED BIT(5)
@@ -73,6 +76,12 @@ enum mt76_wed_type {
MT76_WED_RRO_Q_IND,
};
+enum mt76_wed_state {
+ MT76_WED_DEFAULT,
+ MT76_WED_ACTIVE,
+ MT76_WED_WDS_ACTIVE,
+};
+
struct mt76_bus_ops {
u32 (*rr)(struct mt76_dev *dev, u32 offset);
void (*wr)(struct mt76_dev *dev, u32 offset, u32 val);
diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/main.c b/drivers/net/wireless/mediatek/mt76/mt7915/main.c
index 3aa31c5cefa6a..c489130b6ae2a 100644
--- a/drivers/net/wireless/mediatek/mt76/mt7915/main.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7915/main.c
@@ -745,8 +745,15 @@ int mt7915_mac_sta_add(struct mt76_dev *mdev, struct ieee80211_vif *vif,
struct mt7915_vif *mvif = (struct mt7915_vif *)vif->drv_priv;
bool ext_phy = mvif->phy != &dev->phy;
int idx;
+ u8 flags = MT76_WED_DEFAULT;
- idx = mt76_wcid_alloc(dev->mt76.wcid_mask, MT7915_WTBL_STA);
+ if (mtk_wed_device_active(&dev->mt76.mmio.wed) &&
+ !is_mt7915(&dev->mt76)) {
+ flags = test_bit(MT_WCID_FLAG_4ADDR, &msta->wcid.flags) ?
+ MT76_WED_WDS_ACTIVE : MT76_WED_ACTIVE;
+ }
+
+ idx = __mt76_wcid_alloc(mdev->wcid_mask, MT7915_WTBL_STA, flags);
if (idx < 0)
return -ENOSPC;
@@ -1271,6 +1278,10 @@ static void mt7915_sta_set_4addr(struct ieee80211_hw *hw,
{
struct mt7915_dev *dev = mt7915_hw_dev(hw);
struct mt7915_sta *msta = (struct mt7915_sta *)sta->drv_priv;
+ int min = MT76_WED_WDS_MIN, max = MT76_WED_WDS_MAX;
+ struct ieee80211_sta *pre_sta;
+ u8 flags = MT76_WED_DEFAULT;
+ int temp_idx;
if (enabled)
set_bit(MT_WCID_FLAG_4ADDR, &msta->wcid.flags);
@@ -1280,6 +1291,30 @@ static void mt7915_sta_set_4addr(struct ieee80211_hw *hw,
if (!msta->wcid.sta)
return;
+ if (mtk_wed_device_active(&dev->mt76.mmio.wed) &&
+ !is_mt7915(&dev->mt76) &&
+ (msta->wcid.idx < min || msta->wcid.idx > max - 1)) {
+ pre_sta = kzalloc(sizeof(*sta) + sizeof(*msta), GFP_KERNEL);
+ memmove(pre_sta, sta, sizeof(*sta) + sizeof(*msta));
+
+ flags = test_bit(MT_WCID_FLAG_4ADDR, &msta->wcid.flags) ?
+ MT76_WED_WDS_ACTIVE : MT76_WED_ACTIVE;
+
+ temp_idx = __mt76_wcid_alloc(dev->mt76.wcid_mask, MT7915_WTBL_STA, flags);
+ ((struct mt7915_sta *)pre_sta->drv_priv)->wcid.idx = (u16)temp_idx;
+ mt7915_mac_sta_add(&dev->mt76, vif, pre_sta);
+ rcu_assign_pointer(dev->mt76.wcid[temp_idx], &msta->wcid);
+
+ temp_idx = msta->wcid.idx;
+ msta->wcid.idx = ((struct mt7915_sta *)pre_sta->drv_priv)->wcid.idx;
+ ((struct mt7915_sta *)pre_sta->drv_priv)->wcid.idx = (u16)temp_idx;
+ rcu_assign_pointer(dev->mt76.wcid[temp_idx], NULL);
+
+ synchronize_rcu();
+ mt7915_mac_sta_remove(&dev->mt76, vif, pre_sta);
+ kfree(pre_sta);
+ }
+
mt76_connac_mcu_wtbl_update_hdr_trans(&dev->mt76, vif, sta);
}
@@ -1726,15 +1761,19 @@ mt7915_net_fill_forward_path(struct ieee80211_hw *hw,
if (!mtk_wed_device_active(wed))
return -ENODEV;
- if (msta->wcid.idx > 0xff)
+ if (msta->wcid.idx > MT7915_WTBL_STA)
return -EIO;
path->type = DEV_PATH_MTK_WDMA;
path->dev = ctx->dev;
path->mtk_wdma.wdma_idx = wed->wdma_idx;
path->mtk_wdma.bss = mvif->mt76.idx;
- path->mtk_wdma.wcid = is_mt7915(&dev->mt76) ? msta->wcid.idx : 0x3ff;
path->mtk_wdma.queue = phy != &dev->phy;
+ if (test_bit(MT_WCID_FLAG_4ADDR, &msta->wcid.flags) ||
+ is_mt7915(&dev->mt76))
+ path->mtk_wdma.wcid = msta->wcid.idx;
+ else
+ path->mtk_wdma.wcid = 0x3ff;
ctx->dev = NULL;
diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c b/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c
index 9d790f234e82c..32c5aa1a361e8 100644
--- a/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c
@@ -2385,10 +2385,20 @@ int mt7915_mcu_init_firmware(struct mt7915_dev *dev)
mt76_connac_mcu_del_wtbl_all(&dev->mt76);
- if ((mtk_wed_device_active(&dev->mt76.mmio.wed) &&
- is_mt7915(&dev->mt76)) ||
- !mtk_wed_get_rx_capa(&dev->mt76.mmio.wed))
- mt7915_mcu_wa_cmd(dev, MCU_WA_PARAM_CMD(CAPABILITY), 0, 0, 0);
+#ifdef CONFIG_NET_MEDIATEK_SOC_WED
+ if (mtk_wed_device_active(&dev->mt76.mmio.wed)) {
+ if (is_mt7915(&dev->mt76) ||
+ !mtk_wed_get_rx_capa(&dev->mt76.mmio.wed))
+ ret = mt7915_mcu_wa_cmd(dev, MCU_WA_PARAM_CMD(CAPABILITY),
+ 0, 0, 0);
+ else
+ ret = mt7915_mcu_wa_cmd(dev, MCU_WA_PARAM_CMD(SET),
+ MCU_WA_PARAM_WED_VERSION,
+ dev->mt76.mmio.wed.rev_id, 0);
+ if (ret)
+ return ret;
+ }
+#endif
ret = mt7915_mcu_set_mwds(dev, 1);
if (ret)
diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/mcu.h b/drivers/net/wireless/mediatek/mt76/mt7915/mcu.h
index 49476a4182fd1..c3dd0cb4a5d38 100644
--- a/drivers/net/wireless/mediatek/mt76/mt7915/mcu.h
+++ b/drivers/net/wireless/mediatek/mt76/mt7915/mcu.h
@@ -278,6 +278,7 @@ enum {
MCU_WA_PARAM_PDMA_RX = 0x04,
MCU_WA_PARAM_CPU_UTIL = 0x0b,
MCU_WA_PARAM_RED = 0x0e,
+ MCU_WA_PARAM_WED_VERSION = 0x32,
MCU_WA_PARAM_RED_SETTING = 0x40,
};
diff --git a/drivers/net/wireless/mediatek/mt76/util.c b/drivers/net/wireless/mediatek/mt76/util.c
index 95b3dc96e4c45..7fac9c79ebdf3 100644
--- a/drivers/net/wireless/mediatek/mt76/util.c
+++ b/drivers/net/wireless/mediatek/mt76/util.c
@@ -42,9 +42,11 @@ bool ____mt76_poll_msec(struct mt76_dev *dev, u32 offset, u32 mask, u32 val,
}
EXPORT_SYMBOL_GPL(____mt76_poll_msec);
-int mt76_wcid_alloc(u32 *mask, int size)
+int __mt76_wcid_alloc(u32 *mask, int size, u8 flag)
{
int i, idx = 0, cur;
+ int min = MT76_WED_WDS_MIN;
+ int max = MT76_WED_WDS_MAX;
for (i = 0; i < DIV_ROUND_UP(size, 32); i++) {
idx = ffs(~mask[i]);
@@ -53,16 +55,45 @@ int mt76_wcid_alloc(u32 *mask, int size)
idx--;
cur = i * 32 + idx;
- if (cur >= size)
+
+ switch (flag) {
+ case MT76_WED_ACTIVE:
+ if (cur >= min && cur < max)
+ continue;
+
+ if (cur >= size) {
+ u32 end = max - min - 1;
+
+ i = min / 32;
+ idx = ffs(~mask[i] & GENMASK(end, 0));
+ if (!idx)
+ goto error;
+ idx--;
+ cur = min + idx;
+ }
+
break;
+ case MT76_WED_WDS_ACTIVE:
+ if (cur < min)
+ continue;
+ if (cur >= max)
+ goto error;
+
+ break;
+ default:
+ if (cur >= size)
+ goto error;
+ break;
+ }
mask[i] |= BIT(idx);
return cur;
}
+error:
return -1;
}
-EXPORT_SYMBOL_GPL(mt76_wcid_alloc);
+EXPORT_SYMBOL_GPL(__mt76_wcid_alloc);
int mt76_get_min_avg_rssi(struct mt76_dev *dev, u8 phy_idx)
{
diff --git a/drivers/net/wireless/mediatek/mt76/util.h b/drivers/net/wireless/mediatek/mt76/util.h
index 260965dde94cf..99b7263c0a205 100644
--- a/drivers/net/wireless/mediatek/mt76/util.h
+++ b/drivers/net/wireless/mediatek/mt76/util.h
@@ -27,7 +27,12 @@ enum {
#define MT76_INCR(_var, _size) \
(_var = (((_var) + 1) % (_size)))
-int mt76_wcid_alloc(u32 *mask, int size);
+int __mt76_wcid_alloc(u32 *mask, int size, u8 flags);
+
+static inline int mt76_wcid_alloc(u32 *mask, int size)
+{
+ return __mt76_wcid_alloc(mask, size, 0);
+}
static inline void
mt76_wcid_mask_set(u32 *mask, int idx)
--
2.48.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* RE: [PATCH v8] wifi: mt76: mt7915: add wds support when wed is enabled
2025-03-05 11:09 [PATCH v8] wifi: mt76: mt7915: add wds support when wed is enabled Shengyu Qu
@ 2025-03-06 2:27 ` Ping-Ke Shih
2025-03-06 18:07 ` Shengyu Qu
0 siblings, 1 reply; 3+ messages in thread
From: Ping-Ke Shih @ 2025-03-06 2:27 UTC (permalink / raw)
To: Shengyu Qu, nbd@nbd.name, lorenzo@kernel.org,
ryder.lee@mediatek.com, shayne.chen@mediatek.com,
sean.wang@mediatek.com, johannes@sipsolutions.net,
matthias.bgg@gmail.com, angelogioacchino.delregno@collabora.com,
miriam.rachel.korenblit@intel.com,
nicolas.cavallari@green-communications.fr,
howard-yh.hsu@mediatek.com, greearb@candelatech.com,
christophe.jaillet@wanadoo.fr, benjamin-jw.lin@mediatek.com,
mingyen.hsieh@mediatek.com, quic_adisi@quicinc.com,
deren.wu@mediatek.com, chui-hao.chiu@mediatek.com,
gustavoars@kernel.org, bo.jiao@mediatek.com,
sujuan.chen@mediatek.com, linux-wireless@vger.kernel.org,
linux-kernel@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
linux-mediatek@lists.infradead.org
Shengyu Qu <wiagn233@outlook.com> wrote:
[...]
> @@ -1271,6 +1278,10 @@ static void mt7915_sta_set_4addr(struct ieee80211_hw *hw,
> {
> struct mt7915_dev *dev = mt7915_hw_dev(hw);
> struct mt7915_sta *msta = (struct mt7915_sta *)sta->drv_priv;
> + int min = MT76_WED_WDS_MIN, max = MT76_WED_WDS_MAX;
> + struct ieee80211_sta *pre_sta;
> + u8 flags = MT76_WED_DEFAULT;
> + int temp_idx;
In general 'temp' is short for temperature. 'tmp' is preferred.
>
> if (enabled)
> set_bit(MT_WCID_FLAG_4ADDR, &msta->wcid.flags);
> @@ -1280,6 +1291,30 @@ static void mt7915_sta_set_4addr(struct ieee80211_hw *hw,
> if (!msta->wcid.sta)
> return;
>
> + if (mtk_wed_device_active(&dev->mt76.mmio.wed) &&
> + !is_mt7915(&dev->mt76) &&
> + (msta->wcid.idx < min || msta->wcid.idx > max - 1)) {
> + pre_sta = kzalloc(sizeof(*sta) + sizeof(*msta), GFP_KERNEL);
> + memmove(pre_sta, sta, sizeof(*sta) + sizeof(*msta));
Seemingly, kmemdup() = kzalloc() + memmove().
> +
> + flags = test_bit(MT_WCID_FLAG_4ADDR, &msta->wcid.flags) ?
> + MT76_WED_WDS_ACTIVE : MT76_WED_ACTIVE;
> +
> + temp_idx = __mt76_wcid_alloc(dev->mt76.wcid_mask, MT7915_WTBL_STA, flags);
Since __mt76_wcid_alloc() could return -1 for error case, shouldn't you handle that?
> + ((struct mt7915_sta *)pre_sta->drv_priv)->wcid.idx = (u16)temp_idx;
Define a local `struct mt7915_sta *pre_msta = (struct mt7915_sta *)pre_sta->drv_priv`
ahead. This statement would be simpler. Just `pre_msta-> wcid.idx = (u16)temp_idx`,
but casting of '(u16)' is still not very preferred.
> + mt7915_mac_sta_add(&dev->mt76, vif, pre_sta);
> + rcu_assign_pointer(dev->mt76.wcid[temp_idx], &msta->wcid);
> +
> + temp_idx = msta->wcid.idx;
> + msta->wcid.idx = ((struct mt7915_sta *)pre_sta->drv_priv)->wcid.idx;
> + ((struct mt7915_sta *)pre_sta->drv_priv)->wcid.idx = (u16)temp_idx;
> + rcu_assign_pointer(dev->mt76.wcid[temp_idx], NULL);
> +
> + synchronize_rcu();
> + mt7915_mac_sta_remove(&dev->mt76, vif, pre_sta);
> + kfree(pre_sta);
> + }
> +
> mt76_connac_mcu_wtbl_update_hdr_trans(&dev->mt76, vif, sta);
> }
>
[...]
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH v8] wifi: mt76: mt7915: add wds support when wed is enabled
2025-03-06 2:27 ` Ping-Ke Shih
@ 2025-03-06 18:07 ` Shengyu Qu
0 siblings, 0 replies; 3+ messages in thread
From: Shengyu Qu @ 2025-03-06 18:07 UTC (permalink / raw)
To: Ping-Ke Shih, nbd@nbd.name, lorenzo@kernel.org,
ryder.lee@mediatek.com, shayne.chen@mediatek.com,
sean.wang@mediatek.com, johannes@sipsolutions.net,
matthias.bgg@gmail.com, angelogioacchino.delregno@collabora.com,
miriam.rachel.korenblit@intel.com,
nicolas.cavallari@green-communications.fr,
howard-yh.hsu@mediatek.com, greearb@candelatech.com,
christophe.jaillet@wanadoo.fr, benjamin-jw.lin@mediatek.com,
mingyen.hsieh@mediatek.com, quic_adisi@quicinc.com,
deren.wu@mediatek.com, chui-hao.chiu@mediatek.com,
gustavoars@kernel.org, bo.jiao@mediatek.com,
sujuan.chen@mediatek.com, linux-wireless@vger.kernel.org,
linux-kernel@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
linux-mediatek@lists.infradead.org
Cc: wiagn233
[-- Attachment #1.1.1: Type: text/plain, Size: 2702 bytes --]
Hi,
Thanks for reply. I'll change the code in next version.
Best regards,
Shengyu
在 2025/3/6 10:27, Ping-Ke Shih 写道:
> Shengyu Qu <wiagn233@outlook.com> wrote:
>
> [...]
>
>> @@ -1271,6 +1278,10 @@ static void mt7915_sta_set_4addr(struct ieee80211_hw *hw,
>> {
>> struct mt7915_dev *dev = mt7915_hw_dev(hw);
>> struct mt7915_sta *msta = (struct mt7915_sta *)sta->drv_priv;
>> + int min = MT76_WED_WDS_MIN, max = MT76_WED_WDS_MAX;
>> + struct ieee80211_sta *pre_sta;
>> + u8 flags = MT76_WED_DEFAULT;
>> + int temp_idx;
>
> In general 'temp' is short for temperature. 'tmp' is preferred.
>
>>
>> if (enabled)
>> set_bit(MT_WCID_FLAG_4ADDR, &msta->wcid.flags);
>> @@ -1280,6 +1291,30 @@ static void mt7915_sta_set_4addr(struct ieee80211_hw *hw,
>> if (!msta->wcid.sta)
>> return;
>>
>> + if (mtk_wed_device_active(&dev->mt76.mmio.wed) &&
>> + !is_mt7915(&dev->mt76) &&
>> + (msta->wcid.idx < min || msta->wcid.idx > max - 1)) {
>> + pre_sta = kzalloc(sizeof(*sta) + sizeof(*msta), GFP_KERNEL);
>> + memmove(pre_sta, sta, sizeof(*sta) + sizeof(*msta));
>
> Seemingly, kmemdup() = kzalloc() + memmove().
>
>> +
>> + flags = test_bit(MT_WCID_FLAG_4ADDR, &msta->wcid.flags) ?
>> + MT76_WED_WDS_ACTIVE : MT76_WED_ACTIVE;
>> +
>> + temp_idx = __mt76_wcid_alloc(dev->mt76.wcid_mask, MT7915_WTBL_STA, flags);
>
> Since __mt76_wcid_alloc() could return -1 for error case, shouldn't you handle that?
>
>> + ((struct mt7915_sta *)pre_sta->drv_priv)->wcid.idx = (u16)temp_idx;
>
> Define a local `struct mt7915_sta *pre_msta = (struct mt7915_sta *)pre_sta->drv_priv`
> ahead. This statement would be simpler. Just `pre_msta-> wcid.idx = (u16)temp_idx`,
> but casting of '(u16)' is still not very preferred.
>
>> + mt7915_mac_sta_add(&dev->mt76, vif, pre_sta);
>> + rcu_assign_pointer(dev->mt76.wcid[temp_idx], &msta->wcid);
>> +
>> + temp_idx = msta->wcid.idx;
>> + msta->wcid.idx = ((struct mt7915_sta *)pre_sta->drv_priv)->wcid.idx;
>> + ((struct mt7915_sta *)pre_sta->drv_priv)->wcid.idx = (u16)temp_idx;
>> + rcu_assign_pointer(dev->mt76.wcid[temp_idx], NULL);
>> +
>> + synchronize_rcu();
>> + mt7915_mac_sta_remove(&dev->mt76, vif, pre_sta);
>> + kfree(pre_sta);
>> + }
>> +
>> mt76_connac_mcu_wtbl_update_hdr_trans(&dev->mt76, vif, sta);
>> }
>>
>
> [...]
>
[-- Attachment #1.1.2: OpenPGP public key --]
[-- Type: application/pgp-keys, Size: 6977 bytes --]
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 840 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2025-03-06 18:07 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-03-05 11:09 [PATCH v8] wifi: mt76: mt7915: add wds support when wed is enabled Shengyu Qu
2025-03-06 2:27 ` Ping-Ke Shih
2025-03-06 18:07 ` Shengyu Qu
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox