mt76: move tx_tasklet management in mt76x02-lib moudle

Move tx_tasklet management in mt76x02_mmio.c in order to
be reused by mt76x0 driver and remove duplicated code

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/mt76x0/pci.c b/drivers/net/wireless/mediatek/mt76/mt76x0/pci.c
index f817c870587d7f25a25c1b88fe5a55e9fb0ccfea..87997cddf0d6953c2fcd8ac1e6cdeff20ee7a627 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76x0/pci.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76x0/pci.c
@@ -166,7 +166,7 @@ static void mt76x0e_cleanup(struct mt76x02_dev *dev)
        clear_bit(MT76_STATE_INITIALIZED, &dev->mt76.state);
        mt76x0_chip_onoff(dev, false, false);
        mt76x0e_stop_hw(dev);
-       mt76_dma_cleanup(&dev->mt76);
+       mt76x02_dma_cleanup(dev);
        mt76x02_mcu_cleanup(&dev->mt76);
 }
 

diff --git a/drivers/net/wireless/mediatek/mt76/mt76x02_dma.h b/drivers/net/wireless/mediatek/mt76/mt76x02_dma.h
index aa38ef9ec7d0f91f5bdbf3528cf2838b35597b57..6394010a565ffa53e410278e0fc8a0a2a17fa961 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76x02_dma.h
+++ b/drivers/net/wireless/mediatek/mt76/mt76x02_dma.h
@@ -72,5 +72,6 @@ mt76x02_wait_for_wpdma(struct mt76_dev *dev, int timeout)
 
 int mt76x02_dma_init(struct mt76x02_dev *dev);
 void mt76x02_dma_disable(struct mt76x02_dev *dev);
+void mt76x02_dma_cleanup(struct mt76x02_dev *dev);
 
 #endif /* __MT76x02_DMA_H */

diff --git a/drivers/net/wireless/mediatek/mt76/mt76x02_mmio.c b/drivers/net/wireless/mediatek/mt76/mt76x02_mmio.c
index 98aeb64d9c37e25929c42d70c459b9f2b70b3f29..bb609b775de98f47efbc6c47e54cc80e5e1a690b 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76x02_mmio.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76x02_mmio.c
@@ -57,16 +57,49 @@ mt76x02_init_rx_queue(struct mt76x02_dev *dev, struct mt76_queue *q,
        return 0;
 }
 
