mt76: move beacon_mask in mt76_dev

Move beacon_mask in mt76_dev data structure since it is used by
all drivers

Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
Signed-off-by: Felix Fietkau <nbd@nbd.name>

diff --git a/drivers/net/wireless/mediatek/mt76/mt76.h b/drivers/net/wireless/mediatek/mt76/mt76.h
index 7a31723..f1f56d2 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76.h
+++ b/drivers/net/wireless/mediatek/mt76/mt76.h
@@ -470,6 +470,7 @@ struct mt76_dev {
        u16 chainmask;
 
        int beacon_int;
+       u8 beacon_mask;
 
        struct mt76_sband sband_2g;
        struct mt76_sband sband_5g;

diff --git a/drivers/net/wireless/mediatek/mt76/mt7603/beacon.c b/drivers/net/wireless/mediatek/mt76/mt7603/beacon.c
index 64e15d5..f3e7406 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7603/beacon.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7603/beacon.c
@@ -16,7 +16,7 @@ mt7603_update_beacon_iter(void *priv, u8 *mac, struct ieee80211_vif *vif)
        struct mt7603_vif *mvif = (struct mt7603_vif *)vif->drv_priv;
        struct sk_buff *skb = NULL;
 
-       if (!(dev->beacon_mask & BIT(mvif->idx)))
+       if (!(dev->mt76.beacon_mask & BIT(mvif->idx)))
                return;
 
        skb = ieee80211_beacon_get(mt76_hw(dev), vif);
@@ -48,7 +48,7 @@ mt7603_add_buffered_bc(void *priv, u8 *mac, struct ieee80211_vif *vif)
        struct ieee80211_tx_info *info;
        struct sk_buff *skb;
 
-       if (!(dev->beacon_mask & BIT(mvif->idx)))
+       if (!(dev->mt76.beacon_mask & BIT(mvif->idx)))
                return;
 
        skb = ieee80211_get_buffered_bc(mt76_hw(dev), vif);
@@ -134,7 +134,7 @@ void mt7603_pre_tbtt_tasklet(unsigned long arg)
 out:
        mt76_queue_tx_cleanup(dev, MT_TXQ_BEACON, false);
        if (dev->mt76.q_tx[MT_TXQ_BEACON].q->queued >
-           hweight8(dev->beacon_mask))
+           hweight8(dev->mt76.beacon_mask))
                dev->beacon_check++;
 }
 
@@ -144,12 +144,12 @@ void mt7603_beacon_set_timer(struct mt7603_dev *dev, int idx, int intval)
 
        if (idx >= 0) {
                if (intval)
-                       dev->beacon_mask |= BIT(idx);
+                       dev->mt76.beacon_mask |= BIT(idx);
                else
-                       dev->beacon_mask &= ~BIT(idx);
+                       dev->mt76.beacon_mask &= ~BIT(idx);
        }
 
