mt76: unify channel survey update code

Host time is used to calculate the channel active time on mt7603 and mt7615.
Use the same on mt76x02 and move the lock to core code to get rid of some
duplicated code.

Signed-off-by: Felix Fietkau <nbd@nbd.name>

diff --git a/drivers/net/wireless/mediatek/mt76/mac80211.c b/drivers/net/wireless/mediatek/mt76/mac80211.c
index 38db311..10d7369 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mac80211.c
+++ b/drivers/net/wireless/mediatek/mt76/mac80211.c
@@ -416,13 +416,25 @@ mt76_channel_state(struct mt76_dev *dev, struct ieee80211_channel *c)
 
 void mt76_update_survey(struct mt76_dev *dev)
 {
-       struct mt76_channel_state *state;
+       struct mt76_channel_state *state = dev->chan_state;
+       ktime_t cur_time;
+
+       if (!test_bit(MT76_STATE_RUNNING, &dev->state))
+               return;
+
+       spin_lock_bh(&dev->cc_lock);
 
        if (dev->drv->update_survey)
                dev->drv->update_survey(dev);
 
+       cur_time = ktime_get_boottime();
+       state->cc_active += ktime_to_us(ktime_sub(cur_time,
+                                                 dev->survey_time));
+       dev->survey_time = cur_time;
+
+       spin_unlock_bh(&dev->cc_lock);
+
        if (dev->drv->drv_flags & MT_DRV_SW_RX_AIRTIME) {
-               state = mt76_channel_state(dev, dev->chandef.chan);
                spin_lock_bh(&dev->rx_lock);
                spin_lock(&dev->cc_lock);
                state->cc_bss_rx += dev->cur_cc_bss_rx;

diff --git a/drivers/net/wireless/mediatek/mt76/mt7603/mac.c b/drivers/net/wireless/mediatek/mt76/mt7603/mac.c
index 8e6568d..1497d5e 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7603/mac.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7603/mac.c
@@ -1571,22 +1571,9 @@ void mt7603_update_channel(struct mt76_dev *mdev)
 {
        struct mt7603_dev *dev = container_of(mdev, struct mt7603_dev, mt76);
        struct mt76_channel_state *state;
-       ktime_t cur_time;
-       u32 busy;
-
-       if (!test_bit(MT76_STATE_RUNNING, &dev->mt76.state))
-               return;
 
        state = mdev->chan_state;
-       busy = mt76_rr(dev, MT_MIB_STAT_CCA);
-
-       spin_lock_bh(&dev->mt76.cc_lock);
-       cur_time = ktime_get_boottime();
-       state->cc_busy += busy;
-       state->cc_active += ktime_to_us(ktime_sub(cur_time,
-                                                 dev->mt76.survey_time));
-       dev->mt76.survey_time = cur_time;
-       spin_unlock_bh(&dev->mt76.cc_lock);
+       state->cc_busy += mt76_rr(dev, MT_MIB_STAT_CCA);
 }
 
 void

diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/mac.c b/drivers/net/wireless/mediatek/mt76/mt7615/mac.c
index 81f45c4..271f36f 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7615/mac.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7615/mac.c
@@ -1263,23 +1263,11 @@ void mt7615_update_channel(struct mt76_dev *mdev)
 {
        struct mt7615_dev *dev = container_of(mdev, struct mt7615_dev, mt76);
        struct mt76_channel_state *state;
-       ktime_t cur_time;
-       u32 busy;
 
-       if (!test_bit(MT76_STATE_RUNNING, &mdev->state))
-               return;
-
-       state = mdev->chan_state;
        /* TODO: add DBDC support */
-       busy = mt76_get_field(dev, MT_MIB_SDR16(0), MT_MIB_BUSY_MASK);
-
-       spin_lock_bh(&mdev->cc_lock);
-       cur_time = ktime_get_boottime();
-       state->cc_busy += busy;
-       state->cc_active += ktime_to_us(ktime_sub(cur_time,
-                                                 mdev->survey_time));
-       mdev->survey_time = cur_time;
-       spin_unlock_bh(&mdev->cc_lock);
+       state = mdev->chan_state;
+       state->cc_busy += mt76_get_field(dev, MT_MIB_SDR16(0),
+                                        MT_MIB_BUSY_MASK);
 }
 
 void mt7615_mac_work(struct work_struct *work)

diff --git a/drivers/net/wireless/mediatek/mt76/mt76x0/main.c b/drivers/net/wireless/mediatek/mt76/mt76x0/main.c
index efb7ca9..f7682bd 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76x0/main.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76x0/main.c
@@ -19,10 +19,7 @@ mt76x0_set_channel(struct mt76x02_dev *dev, struct cfg80211_chan_def *chandef)
        mt76_set_channel(&dev->mt76);
        mt76x0_phy_set_channel(dev, chandef);
 
-       /* channel cycle counters read-and-clear */
-       mt76_rr(dev, MT_CH_IDLE);
-       mt76_rr(dev, MT_CH_BUSY);
-
+       mt76x02_mac_cc_reset(dev);
        mt76x02_edcca_init(dev);
 
        if (mt76_is_mmio(dev)) {

diff --git a/drivers/net/wireless/mediatek/mt76/mt76x02_mac.c b/drivers/net/wireless/mediatek/mt76/mt76x02_mac.c
index c987e57..e49d013 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76x02_mac.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76x02_mac.c
@@ -984,17 +984,9 @@ void mt76x02_update_channel(struct mt76_dev *mdev)
 {
        struct mt76x02_dev *dev = container_of(mdev, struct mt76x02_dev, mt76);
        struct mt76_channel_state *state;
-       u32 active, busy;
 
        state = mdev->chan_state;
-
-       busy = mt76_rr(dev, MT_CH_BUSY);
-       active = busy + mt76_rr(dev, MT_CH_IDLE);
-
-       spin_lock_bh(&dev->mt76.cc_lock);
-       state->cc_busy += busy;
-       state->cc_active += active;
-       spin_unlock_bh(&dev->mt76.cc_lock);
+       state->cc_busy += mt76_rr(dev, MT_CH_BUSY);
 }
 EXPORT_SYMBOL_GPL(mt76x02_update_channel);
 
@@ -1152,6 +1144,16 @@ void mt76x02_mac_work(struct work_struct *work)
                                     MT_MAC_WORK_INTERVAL);
 }
 
+void mt76x02_mac_cc_reset(struct mt76x02_dev *dev)
+{
+       dev->mt76.survey_time = ktime_get_boottime();
+
+       /* channel cycle counters read-and-clear */
+       mt76_rr(dev, MT_CH_BUSY);
+       mt76_rr(dev, MT_CH_IDLE);
+}
+EXPORT_SYMBOL_GPL(mt76x02_mac_cc_reset);
+
 void mt76x02_mac_set_bssid(struct mt76x02_dev *dev, u8 idx, const u8 *addr)
 {
        idx &= 7;

diff --git a/drivers/net/wireless/mediatek/mt76/mt76x02_mac.h b/drivers/net/wireless/mediatek/mt76/mt76x02_mac.h
index b687341..48de8eb 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76x02_mac.h
+++ b/drivers/net/wireless/mediatek/mt76/mt76x02_mac.h
@@ -193,6 +193,7 @@ void mt76x02_tx_complete_skb(struct mt76_dev *mdev, enum mt76_txq_id qid,
 void mt76x02_update_channel(struct mt76_dev *mdev);
 void mt76x02_mac_work(struct work_struct *work);
 
+void mt76x02_mac_cc_reset(struct mt76x02_dev *dev);
 void mt76x02_mac_set_bssid(struct mt76x02_dev *dev, u8 idx, const u8 *addr);
 int mt76x02_mac_set_beacon(struct mt76x02_dev *dev, u8 vif_idx,
                           struct sk_buff *skb);

diff --git a/drivers/net/wireless/mediatek/mt76/mt76x2/pci_main.c b/drivers/net/wireless/mediatek/mt76/mt76x2/pci_main.c
index 385960d..1387f31 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76x2/pci_main.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76x2/pci_main.c
@@ -52,10 +52,7 @@ mt76x2_set_channel(struct mt76x02_dev *dev, struct cfg80211_chan_def *chandef)
        mt76x2_mac_stop(dev, true);
        ret = mt76x2_phy_set_channel(dev, chandef);
 
-       /* channel cycle counters read-and-clear */
-       mt76_rr(dev, MT_CH_IDLE);
-       mt76_rr(dev, MT_CH_BUSY);
-
+       mt76x02_mac_cc_reset(dev);
        mt76x02_dfs_init_params(dev);
 
        mt76x2_mac_resume(dev);

diff --git a/drivers/net/wireless/mediatek/mt76/mt76x2/usb_main.c b/drivers/net/wireless/mediatek/mt76/mt76x2/usb_main.c
index 1e6f787..a76a40d 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76x2/usb_main.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76x2/usb_main.c
@@ -49,10 +49,7 @@ mt76x2u_set_channel(struct mt76x02_dev *dev,
 
        err = mt76x2u_phy_set_channel(dev, chandef);
 
-       /* channel cycle counters read-and-clear */
-       mt76_rr(dev, MT_CH_IDLE);
-       mt76_rr(dev, MT_CH_BUSY);
-
+       mt76x02_mac_cc_reset(dev);
        mt76x2_mac_resume(dev);
 
        clear_bit(MT76_RESET, &dev->mt76.state);