wifi: mt76: remove capability of partial bandwidth UL MU-MIMO
Subsystems (2)
Shayne Chen
reviewerPATCH 1/9 wifi: mt76: remove capability of partial bandwidth UL MU-MIMO
From: Howard Hsu <[email protected]>
The firmware only supports full bandwidth UL MU-MIMO, so remove the partial bandwidth capability from HE PHY CAP.
--- drivers/net/wireless/mediatek/mt76/mt7915/init.c | 3 +-- drivers/net/wireless/mediatek/mt76/mt7996/init.c | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-)
drivers/net/wireless/mediatek/mt76/mt7915/init.c +1 -2
@@ -925,8 +925,7 @@ mt7915_set_stream_he_txbf_caps(struct mt7915_phy *phy, c = IEEE80211_HE_PHY_CAP2_NDP_4x_LTF_AND_3_2US;if (!is_mt7915 (&dev->mt76)) - c |=IEEE80211_HE_PHY_CAP2_UL_MU_FULL_MU_MIMO | -IEEE80211_HE_PHY_CAP2_UL_MU_PARTIAL_MU_MIMO ; + c |=IEEE80211_HE_PHY_CAP2_UL_MU_FULL_MU_MIMO ; elem->phy_cap_info[2 ] |= c; c = IEEE80211_HE_PHY_CAP4_SU_BEAMFORMEE |
drivers/net/wireless/mediatek/mt76/mt7996/init.c +1 -2
@@ -1116,8 +1116,7 @@ mt7996_set_stream_he_txbf_caps(struct mt7996_phy *phy, elem->phy_cap_info[7 ] &= ~IEEE80211_HE_PHY_CAP7_MAX_NC_MASK ; c = IEEE80211_HE_PHY_CAP2_NDP_4x_LTF_AND_3_2US | -IEEE80211_HE_PHY_CAP2_UL_MU_FULL_MU_MIMO | -IEEE80211_HE_PHY_CAP2_UL_MU_PARTIAL_MU_MIMO ; +IEEE80211_HE_PHY_CAP2_UL_MU_FULL_MU_MIMO ; elem->phy_cap_info[2 ] |= c; c =IEEE80211_HE_PHY_CAP4_SU_BEAMFORMEE ;
Signature · 1 line
2.39.2
Shayne Chen
reviewerPATCH 2/9 wifi: mt76: mt7996: fix beamformee SS field
From: Howard Hsu <[email protected]>
Fix the beamformee SS field for the mt7996, mt7992 and mt7990 chipsets. For the mt7992, this value shall be set to 0x4, while the others shall be set to 0x3.
--- drivers/net/wireless/mediatek/mt76/mt7996/init.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/net/wireless/mediatek/mt76/mt7996/init.c +4 -4
@@ -1121,12 +1121,12 @@ mt7996_set_stream_he_txbf_caps(struct mt7996_phy *phy, c =IEEE80211_HE_PHY_CAP4_SU_BEAMFORMEE ; -if (is_mt7996 (phy->mt76->dev)) - c |=IEEE80211_HE_PHY_CAP4_BEAMFORMEE_MAX_STS_UNDER_80MHZ_4 | - (IEEE80211_HE_PHY_CAP4_BEAMFORMEE_MAX_STS_ABOVE_80MHZ_4 * non_2g); -else +if (is_mt7992 (phy->mt76->dev)) c |=IEEE80211_HE_PHY_CAP4_BEAMFORMEE_MAX_STS_UNDER_80MHZ_5 | (IEEE80211_HE_PHY_CAP4_BEAMFORMEE_MAX_STS_ABOVE_80MHZ_5 * non_2g); +else + c |=IEEE80211_HE_PHY_CAP4_BEAMFORMEE_MAX_STS_UNDER_80MHZ_4 | + (IEEE80211_HE_PHY_CAP4_BEAMFORMEE_MAX_STS_ABOVE_80MHZ_4 * non_2g); elem->phy_cap_info[4 ] |= c;
Signature · 1 line
2.39.2
Shayne Chen
reviewerPATCH 3/9 wifi: mt76: mt7996: set EHT max ampdu length capability
In reply to Shayne ChenFrom: Peter Chiu <[email protected]>
Set the max AMPDU length in the EHT MAC CAP. Without this patch, the peer station cannot obtain the correct capability, which prevents achieving peak throughput on the 2 GHz band.
--- drivers/net/wireless/mediatek/mt76/mt7996/init.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/net/wireless/mediatek/mt76/mt7996/init.c +3 -0
@@ -1326,6 +1326,9 @@ mt7996_init_eht_caps(struct mt7996_phy *phy, enum nl80211_band band,u8_encode_bits (IEEE80211_EHT_MAC_CAP0_MAX_MPDU_LEN_11454 ,IEEE80211_EHT_MAC_CAP0_MAX_MPDU_LEN_MASK ); + eht_cap_elem->mac_cap_info[1 ] |= +IEEE80211_EHT_MAC_CAP1_MAX_AMPDU_LEN_MASK ; + eht_cap_elem->phy_cap_info[0 ] =IEEE80211_EHT_PHY_CAP0_NDP_4_EHT_LFT_32_GI | IEEE80211_EHT_PHY_CAP0_SU_BEAMFORMER |
Signature · 1 line
2.39.2
Shayne Chen
reviewerPATCH 4/9 wifi: mt76: mt7996: drop fragments with multicast or broadcast RA
In reply to Shayne ChenFrom: Benjamin Lin <[email protected]>
IEEE 802.11 fragmentation can only be applied to unicast frames. Therefore, drop fragments with multicast or broadcast RA. This patch addresses vulnerabilities such as CVE-2020-26145.
--- drivers/net/wireless/mediatek/mt76/mt7996/mac.c | 8 ++++++++ 1 file changed, 8 insertions(+)
drivers/net/wireless/mediatek/mt76/mt7996/mac.c +8 -0
@@ -647,6 +647,14 @@ mt7996_mac_fill_rx(struct mt7996_dev *dev, enum mt76_rxq_id q, status->last_amsdu = amsdu_info ==MT_RXD4_LAST_AMSDU_FRAME ; } +/* IEEE 802.11 fragmentation can only be applied to unicast frames. +* Hence, drop fragments with multicast/broadcast RA. +* This check fixes vulnerabilities, like CVE-2020-26145. +*/ +if ((ieee80211_has_morefrags (fc) || seq_ctrl &IEEE80211_SCTL_FRAG ) && +FIELD_GET (MT_RXD3_NORMAL_ADDR_TYPE , rxd3) !=MT_RXD3_NORMAL_U2M ) +return -EINVAL ; + hdr_gap = (u8 *)rxd - skb->data +2 * remove_pad;if (hdr_trans &&ieee80211_has_morefrags (fc)) {if (mt7996_reverse_frag0_hdr_trans (skb, hdr_gap))
Signature · 1 line
2.39.2
Shayne Chen
reviewerPATCH 5/9 wifi: mt76: mt7996: fix invalid NSS setting when TX path differs from NSS
In reply to Shayne ChenFrom: Peter Chiu <[email protected]>
The maximum TX path and NSS may differ on a band. For example, one variant of the MT7992 has 5 TX paths and 4 NSS on the 5 GHz band. To address this, add orig_antenna_mask to record the maximum NSS and prevent setting an invalid NSS in mt7996_set_antenna().
--- drivers/net/wireless/mediatek/mt76/mt7996/eeprom.c | 1 + drivers/net/wireless/mediatek/mt76/mt7996/main.c | 3 ++- drivers/net/wireless/mediatek/mt76/mt7996/mt7996.h | 1 + 3 files changed, 4 insertions(+), 1 deletion(-)
drivers/net/wireless/mediatek/mt76/mt7996/eeprom.c +1 -0
@@ -310,6 +310,7 @@ int mt7996_eeprom_parse_hw_cap(struct mt7996_dev *dev, struct mt7996_phy *phy) phy->has_aux_rx = true; mphy->antenna_mask =BIT (nss) -1 ; + phy->orig_antenna_mask = mphy->antenna_mask; mphy->chainmask = (BIT (path) -1 ) << dev->chainshift[band_idx]; phy->orig_chainmask = mphy->chainmask; dev->chainmask |= mphy->chainmask;
drivers/net/wireless/mediatek/mt76/mt7996/main.c +2 -1
@@ -1518,7 +1518,8 @@ mt7996_set_antenna(struct ieee80211_hw *hw, u32 tx_ant, u32 rx_ant)u8 shift = dev->chainshift[band_idx]; phy->mt76->chainmask = tx_ant & phy->orig_chainmask; - phy->mt76->antenna_mask = phy->mt76->chainmask >> shift; + phy->mt76->antenna_mask = (phy->mt76->chainmask >> shift) & + phy->orig_antenna_mask;mt76_set_stream_caps (phy->mt76, true);mt7996_set_stream_vht_txbf_caps (phy);
drivers/net/wireless/mediatek/mt76/mt7996/mt7996.h +1 -0
@@ -312,6 +312,7 @@ struct mt7996_phy {struct mt76_channel_state state_ts;u16 orig_chainmask; +u16 orig_antenna_mask;bool has_aux_rx;bool counter_reset;
Signature · 1 line
2.39.2
Shayne Chen
reviewerPATCH 6/9 wifi: mt76: mt7996: change max beacon size
In reply to Shayne ChenFrom: Peter Chiu <[email protected]>
According to hardware capability, the maximum beacon size is 2048 bytes minus the size of TLV headers.
--- drivers/net/wireless/mediatek/mt76/mt7996/mcu.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/wireless/mediatek/mt76/mt7996/mcu.h +2 -2
@@ -832,13 +832,13 @@ enum { sizeof(struct sta_rec_eht_mld) + \ sizeof(struct tlv)) -#define MT7996_MAX_BEACON_SIZE 1338#define MT7996_BEACON_UPDATE_SIZE (sizeof(struct bss_req_hdr) + \ sizeof(struct bss_bcn_content_tlv) + \ 4 + MT_TXD_SIZE + \ sizeof(struct bss_bcn_cntdwn_tlv) + \ sizeof(struct bss_bcn_mbss_tlv)) -#define MT7996_MAX_BSS_OFFLOAD_SIZE (MT7996_MAX_BEACON_SIZE + \ +#define MT7996_MAX_BSS_OFFLOAD_SIZE 2048 +#define MT7996_MAX_BEACON_SIZE (MT7996_MAX_BSS_OFFLOAD_SIZE - \ MT7996_BEACON_UPDATE_SIZE)enum {
Signature · 1 line
2.39.2
Shayne Chen
reviewerPATCH 7/9 wifi: mt76: mt7996: fix RX buffer size of MCU event
In reply to Shayne ChenSome management frames are first processed by the firmware and then passed to the driver through the MCU event rings. In CONNAC3, event rings do not support scatter-gather and have a size limitation of 2048 bytes. If a packet sized between 1728 and 2048 bytes arrives from an event ring, the ring will hang because the driver attempts to use scatter-gather to process it.
To fix this, include the size of struct skb_shared_info in the MCU RX buffer size to prevent scatter-gather from being used for event skb in mt76_dma_rx_fill_buf().
--- drivers/net/wireless/mediatek/mt76/mt7996/dma.c | 4 ++-- drivers/net/wireless/mediatek/mt76/mt7996/mt7996.h | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-)
drivers/net/wireless/mediatek/mt76/mt7996/dma.c +2 -2
@@ -531,7 +531,7 @@ int mt7996_dma_init(struct mt7996_dev *dev) ret =mt76_queue_alloc (dev, &dev->mt76.q_rx[MT_RXQ_MCU ],MT_RXQ_ID (MT_RXQ_MCU ),MT7996_RX_MCU_RING_SIZE , -MT_RX_BUF_SIZE , +MT7996_RX_MCU_BUF_SIZE ,MT_RXQ_RING_BASE (MT_RXQ_MCU ));if (ret)return ret;
@@ -540,7 +540,7 @@ int mt7996_dma_init(struct mt7996_dev *dev) ret =mt76_queue_alloc (dev, &dev->mt76.q_rx[MT_RXQ_MCU_WA ],MT_RXQ_ID (MT_RXQ_MCU_WA ),MT7996_RX_MCU_RING_SIZE_WA , -MT_RX_BUF_SIZE , +MT7996_RX_MCU_BUF_SIZE ,MT_RXQ_RING_BASE (MT_RXQ_MCU_WA ));if (ret)return ret;
drivers/net/wireless/mediatek/mt76/mt7996/mt7996.h +3 -0
@@ -29,6 +29,9 @@#define MT7996_RX_RING_SIZE 1536#define MT7996_RX_MCU_RING_SIZE 512#define MT7996_RX_MCU_RING_SIZE_WA 1024 +/* scatter-gather of mcu event is not supported in connac3 */ +#define MT7996_RX_MCU_BUF_SIZE (2048 + \ + SKB_DATA_ALIGN(sizeof(struct skb_shared_info)))#define MT7996_DEVICE_ID 0x7990#define MT7996_DEVICE_ID_2 0x7991
Signature · 1 line
2.39.2
Shayne Chen
reviewerPATCH 8/9 wifi: mt76: fix available_antennas setting
In reply to Shayne ChenCheck if available_antennas_tx and available_antennas_rx are already set during the per-chip initialization phase; otherwise, they could be overwritten with incorrect values.
--- drivers/net/wireless/mediatek/mt76/mac80211.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/net/wireless/mediatek/mt76/mac80211.c +4 -2
@@ -449,8 +449,10 @@ mt76_phy_init(struct mt76_phy *phy, struct ieee80211_hw *hw)wiphy_ext_feature_set (wiphy,NL80211_EXT_FEATURE_AIRTIME_FAIRNESS );wiphy_ext_feature_set (wiphy,NL80211_EXT_FEATURE_AQL ); - wiphy->available_antennas_tx = phy->antenna_mask; - wiphy->available_antennas_rx = phy->antenna_mask; +if (!wiphy->available_antennas_tx) + wiphy->available_antennas_tx = phy->antenna_mask; +if (!wiphy->available_antennas_rx) + wiphy->available_antennas_rx = phy->antenna_mask; wiphy->sar_capa = &mt76_sar_capa; phy->frp = devm_kcalloc(dev->dev, wiphy->sar_capa->num_freq_ranges,
Signature · 1 line
2.39.2
Shayne Chen
reviewerPATCH 9/9 wifi: mt76: support power delta calculation for 5 TX paths
In reply to Shayne ChenOne variant of MT7992 has 5 TX paths, so extend the power delta function to support it. Also, rename nss_delta to path_delta since the value is based on the number of TX paths rather tha the number of spatial streams. (path delta [0.5 dBm] = 10 * log(path number) [dBm] * 2)
--- drivers/net/wireless/mediatek/mt76/mac80211.c | 4 ++-- drivers/net/wireless/mediatek/mt76/mt76.h | 8 ++++---- drivers/net/wireless/mediatek/mt76/mt7615/init.c | 2 +- drivers/net/wireless/mediatek/mt76/mt7615/mcu.c | 6 +++--- drivers/net/wireless/mediatek/mt76/mt7915/init.c | 4 ++-- drivers/net/wireless/mediatek/mt76/mt7996/init.c | 6 +++--- drivers/net/wireless/mediatek/mt76/mt7996/main.c | 2 +- 7 files changed, 16 insertions(+), 16 deletions(-)
drivers/net/wireless/mediatek/mt76/mac80211.c +2 -2
@@ -1705,7 +1705,7 @@ s8 mt76_get_power_bound(struct mt76_phy *phy, s8 txpower)int n_chains =hweight16 (phy->chainmask); txpower =mt76_get_sar_power (phy, phy->chandef.chan, txpower *2 ); - txpower -=mt76_tx_power_nss_delta (n_chains); + txpower -=mt76_tx_power_path_delta (n_chains);return txpower; }
@@ -1721,7 +1721,7 @@ int mt76_get_txpower(struct ieee80211_hw *hw, struct ieee80211_vif *vif,return -EINVAL ; n_chains =hweight16 (phy->chainmask); - delta =mt76_tx_power_nss_delta (n_chains); + delta =mt76_tx_power_path_delta (n_chains); *dbm =DIV_ROUND_UP (phy->txpower_cur + delta,2 );return 0 ;
drivers/net/wireless/mediatek/mt76/mt76.h +4 -4
@@ -1386,12 +1386,12 @@ static inline bool mt76_is_skb_pktid(u8 pktid)return pktid >=MT_PACKET_ID_FIRST ; } -static inline u8 mt76_tx_power_nss_delta (u8 nss) +static inline u8 mt76_tx_power_path_delta (u8 path) { -static const u8 nss_delta[4 ] = {0 ,6 ,9 ,12 }; -u8 idx = nss -1 ; +static const u8 path_delta[5 ] = {0 ,6 ,9 ,12 ,14 }; +u8 idx = path -1 ; -return (idx <ARRAY_SIZE (nss_delta)) ? nss_delta[idx] :0 ; +return (idx <ARRAY_SIZE (path_delta)) ? path_delta[idx] :0 ; }static inline bool mt76_testmode_enabled (struct mt76_phy *phy)
drivers/net/wireless/mediatek/mt76/mt7615/init.c +1 -1
@@ -273,7 +273,7 @@ void mt7615_init_txpower(struct mt7615_dev *dev, struct ieee80211_supported_band *sband) {int i, n_chains =hweight8 (dev->mphy.antenna_mask), target_chains; -int delta_idx, delta =mt76_tx_power_nss_delta (n_chains); +int delta_idx, delta =mt76_tx_power_path_delta (n_chains);u8 *eep = (u8 *)dev->mt76.eeprom.data;enum nl80211_band band = sband->band;struct mt76_power_limits limits;
drivers/net/wireless/mediatek/mt76/mt7615/mcu.c +3 -3
@@ -2067,7 +2067,7 @@ static void mt7615_mcu_set_txpower_sku(struct mt7615_phy *phy, u8 *sku) }; tx_power =mt76_get_sar_power (mphy, mphy->chandef.chan, tx_power); - tx_power -=mt76_tx_power_nss_delta (n_chains); + tx_power -=mt76_tx_power_path_delta (n_chains); tx_power =mt76_get_rate_power_limits (mphy, mphy->chandef.chan, &limits, tx_power); mphy->txpower_cur = tx_power;
@@ -2084,8 +2084,8 @@ static void mt7615_mcu_set_txpower_sku(struct mt7615_phy *phy, u8 *sku)int delta =0 ;if (i < n_chains -1 ) - delta =mt76_tx_power_nss_delta (n_chains) - -mt76_tx_power_nss_delta (i +1 ); + delta =mt76_tx_power_path_delta (n_chains) - +mt76_tx_power_path_delta (i +1 ); sku[MT_SKU_1SS_DELTA + i] = delta; } }
drivers/net/wireless/mediatek/mt76/mt7915/init.c +2 -2
@@ -285,7 +285,7 @@ static void __mt7915_init_txpower(struct mt7915_phy *phy, {struct mt7915_dev *dev = phy->dev;int i, n_chains =hweight16 (phy->mt76->chainmask); -int nss_delta =mt76_tx_power_nss_delta (n_chains); +int path_delta =mt76_tx_power_path_delta (n_chains);int pwr_delta =mt7915_eeprom_get_power_delta (dev, sband->band);struct mt76_power_limits limits;
@@ -305,7 +305,7 @@ static void __mt7915_init_txpower(struct mt7915_phy *phy, target_power =mt76_get_rate_power_limits (phy->mt76, chan, &limits, target_power); - target_power += nss_delta; + target_power += path_delta; target_power =DIV_ROUND_UP (target_power,2 ); chan->max_power =min_t (int, chan->max_reg_power, target_power);
drivers/net/wireless/mediatek/mt76/mt7996/init.c +3 -3
@@ -317,8 +317,8 @@ static void __mt7996_init_txpower(struct mt7996_phy *phy, struct ieee80211_supported_band *sband) {struct mt7996_dev *dev = phy->dev; -int i, nss =hweight16 (phy->mt76->chainmask); -int nss_delta =mt76_tx_power_nss_delta (nss); +int i, n_chains =hweight16 (phy->mt76->chainmask); +int path_delta =mt76_tx_power_path_delta (n_chains);int pwr_delta =mt7996_eeprom_get_power_delta (dev, sband->band);struct mt76_power_limits limits;
@@ -330,7 +330,7 @@ static void __mt7996_init_txpower(struct mt7996_phy *phy, target_power =mt76_get_rate_power_limits (phy->mt76, chan, &limits, target_power); - target_power += nss_delta; + target_power += path_delta; target_power =DIV_ROUND_UP (target_power,2 ); chan->max_power =min_t (int, chan->max_reg_power, target_power);
drivers/net/wireless/mediatek/mt76/mt7996/main.c +1 -1
@@ -684,7 +684,7 @@ mt7996_get_txpower(struct ieee80211_hw *hw, struct ieee80211_vif *vif, } n_chains =hweight16 (phy->mt76->chainmask); - delta =mt76_tx_power_nss_delta (n_chains); + delta =mt76_tx_power_path_delta (n_chains); *dbm =DIV_ROUND_UP (phy->mt76->txpower_cur + delta,2 );return 0 ;
Signature · 1 line
2.39.2