wifi: rtw89: 8852b: update BSS color mapping register
Ping-Ke Shih
maintainerPATCH 1/1 wifi: rtw89: 8852b: update BSS color mapping register
From: Eric Huang <[email protected]>
BSS color mapping register is different per IC, therefore, move this register to chip_info and update the setting function. Without this patch, wrong BSS color causes behavior abnormal, especially DL-OFDMA.
Signed-off-by Eric Huang <[email protected]>
Signed-off-by Ping-Ke Shih <[email protected]>
--- drivers/net/wireless/realtek/rtw89/core.h | 1 + drivers/net/wireless/realtek/rtw89/phy.c | 9 +++++---- drivers/net/wireless/realtek/rtw89/reg.h | 1 + drivers/net/wireless/realtek/rtw89/rtw8852a.c | 1 + drivers/net/wireless/realtek/rtw89/rtw8852b.c | 1 + drivers/net/wireless/realtek/rtw89/rtw8852c.c | 1 + 6 files changed, 10 insertions(+), 4 deletions(-)
drivers/net/wireless/realtek/rtw89/core.h +1 -0
@@ -2771,6 +2771,7 @@ struct rtw89_chip_info {u8 dcfo_comp_sft;const struct rtw89_imr_info *imr_info;const struct rtw89_rrsr_cfgs *rrsr_cfgs; +u32 bss_clr_map_reg;u32 dma_ch_mask;const struct wiphy_wowlan_support *wowlan_stub; };
drivers/net/wireless/realtek/rtw89/phy.c +5 -4
@@ -4116,6 +4116,7 @@ void rtw89_phy_dm_init(struct rtw89_dev *rtwdev)void rtw89_phy_set_bss_color (struct rtw89_dev *rtwdev,struct ieee80211_vif *vif) { +const struct rtw89_chip_info *chip = rtwdev->chip;enum rtw89_phy_idx phy_idx =RTW89_PHY_0 ;u8 bss_color;
@@ -4124,11 +4125,11 @@ void rtw89_phy_set_bss_color(struct rtw89_dev *rtwdev, struct ieee80211_vif *vif bss_color = vif->bss_conf.he_bss_color.color; -rtw89_phy_write32_idx (rtwdev,R_BSS_CLR_MAP ,B_BSS_CLR_MAP_VLD0 ,0x1 , - phy_idx); -rtw89_phy_write32_idx (rtwdev,R_BSS_CLR_MAP ,B_BSS_CLR_MAP_TGT , bss_color, +rtw89_phy_write32_idx (rtwdev, chip->bss_clr_map_reg,B_BSS_CLR_MAP_VLD0 ,0x1 , phy_idx); -rtw89_phy_write32_idx (rtwdev,R_BSS_CLR_MAP ,B_BSS_CLR_MAP_STAID , +rtw89_phy_write32_idx (rtwdev, chip->bss_clr_map_reg,B_BSS_CLR_MAP_TGT , + bss_color, phy_idx); +rtw89_phy_write32_idx (rtwdev, chip->bss_clr_map_reg,B_BSS_CLR_MAP_STAID , vif->cfg.aid, phy_idx); }
drivers/net/wireless/realtek/rtw89/reg.h +1 -0
@@ -4096,6 +4096,7 @@#define R_SEG0CSI_EN 0x42C4#define B_SEG0CSI_EN BIT(23)#define R_BSS_CLR_MAP 0x43ac +#define R_BSS_CLR_MAP_V1 0x43B0#define B_BSS_CLR_MAP_VLD0 BIT(28)#define B_BSS_CLR_MAP_TGT GENMASK(27, 22)#define B_BSS_CLR_MAP_STAID GENMASK(21, 11)
drivers/net/wireless/realtek/rtw89/rtw8852a.c +1 -0
@@ -2149,6 +2149,7 @@ const struct rtw89_chip_info rtw8852a_chip_info = { .dcfo_comp_sft = 3, .imr_info = &rtw8852a_imr_info, .rrsr_cfgs = &rtw8852a_rrsr_cfgs, + .bss_clr_map_reg = R_BSS_CLR_MAP, .dma_ch_mask =0 , #ifdef CONFIG_PM .wowlan_stub = &rtw_wowlan_stub_8852a,
drivers/net/wireless/realtek/rtw89/rtw8852b.c +1 -0
@@ -2525,6 +2525,7 @@ const struct rtw89_chip_info rtw8852b_chip_info = { .dcfo_comp_sft = 3, .imr_info = &rtw8852b_imr_info, .rrsr_cfgs = &rtw8852b_rrsr_cfgs, + .bss_clr_map_reg = R_BSS_CLR_MAP_V1, .dma_ch_mask =BIT (RTW89_DMA_ACH4 ) |BIT (RTW89_DMA_ACH5 ) |BIT (RTW89_DMA_ACH6 ) |BIT (RTW89_DMA_ACH7 ) | BIT(RTW89_DMA_B1MG) | BIT(RTW89_DMA_B1HI),
drivers/net/wireless/realtek/rtw89/rtw8852c.c +1 -0
@@ -2959,6 +2959,7 @@ const struct rtw89_chip_info rtw8852c_chip_info = { .dcfo_comp_sft = 5, .imr_info = &rtw8852c_imr_info, .rrsr_cfgs = &rtw8852c_rrsr_cfgs, + .bss_clr_map_reg = R_BSS_CLR_MAP, .dma_ch_mask =0 , #ifdef CONFIG_PM .wowlan_stub = &rtw_wowlan_stub_8852c,
Signature · 1 line
2.25.1
Quoted 8 lines · Ping-Ke Shih
From: Eric Huang <[email protected]>
BSS color mapping register is different per IC, therefore, move this register to
chip_infoand update the setting function. Without this patch, wrong BSS color causes behavior abnormal, especially DL-OFDMA.Signed-off-by Eric Huang <[email protected]>Signed-off-by Ping-Ke Shih <[email protected]>
Patch applied to wireless-next.git, thanks.
a48f4fd05d5e wifi: rtw89: 8852b: update BSS color mapping register
Signature · 3 lines
https://patchwork.kernel.org/project/linux-wireless/patch/[email protected]/ https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches