| From d7f7b14d22f890b76d702224107efcf7988dad13 Mon Sep 17 00:00:00 2001 |
| From: Sean Wang <sean.wang@mediatek.com> |
| Date: Fri, 13 Aug 2021 06:48:24 +0800 |
| Subject: [PATCH] BACKPORT: FROMGIT: mt76: mt7921: report HE MU radiotap |
| |
| Report HE MU/BF radiotap. |
| |
| That fixed HE MU packets dropped by mac80211 because they are missing the |
| ieee80211_radiotap_he_mu header. |
| |
| Fixes: 163f4d22c118d ("mt76: mt7921: add MAC support") |
| Co-developed-by: Ryder Lee <ryder.lee@mediatek.com> |
| Signed-off-by: Ryder Lee <ryder.lee@mediatek.com> |
| Co-developed-by: Eric-SY Chang <Eric-SY.Chang@mediatek.com> |
| Signed-off-by: Eric-SY Chang <Eric-SY.Chang@mediatek.com> |
| Tested-by: Eric-SY Chang <Eric-SY.Chang@mediatek.com> |
| Signed-off-by: Sean Wang <sean.wang@mediatek.com> |
| Signed-off-by: Felix Fietkau <nbd@nbd.name> |
| |
| (cherry picked from commit 1de950f0bf69ccc86acecf3df6cb95c8ecdac548 |
| https://github.com/nbd168/wireless.git mt76) |
| |
| Conflicts: |
| drivers/net/wireless/mediatek/mt76/mt7921/mac.c |
| |
| Backport Notes: |
| Those conflicts come from currrent mac80211 doesn't support hw rx-amsdu |
| de-aggregation, so we only merge those changes to the current context. |
| |
| BUG=b:178754244, b:188614537 |
| TEST=build on cherry |
| |
| Signed-off-by: Sean Wang <objelf@gmail.com> |
| Change-Id: I4ba294adcce08d99bd03c2d23a59897748518f04 |
| Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/kernel/+/3151505 |
| Reviewed-by: Joshua Emele <jemele@chromium.org> |
| Tested-by: Joshua Emele <jemele@chromium.org> |
| Commit-Queue: Joshua Emele <jemele@chromium.org> |
| --- |
| .../net/wireless/mediatek/mt76/mt7921/mac.c | 65 ++++++++++++++++--- |
| .../net/wireless/mediatek/mt76/mt7921/mac.h | 8 +++ |
| 2 files changed, 65 insertions(+), 8 deletions(-) |
| |
| diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/mac.c b/drivers/net/wireless/mediatek/mt76/mt7921/mac.c |
| --- a/drivers/net/wireless/mediatek/mt76/mt7921/mac.c |
| +++ b/drivers/net/wireless/mediatek/mt76/mt7921/mac.c |
| @@ -180,12 +180,56 @@ mt7921_mac_decode_he_radiotap_ru(struct mt76_rx_status *status, |
| IEEE80211_RADIOTAP_HE_DATA2_RU_OFFSET); |
| } |
| |
| +static void |
| +mt7921_mac_decode_he_mu_radiotap(struct sk_buff *skb, |
| + struct mt76_rx_status *status, |
| + __le32 *rxv) |
| +{ |
| + static const struct ieee80211_radiotap_he_mu mu_known = { |
| + .flags1 = HE_BITS(MU_FLAGS1_SIG_B_MCS_KNOWN) | |
| + HE_BITS(MU_FLAGS1_SIG_B_DCM_KNOWN) | |
| + HE_BITS(MU_FLAGS1_CH1_RU_KNOWN) | |
| + HE_BITS(MU_FLAGS1_SIG_B_SYMS_USERS_KNOWN) | |
| + HE_BITS(MU_FLAGS1_SIG_B_COMP_KNOWN), |
| + .flags2 = HE_BITS(MU_FLAGS2_BW_FROM_SIG_A_BW_KNOWN) | |
| + HE_BITS(MU_FLAGS2_PUNC_FROM_SIG_A_BW_KNOWN), |
| + }; |
| + struct ieee80211_radiotap_he_mu *he_mu = NULL; |
| + |
| + he_mu = skb_push(skb, sizeof(mu_known)); |
| + memcpy(he_mu, &mu_known, sizeof(mu_known)); |
| + |
| +#define MU_PREP(f, v) le16_encode_bits(v, IEEE80211_RADIOTAP_HE_MU_##f) |
| + |
| + he_mu->flags1 |= MU_PREP(FLAGS1_SIG_B_MCS, status->rate_idx); |
| + if (status->he_dcm) |
| + he_mu->flags1 |= MU_PREP(FLAGS1_SIG_B_DCM, status->he_dcm); |
| + |
| + he_mu->flags2 |= MU_PREP(FLAGS2_BW_FROM_SIG_A_BW, status->bw) | |
| + MU_PREP(FLAGS2_SIG_B_SYMS_USERS, |
| + le32_get_bits(rxv[2], MT_CRXV_HE_NUM_USER)); |
| + |
| + he_mu->ru_ch1[0] = FIELD_GET(MT_CRXV_HE_RU0, cpu_to_le32(rxv[3])); |
| + |
| + if (status->bw >= RATE_INFO_BW_40) { |
| + he_mu->flags1 |= HE_BITS(MU_FLAGS1_CH2_RU_KNOWN); |
| + he_mu->ru_ch2[0] = |
| + FIELD_GET(MT_CRXV_HE_RU1, cpu_to_le32(rxv[3])); |
| + } |
| + |
| + if (status->bw >= RATE_INFO_BW_80) { |
| + he_mu->ru_ch1[1] = |
| + FIELD_GET(MT_CRXV_HE_RU2, cpu_to_le32(rxv[3])); |
| + he_mu->ru_ch2[1] = |
| + FIELD_GET(MT_CRXV_HE_RU3, cpu_to_le32(rxv[3])); |
| + } |
| +} |
| + |
| static void |
| mt7921_mac_decode_he_radiotap(struct sk_buff *skb, |
| struct mt76_rx_status *status, |
| __le32 *rxv, u32 phy) |
| { |
| - /* TODO: struct ieee80211_radiotap_he_mu */ |
| static const struct ieee80211_radiotap_he known = { |
| .data1 = HE_BITS(DATA1_DATA_MCS_KNOWN) | |
| HE_BITS(DATA1_DATA_DCM_KNOWN) | |
| @@ -193,6 +237,7 @@ mt7921_mac_decode_he_radiotap(struct sk_buff *skb, |
| HE_BITS(DATA1_CODING_KNOWN) | |
| HE_BITS(DATA1_LDPC_XSYMSEG_KNOWN) | |
| HE_BITS(DATA1_DOPPLER_KNOWN) | |
| + HE_BITS(DATA1_SPTL_REUSE_KNOWN) | |
| HE_BITS(DATA1_BSS_COLOR_KNOWN), |
| .data2 = HE_BITS(DATA2_GI_KNOWN) | |
| HE_BITS(DATA2_TXBF_KNOWN) | |
| @@ -207,9 +252,12 @@ mt7921_mac_decode_he_radiotap(struct sk_buff *skb, |
| |
| he->data3 = HE_PREP(DATA3_BSS_COLOR, BSS_COLOR, rxv[14]) | |
| HE_PREP(DATA3_LDPC_XSYMSEG, LDPC_EXT_SYM, rxv[2]); |
| + he->data4 = HE_PREP(DATA4_SU_MU_SPTL_REUSE, SR_MASK, rxv[11]); |
| he->data5 = HE_PREP(DATA5_PE_DISAMBIG, PE_DISAMBIG, rxv[2]) | |
| le16_encode_bits(ltf_size, |
| IEEE80211_RADIOTAP_HE_DATA5_LTF_SIZE); |
| + if (cpu_to_le32(rxv[0]) & MT_PRXV_TXBF) |
| + he->data5 |= HE_BITS(DATA5_TXBF); |
| he->data6 = HE_PREP(DATA6_TXOP, TXOP_DUR, rxv[14]) | |
| HE_PREP(DATA6_DOPPLER, DOPPLER, rxv[14]); |
| |
| @@ -217,8 +265,7 @@ mt7921_mac_decode_he_radiotap(struct sk_buff *skb, |
| case MT_PHY_TYPE_HE_SU: |
| he->data1 |= HE_BITS(DATA1_FORMAT_SU) | |
| HE_BITS(DATA1_UL_DL_KNOWN) | |
| - HE_BITS(DATA1_BEAM_CHANGE_KNOWN) | |
| - HE_BITS(DATA1_SPTL_REUSE_KNOWN); |
| + HE_BITS(DATA1_BEAM_CHANGE_KNOWN); |
| |
| he->data3 |= HE_PREP(DATA3_BEAM_CHANGE, BEAM_CHNG, rxv[14]) | |
| HE_PREP(DATA3_UL_DL, UPLINK, rxv[2]); |
| @@ -232,17 +279,15 @@ mt7921_mac_decode_he_radiotap(struct sk_buff *skb, |
| break; |
| case MT_PHY_TYPE_HE_MU: |
| he->data1 |= HE_BITS(DATA1_FORMAT_MU) | |
| - HE_BITS(DATA1_UL_DL_KNOWN) | |
| - HE_BITS(DATA1_SPTL_REUSE_KNOWN); |
| + HE_BITS(DATA1_UL_DL_KNOWN); |
| |
| he->data3 |= HE_PREP(DATA3_UL_DL, UPLINK, rxv[2]); |
| - he->data4 |= HE_PREP(DATA4_SU_MU_SPTL_REUSE, SR_MASK, rxv[11]); |
| + he->data4 |= HE_PREP(DATA4_MU_STA_ID, MU_AID, rxv[7]); |
| |
| mt7921_mac_decode_he_radiotap_ru(status, he, rxv); |
| break; |
| case MT_PHY_TYPE_HE_TB: |
| he->data1 |= HE_BITS(DATA1_FORMAT_TRIG) | |
| - HE_BITS(DATA1_SPTL_REUSE_KNOWN) | |
| HE_BITS(DATA1_SPTL_REUSE2_KNOWN) | |
| HE_BITS(DATA1_SPTL_REUSE3_KNOWN) | |
| HE_BITS(DATA1_SPTL_REUSE4_KNOWN); |
| @@ -606,9 +651,13 @@ int mt7921_mac_fill_rx(struct mt7921_dev *dev, struct sk_buff *skb) |
| |
| mt7921_mac_assoc_rssi(dev, skb); |
| |
| - if (rxv && status->flag & RX_FLAG_RADIOTAP_HE) |
| + if (rxv && status->flag & RX_FLAG_RADIOTAP_HE) { |
| mt7921_mac_decode_he_radiotap(skb, status, rxv, mode); |
| |
| + if (status->flag & RX_FLAG_RADIOTAP_HE_MU) |
| + mt7921_mac_decode_he_mu_radiotap(skb, status, rxv); |
| + } |
| + |
| if (!status->wcid || !ieee80211_is_data_qos(fc)) |
| return 0; |
| |
| diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/mac.h b/drivers/net/wireless/mediatek/mt76/mt7921/mac.h |
| --- a/drivers/net/wireless/mediatek/mt76/mt7921/mac.h |
| +++ b/drivers/net/wireless/mediatek/mt76/mt7921/mac.h |
| @@ -116,6 +116,7 @@ enum rx_pkt_type { |
| #define MT_PRXV_TX_DCM BIT(4) |
| #define MT_PRXV_TX_ER_SU_106T BIT(5) |
| #define MT_PRXV_NSTS GENMASK(9, 7) |
| +#define MT_PRXV_TXBF BIT(10) |
| #define MT_PRXV_HT_AD_CODE BIT(11) |
| #define MT_PRXV_FRAME_MODE GENMASK(14, 12) |
| #define MT_PRXV_SGI GENMASK(16, 15) |
| @@ -138,8 +139,15 @@ enum rx_pkt_type { |
| #define MT_CRXV_HE_LTF_SIZE GENMASK(18, 17) |
| #define MT_CRXV_HE_LDPC_EXT_SYM BIT(20) |
| #define MT_CRXV_HE_PE_DISAMBIG BIT(23) |
| +#define MT_CRXV_HE_NUM_USER GENMASK(30, 24) |
| #define MT_CRXV_HE_UPLINK BIT(31) |
| |
| +#define MT_CRXV_HE_RU0 GENMASK(7, 0) |
| +#define MT_CRXV_HE_RU1 GENMASK(15, 8) |
| +#define MT_CRXV_HE_RU2 GENMASK(23, 16) |
| +#define MT_CRXV_HE_RU3 GENMASK(31, 24) |
| +#define MT_CRXV_HE_MU_AID GENMASK(30, 20) |
| + |
| #define MT_CRXV_HE_SR_MASK GENMASK(11, 8) |
| #define MT_CRXV_HE_SR1_MASK GENMASK(16, 12) |
| #define MT_CRXV_HE_SR2_MASK GENMASK(20, 17) |
| -- |
| 2.33.0.464.g1972c5931b-goog |
| |