wifi: mt76: mt7996: rely on mt76_connac_txp_common structure

[ Upstream commit 3c38dfc1702d812f7c4a89ed5b0521e2ad8381d6 ]

mt7996_txp structure is equal to mt76_connac_fw_txp one. Drop mt7996_txp
and rely on mt76_connac_txp_common.

Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
Signed-off-by: Felix Fietkau <nbd@nbd.name>
Stable-dep-of: 3b522cadedfe ("wifi: mt76: mt7996: fill txd by host driver")
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/net/wireless/mediatek/mt76/mt7996/mac.c b/drivers/net/wireless/mediatek/mt76/mt7996/mac.c
index 17f0b287507d7c5ff8d6def7df97c8576bde1b7e..4a9d1d35568251317b4e6d7a5922b923a45d35cc 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7996/mac.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7996/mac.c
@@ -1072,8 +1072,8 @@ int mt7996_tx_prepare_skb(struct mt76_dev *mdev, void *txwi_ptr,
        struct ieee80211_tx_info *info = IEEE80211_SKB_CB(tx_info->skb);
        struct ieee80211_key_conf *key = info->control.hw_key;
        struct ieee80211_vif *vif = info->control.vif;
+       struct mt76_connac_txp_common *txp;
        struct mt76_txwi_cache *t;
-       struct mt7996_txp *txp;
        int id, i, pid, nbuf = tx_info->nbuf - 1;
        bool is_8023 = info->flags & IEEE80211_TX_CTL_HW_80211_ENCAP;
        u8 *txwi = (u8 *)txwi_ptr;
@@ -1107,35 +1107,35 @@ int mt7996_tx_prepare_skb(struct mt76_dev *mdev, void *txwi_ptr,
                mt7996_mac_write_txwi(dev, txwi_ptr, tx_info->skb, wcid, key,
                                      pid, qid, 0);
 
-       txp = (struct mt7996_txp *)(txwi + MT_TXD_SIZE);
+       txp = (struct mt76_connac_txp_common *)(txwi + MT_TXD_SIZE);
        for (i = 0; i < nbuf; i++) {
-               txp->buf[i] = cpu_to_le32(tx_info->buf[i + 1].addr);
-               txp->len[i] = cpu_to_le16(tx_info->buf[i + 1].len);
+               txp->fw.buf[i] = cpu_to_le32(tx_info->buf[i + 1].addr);
+               txp->fw.len[i] = cpu_to_le16(tx_info->buf[i + 1].len);
        }
-       txp->nbuf = nbuf;
+       txp->fw.nbuf = nbuf;
 
-       txp->flags = cpu_to_le16(MT_CT_INFO_FROM_HOST);
+       txp->fw.flags = cpu_to_le16(MT_CT_INFO_FROM_HOST);
 
        if (!is_8023 || pid >= MT_PACKET_ID_FIRST)
-               txp->flags |= cpu_to_le16(MT_CT_INFO_APPLY_TXD);
+               txp->fw.flags |= cpu_to_le16(MT_CT_INFO_APPLY_TXD);
 
        if (!key)
-               txp->flags |= cpu_to_le16(MT_CT_INFO_NONE_CIPHER_FRAME);
+               txp->fw.flags |= cpu_to_le16(MT_CT_INFO_NONE_CIPHER_FRAME);
 
        if (!is_8023 && ieee80211_is_mgmt(hdr->frame_control))
-               txp->flags |= cpu_to_le16(MT_CT_INFO_MGMT_FRAME);
+               txp->fw.flags |= cpu_to_le16(MT_CT_INFO_MGMT_FRAME);
 
        if (vif) {
                struct mt7996_vif *mvif = (struct mt7996_vif *)vif->drv_priv;
 
-               txp->bss_idx = mvif->mt76.idx;
+               txp->fw.bss_idx = mvif->mt76.idx;
        }
 
-       txp->token = cpu_to_le16(id);
+       txp->fw.token = cpu_to_le16(id);
        if (test_bit(MT_WCID_FLAG_4ADDR, &wcid->flags))
-               txp->rept_wds_wcid = cpu_to_le16(wcid->idx);
+               txp->fw.rept_wds_wcid = cpu_to_le16(wcid->idx);
        else
-               txp->rept_wds_wcid = cpu_to_le16(0xfff);
+               txp->fw.rept_wds_wcid = cpu_to_le16(0xfff);
        tx_info->skb = DMA_DUMMY_DATA;
 
        /* pass partial skb header to fw */
@@ -1174,13 +1174,13 @@ mt7996_tx_check_aggr(struct ieee80211_sta *sta, __le32 *txwi)
 static void
 mt7996_txp_skb_unmap(struct mt76_dev *dev, struct mt76_txwi_cache *t)
 {
-       struct mt7996_txp *txp;
+       struct mt76_connac_txp_common *txp;
        int i;
 
        txp = mt7996_txwi_to_txp(dev, t);
-       for (i = 0; i < txp->nbuf; i++)
-               dma_unmap_single(dev->dev, le32_to_cpu(txp->buf[i]),
-                                le16_to_cpu(txp->len[i]), DMA_TO_DEVICE);
+       for (i = 0; i < txp->fw.nbuf; i++)
+               dma_unmap_single(dev->dev, le32_to_cpu(txp->fw.buf[i]),
+                                le16_to_cpu(txp->fw.len[i]), DMA_TO_DEVICE);
 }
 
 static void
@@ -1557,11 +1557,11 @@ void mt7996_tx_complete_skb(struct mt76_dev *mdev, struct mt76_queue_entry *e)
 
        /* error path */
        if (e->skb == DMA_DUMMY_DATA) {
+               struct mt76_connac_txp_common *txp;
                struct mt76_txwi_cache *t;
-               struct mt7996_txp *txp;
 
                txp = mt7996_txwi_to_txp(mdev, e->txwi);
-               t = mt76_token_put(mdev, le16_to_cpu(txp->token));
+               t = mt76_token_put(mdev, le16_to_cpu(txp->fw.token));
                e->skb = t ? t->skb : NULL;
        }
 

diff --git a/drivers/net/wireless/mediatek/mt76/mt7996/mac.h b/drivers/net/wireless/mediatek/mt76/mt7996/mac.h
index ed79388e5971359442d8b043fe86c65401e72a96..1404ded52104ad7f24e092a7358167ca22ec17cc 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7996/mac.h
+++ b/drivers/net/wireless/mediatek/mt76/mt7996/mac.h
@@ -265,17 +265,6 @@ enum tx_mgnt_type {
 /* VHT/HE only use bits 0-3 */
 #define MT_TX_RATE_IDX                 GENMASK(5, 0)
 
-struct mt7996_txp {
-       __le16 flags;
-       __le16 token;
-       u8 bss_idx;
-       __le16 rept_wds_wcid;
-       u8 nbuf;
-#define MT_TXP_MAX_BUF_NUM     6
-       __le32 buf[MT_TXP_MAX_BUF_NUM];
-       __le16 len[MT_TXP_MAX_BUF_NUM];
-} __packed __aligned(4);
-
 #define MT_TXFREE0_PKT_TYPE            GENMASK(31, 27)
 #define MT_TXFREE0_MSDU_CNT            GENMASK(25, 16)
 #define MT_TXFREE0_RX_BYTE             GENMASK(15, 0)
@@ -379,7 +368,7 @@ struct mt7996_dfs_radar_spec {
        struct mt7996_dfs_pattern radar_pattern[16];
 };
 
-static inline struct mt7996_txp *
+static inline struct mt76_connac_txp_common *
 mt7996_txwi_to_txp(struct mt76_dev *dev, struct mt76_txwi_cache *t)
 {
        u8 *txwi;
@@ -389,7 +378,7 @@ mt7996_txwi_to_txp(struct mt76_dev *dev, struct mt76_txwi_cache *t)
 
        txwi = mt76_get_txwi_ptr(dev, t);
 
-       return (struct mt7996_txp *)(txwi + MT_TXD_SIZE);
+       return (struct mt76_connac_txp_common *)(txwi + MT_TXD_SIZE);
 }
 
 #endif

diff --git a/drivers/net/wireless/mediatek/mt76/mt7996/mmio.c b/drivers/net/wireless/mediatek/mt76/mt7996/mmio.c
index d8a2c1a744b257e3e586795b705fe5908c4b8718..2237f50adbc71e4aa8fcc87b24120b689662e860 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7996/mmio.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7996/mmio.c
@@ -318,7 +318,7 @@ struct mt7996_dev *mt7996_mmio_probe(struct device *pdev,
 {
        static const struct mt76_driver_ops drv_ops = {
                /* txwi_size = txd size + txp size */
-               .txwi_size = MT_TXD_SIZE + sizeof(struct mt7996_txp),
+               .txwi_size = MT_TXD_SIZE + sizeof(struct mt76_connac_fw_txp),
                .drv_flags = MT_DRV_TXWI_NO_FREE |
                             MT_DRV_HW_MGMT_TXQ,
                .survey_flags = SURVEY_INFO_TIME_TX |