+static void mt76x02_process_tx_status_fifo(struct mt76x02_dev *dev)
+{
+       struct mt76x02_tx_status stat;
+       u8 update = 1;
+
+       while (kfifo_get(&dev->txstatus_fifo, &stat))
+               mt76x02_send_tx_status(&dev->mt76, &stat, &update);
+}
+
+static void mt76x02_tx_tasklet(unsigned long data)
+{
+       struct mt76x02_dev *dev = (struct mt76x02_dev *)data;
+       int i;
+
+       mt76x02_process_tx_status_fifo(dev);
+
+       for (i = MT_TXQ_MCU; i >= 0; i--)
+               mt76_queue_tx_cleanup(dev, i, false);
+
+       mt76x02_mac_poll_tx_status(dev, false);
+       mt76x02_irq_enable(dev, MT_INT_TX_DONE_ALL);
+}
+
 int mt76x02_dma_init(struct mt76x02_dev *dev)
 {
        struct mt76_txwi_cache __maybe_unused *t;
+       int i, ret, fifo_size;
        struct mt76_queue *q;
-       int i, ret;
+       void *status_fifo;
 
        BUILD_BUG_ON(sizeof(t->txwi) < sizeof(struct mt76x02_txwi));
        BUILD_BUG_ON(sizeof(struct mt76x02_rxwi) > MT_RX_HEADROOM);
 
+       fifo_size = roundup_pow_of_two(32 * sizeof(struct mt76x02_tx_status));
+       status_fifo = devm_kzalloc(dev->mt76.dev, fifo_size, GFP_KERNEL);
+       if (!status_fifo)
+               return -ENOMEM;
+
+       tasklet_init(&dev->tx_tasklet, mt76x02_tx_tasklet, (unsigned long) dev);
+       kfifo_init(&dev->txstatus_fifo, status_fifo, fifo_size);
+
        mt76_dma_attach(&dev->mt76);
+
        mt76_wr(dev, MT_WPDMA_RST_IDX, ~0);
 
        for (i = 0; i < IEEE80211_NUM_ACS; i++) {
@@ -132,6 +165,13 @@ static void mt76x02_dma_enable(struct mt76x02_dev *dev)
 }
 EXPORT_SYMBOL_GPL(mt76x02_dma_enable);
 
+void mt76x02_dma_cleanup(struct mt76x02_dev *dev)
+{
+       tasklet_kill(&dev->tx_tasklet);
+       mt76_dma_cleanup(&dev->mt76);
+}
+EXPORT_SYMBOL_GPL(mt76x02_dma_cleanup);
+
 void mt76x02_dma_disable(struct mt76x02_dev *dev)
 {
        u32 val = mt76_rr(dev, MT_WPDMA_GLO_CFG);

diff --git a/drivers/net/wireless/mediatek/mt76/mt76x2/Makefile b/drivers/net/wireless/mediatek/mt76/mt76x2/Makefile
index 2e6ef73944ed7cb97d440f25ead7a4a370f9d262..66f8b8ee6bc4e79bb31915f1f581af922ba9c5ec 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76x2/Makefile
+++ b/drivers/net/wireless/mediatek/mt76/mt76x2/Makefile
@@ -6,7 +6,7 @@ mt76x2-common-y := \
        eeprom.o mac.o init.o phy.o debugfs.o mcu.o
 
 mt76x2e-y := \
-       pci.o pci_dma.o pci_main.o pci_init.o pci_tx.o \
+       pci.o pci_main.o pci_init.o pci_tx.o \
        pci_core.o pci_mac.o pci_mcu.o pci_phy.o \
        pci_dfs.o pci_trace.o
 

diff --git a/drivers/net/wireless/mediatek/mt76/mt76x2/mac.h b/drivers/net/wireless/mediatek/mt76/mt76x2/mac.h
index b13d629053d6bcaa8172090efa2f7a1a4bc7f50c..a31bd49ae6cb8c0bdb8125e8a653b7e9b19acdec 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76x2/mac.h
+++ b/drivers/net/wireless/mediatek/mt76/mt76x2/mac.h
@@ -32,8 +32,6 @@ int mt76x2_mac_set_beacon(struct mt76x02_dev *dev, u8 vif_idx,
                          struct sk_buff *skb);
 void mt76x2_mac_set_beacon_enable(struct mt76x02_dev *dev, u8 vif_idx, bool val);
 
-void mt76x2_mac_process_tx_status_fifo(struct mt76x02_dev *dev);
-
 void mt76x2_mac_work(struct work_struct *work);
 
 #endif

diff --git a/drivers/net/wireless/mediatek/mt76/mt76x2/mt76x2.h b/drivers/net/wireless/mediatek/mt76/mt76x2/mt76x2.h
index db9b3b30a8acf5c930a8833e541618c41e050676..fc70711ea9e4b676e003ca9bc312f03b349c72e3 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76x2/mt76x2.h
+++ b/drivers/net/wireless/mediatek/mt76/mt76x2/mt76x2.h
@@ -81,9 +81,6 @@ int mt76x2_mcu_set_channel(struct mt76x02_dev *dev, u8 channel, u8 bw,
 int mt76x2_mcu_load_cr(struct mt76x02_dev *dev, u8 type, u8 temp_level,
                       u8 channel);
 
-void mt76x2_tx_tasklet(unsigned long data);
-void mt76x2_dma_cleanup(struct mt76x02_dev *dev);
-
 void mt76x2_cleanup(struct mt76x02_dev *dev);
 
 void mt76x2_mac_set_tx_protection(struct mt76x02_dev *dev, u32 val);

diff --git a/drivers/net/wireless/mediatek/mt76/mt76x2/pci_dma.c b/drivers/net/wireless/mediatek/mt76/mt76x2/pci_dma.c
deleted file mode 100644 (file)
index 1ac0df9..0000000
--- a/drivers/net/wireless/mediatek/mt76/mt76x2/pci_dma.c
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (C) 2016 Felix Fietkau <nbd@nbd.name>
- *
- * Permission to use, copy, modify, and/or distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#include "mt76x2.h"
-
-void mt76x2_tx_tasklet(unsigned long data)
-{
-       struct mt76x02_dev *dev = (struct mt76x02_dev *) data;
-       int i;
-
-       mt76x2_mac_process_tx_status_fifo(dev);
-
-       for (i = MT_TXQ_MCU; i >= 0; i--)
-               mt76_queue_tx_cleanup(dev, i, false);
-
-       mt76x02_mac_poll_tx_status(dev, false);
-       mt76x02_irq_enable(dev, MT_INT_TX_DONE_ALL);
-}
-
-void mt76x2_dma_cleanup(struct mt76x02_dev *dev)
-{
-       tasklet_kill(&dev->tx_tasklet);
-       mt76_dma_cleanup(&dev->mt76);
-}

diff --git a/drivers/net/wireless/mediatek/mt76/mt76x2/pci_init.c b/drivers/net/wireless/mediatek/mt76/mt76x2/pci_init.c
index 78fdc4754b77173fc26b9354212948ca3c50e039..88f2aa257274935a4311ab76b7bb96395c59df04 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76x2/pci_init.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76x2/pci_init.c
@@ -346,7 +346,7 @@ void mt76x2_cleanup(struct mt76x02_dev *dev)
        tasklet_disable(&dev->dfs_pd.dfs_tasklet);
        tasklet_disable(&dev->pre_tbtt_tasklet);
        mt76x2_stop_hardware(dev);
-       mt76x2_dma_cleanup(dev);
+       mt76x02_dma_cleanup(dev);
        mt76x02_mcu_cleanup(&dev->mt76);
 }
 
@@ -464,17 +464,8 @@ int mt76x2_register_device(struct mt76x02_dev *dev)
 {
        struct ieee80211_hw *hw = mt76_hw(dev);
        struct wiphy *wiphy = hw->wiphy;
-       void *status_fifo;
-       int fifo_size;
        int i, ret;
 
-       fifo_size = roundup_pow_of_two(32 * sizeof(struct mt76x02_tx_status));
-       status_fifo = devm_kzalloc(dev->mt76.dev, fifo_size, GFP_KERNEL);
-       if (!status_fifo)
-               return -ENOMEM;
-
-       tasklet_init(&dev->tx_tasklet, mt76x2_tx_tasklet, (unsigned long)dev);
-       kfifo_init(&dev->txstatus_fifo, status_fifo, fifo_size);
        INIT_DELAYED_WORK(&dev->cal_work, mt76x2_phy_calibrate);
        INIT_DELAYED_WORK(&dev->mac_work, mt76x2_mac_work);
 

diff --git a/drivers/net/wireless/mediatek/mt76/mt76x2/pci_mac.c b/drivers/net/wireless/mediatek/mt76/mt76x2/pci_mac.c
index 710e91ca4af11c083480bcdea8439cd3845518d2..c7484aa543fa9b7d402aaace430295a73af3482b 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76x2/pci_mac.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76x2/pci_mac.c
@@ -28,15 +28,6 @@ void mt76x2_mac_set_bssid(struct mt76x02_dev *dev, u8 idx, const u8 *addr)
                       get_unaligned_le16(addr + 4));
 }
 
-void mt76x2_mac_process_tx_status_fifo(struct mt76x02_dev *dev)
-{
-       struct mt76x02_tx_status stat;
-       u8 update = 1;
-
-       while (kfifo_get(&dev->txstatus_fifo, &stat))
-               mt76x02_send_tx_status(&dev->mt76, &stat, &update);
-}
-
 static int
 mt76_write_beacon(struct mt76x02_dev *dev, int offset, struct sk_buff *skb)
 {