Skip to content

Commit

Permalink
mt76: mt76x02: run mt76x02_edcca_init atomically in mt76_edcca_set
Browse files Browse the repository at this point in the history
Run mt76x02_edcca_init atomically in mt76_edcca_set since it runs
concurrently with calibration work and mt76x2_set_channel.
Moreover perform phy calibration atomically

Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
Signed-off-by: Felix Fietkau <nbd@nbd.name>
  • Loading branch information
Lorenzo Bianconi authored and Felix Fietkau committed Jun 25, 2019
1 parent 6e4caae commit 8aac454
Showing 3 changed files with 15 additions and 0 deletions.
4 changes: 4 additions & 0 deletions drivers/net/wireless/mediatek/mt76/mt76x02_debugfs.c
Original file line number Diff line number Diff line change
@@ -122,11 +122,15 @@ mt76_edcca_set(void *data, u64 val)
struct mt76x02_dev *dev = data;
enum nl80211_dfs_regions region = dev->dfs_pd.region;

mutex_lock(&dev->mt76.mutex);

dev->ed_monitor_enabled = !!val;
dev->ed_monitor = dev->ed_monitor_enabled &&
region == NL80211_DFS_ETSI;
mt76x02_edcca_init(dev);

mutex_unlock(&dev->mt76.mutex);

return 0;
}

6 changes: 6 additions & 0 deletions drivers/net/wireless/mediatek/mt76/mt76x2/pci_phy.c
Original file line number Diff line number Diff line change
@@ -294,10 +294,16 @@ void mt76x2_phy_calibrate(struct work_struct *work)
struct mt76x02_dev *dev;

dev = container_of(work, struct mt76x02_dev, cal_work.work);

mutex_lock(&dev->mt76.mutex);

mt76x2_phy_channel_calibrate(dev, false);
mt76x2_phy_tssi_compensate(dev);
mt76x2_phy_temp_compensate(dev);
mt76x2_phy_update_channel_gain(dev);

mutex_unlock(&dev->mt76.mutex);

ieee80211_queue_delayed_work(mt76_hw(dev), &dev->cal_work,
MT_CALIBRATE_INTERVAL);
}
5 changes: 5 additions & 0 deletions drivers/net/wireless/mediatek/mt76/mt76x2/usb_phy.c
Original file line number Diff line number Diff line change
@@ -55,10 +55,15 @@ void mt76x2u_phy_calibrate(struct work_struct *work)
struct mt76x02_dev *dev;

dev = container_of(work, struct mt76x02_dev, cal_work.work);

mutex_lock(&dev->mt76.mutex);

mt76x2u_phy_channel_calibrate(dev, false);
mt76x2_phy_tssi_compensate(dev);
mt76x2_phy_update_channel_gain(dev);

mutex_unlock(&dev->mt76.mutex);

ieee80211_queue_delayed_work(mt76_hw(dev), &dev->cal_work,
MT_CALIBRATE_INTERVAL);
}

0 comments on commit 8aac454

Please sign in to comment.