mt76: introduce mt76_init_mcu_queue utility routine

Introduce mt76_init_mcu_queue utility routine in order to allocate
dedicate q_mcu pointers for mcu hw queues. This is a preliminary patch
to move data queues in mt76_phy and add dbdc support to mt7915 driver

Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
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 d48f09a3c539160c17e9fa6bf4d34f4ff10108fe..6dcd902efb3d1873bb239e18ba2c8fddda5f684f 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mac80211.c
+++ b/drivers/net/wireless/mediatek/mt76/mac80211.c
@@ -1214,23 +1214,21 @@ int mt76_get_antenna(struct ieee80211_hw *hw, u32 *tx_ant, u32 *rx_ant)
 }
 EXPORT_SYMBOL_GPL(mt76_get_antenna);
 
-int mt76_init_tx_queue(struct mt76_dev *dev, int qid, int idx,
-                      int n_desc, int ring_base)
+struct mt76_queue *
+mt76_init_queue(struct mt76_dev *dev, int qid, int idx, int n_desc,
+               int ring_base)
 {
        struct mt76_queue *hwq;
        int err;
 
        hwq = devm_kzalloc(dev->dev, sizeof(*hwq), GFP_KERNEL);
        if (!hwq)
-               return -ENOMEM;
+               return ERR_PTR(-ENOMEM);
 
        err = dev->queue_ops->alloc(dev, hwq, idx, n_desc, 0, ring_base);
        if (err < 0)
-               return err;
-
-       hwq->qid = qid;
-       dev->q_tx[qid] = hwq;
+               return ERR_PTR(err);
 
-       return 0;
+       return hwq;
 }
-EXPORT_SYMBOL_GPL(mt76_init_tx_queue);
+EXPORT_SYMBOL_GPL(mt76_init_queue);

diff --git a/drivers/net/wireless/mediatek/mt76/mt76.h b/drivers/net/wireless/mediatek/mt76/mt76.h
index ac0886a01aed8673f8a0f6d05b3dbcf50f8e1d6e..3e6b8a647450f497c5607b33d68b48bb4a524aee 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76.h
+++ b/drivers/net/wireless/mediatek/mt76/mt76.h
@@ -72,6 +72,10 @@ enum mt76_txq_id {
        __MT_TXQ_MAX
 };
 
