wifi: rtw89: phy: generalize valid bit of BSS color

The register fields of BSS color map and valid bit are in the same register
for existing chips, but coming WiFi 7 chips define another register to
set valid bit, so add a field to chip_info to reuse the code.

Signed-off-by: Ping-Ke Shih <pkshih@realtek.com>
Signed-off-by: Kalle Valo <kvalo@kernel.org>
Link: https://lore.kernel.org/r/20231016065115.751662-3-pkshih@realtek.com

diff --git a/drivers/net/wireless/realtek/rtw89/core.h b/drivers/net/wireless/realtek/rtw89/core.h
index ef63fc20db71984856bc7a33c8f1aa63efb94875..91e4d4e79eeafd13720cdd2ba42e37fc31469c6c 100644 (file)
--- a/drivers/net/wireless/realtek/rtw89/core.h
+++ b/drivers/net/wireless/realtek/rtw89/core.h
@@ -3711,6 +3711,7 @@ struct rtw89_chip_info {
        u8 dcfo_comp_sft;
        const struct rtw89_imr_info *imr_info;
        const struct rtw89_rrsr_cfgs *rrsr_cfgs;
+       struct rtw89_reg_def bss_clr_vld;
        u32 bss_clr_map_reg;
        u32 dma_ch_mask;
        u32 edcca_lvl_reg;

diff --git a/drivers/net/wireless/realtek/rtw89/phy.c b/drivers/net/wireless/realtek/rtw89/phy.c
index 8a306a86f1f048b1d11868fcb9ca6575a3f01137..c0c24584e930b06a10af60dd7bb1b8572bdeb607 100644 (file)
--- a/drivers/net/wireless/realtek/rtw89/phy.c
+++ b/drivers/net/wireless/realtek/rtw89/phy.c
@@ -4636,6 +4636,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;
+       const struct rtw89_reg_def *bss_clr_vld = &chip->bss_clr_vld;
        enum rtw89_phy_idx phy_idx = RTW89_PHY_0;
        u8 bss_color;
 
@@ -4644,7 +4645,7 @@ 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, chip->bss_clr_map_reg, B_BSS_CLR_MAP_VLD0, 0x1,
+       rtw89_phy_write32_idx(rtwdev, bss_clr_vld->addr, bss_clr_vld->mask, 0x1,
                              phy_idx);
        rtw89_phy_write32_idx(rtwdev, chip->bss_clr_map_reg, B_BSS_CLR_MAP_TGT,
                              bss_color, phy_idx);

diff --git a/drivers/net/wireless/realtek/rtw89/rtw8851b.c b/drivers/net/wireless/realtek/rtw89/rtw8851b.c
index 491980eb8e2e420058893d913a042eb4407094c3..50522ff85003dc10a45c59ec767024a67fcdf45e 100644 (file)
--- a/drivers/net/wireless/realtek/rtw89/rtw8851b.c
+++ b/drivers/net/wireless/realtek/rtw89/rtw8851b.c
@@ -2438,6 +2438,7 @@ const struct rtw89_chip_info rtw8851b_chip_info = {
        .dcfo_comp_sft          = 12,
        .imr_info               = &rtw8851b_imr_info,
        .rrsr_cfgs              = &rtw8851b_rrsr_cfgs,
+       .bss_clr_vld            = {R_BSS_CLR_MAP_V1, B_BSS_CLR_MAP_VLD0},
        .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) |

diff --git a/drivers/net/wireless/realtek/rtw89/rtw8852a.c b/drivers/net/wireless/realtek/rtw89/rtw8852a.c
index 385655c061dbb9a5c4a48b40ad6bca7381f37ff0..0c36e6180e25bbe27703d6bb34e57ae911e21c9c 100644 (file)
--- a/drivers/net/wireless/realtek/rtw89/rtw8852a.c
+++ b/drivers/net/wireless/realtek/rtw89/rtw8852a.c
@@ -2175,6 +2175,7 @@ const struct rtw89_chip_info rtw8852a_chip_info = {
        .dcfo_comp_sft          = 10,
        .imr_info               = &rtw8852a_imr_info,
        .rrsr_cfgs              = &rtw8852a_rrsr_cfgs,
+       .bss_clr_vld            = {R_BSS_CLR_MAP, B_BSS_CLR_MAP_VLD0},
        .bss_clr_map_reg        = R_BSS_CLR_MAP,
        .dma_ch_mask            = 0,
        .edcca_lvl_reg          = R_SEG0R_EDCCA_LVL,

diff --git a/drivers/net/wireless/realtek/rtw89/rtw8852b.c b/drivers/net/wireless/realtek/rtw89/rtw8852b.c
index 93233217b57a5daf25fbffbbd8f6e8dbd752c625..9d4e6f08218dea31469489b53a33ee2de06e891a 100644 (file)
--- a/drivers/net/wireless/realtek/rtw89/rtw8852b.c
+++ b/drivers/net/wireless/realtek/rtw89/rtw8852b.c
@@ -2609,6 +2609,7 @@ const struct rtw89_chip_info rtw8852b_chip_info = {
        .dcfo_comp_sft          = 10,
        .imr_info               = &rtw8852b_imr_info,
        .rrsr_cfgs              = &rtw8852b_rrsr_cfgs,
+       .bss_clr_vld            = {R_BSS_CLR_MAP_V1, B_BSS_CLR_MAP_VLD0},
        .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) |

diff --git a/drivers/net/wireless/realtek/rtw89/rtw8852c.c b/drivers/net/wireless/realtek/rtw89/rtw8852c.c
index 7f7057e74417fd6cfe41e837cc8a778f46e51ae0..3b7d8ab39bab76c5b0fd5fb4dd2098bbdf90a4de 100644 (file)
--- a/drivers/net/wireless/realtek/rtw89/rtw8852c.c
+++ b/drivers/net/wireless/realtek/rtw89/rtw8852c.c
@@ -2924,6 +2924,7 @@ const struct rtw89_chip_info rtw8852c_chip_info = {
        .dcfo_comp_sft          = 12,
        .imr_info               = &rtw8852c_imr_info,
        .rrsr_cfgs              = &rtw8852c_rrsr_cfgs,
+       .bss_clr_vld            = {R_BSS_CLR_MAP, B_BSS_CLR_MAP_VLD0},
        .bss_clr_map_reg        = R_BSS_CLR_MAP,
        .dma_ch_mask            = 0,
        .edcca_lvl_reg          = R_SEG0R_EDCCA_LVL,