* [PATCH 1/3] mt76: mt7663: fix when beacon filter is being applied
@ 2021-03-04 13:25 sean.wang
2021-03-04 13:25 ` [PATCH 2/3] mt76: mt7663s: make all of packets 4-bytes aligned in sdio tx aggregation sean.wang
2021-03-04 13:25 ` [PATCH 3/3] mt76: mt7663s: fix the possible device hang in high traffic sean.wang
0 siblings, 2 replies; 4+ messages in thread
From: sean.wang @ 2021-03-04 13:25 UTC (permalink / raw)
To: nbd, lorenzo.bianconi; +Cc: sean.wang, linux-wireless, linux-mediatek
From: Sean Wang <sean.wang@mediatek.com>
HW beacon filter command is being applied until we're in associated state
because the command would rely on the associated access point's beacon
interval and DTIM information.
Fixes: 7124198ab1a4 ("mt76: mt7615: enable beacon filtering by default for offload fw")
Signed-off-by: Sean Wang <sean.wang@mediatek.com>
---
drivers/net/wireless/mediatek/mt76/mt7615/main.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/main.c b/drivers/net/wireless/mediatek/mt76/mt7615/main.c
index 1aa6928f88fc..1cb310bf01ee 100644
--- a/drivers/net/wireless/mediatek/mt76/mt7615/main.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7615/main.c
@@ -217,8 +217,6 @@ static int mt7615_add_interface(struct ieee80211_hw *hw,
ret = mt7615_mcu_add_dev_info(phy, vif, true);
if (ret)
goto out;
-
- mt7615_mac_set_beacon_filter(phy, vif, true);
out:
mt7615_mutex_release(dev);
@@ -244,7 +242,6 @@ static void mt7615_remove_interface(struct ieee80211_hw *hw,
mt76_connac_free_pending_tx_skbs(&dev->pm, &msta->wcid);
- mt7615_mac_set_beacon_filter(phy, vif, false);
mt7615_mcu_add_dev_info(phy, vif, false);
rcu_assign_pointer(dev->mt76.wcid[idx], NULL);
@@ -548,6 +545,9 @@ static void mt7615_bss_info_changed(struct ieee80211_hw *hw,
if (changed & BSS_CHANGED_ARP_FILTER)
mt7615_mcu_update_arp_filter(hw, vif, info);
+ if (changed & BSS_CHANGED_ASSOC)
+ mt7615_mac_set_beacon_filter(phy, vif, info->assoc);
+
mt7615_mutex_release(dev);
}
--
2.25.1
_______________________________________________
Linux-mediatek mailing list
Linux-mediatek@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-mediatek
^ permalink raw reply related [flat|nested] 4+ messages in thread* [PATCH 2/3] mt76: mt7663s: make all of packets 4-bytes aligned in sdio tx aggregation
2021-03-04 13:25 [PATCH 1/3] mt76: mt7663: fix when beacon filter is being applied sean.wang
@ 2021-03-04 13:25 ` sean.wang
2021-03-04 13:38 ` Lorenzo Bianconi
2021-03-04 13:25 ` [PATCH 3/3] mt76: mt7663s: fix the possible device hang in high traffic sean.wang
1 sibling, 1 reply; 4+ messages in thread
From: sean.wang @ 2021-03-04 13:25 UTC (permalink / raw)
To: nbd, lorenzo.bianconi; +Cc: sean.wang, linux-wireless, linux-mediatek
From: Sean Wang <sean.wang@mediatek.com>
Each packet should be padded with the additional zero to become 4-bytes
alignment in sdio tx aggregation.
Fixes: 1522ff731f84 ("mt76: mt7663s: introduce sdio tx aggregation")
Signed-off-by: Sean Wang <sean.wang@mediatek.com>
---
drivers/net/wireless/mediatek/mt76/mt7615/sdio_txrx.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/sdio_txrx.c b/drivers/net/wireless/mediatek/mt76/mt7615/sdio_txrx.c
index 9fb506f2ace6..2d3b7d1e2c92 100644
--- a/drivers/net/wireless/mediatek/mt76/mt7615/sdio_txrx.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7615/sdio_txrx.c
@@ -218,6 +218,7 @@ static int mt7663s_tx_run_queue(struct mt76_dev *dev, struct mt76_queue *q)
int qid, err, nframes = 0, len = 0, pse_sz = 0, ple_sz = 0;
bool mcu = q == dev->q_mcu[MT_MCUQ_WM];
struct mt76_sdio *sdio = &dev->sdio;
+ u8 pad;
qid = mcu ? ARRAY_SIZE(sdio->xmit_buf) - 1 : q->qid;
while (q->first != q->head) {
@@ -234,7 +235,8 @@ static int mt7663s_tx_run_queue(struct mt76_dev *dev, struct mt76_queue *q)
goto next;
}
- if (len + e->skb->len + 4 > MT76S_XMIT_BUF_SZ)
+ pad = roundup(e->skb->len, 4) - e->skb->len;
+ if (len + e->skb->len + pad + 4 > MT76S_XMIT_BUF_SZ)
break;
if (mt7663s_tx_pick_quota(sdio, mcu, e->buf_sz, &pse_sz,
@@ -252,6 +254,9 @@ static int mt7663s_tx_run_queue(struct mt76_dev *dev, struct mt76_queue *q)
len += iter->len;
nframes++;
}
+
+ memset(sdio->xmit_buf[qid] + len, 0, pad);
+ len += pad;
next:
q->first = (q->first + 1) % q->ndesc;
e->done = true;
--
2.25.1
_______________________________________________
Linux-mediatek mailing list
Linux-mediatek@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-mediatek
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH 2/3] mt76: mt7663s: make all of packets 4-bytes aligned in sdio tx aggregation
2021-03-04 13:25 ` [PATCH 2/3] mt76: mt7663s: make all of packets 4-bytes aligned in sdio tx aggregation sean.wang
@ 2021-03-04 13:38 ` Lorenzo Bianconi
0 siblings, 0 replies; 4+ messages in thread
From: Lorenzo Bianconi @ 2021-03-04 13:38 UTC (permalink / raw)
To: sean.wang; +Cc: nbd, linux-wireless, linux-mediatek
[-- Attachment #1.1: Type: text/plain, Size: 1929 bytes --]
> From: Sean Wang <sean.wang@mediatek.com>
>
> Each packet should be padded with the additional zero to become 4-bytes
> alignment in sdio tx aggregation.
>
> Fixes: 1522ff731f84 ("mt76: mt7663s: introduce sdio tx aggregation")
> Signed-off-by: Sean Wang <sean.wang@mediatek.com>
> ---
> drivers/net/wireless/mediatek/mt76/mt7615/sdio_txrx.c | 7 ++++++-
> 1 file changed, 6 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/sdio_txrx.c b/drivers/net/wireless/mediatek/mt76/mt7615/sdio_txrx.c
> index 9fb506f2ace6..2d3b7d1e2c92 100644
> --- a/drivers/net/wireless/mediatek/mt76/mt7615/sdio_txrx.c
> +++ b/drivers/net/wireless/mediatek/mt76/mt7615/sdio_txrx.c
> @@ -218,6 +218,7 @@ static int mt7663s_tx_run_queue(struct mt76_dev *dev, struct mt76_queue *q)
> int qid, err, nframes = 0, len = 0, pse_sz = 0, ple_sz = 0;
> bool mcu = q == dev->q_mcu[MT_MCUQ_WM];
> struct mt76_sdio *sdio = &dev->sdio;
> + u8 pad;
>
> qid = mcu ? ARRAY_SIZE(sdio->xmit_buf) - 1 : q->qid;
> while (q->first != q->head) {
> @@ -234,7 +235,8 @@ static int mt7663s_tx_run_queue(struct mt76_dev *dev, struct mt76_queue *q)
> goto next;
> }
>
> - if (len + e->skb->len + 4 > MT76S_XMIT_BUF_SZ)
> + pad = roundup(e->skb->len, 4) - e->skb->len;
> + if (len + e->skb->len + pad + 4 > MT76S_XMIT_BUF_SZ)
> break;
>
> if (mt7663s_tx_pick_quota(sdio, mcu, e->buf_sz, &pse_sz,
> @@ -252,6 +254,9 @@ static int mt7663s_tx_run_queue(struct mt76_dev *dev, struct mt76_queue *q)
> len += iter->len;
> nframes++;
> }
> +
> + memset(sdio->xmit_buf[qid] + len, 0, pad);
> + len += pad;
maybe it is better to do something like:
if (unlikely(pad)) {
memset(sdio->xmit_buf[qid] + len, 0, pad);
len += pad;
}
Regards,
Lorenzo
> next:
> q->first = (q->first + 1) % q->ndesc;
> e->done = true;
> --
> 2.25.1
[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]
[-- Attachment #2: Type: text/plain, Size: 170 bytes --]
_______________________________________________
Linux-mediatek mailing list
Linux-mediatek@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-mediatek
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH 3/3] mt76: mt7663s: fix the possible device hang in high traffic
2021-03-04 13:25 [PATCH 1/3] mt76: mt7663: fix when beacon filter is being applied sean.wang
2021-03-04 13:25 ` [PATCH 2/3] mt76: mt7663s: make all of packets 4-bytes aligned in sdio tx aggregation sean.wang
@ 2021-03-04 13:25 ` sean.wang
1 sibling, 0 replies; 4+ messages in thread
From: sean.wang @ 2021-03-04 13:25 UTC (permalink / raw)
To: nbd, lorenzo.bianconi; +Cc: sean.wang, linux-wireless, linux-mediatek
From: Sean Wang <sean.wang@mediatek.com>
Use the additional memory barrier to ensure the skb list up-to-date
between the skb producer and consumer to avoid the invalid skb content
written into sdio controller and then cause device hang due to mcu assert
caught by WR_TIMEOUT_INT.
Fixes: 1522ff731f84 ("mt76: mt7663s: introduce sdio tx aggregation")
Signed-off-by: Sean Wang <sean.wang@mediatek.com>
---
drivers/net/wireless/mediatek/mt76/mt7615/sdio_txrx.c | 2 ++
drivers/net/wireless/mediatek/mt76/sdio.c | 3 +++
2 files changed, 5 insertions(+)
diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/sdio_txrx.c b/drivers/net/wireless/mediatek/mt76/mt7615/sdio_txrx.c
index 2d3b7d1e2c92..29e510d263fc 100644
--- a/drivers/net/wireless/mediatek/mt76/mt7615/sdio_txrx.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7615/sdio_txrx.c
@@ -225,6 +225,8 @@ static int mt7663s_tx_run_queue(struct mt76_dev *dev, struct mt76_queue *q)
struct mt76_queue_entry *e = &q->entry[q->first];
struct sk_buff *iter;
+ smp_rmb();
+
if (!test_bit(MT76_STATE_MCU_RUNNING, &dev->phy.state)) {
__skb_put_zero(e->skb, 4);
err = __mt7663s_xmit_queue(dev, e->skb->data,
diff --git a/drivers/net/wireless/mediatek/mt76/sdio.c b/drivers/net/wireless/mediatek/mt76/sdio.c
index 0b6facb17ff7..a18d2896ee1f 100644
--- a/drivers/net/wireless/mediatek/mt76/sdio.c
+++ b/drivers/net/wireless/mediatek/mt76/sdio.c
@@ -256,6 +256,9 @@ mt76s_tx_queue_skb(struct mt76_dev *dev, struct mt76_queue *q,
q->entry[q->head].skb = tx_info.skb;
q->entry[q->head].buf_sz = len;
+
+ smp_wmb();
+
q->head = (q->head + 1) % q->ndesc;
q->queued++;
--
2.25.1
_______________________________________________
Linux-mediatek mailing list
Linux-mediatek@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-mediatek
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2021-03-04 13:40 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-03-04 13:25 [PATCH 1/3] mt76: mt7663: fix when beacon filter is being applied sean.wang
2021-03-04 13:25 ` [PATCH 2/3] mt76: mt7663s: make all of packets 4-bytes aligned in sdio tx aggregation sean.wang
2021-03-04 13:38 ` Lorenzo Bianconi
2021-03-04 13:25 ` [PATCH 3/3] mt76: mt7663s: fix the possible device hang in high traffic sean.wang
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox