Skip to content

Commit

Permalink
mt76: mt76x02: remove bogus mutex usage
Browse files Browse the repository at this point in the history
mac80211 .start(), .stop() callbacks are never called concurrently with
other callbacks. The only concurencly is with mt76 works which we cancel
on stop() and schedule on start().

This fixes possible deadlock on cancel_delayed_work_sync(&dev->mac_work)
as mac_work also take mutex.

Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
Signed-off-by: Felix Fietkau <nbd@nbd.name>
  • Loading branch information
Stanislaw Gruszka authored and Felix Fietkau committed May 1, 2019
1 parent 39d501d commit 091a79f
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 41 deletions.
6 changes: 0 additions & 6 deletions drivers/net/wireless/mediatek/mt76/mt76x0/pci.c
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,6 @@ static int mt76x0e_start(struct ieee80211_hw *hw)
{
struct mt76x02_dev *dev = hw->priv;

mutex_lock(&dev->mt76.mutex);

mt76x02_mac_start(dev);
mt76x0_phy_calibrate(dev, true);
ieee80211_queue_delayed_work(dev->mt76.hw, &dev->mt76.mac_work,
Expand All @@ -35,8 +33,6 @@ static int mt76x0e_start(struct ieee80211_hw *hw)
MT_CALIBRATE_INTERVAL);
set_bit(MT76_STATE_RUNNING, &dev->mt76.state);

mutex_unlock(&dev->mt76.mutex);

return 0;
}

Expand All @@ -62,10 +58,8 @@ static void mt76x0e_stop(struct ieee80211_hw *hw)
{
struct mt76x02_dev *dev = hw->priv;

mutex_lock(&dev->mt76.mutex);
clear_bit(MT76_STATE_RUNNING, &dev->mt76.state);
mt76x0e_stop_hw(dev);
mutex_unlock(&dev->mt76.mutex);
}

static void
Expand Down
22 changes: 5 additions & 17 deletions drivers/net/wireless/mediatek/mt76/mt76x0/usb.c
Original file line number Diff line number Diff line change
Expand Up @@ -81,8 +81,10 @@ static void mt76x0u_cleanup(struct mt76x02_dev *dev)
mt76u_queues_deinit(&dev->mt76);
}

static void mt76x0u_mac_stop(struct mt76x02_dev *dev)
static void mt76x0u_stop(struct ieee80211_hw *hw)
{
struct mt76x02_dev *dev = hw->priv;

clear_bit(MT76_STATE_RUNNING, &dev->mt76.state);
cancel_delayed_work_sync(&dev->cal_work);
cancel_delayed_work_sync(&dev->mt76.mac_work);
Expand All @@ -106,31 +108,17 @@ static int mt76x0u_start(struct ieee80211_hw *hw)
struct mt76x02_dev *dev = hw->priv;
int ret;

mutex_lock(&dev->mt76.mutex);

ret = mt76x0_mac_start(dev);
if (ret)
goto out;
return ret;

mt76x0_phy_calibrate(dev, true);
ieee80211_queue_delayed_work(dev->mt76.hw, &dev->mt76.mac_work,
MT_MAC_WORK_INTERVAL);
ieee80211_queue_delayed_work(dev->mt76.hw, &dev->cal_work,
MT_CALIBRATE_INTERVAL);
set_bit(MT76_STATE_RUNNING, &dev->mt76.state);

out:
mutex_unlock(&dev->mt76.mutex);
return ret;
}

static void mt76x0u_stop(struct ieee80211_hw *hw)
{
struct mt76x02_dev *dev = hw->priv;

mutex_lock(&dev->mt76.mutex);
mt76x0u_mac_stop(dev);
mutex_unlock(&dev->mt76.mutex);
return 0;
}

static const struct ieee80211_ops mt76x0u_ops = {
Expand Down
13 changes: 3 additions & 10 deletions drivers/net/wireless/mediatek/mt76/mt76x2/pci_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -22,37 +22,30 @@ mt76x2_start(struct ieee80211_hw *hw)
struct mt76x02_dev *dev = hw->priv;
int ret;

mutex_lock(&dev->mt76.mutex);

ret = mt76x2_mac_start(dev);
if (ret)
goto out;
return ret;

ret = mt76x2_phy_start(dev);
if (ret)
goto out;
return ret;

ieee80211_queue_delayed_work(mt76_hw(dev), &dev->mt76.mac_work,
MT_MAC_WORK_INTERVAL);
ieee80211_queue_delayed_work(mt76_hw(dev), &dev->wdt_work,
MT_WATCHDOG_TIME);

set_bit(MT76_STATE_RUNNING, &dev->mt76.state);

out:
mutex_unlock(&dev->mt76.mutex);
return ret;
return 0;
}

static void
mt76x2_stop(struct ieee80211_hw *hw)
{
struct mt76x02_dev *dev = hw->priv;

mutex_lock(&dev->mt76.mutex);
clear_bit(MT76_STATE_RUNNING, &dev->mt76.state);
mt76x2_stop_hardware(dev);
mutex_unlock(&dev->mt76.mutex);
}

static int
Expand Down
10 changes: 2 additions & 8 deletions drivers/net/wireless/mediatek/mt76/mt76x2/usb_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -21,30 +21,24 @@ static int mt76x2u_start(struct ieee80211_hw *hw)
struct mt76x02_dev *dev = hw->priv;
int ret;

mutex_lock(&dev->mt76.mutex);

ret = mt76x2u_mac_start(dev);
if (ret)
goto out;
return ret;

ieee80211_queue_delayed_work(mt76_hw(dev), &dev->mt76.mac_work,
MT_MAC_WORK_INTERVAL);
set_bit(MT76_STATE_RUNNING, &dev->mt76.state);

out:
mutex_unlock(&dev->mt76.mutex);
return ret;
return 0;
}

static void mt76x2u_stop(struct ieee80211_hw *hw)
{
struct mt76x02_dev *dev = hw->priv;

mutex_lock(&dev->mt76.mutex);
clear_bit(MT76_STATE_RUNNING, &dev->mt76.state);
mt76u_stop_tx(&dev->mt76);
mt76x2u_stop_hw(dev);
mutex_unlock(&dev->mt76.mutex);
}

static int
Expand Down

0 comments on commit 091a79f

Please sign in to comment.