-       if (!dev->beacon_mask || (!intval && idx < 0)) {
+       if (!dev->mt76.beacon_mask || (!intval && idx < 0)) {
                mt7603_irq_disable(dev, MT_INT_MAC_IRQ3);
                mt76_clear(dev, MT_ARB_SCR, MT_ARB_SCR_BCNQ_OPMODE_MASK);
                mt76_wr(dev, MT_HW_INT_MASK(3), 0);
@@ -174,10 +174,11 @@ void mt7603_beacon_set_timer(struct mt7603_dev *dev, int idx, int intval)
 
        mt76_set(dev, MT_WF_ARB_BCN_START,
                 MT_WF_ARB_BCN_START_BSSn(0) |
-                ((dev->beacon_mask >> 1) * MT_WF_ARB_BCN_START_BSS0n(1)));
+                ((dev->mt76.beacon_mask >> 1) *
+                 MT_WF_ARB_BCN_START_BSS0n(1)));
        mt7603_irq_enable(dev, MT_INT_MAC_IRQ3);
 
-       if (dev->beacon_mask & ~BIT(0))
+       if (dev->mt76.beacon_mask & ~BIT(0))
                mt76_set(dev, MT_LPON_SBTOR(0), MT_LPON_SBTOR_SUB_BSS_EN);
        else
                mt76_clear(dev, MT_LPON_SBTOR(0), MT_LPON_SBTOR_SUB_BSS_EN);

diff --git a/drivers/net/wireless/mediatek/mt76/mt7603/mt7603.h b/drivers/net/wireless/mediatek/mt76/mt7603/mt7603.h
index 380bd8d..cc20a0c 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7603/mt7603.h
+++ b/drivers/net/wireless/mediatek/mt76/mt7603/mt7603.h
@@ -125,8 +125,6 @@ struct mt7603_dev {
 
        s8 sensitivity;
 
-       u8 beacon_mask;
-
        u8 beacon_check;
        u8 tx_hang_check;
        u8 tx_dma_check;

diff --git a/drivers/net/wireless/mediatek/mt76/mt76x02.h b/drivers/net/wireless/mediatek/mt76/mt76x02.h
index 8462d3a..a679914 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76x02.h
+++ b/drivers/net/wireless/mediatek/mt76/mt76x02.h
@@ -103,7 +103,6 @@ struct mt76x02_dev {
        u32 aggr_stats[32];
 
        struct sk_buff *beacons[8];
-       u8 beacon_mask;
        u8 beacon_data_mask;
 
        u8 tbtt_count;

diff --git a/drivers/net/wireless/mediatek/mt76/mt76x02_beacon.c b/drivers/net/wireless/mediatek/mt76/mt76x02_beacon.c
index 985a9b5..e196b9c 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76x02_beacon.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76x02_beacon.c
@@ -119,23 +119,23 @@ static void
 __mt76x02_mac_set_beacon_enable(struct mt76x02_dev *dev, u8 vif_idx,
                                bool val, struct sk_buff *skb)
 {
-       u8 old_mask = dev->beacon_mask;
+       u8 old_mask = dev->mt76.beacon_mask;
        bool en;
        u32 reg;
 
        if (val) {
-               dev->beacon_mask |= BIT(vif_idx);
+               dev->mt76.beacon_mask |= BIT(vif_idx);
                if (skb)
                        mt76x02_mac_set_beacon(dev, vif_idx, skb);
        } else {
-               dev->beacon_mask &= ~BIT(vif_idx);
+               dev->mt76.beacon_mask &= ~BIT(vif_idx);
                mt76x02_mac_set_beacon(dev, vif_idx, NULL);
        }
 
-       if (!!old_mask == !!dev->beacon_mask)
+       if (!!old_mask == !!dev->mt76.beacon_mask)
                return;
 
-       en = dev->beacon_mask;
+       en = dev->mt76.beacon_mask;
 
        reg = MT_BEACON_TIME_CFG_BEACON_TX |
              MT_BEACON_TIME_CFG_TBTT_EN |
@@ -156,7 +156,7 @@ void mt76x02_mac_set_beacon_enable(struct mt76x02_dev *dev,
        if (mt76_is_usb(dev))
                skb = ieee80211_beacon_get(mt76_hw(dev), vif);
 
-       if (!dev->beacon_mask)
+       if (!dev->mt76.beacon_mask)
                dev->tbtt_count = 0;
 
        __mt76x02_mac_set_beacon_enable(dev, vif_idx, val, skb);
@@ -203,7 +203,7 @@ mt76x02_update_beacon_iter(void *priv, u8 *mac, struct ieee80211_vif *vif)
        struct mt76x02_vif *mvif = (struct mt76x02_vif *)vif->drv_priv;
        struct sk_buff *skb = NULL;
 
-       if (!(dev->beacon_mask & BIT(mvif->idx)))
+       if (!(dev->mt76.beacon_mask & BIT(mvif->idx)))
                return;
 
        skb = ieee80211_beacon_get(mt76_hw(dev), vif);
@@ -223,7 +223,7 @@ mt76x02_add_buffered_bc(void *priv, u8 *mac, struct ieee80211_vif *vif)
        struct ieee80211_tx_info *info;
        struct sk_buff *skb;
 
-       if (!(dev->beacon_mask & BIT(mvif->idx)))
+       if (!(dev->mt76.beacon_mask & BIT(mvif->idx)))
                return;
 
        skb = ieee80211_get_buffered_bc(mt76_hw(dev), vif);

diff --git a/drivers/net/wireless/mediatek/mt76/mt76x02_mac.c b/drivers/net/wireless/mediatek/mt76/mt76x02_mac.c
index c1f041e..56510a1 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76x02_mac.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76x02_mac.c
@@ -1045,7 +1045,7 @@ void mt76x02_mac_work(struct work_struct *work)
                dev->aggr_stats[idx++] += val >> 16;
        }
 
-       if (!dev->beacon_mask)
+       if (!dev->mt76.beacon_mask)
                mt76x02_check_mac_err(dev);
 
        if (dev->ed_monitor)

diff --git a/drivers/net/wireless/mediatek/mt76/mt76x02_mmio.c b/drivers/net/wireless/mediatek/mt76/mt76x02_mmio.c
index c834acc..4e0f8ae 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76x02_mmio.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76x02_mmio.c
@@ -437,7 +437,7 @@ static void mt76x02_reset_state(struct mt76x02_dev *dev)
        }
 
        dev->vif_mask = 0;
-       dev->beacon_mask = 0;
+       dev->mt76.beacon_mask = 0;
 }
 
 static void mt76x02_watchdog_reset(struct mt76x02_dev *dev)
@@ -461,7 +461,7 @@ static void mt76x02_watchdog_reset(struct mt76x02_dev *dev)
        if (restart)
                mt76x02_reset_state(dev);
 
-       if (dev->beacon_mask)
+       if (dev->mt76.beacon_mask)
                mt76_clear(dev, MT_BEACON_TIME_CFG,
                           MT_BEACON_TIME_CFG_BEACON_TX |
                           MT_BEACON_TIME_CFG_TBTT_EN);
@@ -493,7 +493,7 @@ static void mt76x02_watchdog_reset(struct mt76x02_dev *dev)
        if (dev->ed_monitor)
                mt76_set(dev, MT_TXOP_CTRL_CFG, MT_TXOP_ED_CCA_EN);
 
-       if (dev->beacon_mask && !restart)
+       if (dev->mt76.beacon_mask && !restart)
                mt76_set(dev, MT_BEACON_TIME_CFG,
                         MT_BEACON_TIME_CFG_BEACON_TX |
                         MT_BEACON_TIME_CFG_TBTT_EN);

diff --git a/drivers/net/wireless/mediatek/mt76/mt76x02_usb_core.c b/drivers/net/wireless/mediatek/mt76/mt76x02_usb_core.c
index 81cebd9..5b6ac1b 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76x02_usb_core.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76x02_usb_core.c
@@ -175,7 +175,7 @@ static void mt76x02u_pre_tbtt_work(struct work_struct *work)
        struct sk_buff *skb;
        int i, nbeacons;
 
-       if (!dev->beacon_mask)
+       if (!dev->mt76.beacon_mask)
                return;
 
        mt76x02_resync_beacon_timer(dev);
@@ -184,7 +184,7 @@ static void mt76x02u_pre_tbtt_work(struct work_struct *work)
                IEEE80211_IFACE_ITER_RESUME_ALL,
                mt76x02_update_beacon_iter, dev);
 
-       nbeacons = hweight8(dev->beacon_mask);
+       nbeacons = hweight8(dev->mt76.beacon_mask);
        mt76x02_enqueue_buffered_bc(dev, &data, N_BCN_SLOTS - nbeacons);
 
        for (i = nbeacons; i < N_BCN_SLOTS; i++) {
@@ -207,7 +207,8 @@ static enum hrtimer_restart mt76x02u_pre_tbtt_interrupt(struct hrtimer *timer)
 
 static void mt76x02u_pre_tbtt_enable(struct mt76x02_dev *dev, bool en)
 {
-       if (en && dev->beacon_mask && !hrtimer_active(&dev->pre_tbtt_timer))
+       if (en && dev->mt76.beacon_mask &&
+           !hrtimer_active(&dev->pre_tbtt_timer))
                mt76x02u_start_pre_tbtt_timer(dev);
        if (!en)
                mt76x02u_stop_pre_tbtt_timer(dev);