mt76: move mt76x02_set_irq_mask in mt76x02_mmio.c

Move mt76x02_set_irq_mask, mt76x02_irq_enable and mt76x02_irq_disable
in mt76x02-lib module in order to be reused by mt76x0 driver.
Moreover move irq_lock and irqmask in mt76_mmio data structure

Signed-off-by: Lorenzo Bianconi <lorenzo.bianconi@redhat.com>
Signed-off-by: Felix Fietkau <nbd@nbd.name>

diff --git a/drivers/net/wireless/mediatek/mt76/mmio.c b/drivers/net/wireless/mediatek/mt76/mmio.c
index 2f09f45..08685f5 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mmio.c
+++ b/drivers/net/wireless/mediatek/mt76/mmio.c
@@ -60,6 +60,7 @@ void mt76_mmio_init(struct mt76_dev *dev, void __iomem *regs)
 
        skb_queue_head_init(&dev->mmio.mcu.res_q);
        init_waitqueue_head(&dev->mmio.mcu.wait);
+       spin_lock_init(&dev->mmio.irq_lock);
        mutex_init(&dev->mmio.mcu.mutex);
 }
 EXPORT_SYMBOL_GPL(mt76_mmio_init);

diff --git a/drivers/net/wireless/mediatek/mt76/mt76.h b/drivers/net/wireless/mediatek/mt76/mt76.h
index 8031360..d747d60 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76.h
+++ b/drivers/net/wireless/mediatek/mt76/mt76.h
@@ -363,6 +363,8 @@ struct mt76_mmio {
                u32 msg_seq;
        } mcu;
        void __iomem *regs;
