mt76: mt76x02: run mt76x02_edcca_init atomically in mt76_edcca_set
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>
This commit is contained in:
parent
6e4caaea99
commit
8aac454dbb
|
@ -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;
|
||||
}
|
||||
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue