Skip to content

Commit

Permalink
mt76: mt7915: fix possible deadlock while mt7915_register_ext_phy()
Browse files Browse the repository at this point in the history
ieee80211_register_hw() is called with rtnl_lock held, and this could be
caused lockdep from a work item that's on a workqueue that is flushed
with the rtnl held.

Move mt7915_register_ext_phy() outside the init_work().

Signed-off-by: Evelyn Tsai <evelyn.tsai@mediatek.com>
Signed-off-by: Ryder Lee <ryder.lee@mediatek.com>
Signed-off-by: Felix Fietkau <nbd@nbd.name>
  • Loading branch information
Ryder Lee authored and Felix Fietkau committed Apr 11, 2021
1 parent dc0a108 commit 7820183
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 3 deletions.
7 changes: 4 additions & 3 deletions drivers/net/wireless/mediatek/mt76/mt7915/init.c
Original file line number Diff line number Diff line change
Expand Up @@ -181,8 +181,6 @@ static void mt7915_mac_init(struct mt7915_dev *dev)
MT_WTBL_UPDATE_ADM_COUNT_CLEAR);
for (i = 0; i < 2; i++)
mt7915_mac_init_band(dev, i);

mt7915_mcu_set_rts_thresh(&dev->phy, 0x92b);
}

static int mt7915_txbf_init(struct mt7915_dev *dev)
Expand Down Expand Up @@ -295,7 +293,6 @@ static void mt7915_init_work(struct work_struct *work)
mt7915_mac_init(dev);
mt7915_init_txpower(dev);
mt7915_txbf_init(dev);
mt7915_register_ext_phy(dev);
}

static int mt7915_init_hardware(struct mt7915_dev *dev)
Expand Down Expand Up @@ -677,6 +674,10 @@ int mt7915_register_device(struct mt7915_dev *dev)

ieee80211_queue_work(mt76_hw(dev), &dev->init_work);

ret = mt7915_register_ext_phy(dev);
if (ret)
return ret;

return mt7915_init_debugfs(dev);
}

Expand Down
4 changes: 4 additions & 0 deletions drivers/net/wireless/mediatek/mt76/mt7915/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,10 @@ static int mt7915_start(struct ieee80211_hw *hw)
mt7915_mac_enable_nf(dev, 1);
}

ret = mt7915_mcu_set_rts_thresh(phy, 0x92b);
if (ret)
goto out;

ret = mt7915_mcu_set_sku_en(phy, true);
if (ret)
goto out;
Expand Down

0 comments on commit 7820183

Please sign in to comment.