2018-12-06 16:07:53

by Lorenzo Bianconi

Subject: [PATCH] mt76: mac: run mt76x02_mac_work routine atomically

Grab mt76_dev mutex in mt76x02_mac_work handler since it runs
concurrently with mt76x{0,2}_set_channel routines

Signed-off-by: Lorenzo Bianconi <[email protected]>
---
drivers/net/wireless/mediatek/mt76/mt76x02_mac.c | 4 ++++
1 file changed, 4 insertions(+)

diff --git a/drivers/net/wireless/mediatek/mt76/mt76x02_mac.c b/drivers/net/wireless/mediatek/mt76/mt76x02_mac.c
index 490368dc9325..64841f40cdcf 100644
--- a/drivers/net/wireless/mediatek/mt76/mt76x02_mac.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76x02_mac.c
@@ -784,6 +784,8 @@ void mt76x02_mac_work(struct work_struct *work)
mac_work.work);
int i, idx;

+ mutex_lock(&dev->mt76.mutex);
+
mt76x02_update_channel(&dev->mt76);
for (i = 0, idx = 0; i < 16; i++) {
u32 val = mt76_rr(dev, MT_TX_AGG_CNT(i));
@@ -796,6 +798,8 @@ void mt76x02_mac_work(struct work_struct *work)
if (!dev->beacon_mask)
mt76x02_check_mac_err(dev);

+ mutex_unlock(&dev->mt76.mutex);
+
mt76_tx_status_check(&dev->mt76, NULL, false);

ieee80211_queue_delayed_work(mt76_hw(dev), &dev->mac_work,
--
2.19.2

2018-12-28 12:17:00

by Felix Fietkau

Subject: Re: [PATCH] mt76: mac: run mt76x02_mac_work routine atomically

On 2018-12-06 17:07, Lorenzo Bianconi wrote:
> Grab mt76_dev mutex in mt76x02_mac_work handler since it runs
> concurrently with mt76x{0,2}_set_channel routines
>
> Signed-off-by: Lorenzo Bianconi <[email protected]>

Applied, thanks.

- Felix