mt76: add mt76x02_mac_start routine

Introduce mt76x02_mac_start since the mac start code is shared between
mt76x0e and mt76x2 drivers.

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/mt76x02_mmio.c b/drivers/net/wireless/mediatek/mt76/mt76x02_mmio.c
index 8c083d2def372b0e25b48fb459b5f745896899b3..1146fbfd8df52f9d3427ca1d7985a43d0dba1e80 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76x02_mmio.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76x02_mmio.c
@@ -146,3 +146,16 @@ void mt76x02_dma_disable(struct mt76_dev *dev)
        __mt76_wr(dev, MT_WPDMA_GLO_CFG, val);
 }
 EXPORT_SYMBOL_GPL(mt76x02_dma_disable);
+
+void mt76x02_mac_start(struct mt76_dev *dev)
+{
+       mt76x02_dma_enable(dev);
+       __mt76_wr(dev, MT_RX_FILTR_CFG, dev->rxfilter);
+       __mt76_wr(dev, MT_MAC_SYS_CTRL,
+                 MT_MAC_SYS_CTRL_ENABLE_TX |
+                 MT_MAC_SYS_CTRL_ENABLE_RX);
+       mt76x02_irq_enable(dev,
+                          MT_INT_RX_DONE_ALL | MT_INT_TX_DONE_ALL |
+                          MT_INT_TX_STAT);
+}
+EXPORT_SYMBOL_GPL(mt76x02_mac_start);

diff --git a/drivers/net/wireless/mediatek/mt76/mt76x02_util.h b/drivers/net/wireless/mediatek/mt76/mt76x02_util.h
index cd9282194c97c9295060c4dab14386d080422229..ff4cab5ca038866081e1066094f3f16bb2cae4ab 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76x02_util.h
+++ b/drivers/net/wireless/mediatek/mt76/mt76x02_util.h
@@ -55,6 +55,7 @@ bool mt76x02_tx_status_data(struct mt76_dev *dev, u8 *update);
 extern const u16 mt76x02_beacon_offsets[16];
 void mt76x02_set_beacon_offsets(struct mt76_dev *dev);
 void mt76x02_set_irq_mask(struct mt76_dev *dev, u32 clear, u32 set);
+void mt76x02_mac_start(struct mt76_dev *dev);
 
 static inline void mt76x02_irq_enable(struct mt76_dev *dev, u32 mask)
 {

diff --git a/drivers/net/wireless/mediatek/mt76/mt76x2_init.c b/drivers/net/wireless/mediatek/mt76/mt76x2_init.c
index 37cbe550ad1ac4d2c0d77c26ae950ee3eff06650..3f77c13a6d546c24bf640d4bb266778a09f339d1 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76x2_init.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76x2_init.c
@@ -188,17 +188,7 @@ int mt76x2_mac_start(struct mt76x2_dev *dev)
                mt76_rr(dev, MT_TX_STAT_FIFO);
 
        memset(dev->aggr_stats, 0, sizeof(dev->aggr_stats));
-
-       mt76x02_dma_enable(&dev->mt76);
-       mt76_wr(dev, MT_RX_FILTR_CFG, dev->mt76.rxfilter);
-
-       mt76_wr(dev, MT_MAC_SYS_CTRL,
-               MT_MAC_SYS_CTRL_ENABLE_TX |
-               MT_MAC_SYS_CTRL_ENABLE_RX);
-
-       mt76x02_irq_enable(&dev->mt76,
-                          MT_INT_RX_DONE_ALL | MT_INT_TX_DONE_ALL |
-                          MT_INT_TX_STAT);
+       mt76x02_mac_start(&dev->mt76);
 
        return 0;
 }