+       spinlock_t irq_lock;
+       u32 irqmask;
 };
 
 struct mt76_dev {

diff --git a/drivers/net/wireless/mediatek/mt76/mt76x02_mmio.c b/drivers/net/wireless/mediatek/mt76/mt76x02_mmio.c
index f471c3a..1b0dc6b 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76x02_mmio.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76x02_mmio.c
@@ -21,6 +21,18 @@
 #include "mt76x02_dma.h"
 #include "mt76x02_regs.h"
 
+void mt76x02_set_irq_mask(struct mt76_dev *dev, u32 clear, u32 set)
+{
+       unsigned long flags;
+
+       spin_lock_irqsave(&dev->mmio.irq_lock, flags);
+       dev->mmio.irqmask &= ~clear;
+       dev->mmio.irqmask |= set;
+       __mt76_wr(dev, MT_INT_MASK_CSR, dev->mmio.irqmask);
+       spin_unlock_irqrestore(&dev->mmio.irq_lock, flags);
+}
+EXPORT_SYMBOL_GPL(mt76x02_set_irq_mask);
+
 void mt76x02_dma_enable(struct mt76_dev *dev)
 {
        u32 val;

diff --git a/drivers/net/wireless/mediatek/mt76/mt76x02_util.h b/drivers/net/wireless/mediatek/mt76/mt76x02_util.h
index 2ea9e68..2c1ead8 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76x02_util.h
+++ b/drivers/net/wireless/mediatek/mt76/mt76x02_util.h
@@ -51,4 +51,17 @@ void mt76x02_tx_complete(struct mt76_dev *dev, struct sk_buff *skb);
 void mt76x02_tx_complete_skb(struct mt76_dev *mdev, struct mt76_queue *q,
                            struct mt76_queue_entry *e, bool flush);
 bool mt76x02_tx_status_data(struct mt76_dev *dev, u8 *update);
+
+void mt76x02_set_irq_mask(struct mt76_dev *dev, u32 clear, u32 set);
+
+static inline void mt76x02_irq_enable(struct mt76_dev *dev, u32 mask)
+{
+       mt76x02_set_irq_mask(dev, 0, mask);
+}
+
+static inline void mt76x02_irq_disable(struct mt76_dev *dev, u32 mask)
+{
+       mt76x02_set_irq_mask(dev, mask, 0);
+}
+
 #endif

diff --git a/drivers/net/wireless/mediatek/mt76/mt76x2.h b/drivers/net/wireless/mediatek/mt76/mt76x2.h
index b950361..2597bf4 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76x2.h
+++ b/drivers/net/wireless/mediatek/mt76/mt76x2.h
@@ -95,9 +95,6 @@ struct mt76x2_dev {
 
        u32 aggr_stats[32];
 
-       spinlock_t irq_lock;
-       u32 irqmask;
-
        struct sk_buff *beacons[8];
        u8 beacon_mask;
        u8 beacon_data_mask;
@@ -124,8 +121,6 @@ static inline bool is_mt7612(struct mt76x2_dev *dev)
        return mt76_chip(&dev->mt76) == 0x7612;
 }
 
-void mt76x2_set_irq_mask(struct mt76x2_dev *dev, u32 clear, u32 set);
-
 static inline bool mt76x2_channel_silent(struct mt76x2_dev *dev)
 {
        struct ieee80211_channel *chan = dev->mt76.chandef.chan;
@@ -134,16 +129,6 @@ static inline bool mt76x2_channel_silent(struct mt76x2_dev *dev)
                chan->dfs_state != NL80211_DFS_AVAILABLE);
 }
 
-static inline void mt76x2_irq_enable(struct mt76x2_dev *dev, u32 mask)
-{
-       mt76x2_set_irq_mask(dev, 0, mask);
-}
-
-static inline void mt76x2_irq_disable(struct mt76x2_dev *dev, u32 mask)
-{
-       mt76x2_set_irq_mask(dev, mask, 0);
-}
-
 static inline bool mt76x2_wait_for_bbp(struct mt76x2_dev *dev)
 {
        return mt76_poll_msec(dev, MT_MAC_STATUS,

diff --git a/drivers/net/wireless/mediatek/mt76/mt76x2_core.c b/drivers/net/wireless/mediatek/mt76/mt76x2_core.c
index 2629779..06e47f9 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76x2_core.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76x2_core.c
@@ -17,23 +17,11 @@
 #include <linux/delay.h>
 #include "mt76x2.h"
 #include "mt76x2_trace.h"
-
-void mt76x2_set_irq_mask(struct mt76x2_dev *dev, u32 clear, u32 set)
-{
-       unsigned long flags;
-
-       spin_lock_irqsave(&dev->irq_lock, flags);
-       dev->irqmask &= ~clear;
-       dev->irqmask |= set;
-       mt76_wr(dev, MT_INT_MASK_CSR, dev->irqmask);
-       spin_unlock_irqrestore(&dev->irq_lock, flags);
-}
+#include "mt76x02_util.h"
 
 void mt76x2_rx_poll_complete(struct mt76_dev *mdev, enum mt76_rxq_id q)
 {
-       struct mt76x2_dev *dev = container_of(mdev, struct mt76x2_dev, mt76);
-
-       mt76x2_irq_enable(dev, MT_INT_RX_DONE(q));
+       mt76x02_irq_enable(mdev, MT_INT_RX_DONE(q));
 }
 
 irqreturn_t mt76x2_irq_handler(int irq, void *dev_instance)
@@ -47,22 +35,22 @@ irqreturn_t mt76x2_irq_handler(int irq, void *dev_instance)
        if (!test_bit(MT76_STATE_INITIALIZED, &dev->mt76.state))
                return IRQ_NONE;
 
-       trace_dev_irq(dev, intr, dev->irqmask);
+       trace_dev_irq(dev, intr, dev->mt76.mmio.irqmask);
 
-       intr &= dev->irqmask;
+       intr &= dev->mt76.mmio.irqmask;
 
        if (intr & MT_INT_TX_DONE_ALL) {
-               mt76x2_irq_disable(dev, MT_INT_TX_DONE_ALL);
+               mt76x02_irq_disable(&dev->mt76, MT_INT_TX_DONE_ALL);
                tasklet_schedule(&dev->tx_tasklet);
        }
 
        if (intr & MT_INT_RX_DONE(0)) {
-               mt76x2_irq_disable(dev, MT_INT_RX_DONE(0));
+               mt76x02_irq_disable(&dev->mt76, MT_INT_RX_DONE(0));
                napi_schedule(&dev->mt76.napi[0]);
        }
 
        if (intr & MT_INT_RX_DONE(1)) {
-               mt76x2_irq_disable(dev, MT_INT_RX_DONE(1));
+               mt76x02_irq_disable(&dev->mt76, MT_INT_RX_DONE(1));
                napi_schedule(&dev->mt76.napi[1]);
        }
 
@@ -79,7 +67,7 @@ irqreturn_t mt76x2_irq_handler(int irq, void *dev_instance)
        }
 
        if (intr & MT_INT_GPTIMER) {
-               mt76x2_irq_disable(dev, MT_INT_GPTIMER);
+               mt76x02_irq_disable(&dev->mt76, MT_INT_GPTIMER);
                tasklet_schedule(&dev->dfs_pd.dfs_tasklet);
        }
 

diff --git a/drivers/net/wireless/mediatek/mt76/mt76x2_dfs.c b/drivers/net/wireless/mediatek/mt76/mt76x2_dfs.c
index 374cc65..8cfa3a0 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76x2_dfs.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76x2_dfs.c
@@ -15,6 +15,7 @@
  */
 
 #include "mt76x2.h"
+#include "mt76x02_util.h"
 
 #define RADAR_SPEC(m, len, el, eh, wl, wh,             \
                   w_tolerance, tl, th, t_tolerance,    \
@@ -678,7 +679,7 @@ static void mt76x2_dfs_tasklet(unsigned long arg)
        mt76_wr(dev, MT_BBP(DFS, 1), 0xf);
 
 out:
-       mt76x2_irq_enable(dev, MT_INT_GPTIMER);
+       mt76x02_irq_enable(&dev->mt76, MT_INT_GPTIMER);
 }
 
 static void mt76x2_dfs_init_sw_detector(struct mt76x2_dev *dev)
@@ -834,7 +835,7 @@ void mt76x2_dfs_init_params(struct mt76x2_dev *dev)
                /* enable debug mode */
                mt76x2_dfs_set_capture_mode_ctrl(dev, true);
 
-               mt76x2_irq_enable(dev, MT_INT_GPTIMER);
+               mt76x02_irq_enable(&dev->mt76, MT_INT_GPTIMER);
                mt76_rmw_field(dev, MT_INT_TIMER_EN,
                               MT_INT_TIMER_EN_GP_TIMER_EN, 1);
        } else {
@@ -844,7 +845,7 @@ void mt76x2_dfs_init_params(struct mt76x2_dev *dev)
                mt76_wr(dev, MT_BBP(DFS, 1), 0xf);
                mt76_wr(dev, 0x212c, 0);
 
-               mt76x2_irq_disable(dev, MT_INT_GPTIMER);
+               mt76x02_irq_disable(&dev->mt76, MT_INT_GPTIMER);
                mt76_rmw_field(dev, MT_INT_TIMER_EN,
                               MT_INT_TIMER_EN_GP_TIMER_EN, 0);
        }

