wifi: mt76: mt7996: check txs format before getting skb by pid
Subsystems (2)
Shayne Chen
reviewerPATCH v2 1/12 wifi: mt76: mt7996: check txs format before getting skb by pid
From: Peter Chiu <[email protected]>
The PPDU TXS does not include the error bit so it cannot use to report status to mac80211. This patch fixes issue that STA wrongly detects if AP is still alive.
--- .../net/wireless/mediatek/mt76/mt7996/mac.c | 23 +++++++++++-------- 1 file changed, 13 insertions(+), 10 deletions(-)
drivers/net/wireless/mediatek/mt76/mt7996/mac.c +13 -10
@@ -1188,25 +1188,28 @@ mt7996_mac_add_txs_skb(struct mt7996_dev *dev, struct mt76_wcid *wcid,struct ieee80211_tx_info *info;struct sk_buff_head list;struct rate_info rate = {}; -struct sk_buff *skb; +struct sk_buff *skb =NULL ;bool cck = false;u32 txrate, txs, mode, stbc; txs =le32_to_cpu (txs_data[0 ]);mt76_tx_status_lock (mdev, &list); - skb =mt76_tx_status_skb_get (mdev, wcid, pid, &list); -if (skb) { - info =IEEE80211_SKB_CB (skb); -if (!(txs &MT_TXS0_ACK_ERROR_MASK )) - info->flags |=IEEE80211_TX_STAT_ACK ; +/* only report MPDU TXS */ +if (le32_get_bits (txs_data[0 ],MT_TXS0_TXS_FORMAT ) ==0 ) { + skb =mt76_tx_status_skb_get (mdev, wcid, pid, &list); +if (skb) { + info =IEEE80211_SKB_CB (skb); +if (!(txs &MT_TXS0_ACK_ERROR_MASK )) + info->flags |=IEEE80211_TX_STAT_ACK ; - info->status.ampdu_len =1 ; - info->status.ampdu_ack_len = - !!(info->flags &IEEE80211_TX_STAT_ACK ); + info->status.ampdu_len =1 ; + info->status.ampdu_ack_len = + !!(info->flags &IEEE80211_TX_STAT_ACK ); - info->status.rates[0 ].idx =-1 ; + info->status.rates[0 ].idx =-1 ; + } }if (mtk_wed_device_active (&dev->mt76.mmio.wed) && wcid->sta) {
Signature · 1 line
2.39.2
Shayne Chen
reviewerPATCH v2 2/12 wifi: mt76: mt7996: fix TWT issues
From: Peter Chiu <[email protected]>
This patch fixes the following TWT issues:
- Change table_mask to u16 to support up to 16 TWT stations
- Reject TWT flows for duplicated establishment
- Fix possible unaligned pointer
- Remove unsupported TWT_CONTROL_WAKE_DUR_UNIT flag
- The minimum TWT duration supported by mt7996 chipsets is 64. Reply with TWT_SETUP_CMD_DICTATE if the min_twt_dur is smaller than 64
--- .../net/wireless/mediatek/mt76/mt7996/mac.c | 53 ++++++++++++++++--- .../wireless/mediatek/mt76/mt7996/mt7996.h | 3 +- 2 files changed, 47 insertions(+), 9 deletions(-)
drivers/net/wireless/mediatek/mt76/mt7996/mac.c +45 -8
@@ -2530,6 +2530,34 @@ static int mt7996_mac_check_twt_req(struct ieee80211_twt_setup *twt)return 0 ; } +static bool +mt7996_mac_twt_param_equal (struct mt7996_sta *msta, +struct ieee80211_twt_params *twt_agrt) +{ +u16 type =le16_to_cpu (twt_agrt->req_type); +u8 exp; +int i; + + exp =FIELD_GET (IEEE80211_TWT_REQTYPE_WAKE_INT_EXP , type); +for (i =0 ; i <MT7996_MAX_STA_TWT_AGRT ; i++) { +struct mt7996_twt_flow *f; + +if (!(msta->twt.flowid_mask &BIT (i))) +continue ; + + f = &msta->twt.flow[i]; +if (f->duration == twt_agrt->min_twt_dur && + f->mantissa == twt_agrt->mantissa && + f->exp == exp && + f->protection == !!(type &IEEE80211_TWT_REQTYPE_PROTECTION ) && + f->flowtype == !!(type &IEEE80211_TWT_REQTYPE_FLOWTYPE ) && + f->trigger == !!(type &IEEE80211_TWT_REQTYPE_TRIGGER )) +return true; + } + +return false; +} +void mt7996_mac_add_twt_setup (struct ieee80211_hw *hw,struct ieee80211_sta *sta,struct ieee80211_twt_setup *twt)
@@ -2541,8 +2569,7 @@ void mt7996_mac_add_twt_setup(struct ieee80211_hw *hw,enum ieee80211_twt_setup_cmd sta_setup_cmd;struct mt7996_dev *dev =mt7996_hw_dev (hw);struct mt7996_twt_flow *flow; -int flowid, table_id; -u8 exp; +u8 flowid, table_id, exp;if (mt7996_mac_check_twt_req (twt)) goto out;
@@ -2555,9 +2582,19 @@ void mt7996_mac_add_twt_setup(struct ieee80211_hw *hw,if (hweight8 (msta->twt.flowid_mask) ==ARRAY_SIZE (msta->twt.flow)) goto unlock; +if (twt_agrt->min_twt_dur <MT7996_MIN_TWT_DUR ) { + setup_cmd =TWT_SETUP_CMD_DICTATE ; + twt_agrt->min_twt_dur =MT7996_MIN_TWT_DUR ; + goto unlock; + } + +if (mt7996_mac_twt_param_equal (msta, twt_agrt)) + goto unlock; + flowid =ffs (~msta->twt.flowid_mask) -1 ; -le16p_replace_bits (&twt_agrt->req_type, flowid, -IEEE80211_TWT_REQTYPE_FLOWID ); + twt_agrt->req_type &= ~cpu_to_le16 (IEEE80211_TWT_REQTYPE_FLOWID ); + twt_agrt->req_type |=le16_encode_bits (flowid, +IEEE80211_TWT_REQTYPE_FLOWID ); table_id =ffs (~dev->twt.table_mask) -1 ; exp =FIELD_GET (IEEE80211_TWT_REQTYPE_WAKE_INT_EXP , req_type);
@@ -2604,10 +2641,10 @@ void mt7996_mac_add_twt_setup(struct ieee80211_hw *hw, unlock:mutex_unlock (&dev->mt76.mutex); out: -le16p_replace_bits (&twt_agrt->req_type, setup_cmd, -IEEE80211_TWT_REQTYPE_SETUP_CMD ); - twt->control = (twt->control &IEEE80211_TWT_CONTROL_WAKE_DUR_UNIT ) | - (twt->control &IEEE80211_TWT_CONTROL_RX_DISABLED ); + twt_agrt->req_type &= ~cpu_to_le16 (IEEE80211_TWT_REQTYPE_SETUP_CMD ); + twt_agrt->req_type |= +le16_encode_bits (setup_cmd,IEEE80211_TWT_REQTYPE_SETUP_CMD ); + twt->control = twt->control &IEEE80211_TWT_CONTROL_RX_DISABLED ; } void mt7996_mac_twt_teardown_flow(struct mt7996_dev *dev,
drivers/net/wireless/mediatek/mt76/mt7996/mt7996.h +2 -1
@@ -53,6 +53,7 @@#define MT7996_MAX_TWT_AGRT 16#define MT7996_MAX_STA_TWT_AGRT 8 +#define MT7996_MIN_TWT_DUR 64#define MT7996_MAX_QUEUE (__MT_RXQ_MAX + __MT_MCUQ_MAX + 3)/* NOTE: used to map mt76_rates. idx may change if firmware expands table */
@@ -320,7 +321,7 @@ struct mt7996_dev {struct rchan *relay_fwlog;struct { -u8 table_mask; +u16 table_mask;u8 n_agrt; } twt;
Signature · 1 line
2.39.2
Shayne Chen
reviewerPATCH v2 3/12 wifi: mt76: mt7996: disable AMSDU for non-data frames
In reply to Shayne ChenFrom: Peter Chiu <[email protected]>
Disable AMSDU for non-data frames to prevent TX token leak issues.
--- drivers/net/wireless/mediatek/mt76/mt7996/mac.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/net/wireless/mediatek/mt76/mt7996/mac.c +3 -2
@@ -732,6 +732,9 @@ mt7996_mac_write_txwi_8023(struct mt7996_dev *dev, __le32 *txwi,FIELD_PREP (MT_TXD2_SUB_TYPE , fc_stype); txwi[2 ] |=cpu_to_le32 (val); + +if (wcid->amsdu) + txwi[3 ] |=cpu_to_le32 (MT_TXD3_HW_AMSDU ); } static void
@@ -862,8 +865,6 @@ void mt7996_mac_write_txwi(struct mt7996_dev *dev, __le32 *txwi, val |=MT_TXD3_PROTECT_FRAME ;if (info->flags &IEEE80211_TX_CTL_NO_ACK ) val |=MT_TXD3_NO_ACK ; -if (wcid->amsdu) - val |=MT_TXD3_HW_AMSDU ; txwi[3 ] =cpu_to_le32 (val); txwi[4 ] =0 ;
Signature · 1 line
2.39.2
Shayne Chen
reviewerPATCH v2 4/12 wifi: mt76: mt7996: fix incorrect interpretation of EHT MCS caps
In reply to Shayne ChenFrom: Benjamin Lin <[email protected]>
The EHT MCS map subfield of 20 MHz-Only is not present in the EHT capability of AP, so STA does not need to parse the subfield. Moreover, AP should parse the subfield only if STA is 20 MHz-Only, which can be confirmed by checking supported channel width in HE capability.
--- drivers/net/wireless/mediatek/mt76/mt7996/mcu.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-)
drivers/net/wireless/mediatek/mt76/mt7996/mcu.c +14 -2
@@ -1240,6 +1240,9 @@ mt7996_mcu_sta_he_6g_tlv(struct sk_buff *skb, struct ieee80211_sta *sta)static void mt7996_mcu_sta_eht_tlv (struct sk_buff *skb,struct ieee80211_sta *sta) { +struct mt7996_sta *msta = (struct mt7996_sta *)sta->drv_priv; +struct ieee80211_vif *vif =container_of ((void *)msta->vif, + struct ieee80211_vif, drv_priv);struct ieee80211_eht_mcs_nss_supp *mcs_map;struct ieee80211_eht_cap_elem_fixed *elem;struct sta_rec_eht *eht;
@@ -1259,8 +1262,17 @@ mt7996_mcu_sta_eht_tlv(struct sk_buff *skb, struct ieee80211_sta *sta) eht->phy_cap =cpu_to_le64 (*(u64 *)elem->phy_cap_info); eht->phy_cap_ext =cpu_to_le64 (elem->phy_cap_info[8 ]); -if (sta->deflink.bandwidth ==IEEE80211_STA_RX_BW_20 ) -memcpy (eht->mcs_map_bw20, &mcs_map->only_20mhz,sizeof (eht->mcs_map_bw20)); +if (vif->type !=NL80211_IFTYPE_STATION && + (sta->deflink.he_cap.he_cap_elem.phy_cap_info[0 ] & + (IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_40MHZ_IN_2G | +IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_40MHZ_80MHZ_IN_5G | +IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_160MHZ_IN_5G | +IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_80PLUS80_MHZ_IN_5G )) ==0 ) { +memcpy (eht->mcs_map_bw20, &mcs_map->only_20mhz, +sizeof (eht->mcs_map_bw20)); +return ; + } +memcpy (eht->mcs_map_bw80, &mcs_map->bw._80,sizeof (eht->mcs_map_bw80));memcpy (eht->mcs_map_bw160, &mcs_map->bw._160,sizeof (eht->mcs_map_bw160));memcpy (eht->mcs_map_bw320, &mcs_map->bw._320,sizeof (eht->mcs_map_bw320));
Signature · 1 line
2.39.2
Shayne Chen
reviewerPATCH v2 5/12 wifi: mt76: mt7996: ensure 4-byte alignment for beacon commands
In reply to Shayne ChenFrom: Benjamin Lin <[email protected]>
If TLV includes beacon content, its length might not be 4-byte aligned. Make sure the length is aligned before sending beacon commands to FW.
--- drivers/net/wireless/mediatek/mt76/mt7996/mcu.c | 14 +++++--------- drivers/net/wireless/mediatek/mt76/mt7996/mcu.h | 4 ++-- 2 files changed, 7 insertions(+), 11 deletions(-)
drivers/net/wireless/mediatek/mt76/mt7996/mcu.c +5 -9
@@ -732,13 +732,10 @@ void mt7996_mcu_rx_event(struct mt7996_dev *dev, struct sk_buff *skb)static struct tlv *mt7996_mcu_add_uni_tlv (struct sk_buff *skb,u16 tag,u16 len) { -struct tlv *ptlv, tlv = { - .tag =cpu_to_le16 (tag), - .len =cpu_to_le16 (len), - }; +struct tlv *ptlv =skb_put (skb, len); - ptlv =skb_put (skb, len); -memcpy (ptlv, &tlv,sizeof (tlv)); + ptlv->tag =cpu_to_le16 (tag); + ptlv->len =cpu_to_le16 (len);return ptlv; }
@@ -2522,7 +2519,7 @@ int mt7996_mcu_add_beacon(struct ieee80211_hw *hw, info =IEEE80211_SKB_CB (skb); info->hw_queue |=FIELD_PREP (MT_TX_HW_QUEUE_PHY , phy->mt76->band_idx); - len =sizeof (*bcn) +MT_TXD_SIZE + skb->len; + len =ALIGN (sizeof (*bcn) +MT_TXD_SIZE + skb->len,4 ); tlv =mt7996_mcu_add_uni_tlv (rskb,UNI_BSS_INFO_BCN_CONTENT , len); bcn = (struct bss_bcn_content_tlv *)tlv; bcn->enable = en;
@@ -2591,8 +2588,7 @@ int mt7996_mcu_beacon_inband_discov(struct mt7996_dev *dev, info->band = band; info->hw_queue |=FIELD_PREP (MT_TX_HW_QUEUE_PHY , phy->mt76->band_idx); - len =sizeof (*discov) +MT_TXD_SIZE + skb->len; - + len =ALIGN (sizeof (*discov) +MT_TXD_SIZE + skb->len,4 ); tlv =mt7996_mcu_add_uni_tlv (rskb,UNI_BSS_INFO_OFFLOAD , len); discov = (struct bss_inband_discovery_tlv *)tlv;
drivers/net/wireless/mediatek/mt76/mt7996/mcu.h +2 -2
@@ -800,10 +800,10 @@ enum { sizeof(struct sta_rec_hdr_trans) + \ sizeof(struct tlv)) -#define MT7996_MAX_BEACON_SIZE 1342 +#define MT7996_MAX_BEACON_SIZE 1338#define MT7996_BEACON_UPDATE_SIZE (sizeof(struct bss_req_hdr) + \ sizeof(struct bss_bcn_content_tlv) + \ - MT_TXD_SIZE + \ + 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 + \
Signature · 1 line
2.39.2
Shayne Chen
reviewerPATCH v2 6/12 wifi: mt76: mt7996: fix HE beamformer phy cap for station vif
In reply to Shayne ChenFrom: Howard Hsu <[email protected]>
Set correct beamformer capabilities for station vif in HE PHY capability IE.
--- drivers/net/wireless/mediatek/mt76/mt7996/init.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/net/wireless/mediatek/mt76/mt7996/init.c +3 -2
@@ -1012,11 +1012,12 @@ mt7996_set_stream_he_txbf_caps(struct mt7996_phy *phy,/* the maximum cap is 4 x 3, (Nr, Nc) = (3, 2) */ elem->phy_cap_info[7 ] |=min_t (int, sts -1 ,2 ) <<3 ; -if (vif !=NL80211_IFTYPE_AP ) +if (!(vif ==NL80211_IFTYPE_AP || vif ==NL80211_IFTYPE_STATION ))return ; elem->phy_cap_info[3 ] |=IEEE80211_HE_PHY_CAP3_SU_BEAMFORMER ; - elem->phy_cap_info[4 ] |=IEEE80211_HE_PHY_CAP4_MU_BEAMFORMER ; +if (vif ==NL80211_IFTYPE_AP ) + elem->phy_cap_info[4 ] |=IEEE80211_HE_PHY_CAP4_MU_BEAMFORMER ; c =FIELD_PREP (IEEE80211_HE_PHY_CAP5_BEAMFORMEE_NUM_SND_DIM_UNDER_80MHZ_MASK , sts - 1) |
Signature · 1 line
2.39.2
Shayne Chen
reviewerPATCH v2 7/12 wifi: mt76: mt7996: mark GCMP IGTK unsupported
In reply to Shayne ChenFrom: Michael-CY Lee <[email protected]>
Since the FW does not support to handle the integrity and validation of IGTK in GCMP mode, return -EOPNOTSUPP to let it be handled by upper layer.
--- drivers/net/wireless/mediatek/mt76/mt7996/main.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/net/wireless/mediatek/mt76/mt7996/main.c +4 -1
@@ -350,9 +350,12 @@ static int mt7996_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,case WLAN_CIPHER_SUITE_GCMP :case WLAN_CIPHER_SUITE_GCMP_256 :case WLAN_CIPHER_SUITE_SMS4 : +break ;case WLAN_CIPHER_SUITE_BIP_GMAC_128 :case WLAN_CIPHER_SUITE_BIP_GMAC_256 : -break ; +if (key->keyidx ==6 || key->keyidx ==7 ) +break ; + fallthrough;case WLAN_CIPHER_SUITE_WEP40 :case WLAN_CIPHER_SUITE_WEP104 :default :
Signature · 1 line
2.39.2
Shayne Chen
reviewerPATCH v2 8/12 wifi: mt76: mt7996: fix efuse reading issue
In reply to Shayne ChenFrom: StanleyYP Wang <[email protected]>
The efuse data starts from the 48th bytes instead of 64th bytes in the returned event skb.
--- drivers/net/wireless/mediatek/mt76/mt7996/mcu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/mediatek/mt76/mt7996/mcu.c +1 -1
@@ -3547,7 +3547,7 @@ int mt7996_mcu_get_eeprom(struct mt7996_dev *dev, u32 offset)u32 addr =le32_to_cpu (*(__le32 *)(skb->data +12 ));u8 *buf = (u8 *)dev->mt76.eeprom.data + addr; -skb_pull (skb,64 ); +skb_pull (skb,48 );memcpy (buf, skb->data,MT7996_EEPROM_BLOCK_SIZE ); }
Signature · 1 line
2.39.2
Shayne Chen
reviewerPATCH v2 9/12 wifi: mt76: mt7996: remove TXS queue setting
In reply to Shayne ChenFrom: Peter Chiu <[email protected]>
DMA queue settings of TXS will be initialized by the firmware.
--- drivers/net/wireless/mediatek/mt76/mt7996/init.c | 5 ----- 1 file changed, 5 deletions(-)
drivers/net/wireless/mediatek/mt76/mt7996/init.c +0 -5
@@ -507,11 +507,6 @@ void mt7996_mac_init(struct mt7996_dev *dev)mt76_rmw_field (dev, i,MT_LED_GPIO_SEL_MASK ,4 ); } -/* txs report queue */ -mt76_rmw_field (dev,MT_DMA_TCRF1 (0 ),MT_DMA_TCRF1_QIDX ,0 ); -mt76_rmw_field (dev,MT_DMA_TCRF1 (1 ),MT_DMA_TCRF1_QIDX ,6 ); -mt76_rmw_field (dev,MT_DMA_TCRF1 (2 ),MT_DMA_TCRF1_QIDX ,0 ); -/* rro module init */ if (is_mt7996 (&dev->mt76))mt7996_mcu_set_rro (dev,UNI_RRO_SET_PLATFORM_TYPE ,2 );
Signature · 1 line
2.39.2
Shayne Chen
reviewerPATCH v2 10/12 wifi: mt76: mt7996: add locking for accessing mapped registers
In reply to Shayne ChenA race condition was observed when accessing mapped registers, so add locking to protect against concurrent access.
--- .../net/wireless/mediatek/mt76/mt7996/mmio.c | 64 ++++++++++++------- .../wireless/mediatek/mt76/mt7996/mt7996.h | 3 +- 2 files changed, 43 insertions(+), 24 deletions(-)
drivers/net/wireless/mediatek/mt76/mt7996/mmio.c +42 -22
@@ -140,7 +140,6 @@ static u32 mt7996_reg_map_l1(struct mt7996_dev *dev, u32 addr)u32 offset =FIELD_GET (MT_HIF_REMAP_L1_OFFSET , addr);u32 base =FIELD_GET (MT_HIF_REMAP_L1_BASE , addr); - dev->reg_l1_backup = dev->bus_ops->rr (&dev->mt76,MT_HIF_REMAP_L1 ); dev->bus_ops->rmw (&dev->mt76,MT_HIF_REMAP_L1 ,MT_HIF_REMAP_L1_MASK ,FIELD_PREP (MT_HIF_REMAP_L1_MASK , base));
@@ -155,7 +154,6 @@ static u32 mt7996_reg_map_l2(struct mt7996_dev *dev, u32 addr)u32 offset =FIELD_GET (MT_HIF_REMAP_L2_OFFSET , addr);u32 base =FIELD_GET (MT_HIF_REMAP_L2_BASE , addr); - dev->reg_l2_backup = dev->bus_ops->rr (&dev->mt76,MT_HIF_REMAP_L2 ); dev->bus_ops->rmw (&dev->mt76,MT_HIF_REMAP_L2 ,MT_HIF_REMAP_L2_MASK ,FIELD_PREP (MT_HIF_REMAP_L2_MASK , base));
@@ -165,26 +163,10 @@ static u32 mt7996_reg_map_l2(struct mt7996_dev *dev, u32 addr)return MT_HIF_REMAP_BASE_L2 + offset; } -static void mt7996_reg_remap_restore (struct mt7996_dev *dev) -{ -/* remap to ori status */ -if (unlikely (dev->reg_l1_backup)) { - dev->bus_ops->wr (&dev->mt76,MT_HIF_REMAP_L1 , dev->reg_l1_backup); - dev->reg_l1_backup =0 ; - } - -if (dev->reg_l2_backup) { - dev->bus_ops->wr (&dev->mt76,MT_HIF_REMAP_L2 , dev->reg_l2_backup); - dev->reg_l2_backup =0 ; - } -} -static u32 __mt7996_reg_addr (struct mt7996_dev *dev,u32 addr) {int i; -mt7996_reg_remap_restore (dev); -if (addr <0x100000 )return addr;
@@ -201,6 +183,11 @@ static u32 __mt7996_reg_addr(struct mt7996_dev *dev, u32 addr)return dev->reg.map[i].mapped + ofs; } +return 0 ; +} + +static u32 __mt7996_reg_remap_addr (struct mt7996_dev *dev,u32 addr) +{if ((addr >=MT_INFRA_BASE && addr <MT_WFSYS0_PHY_START ) || (addr >=MT_WFSYS0_PHY_START && addr <MT_WFSYS1_PHY_START ) || (addr >=MT_WFSYS1_PHY_START && addr <=MT_WFSYS1_PHY_END ))
@@ -225,28 +212,60 @@ void mt7996_memcpy_fromio(struct mt7996_dev *dev, void *buf, u32 offset, {u32 addr =__mt7996_reg_addr (dev, offset); -memcpy_fromio (buf, dev->mt76.mmio.regs + addr, len); +if (addr) { +memcpy_fromio (buf, dev->mt76.mmio.regs + addr, len); +return ; + } + +spin_lock_bh (&dev->reg_lock); +memcpy_fromio (buf, dev->mt76.mmio.regs + +__mt7996_reg_remap_addr (dev, offset), len); +spin_unlock_bh (&dev->reg_lock); }static u32 mt7996_rr (struct mt76_dev *mdev,u32 offset) { struct mt7996_dev *dev = container_of(mdev, struct mt7996_dev, mt76); +u32 addr =__mt7996_reg_addr (dev, offset), val; + +if (addr) +return dev->bus_ops->rr (mdev, addr); -return dev->bus_ops->rr (mdev,__mt7996_reg_addr (dev, offset)); +spin_lock_bh (&dev->reg_lock); + val = dev->bus_ops->rr (mdev,__mt7996_reg_remap_addr (dev, offset)); +spin_unlock_bh (&dev->reg_lock); + +return val; }static void mt7996_wr (struct mt76_dev *mdev,u32 offset,u32 val) { struct mt7996_dev *dev = container_of(mdev, struct mt7996_dev, mt76); +u32 addr =__mt7996_reg_addr (dev, offset); - dev->bus_ops->wr (mdev,__mt7996_reg_addr (dev, offset), val); +if (addr) { + dev->bus_ops->wr (mdev, addr, val); +return ; + } + +spin_lock_bh (&dev->reg_lock); + dev->bus_ops->wr (mdev,__mt7996_reg_remap_addr (dev, offset), val); +spin_unlock_bh (&dev->reg_lock); }static u32 mt7996_rmw (struct mt76_dev *mdev,u32 offset,u32 mask,u32 val) { struct mt7996_dev *dev = container_of(mdev, struct mt7996_dev, mt76); +u32 addr =__mt7996_reg_addr (dev, offset); + +if (addr) +return dev->bus_ops->rmw (mdev, addr, mask, val); + +spin_lock_bh (&dev->reg_lock); + val = dev->bus_ops->rmw (mdev,__mt7996_reg_remap_addr (dev, offset), mask, val); +spin_unlock_bh (&dev->reg_lock); -return dev->bus_ops->rmw (mdev,__mt7996_reg_addr (dev, offset), mask, val); +return val; }#ifdef CONFIG_NET_MEDIATEK_SOC_WED
@@ -421,6 +440,7 @@ static int mt7996_mmio_init(struct mt76_dev *mdev, dev = container_of(mdev, struct mt7996_dev, mt76);mt76_mmio_init (&dev->mt76, mem_base); +spin_lock_init (&dev->reg_lock);switch (device_id) {case 0x7990 :
drivers/net/wireless/mediatek/mt76/mt7996/mt7996.h +1 -2
@@ -325,8 +325,7 @@ struct mt7996_dev {u8 n_agrt; } twt; -u32 reg_l1_backup; -u32 reg_l2_backup; +spinlock_t reg_lock;u8 wtbl_size_group; };
Signature · 1 line
2.39.2
Shayne Chen
reviewerPATCH v2 11/12 wifi: mt76: connac: set correct muar_idx for mt799x chipsets
In reply to Shayne ChenThe MUAR (multicast unicast address) is an address mapping table that participates in the process of searching WTBL entries. For mt799x chipsets, the default muar index of BMC WTBL is 0xe.
---
v2: update commit message
--- drivers/net/wireless/mediatek/mt76/mt76_connac.h | 5 +++++ drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c | 3 +++ 2 files changed, 8 insertions(+)
drivers/net/wireless/mediatek/mt76/mt76_connac.h +5 -0
@@ -227,6 +227,11 @@ static inline bool is_mt7992(struct mt76_dev *dev)return mt76_chip (dev) ==0x7992 ; } +static inline bool is_mt799x (struct mt76_dev *dev) +{ +return is_mt7996 (dev) ||is_mt7992 (dev); +} +static inline bool is_mt7622 (struct mt76_dev *dev) {if (!IS_ENABLED (CONFIG_MT7622_WMAC ))
drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c +3 -0
@@ -283,6 +283,9 @@ __mt76_connac_mcu_alloc_sta_req(struct mt76_dev *dev, struct mt76_vif *mvif, };struct sk_buff *skb; +if (is_mt799x (dev) && !wcid->sta) + hdr.muar_idx =0xe ; +mt76_connac_mcu_get_wlan_idx (dev, wcid, &hdr.wlan_idx_lo, &hdr.wlan_idx_hi); skb =mt76_mcu_msg_alloc (dev,NULL , len);
Signature · 1 line
2.39.2
Shayne Chen
reviewerPATCH v2 12/12 wifi: mt76: mt7996: fix HIF_TXD_V2_1 value
In reply to Shayne ChenFrom: Benjamin Lin <[email protected]>
Sync the value of HIF_TXD_V2_1 with firmware to let it correctly fill TXD values for HW path.
--- drivers/net/wireless/mediatek/mt76/mt7996/init.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/mediatek/mt76/mt7996/init.c +1 -1
@@ -493,7 +493,7 @@ static void mt7996_mac_init_basic_rates(struct mt7996_dev *dev)void mt7996_mac_init (struct mt7996_dev *dev) { -#define HIF_TXD_V2_1 4 +#define HIF_TXD_V2_1 0x21int i;mt76_clear (dev,MT_MDP_DCR2 ,MT_MDP_DCR2_RX_TRANS_SHORT );
Signature · 1 line
2.39.2