gitops/mt76
1
0
Fork 0
mirror of https://github.com/outbackdingo/mt76.git synced 2026-10-24 21:36:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

mt76: mt7921: fix the insmod hangs

Browse Source 
Fix the second insert module causing the device hangs after remove module.

Fixes: 1c099ab44727 ("mt76: mt7921: add MCU support")
Signed-off-by: Sean Wang <[email protected]>
Signed-off-by: Felix Fietkau <[email protected]>
This commit is contained in:
Sean Wang
2021-04-07 10:55:33 +02:00
committed by Felix Fietkau
parent 54f52771a0
commit 97189d2a04
4 changed files with 3 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mt7921/init.c
-2
View File
@@ -273,8 +273,6 @@ void mt7921_unregister_device(struct mt7921_dev *dev)
{
mt76_unregister_device(&dev->mt76);
mt7921_mcu_exit(dev);
mt7921_dma_cleanup(dev);
mt7921_tx_token_put(dev);
tasklet_disable(&dev->irq_tasklet);
mt7921/mac.c
+1 -2
View File
@@ -1207,8 +1207,7 @@ void mt7921_update_channel(struct mt76_dev *mdev)
mt76_connac_power_save_sched(&dev->mphy, &dev->pm);
}
static int
mt7921_wfsys_reset(struct mt7921_dev *dev)
int mt7921_wfsys_reset(struct mt7921_dev *dev)
{
mt76_set(dev, 0x70002600, BIT(0));
msleep(200);
mt7921/mcu.c
+1 -12
View File
@@ -961,18 +961,7 @@ int mt7921_mcu_init(struct mt7921_dev *dev)
void mt7921_mcu_exit(struct mt7921_dev *dev)
{
u32 reg = mt7921_reg_map_l1(dev, MT_TOP_MISC);
__mt76_mcu_restart(&dev->mt76);
if (!mt76_poll_msec(dev, reg, MT_TOP_MISC_FW_STATE,
FIELD_PREP(MT_TOP_MISC_FW_STATE,
FW_STATE_FW_DOWNLOAD), 1000)) {
dev_err(dev->mt76.dev, "Failed to exit mcu\n");
return;
}
reg = mt7921_reg_map_l1(dev, MT_TOP_LPCR_HOST_BAND0);
mt76_wr(dev, reg, MT_TOP_LPCR_HOST_FW_OWN);
mt7921_wfsys_reset(dev);
skb_queue_purge(&dev->mt76.mcu.res_q);
}
mt7921/mt7921.h
+1
View File
@@ -351,4 +351,5 @@ void mt7921_coredump_work(struct work_struct *work);
int mt7921_mcu_update_arp_filter(struct ieee80211_hw *hw,
struct ieee80211_vif *vif,
struct ieee80211_bss_conf *info);
int mt7921_wfsys_reset(struct mt7921_dev *dev);
#endif