wifi: mt76: mt7996: enable mesh HW amsdu/de-amsdu support

This enables HW offloading amsdu/de-amsdu support for 802.11s mesh
interface.

Co-developed-by: Bo Jiao <bo.jiao@mediatek.com>
Signed-off-by: Bo Jiao <bo.jiao@mediatek.com>
Signed-off-by: Ryder Lee <ryder.lee@mediatek.com>
Signed-off-by: Felix Fietkau <nbd@nbd.name>

diff --git a/drivers/net/wireless/mediatek/mt76/mt7996/mac.c b/drivers/net/wireless/mediatek/mt76/mt7996/mac.c
index 1ae2c85..0639bd3 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7996/mac.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7996/mac.c
@@ -641,6 +641,8 @@ mt7996_mac_fill_rx(struct mt7996_dev *dev, struct sk_buff *skb)
        u32 rxd4 = le32_to_cpu(rxd[4]);
        u32 csum_mask = MT_RXD0_NORMAL_IP_SUM | MT_RXD0_NORMAL_UDP_TCP_SUM;
        u32 csum_status = *(u32 *)skb->cb;
+       u32 mesh_mask = MT_RXD0_MESH | MT_RXD0_MHCP;
+       bool is_mesh = (rxd0 & mesh_mask) == mesh_mask;
        bool unicast, insert_ccmp_hdr = false;
        u8 remove_pad, amsdu_info, band_idx;
        u8 mode = 0, qos_ctl = 0;
@@ -832,19 +834,16 @@ mt7996_mac_fill_rx(struct mt7996_dev *dev, struct sk_buff *skb)
                int pad_start = 0;
 
                skb_pull(skb, hdr_gap);
-               if (!hdr_trans && status->amsdu) {
+               if (!hdr_trans && status->amsdu && !(ieee80211_has_a4(fc) && is_mesh)) {
                        pad_start = ieee80211_get_hdrlen_from_skb(skb);
-               } else if (hdr_trans && (rxd2 & MT_RXD2_NORMAL_HDR_TRANS_ERROR)) {
+               } else if (hdr_trans && (rxd2 & MT_RXD2_NORMAL_HDR_TRANS_ERROR) &&
+                          get_unaligned_be16(skb->data + pad_start) == ETH_P_8021Q) {
                        /* When header translation failure is indicated,
                         * the hardware will insert an extra 2-byte field
                         * containing the data length after the protocol
                         * type field.
                         */
-                       pad_start = 12;
-                       if (get_unaligned_be16(skb->data + pad_start) == ETH_P_8021Q)
-                               pad_start += 4;
-                       else
-                               pad_start = 0;
+                       pad_start = 16;
                }
 
                if (pad_start) {
@@ -865,8 +864,17 @@ mt7996_mac_fill_rx(struct mt7996_dev *dev, struct sk_buff *skb)
                hdr = mt76_skb_get_hdr(skb);
                fc = hdr->frame_control;
                if (ieee80211_is_data_qos(fc)) {
+                       u8 *qos = ieee80211_get_qos_ctl(hdr);
+
                        seq_ctrl = le16_to_cpu(hdr->seq_ctrl);
-                       qos_ctl = *ieee80211_get_qos_ctl(hdr);
+                       qos_ctl = *qos;
+
+                       /* Mesh DA/SA/Length will be stripped after hardware
+                        * de-amsdu, so here needs to clear amsdu present bit
+                        * to mark it as a normal mesh frame.
+                        */
+                       if (ieee80211_has_a4(fc) && is_mesh && status->amsdu)
+                               *qos &= ~IEEE80211_QOS_CTL_A_MSDU_PRESENT;
                }
        } else {
                status->flag |= RX_FLAG_8023;

diff --git a/drivers/net/wireless/mediatek/mt76/mt7996/mac.h b/drivers/net/wireless/mediatek/mt76/mt7996/mac.h
index b2bbe0e..bc4e6c5 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7996/mac.h
+++ b/drivers/net/wireless/mediatek/mt76/mt7996/mac.h
@@ -12,6 +12,8 @@
 #define MT_RXD0_LENGTH                 GENMASK(15, 0)
 #define MT_RXD0_PKT_TYPE               GENMASK(31, 27)
 
+#define MT_RXD0_MESH                   BIT(18)
+#define MT_RXD0_MHCP                   BIT(19)
 #define MT_RXD0_NORMAL_ETH_TYPE_OFS    GENMASK(22, 16)
 #define MT_RXD0_NORMAL_IP_SUM          BIT(23)
 #define MT_RXD0_NORMAL_UDP_TCP_SUM     BIT(24)

diff --git a/drivers/net/wireless/mediatek/mt76/mt7996/mcu.c b/drivers/net/wireless/mediatek/mt76/mt7996/mcu.c
index f96992b..88e2f9d 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7996/mcu.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7996/mcu.c
@@ -1022,6 +1022,7 @@ mt7996_mcu_sta_amsdu_tlv(struct mt7996_dev *dev, struct sk_buff *skb,
        struct tlv *tlv;
 
        if (vif->type != NL80211_IFTYPE_STATION &&
+           vif->type != NL80211_IFTYPE_MESH_POINT &&
            vif->type != NL80211_IFTYPE_AP)
                return;
 
@@ -1470,6 +1471,12 @@ mt7996_mcu_sta_hdr_trans_tlv(struct mt7996_dev *dev, struct sk_buff *skb,
                hdr_trans->to_ds = true;
                hdr_trans->from_ds = true;
        }
+
+       if (vif->type == NL80211_IFTYPE_MESH_POINT) {
+               hdr_trans->to_ds = true;
+               hdr_trans->from_ds = true;
+               hdr_trans->mesh = true;
+       }
 }
 
 static enum mcu_mmps_mode

diff --git a/drivers/net/wireless/mediatek/mt76/mt7996/mcu.h b/drivers/net/wireless/mediatek/mt76/mt7996/mcu.h
index 6f92b9a..d7075a4 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7996/mcu.h
+++ b/drivers/net/wireless/mediatek/mt76/mt7996/mcu.h
@@ -396,7 +396,7 @@ struct sta_rec_hdr_trans {
        u8 from_ds;
        u8 to_ds;
        u8 dis_rx_hdr_tran;
-       u8 rsv;
+       u8 mesh;
 } __packed;
 
 struct hdr_trans_en {

diff --git a/drivers/net/wireless/mediatek/mt76/mt7996/mmio.c b/drivers/net/wireless/mediatek/mt76/mt7996/mmio.c
index 879b0e9..3a591a7 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7996/mmio.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7996/mmio.c
@@ -327,6 +327,7 @@ struct mt7996_dev *mt7996_mmio_probe(struct device *pdev,
                /* txwi_size = txd size + txp size */
                .txwi_size = MT_TXD_SIZE + sizeof(struct mt76_connac_fw_txp),
                .drv_flags = MT_DRV_TXWI_NO_FREE |
+                            MT_DRV_AMSDU_OFFLOAD |
                             MT_DRV_HW_MGMT_TXQ,
                .survey_flags = SURVEY_INFO_TIME_TX |
                                SURVEY_INFO_TIME_RX |