mt76: remove mt76_queue dependency from tx_prepare_skb function pointer

Remove mt76_queue dependency from tx_prepare_skb function pointer and
rely on mt76_tx_qid instead. This is a preliminary patch to introduce
mt76_sw_queue support

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

diff --git a/drivers/net/wireless/mediatek/mt76/dma.c b/drivers/net/wireless/mediatek/mt76/dma.c
index b9a4318..a9f0195 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/dma.c
+++ b/drivers/net/wireless/mediatek/mt76/dma.c
@@ -301,7 +301,7 @@ int mt76_dma_tx_queue_skb(struct mt76_dev *dev, enum mt76_txq_id qid,
        skb->prev = skb->next = NULL;
        dma_sync_single_for_cpu(dev->dev, t->dma_addr, sizeof(t->txwi),
                                DMA_TO_DEVICE);
-       ret = dev->drv->tx_prepare_skb(dev, &t->txwi, skb, q, wcid, sta,
+       ret = dev->drv->tx_prepare_skb(dev, &t->txwi, skb, qid, wcid, sta,
                                       &tx_info);
        dma_sync_single_for_device(dev->dev, t->dma_addr, sizeof(t->txwi),
                                   DMA_TO_DEVICE);

diff --git a/drivers/net/wireless/mediatek/mt76/mt76.h b/drivers/net/wireless/mediatek/mt76/mt76.h
index b63127e..98d41f4 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76.h
+++ b/drivers/net/wireless/mediatek/mt76/mt76.h
@@ -288,7 +288,7 @@ struct mt76_driver_ops {
        void (*update_survey)(struct mt76_dev *dev);
 
        int (*tx_prepare_skb)(struct mt76_dev *dev, void *txwi_ptr,
-                             struct sk_buff *skb, struct mt76_queue *q,
+                             struct sk_buff *skb, enum mt76_txq_id qid,
                              struct mt76_wcid *wcid,
                              struct ieee80211_sta *sta, u32 *tx_info);
 

diff --git a/drivers/net/wireless/mediatek/mt76/mt7603/mac.c b/drivers/net/wireless/mediatek/mt76/mt7603/mac.c
index 5abc02b..306323f 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7603/mac.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7603/mac.c
@@ -783,7 +783,7 @@ int mt7603_wtbl_set_key(struct mt7603_dev *dev, int wcid,
 
 static int
 mt7603_mac_write_txwi(struct mt7603_dev *dev, __le32 *txwi,
-                     struct sk_buff *skb, struct mt76_queue *q,
+                     struct sk_buff *skb, enum mt76_txq_id qid,
                      struct mt76_wcid *wcid, struct ieee80211_sta *sta,
                      int pid, struct ieee80211_key_conf *key)
 {
@@ -792,6 +792,7 @@ mt7603_mac_write_txwi(struct mt7603_dev *dev, __le32 *txwi,
        struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data;
        struct ieee80211_bar *bar = (struct ieee80211_bar *)skb->data;
        struct ieee80211_vif *vif = info->control.vif;
+       struct mt76_queue *q = &dev->mt76.q_tx[qid];
        struct mt7603_vif *mvif;
        int wlan_idx;
        int hdr_len = ieee80211_get_hdrlen_from_skb(skb);
@@ -806,7 +807,7 @@ mt7603_mac_write_txwi(struct mt7603_dev *dev, __le32 *txwi,
        if (vif) {
                mvif = (struct mt7603_vif *)vif->drv_priv;
                vif_idx = mvif->idx;
-               if (vif_idx && q >= &dev->mt76.q_tx[MT_TXQ_BEACON])
+               if (vif_idx && qid >= MT_TXQ_BEACON)
                        vif_idx += 0x10;
        }
 
@@ -880,7 +881,7 @@ mt7603_mac_write_txwi(struct mt7603_dev *dev, __le32 *txwi,
        }
 
        /* use maximum tx count for beacons and buffered multicast */
-       if (q >= &dev->mt76.q_tx[MT_TXQ_BEACON])
+       if (qid >= MT_TXQ_BEACON)
                tx_count = 0x1f;
 
        val = FIELD_PREP(MT_TXD3_REM_TX_COUNT, tx_count) |
@@ -911,7 +912,7 @@ mt7603_mac_write_txwi(struct mt7603_dev *dev, __le32 *txwi,
 }
 
 int mt7603_tx_prepare_skb(struct mt76_dev *mdev, void *txwi_ptr,
-                         struct sk_buff *skb, struct mt76_queue *q,
+                         struct sk_buff *skb, enum mt76_txq_id qid,
                          struct mt76_wcid *wcid, struct ieee80211_sta *sta,
                          u32 *tx_info)
 {
@@ -943,7 +944,7 @@ int mt7603_tx_prepare_skb(struct mt76_dev *mdev, void *txwi_ptr,
                spin_unlock_bh(&dev->mt76.lock);
        }
 
-       mt7603_mac_write_txwi(dev, txwi_ptr, skb, q, wcid, sta, pid, key);
+       mt7603_mac_write_txwi(dev, txwi_ptr, skb, qid, wcid, sta, pid, key);
 
        return 0;
 }

diff --git a/drivers/net/wireless/mediatek/mt76/mt7603/mt7603.h b/drivers/net/wireless/mediatek/mt76/mt7603/mt7603.h
index 3273e9f..d4434c3 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7603/mt7603.h
+++ b/drivers/net/wireless/mediatek/mt76/mt7603/mt7603.h
@@ -223,7 +223,7 @@ void mt7603_wtbl_set_smps(struct mt7603_dev *dev, struct mt7603_sta *sta,
 void mt7603_filter_tx(struct mt7603_dev *dev, int idx, bool abort);
 
 int mt7603_tx_prepare_skb(struct mt76_dev *mdev, void *txwi_ptr,
-                         struct sk_buff *skb, struct mt76_queue *q,
+                         struct sk_buff *skb, enum mt76_txq_id qid,
                          struct mt76_wcid *wcid, struct ieee80211_sta *sta,
                          u32 *tx_info);
 

diff --git a/drivers/net/wireless/mediatek/mt76/mt76x02.h b/drivers/net/wireless/mediatek/mt76/mt76x02.h
index 9f972ee..9b66dce 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76x02.h
+++ b/drivers/net/wireless/mediatek/mt76/mt76x02.h
@@ -173,7 +173,7 @@ irqreturn_t mt76x02_irq_handler(int irq, void *dev_instance);
 void mt76x02_tx(struct ieee80211_hw *hw, struct ieee80211_tx_control *control,
                struct sk_buff *skb);
 int mt76x02_tx_prepare_skb(struct mt76_dev *mdev, void *txwi,
-                          struct sk_buff *skb, struct mt76_queue *q,
+                          struct sk_buff *skb, enum mt76_txq_id qid,
                           struct mt76_wcid *wcid, struct ieee80211_sta *sta,
                           u32 *tx_info);
 void mt76x02_sw_scan(struct ieee80211_hw *hw, struct ieee80211_vif *vif,

diff --git a/drivers/net/wireless/mediatek/mt76/mt76x02_txrx.c b/drivers/net/wireless/mediatek/mt76/mt76x02_txrx.c
index 94f4724..ce9ace1 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76x02_txrx.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76x02_txrx.c
@@ -147,7 +147,7 @@ bool mt76x02_tx_status_data(struct mt76_dev *mdev, u8 *update)
 EXPORT_SYMBOL_GPL(mt76x02_tx_status_data);
 
 int mt76x02_tx_prepare_skb(struct mt76_dev *mdev, void *txwi_ptr,
-                          struct sk_buff *skb, struct mt76_queue *q,
+                          struct sk_buff *skb, enum mt76_txq_id qid,
                           struct mt76_wcid *wcid, struct ieee80211_sta *sta,
                           u32 *tx_info)
 {
@@ -157,7 +157,7 @@ int mt76x02_tx_prepare_skb(struct mt76_dev *mdev, void *txwi_ptr,
        int pid;
        int ret;
 
-       if (q == &dev->mt76.q_tx[MT_TXQ_PSD] && wcid && wcid->idx < 128)
+       if (qid == MT_TXQ_PSD && wcid && wcid->idx < 128)
                mt76x02_mac_wcid_set_drop(dev, wcid->idx, false);
 
        mt76x02_mac_write_txwi(dev, txwi, skb, wcid, sta, skb->len);

diff --git a/drivers/net/wireless/mediatek/mt76/mt76x02_usb.h b/drivers/net/wireless/mediatek/mt76/mt76x02_usb.h
index 0126e51..20e0cee 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76x02_usb.h
+++ b/drivers/net/wireless/mediatek/mt76/mt76x02_usb.h
@@ -26,7 +26,7 @@ int mt76x02u_mcu_fw_send_data(struct mt76x02_dev *dev, const void *data,
 
 int mt76x02u_skb_dma_info(struct sk_buff *skb, int port, u32 flags);
 int mt76x02u_tx_prepare_skb(struct mt76_dev *mdev, void *data,
-                           struct sk_buff *skb, struct mt76_queue *q,
+                           struct sk_buff *skb, enum mt76_txq_id qid,
                            struct mt76_wcid *wcid, struct ieee80211_sta *sta,
                            u32 *tx_info);
 void mt76x02u_tx_complete_skb(struct mt76_dev *mdev, struct mt76_queue *q,

diff --git a/drivers/net/wireless/mediatek/mt76/mt76x02_usb_core.c b/drivers/net/wireless/mediatek/mt76/mt76x02_usb_core.c
index 6fb52b5..643a817 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76x02_usb_core.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76x02_usb_core.c
@@ -72,16 +72,15 @@ int mt76x02u_skb_dma_info(struct sk_buff *skb, int port, u32 flags)
 }
 
 int mt76x02u_tx_prepare_skb(struct mt76_dev *mdev, void *data,
-                           struct sk_buff *skb, struct mt76_queue *q,
+                           struct sk_buff *skb, enum mt76_txq_id qid,
                            struct mt76_wcid *wcid, struct ieee80211_sta *sta,
                            u32 *tx_info)
 {
        struct mt76x02_dev *dev = container_of(mdev, struct mt76x02_dev, mt76);
+       int pid, len = skb->len, ep = q2ep(mdev->q_tx[qid].hw_idx);
        struct mt76x02_txwi *txwi;
        enum mt76_qsel qsel;
-       int len = skb->len;
        u32 flags;
-       int pid;
 
        mt76x02_insert_hdr_pad(skb);
 
@@ -92,7 +91,7 @@ int mt76x02u_tx_prepare_skb(struct mt76_dev *mdev, void *data,
        pid = mt76_tx_status_skb_add(mdev, wcid, skb);
        txwi->pktid = pid;
 
-       if (pid >= MT_PACKET_ID_FIRST || q2ep(q->hw_idx) == MT_EP_OUT_HCCA)
+       if (pid >= MT_PACKET_ID_FIRST || ep == MT_EP_OUT_HCCA)
                qsel = MT_QSEL_MGMT;
        else
                qsel = MT_QSEL_EDCA;

diff --git a/drivers/net/wireless/mediatek/mt76/usb.c b/drivers/net/wireless/mediatek/mt76/usb.c
index b155141..e9ccdab 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/usb.c
+++ b/drivers/net/wireless/mediatek/mt76/usb.c
@@ -739,7 +739,7 @@ mt76u_tx_queue_skb(struct mt76_dev *dev, enum mt76_txq_id qid,
                return -ENOSPC;
 
        skb->prev = skb->next = NULL;
-       err = dev->drv->tx_prepare_skb(dev, NULL, skb, q, wcid, sta, NULL);
+       err = dev->drv->tx_prepare_skb(dev, NULL, skb, qid, wcid, sta, NULL);
        if (err < 0)
                return err;