+enum mt76_mcuq_id {
+       __MT_MCUQ_MAX
+};
+
 enum mt76_rxq_id {
        MT_RXQ_MAIN,
        MT_RXQ_MCU,
@@ -604,6 +608,7 @@ struct mt76_dev {
 
        struct list_head txwi_cache;
        struct mt76_queue *q_tx[2 * __MT_TXQ_MAX];
+       struct mt76_queue *q_mcu[__MT_MCUQ_MAX];
        struct mt76_queue q_rx[__MT_RXQ_MAX];
        const struct mt76_queue_ops *queue_ops;
        int tx_dma_idx[4];
@@ -779,8 +784,38 @@ void mt76_seq_puts_array(struct seq_file *file, const char *str,
 int mt76_eeprom_init(struct mt76_dev *dev, int len);
 void mt76_eeprom_override(struct mt76_dev *dev);
 
-int mt76_init_tx_queue(struct mt76_dev *dev, int qid, int idx,
-                      int n_desc, int ring_base);
+struct mt76_queue *
+mt76_init_queue(struct mt76_dev *dev, int qid, int idx, int n_desc,
+               int ring_base);
+static inline int mt76_init_tx_queue(struct mt76_phy *phy, int qid, int idx,
+                                    int n_desc, int ring_base)
+{
+       struct mt76_queue *q;
+
+       q = mt76_init_queue(phy->dev, qid, idx, n_desc, ring_base);
+       if (IS_ERR(q))
+               return PTR_ERR(q);
+
+       q->qid = qid;
+       phy->dev->q_tx[qid] = q;
+
+       return 0;
+}
+
+static inline int mt76_init_mcu_queue(struct mt76_dev *dev, int qid, int idx,
+                                     int n_desc, int ring_base)
+{
+       struct mt76_queue *q;
+
+       q = mt76_init_queue(dev, qid, idx, n_desc, ring_base);
+       if (IS_ERR(q))
+               return PTR_ERR(q);
+
+       q->qid = qid;
+       dev->q_mcu[qid] = q;
+
+       return 0;
+}
 
 static inline struct mt76_phy *
 mt76_dev_phy(struct mt76_dev *dev, bool phy_ext)

diff --git a/drivers/net/wireless/mediatek/mt76/mt7603/dma.c b/drivers/net/wireless/mediatek/mt76/mt7603/dma.c
index 3c6399909c063b424950c82775cc8892b7587086..3d4be1f3abd8b42259cae526ccab546b09cfed41 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7603/dma.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7603/dma.c
@@ -9,7 +9,7 @@ mt7603_init_tx_queue(struct mt7603_dev *dev, int qid, int idx, int n_desc)
 {
        int err;
 
-       err = mt76_init_tx_queue(&dev->mt76, qid, idx, n_desc,
+       err = mt76_init_tx_queue(&dev->mphy, qid, idx, n_desc,
                                 MT_TX_RING_BASE);
        if (err < 0)
                return err;

diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/dma.c b/drivers/net/wireless/mediatek/mt76/mt7615/dma.c
index 0a11b346f52296cadbc4590f649ae5409ec057b5..ac5c9c951600f095272d9e9968ad7e15f5ca8160 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7615/dma.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7615/dma.c
@@ -24,20 +24,20 @@ mt7622_init_tx_queues_multi(struct mt7615_dev *dev)
        int i;
 
        for (i = 0; i < ARRAY_SIZE(wmm_queue_map); i++) {
-               ret = mt76_init_tx_queue(&dev->mt76, i, wmm_queue_map[i],
+               ret = mt76_init_tx_queue(&dev->mphy, i, wmm_queue_map[i],
                                         MT7615_TX_RING_SIZE / 2,
                                         MT_TX_RING_BASE);
                if (ret)
                        return ret;
        }
 
-       ret = mt76_init_tx_queue(&dev->mt76, MT_TXQ_PSD, MT7622_TXQ_MGMT,
+       ret = mt76_init_tx_queue(&dev->mphy, MT_TXQ_PSD, MT7622_TXQ_MGMT,
                                 MT7615_TX_MGMT_RING_SIZE,
                                 MT_TX_RING_BASE);
        if (ret)
                return ret;
 
-       return mt76_init_tx_queue(&dev->mt76, MT_TXQ_MCU, MT7622_TXQ_MCU,
+       return mt76_init_tx_queue(&dev->mphy, MT_TXQ_MCU, MT7622_TXQ_MCU,
                                  MT7615_TX_MCU_RING_SIZE,
                                  MT_TX_RING_BASE);
 }
@@ -47,7 +47,7 @@ mt7615_init_tx_queues(struct mt7615_dev *dev)
 {
        int ret, i;
 
-       ret = mt76_init_tx_queue(&dev->mt76, MT_TXQ_FWDL, MT7615_TXQ_FWDL,
+       ret = mt76_init_tx_queue(&dev->mphy, MT_TXQ_FWDL, MT7615_TXQ_FWDL,
                                 MT7615_TX_FWDL_RING_SIZE,
                                 MT_TX_RING_BASE);
        if (ret)
@@ -56,7 +56,7 @@ mt7615_init_tx_queues(struct mt7615_dev *dev)
        if (!is_mt7615(&dev->mt76))
                return mt7622_init_tx_queues_multi(dev);
 
-       ret = mt76_init_tx_queue(&dev->mt76, 0, 0, MT7615_TX_RING_SIZE,
+       ret = mt76_init_tx_queue(&dev->mphy, 0, 0, MT7615_TX_RING_SIZE,
                                 MT_TX_RING_BASE);
        if (ret)
                return ret;
@@ -64,7 +64,7 @@ mt7615_init_tx_queues(struct mt7615_dev *dev)
        for (i = 1; i < MT_TXQ_MCU; i++)
                dev->mt76.q_tx[i] = dev->mt76.q_tx[0];
 
-       return mt76_init_tx_queue(&dev->mt76, MT_TXQ_MCU, MT7615_TXQ_MCU,
+       return mt76_init_tx_queue(&dev->mphy, MT_TXQ_MCU, MT7615_TXQ_MCU,
                                  MT7615_TX_MCU_RING_SIZE,
                                  MT_TX_RING_BASE);
 }

diff --git a/drivers/net/wireless/mediatek/mt76/mt76x02_mmio.c b/drivers/net/wireless/mediatek/mt76/mt76x02_mmio.c
index 8b0e2a4bdf307b6e0d97a65a85748faa5874dc3c..609988eeb89dfa49e35c9d030fcfab35ce3503d3 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76x02_mmio.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76x02_mmio.c
@@ -109,7 +109,7 @@ mt76x02_init_tx_queue(struct mt76x02_dev *dev, int qid, int idx, int n_desc)
 {
        int err;
 
-       err = mt76_init_tx_queue(&dev->mt76, qid, idx, n_desc,
+       err = mt76_init_tx_queue(&dev->mphy, qid, idx, n_desc,
                                 MT_TX_RING_BASE);
        if (err < 0)
                return err;

diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/dma.c b/drivers/net/wireless/mediatek/mt76/mt7915/dma.c
index 702034be621c19bf13a7d18ebe1f3d9c448119f2..479fe828ea9f3cef4d71173d2de39c0d451ae7e8 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7915/dma.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7915/dma.c
@@ -10,7 +10,7 @@ mt7915_init_tx_queues(struct mt7915_dev *dev, int idx, int n_desc)
 {
        int i, err;
 
-       err = mt76_init_tx_queue(&dev->mt76, 0, idx, n_desc, MT_TX_RING_BASE);
+       err = mt76_init_tx_queue(&dev->mphy, 0, idx, n_desc, MT_TX_RING_BASE);
        if (err < 0)
                return err;
 
@@ -243,19 +243,19 @@ int mt7915_dma_init(struct mt7915_dev *dev)
                return ret;
 
        /* command to WM */
-       ret = mt76_init_tx_queue(&dev->mt76, MT_TXQ_MCU, MT7915_TXQ_MCU_WM,
+       ret = mt76_init_tx_queue(&dev->mphy, MT_TXQ_MCU, MT7915_TXQ_MCU_WM,
                                 MT7915_TX_MCU_RING_SIZE, MT_TX_RING_BASE);
        if (ret)
                return ret;
 
        /* command to WA */
-       ret = mt76_init_tx_queue(&dev->mt76, MT_TXQ_MCU_WA, MT7915_TXQ_MCU_WA,
+       ret = mt76_init_tx_queue(&dev->mphy, MT_TXQ_MCU_WA, MT7915_TXQ_MCU_WA,
                                 MT7915_TX_MCU_RING_SIZE, MT_TX_RING_BASE);
        if (ret)
                return ret;
 
        /* firmware download */
-       ret = mt76_init_tx_queue(&dev->mt76, MT_TXQ_FWDL, MT7915_TXQ_FWDL,
+       ret = mt76_init_tx_queue(&dev->mphy, MT_TXQ_FWDL, MT7915_TXQ_FWDL,
                                 MT7915_TX_FWDL_RING_SIZE, MT_TX_RING_BASE);
        if (ret)
                return ret;