diff --git a/drivers/net/wireless/mediatek/mt76/mt76x2_dma.c b/drivers/net/wireless/mediatek/mt76/mt76x2_dma.c
index 879ed91..45bed7c 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76x2_dma.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76x2_dma.c
@@ -16,6 +16,7 @@
 
 #include "mt76x2.h"
 #include "mt76x02_dma.h"
+#include "mt76x02_util.h"
 
 static int
 mt76x2_init_tx_queue(struct mt76x2_dev *dev, struct mt76_queue *q,
@@ -31,7 +32,7 @@ mt76x2_init_tx_queue(struct mt76x2_dev *dev, struct mt76_queue *q,
        if (ret)
                return ret;
 
-       mt76x2_irq_enable(dev, MT_INT_TX_DONE(idx));
+       mt76x02_irq_enable(&dev->mt76, MT_INT_TX_DONE(idx));
 
        return 0;
 }
@@ -50,7 +51,7 @@ mt76x2_init_rx_queue(struct mt76x2_dev *dev, struct mt76_queue *q,
        if (ret)
                return ret;
 
-       mt76x2_irq_enable(dev, MT_INT_RX_DONE(idx));
+       mt76x02_irq_enable(&dev->mt76, MT_INT_RX_DONE(idx));
 
        return 0;
 }
@@ -67,7 +68,7 @@ mt76x2_tx_tasklet(unsigned long data)
                mt76_queue_tx_cleanup(dev, i, false);
 
        mt76x2_mac_poll_tx_status(dev, false);
-       mt76x2_irq_enable(dev, MT_INT_TX_DONE_ALL);
+       mt76x02_irq_enable(&dev->mt76, MT_INT_TX_DONE_ALL);
 }
 
 int mt76x2_dma_init(struct mt76x2_dev *dev)

