mt76: add missing lock configuring coverage class
authorLorenzo Bianconi <lorenzo@kernel.org>
Tue, 2 Jun 2020 20:26:38 +0000 (22:26 +0200)
committerFelix Fietkau <nbd@nbd.name>
Sun, 7 Jun 2020 14:59:39 +0000 (16:59 +0200)
Coverage class callback can potentially run in parallel with other
routines (e.g. mt7615_set_channel) that configures timing registers.
Run coverage class callback holding mt76 mutex

Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
Signed-off-by: Felix Fietkau <nbd@nbd.name>
drivers/net/wireless/mediatek/mt76/mt7603/main.c
drivers/net/wireless/mediatek/mt76/mt7615/main.c
drivers/net/wireless/mediatek/mt76/mt7915/main.c

index 26cb711b465f38b6f078b52202ba40fca8a55017..83dfa6da4761edb281bdf9d405009997bb057824 100644 (file)
@@ -642,8 +642,10 @@ mt7603_set_coverage_class(struct ieee80211_hw *hw, s16 coverage_class)
 {
        struct mt7603_dev *dev = hw->priv;
 
+       mutex_lock(&dev->mt76.mutex);
        dev->coverage_class = max_t(s16, coverage_class, 0);
        mt7603_mac_set_timing(dev);
+       mutex_unlock(&dev->mt76.mutex);
 }
 
 static void mt7603_tx(struct ieee80211_hw *hw,
index c26f99b368d934b974780db87e8fa8aaf8a98865..52d6544698fee4091bb31aeec1f764215aab1a4e 100644 (file)
@@ -735,9 +735,12 @@ static void
 mt7615_set_coverage_class(struct ieee80211_hw *hw, s16 coverage_class)
 {
        struct mt7615_phy *phy = mt7615_hw_phy(hw);
+       struct mt7615_dev *dev = phy->dev;
 
+       mutex_lock(&dev->mt76.mutex);
        phy->coverage_class = max_t(s16, coverage_class, 0);
        mt7615_mac_set_timing(phy);
+       mutex_unlock(&dev->mt76.mutex);
 }
 
 static int
index 0575c259f2459ff6ee01ffa6e094306745374611..05b5650c56c82ddd2bb4ea6245a0852cbfb21b27 100644 (file)
@@ -716,9 +716,12 @@ static void
 mt7915_set_coverage_class(struct ieee80211_hw *hw, s16 coverage_class)
 {
        struct mt7915_phy *phy = mt7915_hw_phy(hw);
+       struct mt7915_dev *dev = phy->dev;
 
+       mutex_lock(&dev->mt76.mutex);
        phy->coverage_class = max_t(s16, coverage_class, 0);
        mt7915_mac_set_timing(phy);
+       mutex_unlock(&dev->mt76.mutex);
 }
 
 static int