raspi/linux
1
0
Fork 1
mirror of https://github.com/raspberrypi/linux.git synced 2025-12-06 18:09:56 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Ryder Lee
2023-03-12 14:11:25 +08:00
committed by Felix Fietkau
parent c2171b068b
commit 27db47ab1f
5 changed files with 27 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
drivers/net/wireless/mediatek/mt76/mt7996/mac.c
View File

@@ -641,6 +641,8 @@ mt7996_mac_fill_rx(struct mt7996_dev *dev, struct sk_buff *skb)
u32 rxd4 = le32_to_cpu(rxd[4]); u32 rxd4 = le32_to_cpu(rxd[4]);
u32 csum_mask = MT_RXD0_NORMAL_IP_SUM | MT_RXD0_NORMAL_UDP_TCP_SUM; u32 csum_mask = MT_RXD0_NORMAL_IP_SUM | MT_RXD0_NORMAL_UDP_TCP_SUM;
u32 csum_status = *(u32 *)skb->cb; 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; bool unicast, insert_ccmp_hdr = false;
u8 remove_pad, amsdu_info, band_idx; u8 remove_pad, amsdu_info, band_idx;
u8 mode = 0, qos_ctl = 0; 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; int pad_start = 0;
skb_pull(skb, hdr_gap); 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); 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, /* When header translation failure is indicated,
* the hardware will insert an extra 2-byte field * the hardware will insert an extra 2-byte field
* containing the data length after the protocol * containing the data length after the protocol
* type field. * type field.
*/ */
pad_start = 12; pad_start = 16;
if (get_unaligned_be16(skb->data + pad_start) == ETH_P_8021Q)
pad_start += 4;
else
pad_start = 0;
} }
if (pad_start) { 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); hdr = mt76_skb_get_hdr(skb);
fc = hdr->frame_control; fc = hdr->frame_control;
if (ieee80211_is_data_qos(fc)) { if (ieee80211_is_data_qos(fc)) {
u8 *qos = ieee80211_get_qos_ctl(hdr);
seq_ctrl = le16_to_cpu(hdr->seq_ctrl); 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 { } else {
status->flag |= RX_FLAG_8023; status->flag |= RX_FLAG_8023;

2
drivers/net/wireless/mediatek/mt76/mt7996/mac.h
View File

@@ -12,6 +12,8 @@
#define MT_RXD0_LENGTH GENMASK(15, 0) #define MT_RXD0_LENGTH GENMASK(15, 0)
#define MT_RXD0_PKT_TYPE GENMASK(31, 27) #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_ETH_TYPE_OFS GENMASK(22, 16)
#define MT_RXD0_NORMAL_IP_SUM BIT(23) #define MT_RXD0_NORMAL_IP_SUM BIT(23)
#define MT_RXD0_NORMAL_UDP_TCP_SUM BIT(24) #define MT_RXD0_NORMAL_UDP_TCP_SUM BIT(24)

7
drivers/net/wireless/mediatek/mt76/mt7996/mcu.c
View File

@@ -1022,6 +1022,7 @@ mt7996_mcu_sta_amsdu_tlv(struct mt7996_dev *dev, struct sk_buff *skb,
struct tlv *tlv; struct tlv *tlv;
if (vif->type != NL80211_IFTYPE_STATION && if (vif->type != NL80211_IFTYPE_STATION &&
vif->type != NL80211_IFTYPE_MESH_POINT &&
vif->type != NL80211_IFTYPE_AP) vif->type != NL80211_IFTYPE_AP)
return; 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->to_ds = true;
hdr_trans->from_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 static enum mcu_mmps_mode

2
drivers/net/wireless/mediatek/mt76/mt7996/mcu.h
View File

@@ -396,7 +396,7 @@ struct sta_rec_hdr_trans {
u8 from_ds; u8 from_ds;
u8 to_ds; u8 to_ds;
u8 dis_rx_hdr_tran; u8 dis_rx_hdr_tran;
u8 rsv; u8 mesh;
} __packed; } __packed;
struct hdr_trans_en { struct hdr_trans_en {

1
drivers/net/wireless/mediatek/mt76/mt7996/mmio.c
View File

@@ -327,6 +327,7 @@ struct mt7996_dev *mt7996_mmio_probe(struct device *pdev,
/* txwi_size = txd size + txp size */ /* txwi_size = txd size + txp size */
.txwi_size = MT_TXD_SIZE + sizeof(struct mt76_connac_fw_txp), .txwi_size = MT_TXD_SIZE + sizeof(struct mt76_connac_fw_txp),
.drv_flags = MT_DRV_TXWI_NO_FREE | .drv_flags = MT_DRV_TXWI_NO_FREE |
MT_DRV_AMSDU_OFFLOAD |
MT_DRV_HW_MGMT_TXQ, MT_DRV_HW_MGMT_TXQ,
.survey_flags = SURVEY_INFO_TIME_TX | .survey_flags = SURVEY_INFO_TIME_TX |
SURVEY_INFO_TIME_RX | SURVEY_INFO_TIME_RX |