diff --git a/drivers/net/wireless/mediatek/mt76/mt76x2_init.c b/drivers/net/wireless/mediatek/mt76/mt76x2_init.c
index bd52c8b..d4134e3 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76x2_init.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76x2_init.c
@@ -213,8 +213,9 @@ int mt76x2_mac_start(struct mt76x2_dev *dev)
                MT_MAC_SYS_CTRL_ENABLE_TX |
                MT_MAC_SYS_CTRL_ENABLE_RX);
 
-       mt76x2_irq_enable(dev, MT_INT_RX_DONE_ALL | MT_INT_TX_DONE_ALL |
-                              MT_INT_TX_STAT);
+       mt76x02_irq_enable(&dev->mt76,
+                          MT_INT_RX_DONE_ALL | MT_INT_TX_DONE_ALL |
+                          MT_INT_TX_STAT);
 
        return 0;
 }
@@ -422,7 +423,6 @@ struct mt76x2_dev *mt76x2_alloc_device(struct device *pdev)
        dev = container_of(mdev, struct mt76x2_dev, mt76);
        mdev->dev = pdev;
        mdev->drv = &drv_ops;
-       spin_lock_init(&dev->irq_lock);
 
        return dev;
 }

diff --git a/drivers/net/wireless/mediatek/mt76/mt76x2_mac.c b/drivers/net/wireless/mediatek/mt76/mt76x2_mac.c
index 241ede9..5fff086 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76x2_mac.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76x2_mac.c
@@ -42,9 +42,9 @@ void mt76x2_mac_poll_tx_status(struct mt76x2_dev *dev, bool irq)
        trace_mac_txstat_poll(dev);
 
        while (!irq || !kfifo_is_full(&dev->txstatus_fifo)) {
-               spin_lock_irqsave(&dev->irq_lock, flags);
+               spin_lock_irqsave(&dev->mt76.mmio.irq_lock, flags);
                ret = mt76x02_mac_load_tx_status(&dev->mt76, &stat);
-               spin_unlock_irqrestore(&dev->irq_lock, flags);
+               spin_unlock_irqrestore(&dev->mt76.mmio.irq_lock, flags);
 
                if (!ret)
                        break;
@@ -202,9 +202,9 @@ void mt76x2_mac_set_beacon_enable(struct mt76x2_dev *dev, u8 vif_idx, bool val)
        mt76_rmw(dev, MT_BEACON_TIME_CFG, reg, reg * en);
 
        if (en)
-               mt76x2_irq_enable(dev, MT_INT_PRE_TBTT | MT_INT_TBTT);
+               mt76x02_irq_enable(&dev->mt76, MT_INT_PRE_TBTT | MT_INT_TBTT);
        else
-               mt76x2_irq_disable(dev, MT_INT_PRE_TBTT | MT_INT_TBTT);
+               mt76x02_irq_disable(&dev->mt76, MT_INT_PRE_TBTT | MT_INT_TBTT);
 }
 
 void mt76x2_update_channel(struct mt76_dev *mdev)