wifi: mt76: mt7996: fix chainmask calculation in mt7996_set_antenna()
Subsystems (2)
Shayne Chen
reviewerPATCH 1/4 wifi: mt76: mt7996: fix chainmask calculation in mt7996_set_antenna()
Fix per-band chainmask when restoring from the dev chainmask.
Fixes 98686cd21624 ("wifi: mt76: mt7996: add driver for MediaTek Wi-Fi 7 (802.11be) devices")
Signed-off-by Shayne Chen <[email protected]>
--- 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
@@ -880,7 +880,10 @@ mt7996_set_antenna(struct ieee80211_hw *hw, u32 tx_ant, u32 rx_ant) phy->mt76->antenna_mask = tx_ant;/* restore to the origin chainmask which might have auxiliary path */ -if (hweight8 (tx_ant) == max_nss) +if (hweight8 (tx_ant) == max_nss && band_idx <MT_BAND2 ) + phy->mt76->chainmask = ((dev->chainmask >> shift) & + (BIT (dev->chainshift[band_idx +1 ] - shift) -1 )) << shift; +else if (hweight8 (tx_ant) == max_nss) phy->mt76->chainmask = (dev->chainmask >> shift) << shift;else phy->mt76->chainmask = tx_ant << shift;
Signature · 1 line
2.25.1
Shayne Chen
reviewerPATCH 2/4 wifi: mt76: mt7996: update register for CFEND_RATE
In newer chipsets, CFEND_RATE setting has been moved to different hw module.
Fixes 98686cd21624 ("wifi: mt76: mt7996: add driver for MediaTek Wi-Fi 7 (802.11be) devices")
Signed-off-by Shayne Chen <[email protected]>
--- drivers/net/wireless/mediatek/mt76/mt7996/mac.c | 2 +- drivers/net/wireless/mediatek/mt76/mt7996/mmio.c | 1 + drivers/net/wireless/mediatek/mt76/mt7996/regs.h | 15 ++++++++------- 3 files changed, 10 insertions(+), 8 deletions(-)
drivers/net/wireless/mediatek/mt76/mt7996/mac.c +1 -1
@@ -1690,7 +1690,7 @@ void mt7996_mac_set_timing(struct mt7996_phy *phy)else val =MT7996_CFEND_RATE_11B ; -mt76_rmw_field (dev,MT_AGG_ACR0 (band_idx),MT_AGG_ACR_CFEND_RATE , val); +mt76_rmw_field (dev,MT_RATE_HRCR0 (band_idx),MT_RATE_HRCR0_CFEND_RATE , val);mt76_clear (dev,MT_ARB_SCR (band_idx),MT_ARB_SCR_TX_DISABLE |MT_ARB_SCR_RX_DISABLE ); }
drivers/net/wireless/mediatek/mt76/mt7996/mmio.c +1 -0
@@ -21,6 +21,7 @@ static const struct __base mt7996_reg_base[] = { [WF_ETBF_BASE] = { { 0x820ea000, 0x820fa000, 0x830ea000 } }, [WF_LPON_BASE] = { { 0x820eb000, 0x820fb000, 0x830eb000 } }, [WF_MIB_BASE] = { { 0x820ed000, 0x820fd000, 0x830ed000 } }, + [WF_RATE_BASE] = { { 0x820ee000, 0x820fe000, 0x830ee000 } }, };static const struct __map mt7996_reg_map[] = {
drivers/net/wireless/mediatek/mt76/mt7996/regs.h +8 -7
@@ -33,6 +33,7 @@ enum base_rev {WF_ETBF_BASE ,WF_LPON_BASE ,WF_MIB_BASE , +WF_RATE_BASE , __MT_REG_BASE_MAX, };
@@ -235,13 +236,6 @@ enum base_rev { FIELD_PREP(MT_WTBL_LMAC_ID, _id) | \ FIELD_PREP(MT_WTBL_LMAC_DW, _dw)) -/* AGG: band 0(0x820e2000), band 1(0x820f2000), band 2(0x830e2000) */ -#define MT_WF_AGG_BASE (_band) __BASE(WF_AGG_BASE, (_band)) -#define MT_WF_AGG (_band, ofs) (MT_WF_AGG_BASE(_band) + (ofs)) - -#define MT_AGG_ACR0 (_band) MT_WF_AGG(_band, 0x054) -#define MT_AGG_ACR_CFEND_RATE GENMASK(13, 0) -/* ARB: band 0(0x820e3000), band 1(0x820f3000), band 2(0x830e3000) */ #define MT_WF_ARB_BASE (_band) __BASE(WF_ARB_BASE, (_band))#define MT_WF_ARB (_band, ofs) (MT_WF_ARB_BASE(_band) + (ofs))
@@ -300,6 +294,13 @@ enum base_rev {#define MT_WF_RMAC_RSVD0 (_band) MT_WF_RMAC(_band, 0x03e0)#define MT_WF_RMAC_RSVD0_EIFS_CLR BIT(21) +/* RATE: band 0(0x820ee000), band 1(0x820fe000), band 2(0x830ee000) */ +#define MT_WF_RATE_BASE (_band) __BASE(WF_RATE_BASE, (_band)) +#define MT_WF_RATE (_band, ofs) (MT_WF_RATE_BASE(_band) + (ofs)) + +#define MT_RATE_HRCR0 (_band) MT_WF_RATE(_band, 0x050) +#define MT_RATE_HRCR0_CFEND_RATE GENMASK(14, 0) +/* WFDMA0 */ #define MT_WFDMA0_BASE 0xd4000#define MT_WFDMA0 (ofs) (MT_WFDMA0_BASE + (ofs))
Signature · 1 line
2.25.1
Shayne Chen
reviewerPATCH 3/4 wifi: mt76: mt7996: do not hardcode vht beamform cap
In reply to Shayne ChenUse the sts variable when setting vht beamform sts cap.
Signed-off-by Shayne Chen <[email protected]>
--- 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
@@ -465,7 +465,7 @@ void mt7996_set_stream_vht_txbf_caps(struct mt7996_phy *phy) *cap |=IEEE80211_VHT_CAP_SU_BEAMFORMEE_CAPABLE |IEEE80211_VHT_CAP_MU_BEAMFORMEE_CAPABLE | - (3 <<IEEE80211_VHT_CAP_BEAMFORMEE_STS_SHIFT ); +FIELD_PREP (IEEE80211_VHT_CAP_BEAMFORMEE_STS_MASK , sts -1 ); *cap &= ~(IEEE80211_VHT_CAP_SOUNDING_DIMENSIONS_MASK | IEEE80211_VHT_CAP_SU_BEAMFORMER_CAPABLE |
Signature · 1 line
2.25.1
Shayne Chen
reviewerPATCH 4/4 wifi: mt76: connac: fix POWER_CTRL command name typo
In reply to Shayne ChenFix typo MCU_UNI_CMD_POWER_CREL to MCU_UNI_CMD_POWER_CTRL.
Fixes 779d34de055e ("wifi: mt76: connac: add more unified command IDs")
Signed-off-by Shayne Chen <[email protected]>
--- drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.h | 2 +- drivers/net/wireless/mediatek/mt76/mt7996/mcu.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.h +1 -1
@@ -1198,7 +1198,7 @@ enum {MCU_UNI_CMD_REPT_MUAR =0x09 ,MCU_UNI_CMD_WSYS_CONFIG =0x0b ,MCU_UNI_CMD_REG_ACCESS =0x0d , -MCU_UNI_CMD_POWER_CREL =0x0f , +MCU_UNI_CMD_POWER_CTRL =0x0f ,MCU_UNI_CMD_RX_HDR_TRANS =0x12 ,MCU_UNI_CMD_SER =0x13 , MCU_UNI_CMD_TWT = 0x14,
drivers/net/wireless/mediatek/mt76/mt7996/mcu.c +1 -1
@@ -2399,7 +2399,7 @@ mt7996_mcu_restart(struct mt76_dev *dev) .power_mode = 1, }; -return mt76_mcu_send_msg (dev,MCU_WM_UNI_CMD (POWER_CREL ), &req, +return mt76_mcu_send_msg (dev,MCU_WM_UNI_CMD (POWER_CTRL ), &req,sizeof (req), false); }
Signature · 1 line
2.25.1