wifi: rtw89: introduce struct {mac,phy}_gen_def to define register address for WiFi 6 and 7 chips
Ping-Ke Shih
maintainercover wifi: rtw89: introduce struct {mac,phy}_gen_def to define register address for WiFi 6 and 7 chips
The address space of WiFi 7 chips is changed from WiFi 6, and the layout looks like below.
+---------------------+ 0x0_0000 MAC base address (WiFi 6: 0x0_0000 the same) | | | | | +-----------+ ----|-------+ | | BAND0 | | | offset = 0x0_4000 (WiFi 6: 0x0_2000) | +-----------+ <---|-------+ | | BAND1 | | | +-----------+ | | | +---------------------+ 0x2_0000 PHY0 base address (WiFi 6: 0x1_0000) | | | | +---------------------+ 0x4_0000 PHY1 base address (WiFi 6: not simple offset) | | | | +---------------------+
Thus, introduce struct {mac,phy}_gen_def to define these addresses, and also registers addresses are changed after WiFi 7, so add fields to the struct to reuse codes. More functions will be added into the struct afterward, because register settings and flows are also changed.
Currently, we add mac_be.c and phy_be.c for WiFi 7 chips, and the share code and WiFi 6 specified code still locate on existing mac.c and phy.c. In the future, we might move WiFi 6 part into mac_ax.c and phy_ax.c in one go if needed.
Cheng-Chieh Hsieh (1):
wifi: rtw89: phy: modify register setting of ENV_MNTR, PHYSTS and DIG
Ping-Ke Shih (5):
wifi: rtw89: mac: add mac_gen_def::band1_offset to map MAC band1
register address
wifi: rtw89: mac: generalize code to indirectly access WiFi internal
memory
wifi: rtw89: mac: define internal memory address for WiFi 7 chip
wifi: rtw89: mac: define register address of rx_filter to generalize
code
wifi: rtw89: phy: add phy_gen_def::cr_base to support WiFi 7 chips
drivers/net/wireless/realtek/rtw89/core.c | 6 +- drivers/net/wireless/realtek/rtw89/core.h | 8 + drivers/net/wireless/realtek/rtw89/debug.c | 13 +- drivers/net/wireless/realtek/rtw89/fw.c | 6 +- drivers/net/wireless/realtek/rtw89/mac.c | 197 ++++++++------- drivers/net/wireless/realtek/rtw89/mac.h | 69 ++++- drivers/net/wireless/realtek/rtw89/mac80211.c | 7 +- drivers/net/wireless/realtek/rtw89/mac_be.c | 38 +++ drivers/net/wireless/realtek/rtw89/phy.c | 239 +++++++++++++----- drivers/net/wireless/realtek/rtw89/phy.h | 114 ++++++++- drivers/net/wireless/realtek/rtw89/phy_be.c | 77 ++++++ drivers/net/wireless/realtek/rtw89/reg.h | 34 +++ drivers/net/wireless/realtek/rtw89/rtw8851b.c | 18 +- drivers/net/wireless/realtek/rtw89/rtw8852a.c | 19 +- drivers/net/wireless/realtek/rtw89/rtw8852b.c | 18 +- drivers/net/wireless/realtek/rtw89/rtw8852c.c | 24 +- drivers/net/wireless/realtek/rtw89/ser.c | 20 +- drivers/net/wireless/realtek/rtw89/wow.c | 3 +- 18 files changed, 680 insertions(+), 230 deletions(-) create mode 100644 drivers/net/wireless/realtek/rtw89/mac_be.c create mode 100644 drivers/net/wireless/realtek/rtw89/phy_be.c
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 1/6 wifi: rtw89: mac: add mac_gen_def::band1_offset to map MAC band1 register address
There are two copies of MAC hardware called band0 and band1. Basically, the only difference between them is base address, so we can share functions with a 'band' (or 'mac_idx') argument.
The offset of base address of WiFi 6 and 7 are 0x2000 and 0x4000 respectively, so add band1_offset field to new introduced struct mac_gen_def to possibly reuse functions.
Using below spatch script to convert callers:
@@
expression reg, band;
@@
- rtw89_mac_reg_by_idx(reg, band)
+ rtw89_mac_reg_by_idx(rtwdev, reg, band)
@@
expression reg, port, band;
@@
- rtw89_mac_reg_by_port(reg, port, band)
+ rtw89_mac_reg_by_port(rtwdev, reg, port, band)
--- drivers/net/wireless/realtek/rtw89/core.c | 4 +- drivers/net/wireless/realtek/rtw89/core.h | 2 + drivers/net/wireless/realtek/rtw89/fw.c | 4 +- drivers/net/wireless/realtek/rtw89/mac.c | 171 +++++++++--------- drivers/net/wireless/realtek/rtw89/mac.h | 36 ++-- drivers/net/wireless/realtek/rtw89/mac80211.c | 6 +- drivers/net/wireless/realtek/rtw89/mac_be.c | 10 + drivers/net/wireless/realtek/rtw89/phy.c | 6 +- drivers/net/wireless/realtek/rtw89/rtw8851b.c | 13 +- drivers/net/wireless/realtek/rtw89/rtw8852a.c | 14 +- drivers/net/wireless/realtek/rtw89/rtw8852b.c | 13 +- drivers/net/wireless/realtek/rtw89/rtw8852c.c | 19 +- 12 files changed, 165 insertions(+), 133 deletions(-) create mode 100644 drivers/net/wireless/realtek/rtw89/mac_be.c
drivers/net/wireless/realtek/rtw89/core.c +2 -2
@@ -2478,7 +2478,7 @@ void rtw89_roc_start(struct rtw89_dev *rtwdev, struct rtw89_vif *rtwvif)rtw89_config_roc_chandef (rtwdev, rtwvif->sub_entity_idx, &roc_chan);rtw89_set_channel (rtwdev);rtw89_write32_clr (rtwdev, -rtw89_mac_reg_by_idx (R_AX_RX_FLTR_OPT ,RTW89_MAC_0 ), +rtw89_mac_reg_by_idx (rtwdev,R_AX_RX_FLTR_OPT ,RTW89_MAC_0 ),B_AX_A_UC_CAM_MATCH |B_AX_A_BC_CAM_MATCH );ieee80211_ready_on_channel (hw);
@@ -2499,7 +2499,7 @@ void rtw89_roc_end(struct rtw89_dev *rtwdev, struct rtw89_vif *rtwvif)rtw89_leave_lps (rtwdev);rtw89_write32_mask (rtwdev, -rtw89_mac_reg_by_idx (R_AX_RX_FLTR_OPT ,RTW89_MAC_0 ), +rtw89_mac_reg_by_idx (rtwdev,R_AX_RX_FLTR_OPT ,RTW89_MAC_0 ),B_AX_RX_FLTR_CFG_MASK , rtwdev->hal.rx_fltr);
drivers/net/wireless/realtek/rtw89/core.h +2 -0
@@ -14,6 +14,7 @@struct rtw89_dev ;struct rtw89_pci_info ; +struct rtw89_mac_gen_def ;extern const struct ieee80211_ops rtw89_ops;
@@ -3379,6 +3380,7 @@ struct rtw89_chip_info {enum rtw89_core_chip_id chip_id;enum rtw89_chip_gen chip_gen;const struct rtw89_chip_ops *ops; +const struct rtw89_mac_gen_def *mac_def;const char *fw_basename;u8 fw_format_max;bool try_ce_fw;
drivers/net/wireless/realtek/rtw89/fw.c +2 -2
@@ -3873,7 +3873,7 @@ void rtw89_hw_scan_start(struct rtw89_dev *rtwdev, struct ieee80211_vif *vif, rx_fltr &= ~B_AX_A_BC ; rx_fltr &= ~B_AX_A_A1_MATCH ;rtw89_write32_mask (rtwdev, -rtw89_mac_reg_by_idx (R_AX_RX_FLTR_OPT ,RTW89_MAC_0 ), +rtw89_mac_reg_by_idx (rtwdev,R_AX_RX_FLTR_OPT ,RTW89_MAC_0 ),B_AX_RX_FLTR_CFG_MASK , rx_fltr); }
@@ -3891,7 +3891,7 @@ void rtw89_hw_scan_complete(struct rtw89_dev *rtwdev, struct ieee80211_vif *vif,return ;rtw89_write32_mask (rtwdev, -rtw89_mac_reg_by_idx (R_AX_RX_FLTR_OPT ,RTW89_MAC_0 ), +rtw89_mac_reg_by_idx (rtwdev,R_AX_RX_FLTR_OPT ,RTW89_MAC_0 ),B_AX_RX_FLTR_CFG_MASK , rtwdev->hal.rx_fltr);
drivers/net/wireless/realtek/rtw89/mac.c +89 -82
560 lines not on this page · raw message
drivers/net/wireless/realtek/rtw89/mac.h +24 -12
@@ -478,6 +478,7 @@ enum rtw89_mac_bf_rrsc_rate { ({typeof (_addr) __addr = (_addr); \ __addr >= R_AX_CMAC_REG_START && __addr <= R_AX_CMAC_REG_END; })#define RTW89_MAC_AX_BAND_REG_OFFSET 0x2000 +#define RTW89_MAC_BE_BAND_REG_OFFSET 0x4000#define PTCL_IDLE_POLL_CNT 10000#define SW_CVR_DUR_US 8
@@ -826,14 +827,25 @@ struct rtw89_mac_size_set {extern const struct rtw89_mac_size_set rtw89_mac_size; -static inline u32 rtw89_mac_reg_by_idx (u32 reg_base,u8 band) +struct rtw89_mac_gen_def { +u32 band1_offset; +}; + +extern const struct rtw89_mac_gen_def rtw89_mac_gen_ax; +extern const struct rtw89_mac_gen_def rtw89_mac_gen_be; + +static inline +u32 rtw89_mac_reg_by_idx (struct rtw89_dev *rtwdev,u32 reg_base,u8 band) { -return band ==0 ? reg_base : (reg_base +0x2000 ); +const struct rtw89_mac_gen_def *mac = rtwdev->chip->mac_def; + +return band ==0 ? reg_base : (reg_base + mac->band1_offset); } -static inline u32 rtw89_mac_reg_by_port (u32 base,u8 port,u8 mac_idx) +static inline +u32 rtw89_mac_reg_by_port (struct rtw89_dev *rtwdev,u32 base,u8 port,u8 mac_idx) { -return rtw89_mac_reg_by_idx (base + port *0x40 , mac_idx); +return rtw89_mac_reg_by_idx (rtwdev, base + port *0x40 , mac_idx); } static inline u32
@@ -841,7 +853,7 @@ rtw89_read32_port(struct rtw89_dev *rtwdev, struct rtw89_vif *rtwvif, u32 base) {u32 reg; - reg =rtw89_mac_reg_by_port (base, rtwvif->port, rtwvif->mac_idx); + reg =rtw89_mac_reg_by_port (rtwdev, base, rtwvif->port, rtwvif->mac_idx);return rtw89_read32 (rtwdev, reg); }
@@ -851,7 +863,7 @@ rtw89_read32_port_mask(struct rtw89_dev *rtwdev, struct rtw89_vif *rtwvif, {u32 reg; - reg =rtw89_mac_reg_by_port (base, rtwvif->port, rtwvif->mac_idx); + reg =rtw89_mac_reg_by_port (rtwdev, base, rtwvif->port, rtwvif->mac_idx);return rtw89_read32_mask (rtwdev, reg, mask); }
@@ -861,7 +873,7 @@ rtw89_write32_port(struct rtw89_dev *rtwdev, struct rtw89_vif *rtwvif, u32 base, {u32 reg; - reg =rtw89_mac_reg_by_port (base, rtwvif->port, rtwvif->mac_idx); + reg =rtw89_mac_reg_by_port (rtwdev, base, rtwvif->port, rtwvif->mac_idx);rtw89_write32 (rtwdev, reg, data); }
@@ -871,7 +883,7 @@ rtw89_write32_port_mask(struct rtw89_dev *rtwdev, struct rtw89_vif *rtwvif, {u32 reg; - reg =rtw89_mac_reg_by_port (base, rtwvif->port, rtwvif->mac_idx); + reg =rtw89_mac_reg_by_port (rtwdev, base, rtwvif->port, rtwvif->mac_idx);rtw89_write32_mask (rtwdev, reg, mask, data); }
@@ -881,7 +893,7 @@ rtw89_write16_port_mask(struct rtw89_dev *rtwdev, struct rtw89_vif *rtwvif, {u32 reg; - reg =rtw89_mac_reg_by_port (base, rtwvif->port, rtwvif->mac_idx); + reg =rtw89_mac_reg_by_port (rtwdev, base, rtwvif->port, rtwvif->mac_idx);rtw89_write16_mask (rtwdev, reg, mask, data); }
@@ -891,7 +903,7 @@ rtw89_write32_port_clr(struct rtw89_dev *rtwdev, struct rtw89_vif *rtwvif, {u32 reg; - reg =rtw89_mac_reg_by_port (base, rtwvif->port, rtwvif->mac_idx); + reg =rtw89_mac_reg_by_port (rtwdev, base, rtwvif->port, rtwvif->mac_idx);rtw89_write32_clr (rtwdev, reg, bit); }
@@ -901,7 +913,7 @@ rtw89_write16_port_clr(struct rtw89_dev *rtwdev, struct rtw89_vif *rtwvif, {u32 reg; - reg =rtw89_mac_reg_by_port (base, rtwvif->port, rtwvif->mac_idx); + reg =rtw89_mac_reg_by_port (rtwdev, base, rtwvif->port, rtwvif->mac_idx);rtw89_write16_clr (rtwdev, reg, bit); }
@@ -911,7 +923,7 @@ rtw89_write32_port_set(struct rtw89_dev *rtwdev, struct rtw89_vif *rtwvif, {u32 reg; - reg =rtw89_mac_reg_by_port (base, rtwvif->port, rtwvif->mac_idx); + reg =rtw89_mac_reg_by_port (rtwdev, base, rtwvif->port, rtwvif->mac_idx);rtw89_write32_set (rtwdev, reg, bit); }
drivers/net/wireless/realtek/rtw89/mac80211.c +3 -3
@@ -271,13 +271,13 @@ static void rtw89_ops_configure_filter(struct ieee80211_hw *hw, }rtw89_write32_mask (rtwdev, -rtw89_mac_reg_by_idx (R_AX_RX_FLTR_OPT ,RTW89_MAC_0 ), +rtw89_mac_reg_by_idx (rtwdev,R_AX_RX_FLTR_OPT ,RTW89_MAC_0 ),B_AX_RX_FLTR_CFG_MASK , rtwdev->hal.rx_fltr);if (!rtwdev->dbcc_en) goto out;rtw89_write32_mask (rtwdev, -rtw89_mac_reg_by_idx (R_AX_RX_FLTR_OPT ,RTW89_MAC_1 ), +rtw89_mac_reg_by_idx (rtwdev,R_AX_RX_FLTR_OPT ,RTW89_MAC_1 ),B_AX_RX_FLTR_CFG_MASK , rtwdev->hal.rx_fltr);
@@ -353,7 +353,7 @@ static void ____rtw89_conf_tx_mu_edca(struct rtw89_dev *rtwdev, val =FIELD_PREP (B_AX_MUEDCA_BE_PARAM_0_TIMER_MASK , timer_32us) |FIELD_PREP (B_AX_MUEDCA_BE_PARAM_0_CW_MASK , mu_edca->ecw_min_max) |FIELD_PREP (B_AX_MUEDCA_BE_PARAM_0_AIFS_MASK , aifs); - reg =rtw89_mac_reg_by_idx (ac_to_mu_edca_param[ac], rtwvif->mac_idx); + reg =rtw89_mac_reg_by_idx (rtwdev, ac_to_mu_edca_param[ac], rtwvif->mac_idx);rtw89_write32 (rtwdev, reg, val);rtw89_mac_set_hw_muedca_ctrl (rtwdev, rtwvif, true);
drivers/net/wireless/realtek/rtw89/mac_be.c new file +10 -0
@@ -0,0 +1,10 @@ +// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause +/* Copyright(c) 2019-2020 Realtek Corporation +*/ + +#include "mac.h" + +const struct rtw89_mac_gen_def rtw89_mac_gen_be = { + .band1_offset =RTW89_MAC_BE_BAND_REG_OFFSET , +}; +EXPORT_SYMBOL (rtw89_mac_gen_be);
drivers/net/wireless/realtek/rtw89/phy.c +3 -3
@@ -4561,7 +4561,7 @@ void rtw89_phy_tssi_ctrl_set_fast_mode_cfg(struct rtw89_dev *rtwdev, regs = rtw89_tssi_fastmode_regs_level;for (i =0 ; i <RTW89_TSSI_FAST_MODE_NUM ; i++) { - reg =rtw89_mac_reg_by_idx (regs[i].addr, mac_idx); + reg =rtw89_mac_reg_by_idx (rtwdev, regs[i].addr, mac_idx);rtw89_write32_mask (rtwdev, reg, regs[i].mask, val); } }
@@ -4623,11 +4623,11 @@ void rtw89_phy_tssi_ctrl_set_bandedge_cfg(struct rtw89_dev *rtwdev, data = chip->tssi_dbw_table->data[bandedge_cfg];for (i =0 ; i <RTW89_TSSI_SBW_NUM ; i++) { - reg =rtw89_mac_reg_by_idx (regs[i].addr, mac_idx); + reg =rtw89_mac_reg_by_idx (rtwdev, regs[i].addr, mac_idx);rtw89_write32_mask (rtwdev, reg, regs[i].mask, data[i]); } - reg =rtw89_mac_reg_by_idx (R_AX_BANDEDGE_CFG , mac_idx); + reg =rtw89_mac_reg_by_idx (rtwdev,R_AX_BANDEDGE_CFG , mac_idx);rtw89_write32_mask (rtwdev, reg,B_AX_BANDEDGE_CFG_IDX_MASK , bandedge_cfg); rtw89_phy_tssi_ctrl_set_fast_mode_cfg(rtwdev, mac_idx, bandedge_cfg,
drivers/net/wireless/realtek/rtw89/rtw8851b.c +7 -6
@@ -756,9 +756,9 @@ static void rtw8851b_set_channel_mac(struct rtw89_dev *rtwdev,const struct rtw89_chan *chan, u8 mac_idx) { - u32 sub_carr = rtw89_mac_reg_by_idx(R_AX_TX_SUB_CARRIER_VALUE, mac_idx); -u32 chk_rate =rtw89_mac_reg_by_idx (R_AX_TXRATE_CHK , mac_idx); -u32 rf_mod =rtw89_mac_reg_by_idx (R_AX_WMAC_RFMOD , mac_idx); + u32 sub_carr = rtw89_mac_reg_by_idx(rtwdev, R_AX_TX_SUB_CARRIER_VALUE, mac_idx); +u32 chk_rate =rtw89_mac_reg_by_idx (rtwdev,R_AX_TXRATE_CHK , mac_idx); +u32 rf_mod =rtw89_mac_reg_by_idx (rtwdev,R_AX_WMAC_RFMOD , mac_idx);u8 txsc20 =0 , txsc40 =0 ;switch (chan->band_width) {
@@ -1740,14 +1740,14 @@ void rtw8851b_set_txpwr_ul_tb_offset(struct rtw89_dev *rtwdev,return ; } - reg =rtw89_mac_reg_by_idx (R_AX_PWR_UL_TB_CTRL , mac_idx); + reg =rtw89_mac_reg_by_idx (rtwdev,R_AX_PWR_UL_TB_CTRL , mac_idx);rtw89_write32_set (rtwdev, reg,B_AX_PWR_UL_TB_CTRL_EN ); - reg =rtw89_mac_reg_by_idx (R_AX_PWR_UL_TB_1T , mac_idx); + reg =rtw89_mac_reg_by_idx (rtwdev,R_AX_PWR_UL_TB_1T , mac_idx);rtw89_write32_mask (rtwdev, reg,B_AX_PWR_UL_TB_1T_MASK , pw_ofst); pw_ofst =max_t (s8, pw_ofst -3 ,-16 ); - reg =rtw89_mac_reg_by_idx (R_AX_PWR_UL_TB_2T , mac_idx); + reg =rtw89_mac_reg_by_idx (rtwdev,R_AX_PWR_UL_TB_2T , mac_idx);rtw89_write32_mask (rtwdev, reg,B_AX_PWR_UL_TB_2T_MASK , pw_ofst); }
@@ -2336,6 +2336,7 @@ const struct rtw89_chip_info rtw8851b_chip_info = { .chip_id = RTL8851B, .chip_gen = RTW89_CHIP_AX, .ops = &rtw8851b_chip_ops, + .mac_def = &rtw89_mac_gen_ax, .fw_basename = RTW8851B_FW_BASENAME, .fw_format_max = RTW8851B_FW_FORMAT_MAX, .try_ce_fw = true,
drivers/net/wireless/realtek/rtw89/rtw8852a.c +7 -7
@@ -704,10 +704,9 @@ static void rtw8852a_set_channel_mac(struct rtw89_dev *rtwdev,const struct rtw89_chan *chan, u8 mac_idx) { - u32 rf_mod = rtw89_mac_reg_by_idx(R_AX_WMAC_RFMOD, mac_idx); -u32 sub_carr =rtw89_mac_reg_by_idx (R_AX_TX_SUB_CARRIER_VALUE , - mac_idx); -u32 chk_rate =rtw89_mac_reg_by_idx (R_AX_TXRATE_CHK , mac_idx); + u32 rf_mod = rtw89_mac_reg_by_idx(rtwdev, R_AX_WMAC_RFMOD, mac_idx); +u32 sub_carr =rtw89_mac_reg_by_idx (rtwdev,R_AX_TX_SUB_CARRIER_VALUE , mac_idx); +u32 chk_rate =rtw89_mac_reg_by_idx (rtwdev,R_AX_TXRATE_CHK , mac_idx);u8 txsc20 =0 , txsc40 =0 ;switch (chan->band_width) {
@@ -1380,13 +1379,13 @@ void rtw8852a_set_txpwr_ul_tb_offset(struct rtw89_dev *rtwdev, pw_ofst);return ; } - reg =rtw89_mac_reg_by_idx (R_AX_PWR_UL_TB_CTRL , mac_idx); + reg =rtw89_mac_reg_by_idx (rtwdev,R_AX_PWR_UL_TB_CTRL , mac_idx);rtw89_write32_set (rtwdev, reg,B_AX_PWR_UL_TB_CTRL_EN ); val_1t = pw_ofst; - reg =rtw89_mac_reg_by_idx (R_AX_PWR_UL_TB_1T , mac_idx); + reg =rtw89_mac_reg_by_idx (rtwdev,R_AX_PWR_UL_TB_1T , mac_idx);rtw89_write32_mask (rtwdev, reg,B_AX_PWR_UL_TB_1T_MASK , val_1t); val_2t =max (val_1t -3 ,-16 ); - reg =rtw89_mac_reg_by_idx (R_AX_PWR_UL_TB_2T , mac_idx); + reg =rtw89_mac_reg_by_idx (rtwdev,R_AX_PWR_UL_TB_2T , mac_idx);rtw89_write32_mask (rtwdev, reg,B_AX_PWR_UL_TB_2T_MASK , val_2t);rtw89_debug (rtwdev,RTW89_DBG_TXPWR ,"[ULTB] Set TB pwr_offset=(%d, %d)\n" , val_1t, val_2t);
@@ -2073,6 +2072,7 @@ const struct rtw89_chip_info rtw8852a_chip_info = { .chip_id = RTL8852A, .chip_gen = RTW89_CHIP_AX, .ops = &rtw8852a_chip_ops, + .mac_def = &rtw89_mac_gen_ax, .fw_basename = RTW8852A_FW_BASENAME, .fw_format_max = RTW8852A_FW_FORMAT_MAX, .try_ce_fw = false,
drivers/net/wireless/realtek/rtw89/rtw8852b.c +7 -6
@@ -843,9 +843,9 @@ static void rtw8852b_set_channel_mac(struct rtw89_dev *rtwdev,const struct rtw89_chan *chan, u8 mac_idx) { - u32 rf_mod = rtw89_mac_reg_by_idx(R_AX_WMAC_RFMOD, mac_idx); -u32 sub_carr =rtw89_mac_reg_by_idx (R_AX_TX_SUB_CARRIER_VALUE , mac_idx); -u32 chk_rate =rtw89_mac_reg_by_idx (R_AX_TXRATE_CHK , mac_idx); + u32 rf_mod = rtw89_mac_reg_by_idx(rtwdev, R_AX_WMAC_RFMOD, mac_idx); +u32 sub_carr =rtw89_mac_reg_by_idx (rtwdev,R_AX_TX_SUB_CARRIER_VALUE , mac_idx); +u32 chk_rate =rtw89_mac_reg_by_idx (rtwdev,R_AX_TXRATE_CHK , mac_idx);u8 txsc20 =0 , txsc40 =0 ;switch (chan->band_width) {
@@ -1725,14 +1725,14 @@ void rtw8852b_set_txpwr_ul_tb_offset(struct rtw89_dev *rtwdev,return ; } - reg =rtw89_mac_reg_by_idx (R_AX_PWR_UL_TB_CTRL , mac_idx); + reg =rtw89_mac_reg_by_idx (rtwdev,R_AX_PWR_UL_TB_CTRL , mac_idx);rtw89_write32_set (rtwdev, reg,B_AX_PWR_UL_TB_CTRL_EN ); - reg =rtw89_mac_reg_by_idx (R_AX_PWR_UL_TB_1T , mac_idx); + reg =rtw89_mac_reg_by_idx (rtwdev,R_AX_PWR_UL_TB_1T , mac_idx);rtw89_write32_mask (rtwdev, reg,B_AX_PWR_UL_TB_1T_MASK , pw_ofst); pw_ofst =max_t (s8, pw_ofst -3 ,-16 ); - reg =rtw89_mac_reg_by_idx (R_AX_PWR_UL_TB_2T , mac_idx); + reg =rtw89_mac_reg_by_idx (rtwdev,R_AX_PWR_UL_TB_2T , mac_idx);rtw89_write32_mask (rtwdev, reg,B_AX_PWR_UL_TB_2T_MASK , pw_ofst); }
@@ -2505,6 +2505,7 @@ const struct rtw89_chip_info rtw8852b_chip_info = { .chip_id = RTL8852B, .chip_gen = RTW89_CHIP_AX, .ops = &rtw8852b_chip_ops, + .mac_def = &rtw89_mac_gen_ax, .fw_basename = RTW8852B_FW_BASENAME, .fw_format_max = RTW8852B_FW_FORMAT_MAX, .try_ce_fw = true,
drivers/net/wireless/realtek/rtw89/rtw8852c.c +9 -10
@@ -606,10 +606,9 @@ static void rtw8852c_set_channel_mac(struct rtw89_dev *rtwdev,const struct rtw89_chan *chan, u8 mac_idx) { - u32 rf_mod = rtw89_mac_reg_by_idx(R_AX_WMAC_RFMOD, mac_idx); -u32 sub_carr =rtw89_mac_reg_by_idx (R_AX_TX_SUB_CARRIER_VALUE , - mac_idx); -u32 chk_rate =rtw89_mac_reg_by_idx (R_AX_TXRATE_CHK , mac_idx); + u32 rf_mod = rtw89_mac_reg_by_idx(rtwdev, R_AX_WMAC_RFMOD, mac_idx); +u32 sub_carr =rtw89_mac_reg_by_idx (rtwdev,R_AX_TX_SUB_CARRIER_VALUE , mac_idx); +u32 chk_rate =rtw89_mac_reg_by_idx (rtwdev,R_AX_TXRATE_CHK , mac_idx);u8 txsc20 =0 , txsc40 =0 , txsc80 =0 ;u8 rf_mod_val =0 , chk_rate_mask =0 ;u32 txsc;
@@ -1654,8 +1653,7 @@ static void rtw8852c_set_channel_bb(struct rtw89_dev *rtwdev, rtwdev->hal.cv != CHIP_CAV) {rtw89_phy_write32_idx (rtwdev,R_P80_AT_HIGH_FREQ ,B_P80_AT_HIGH_FREQ ,0x0 , phy_idx); - reg =rtw89_mac_reg_by_idx (R_P80_AT_HIGH_FREQ_BB_WRP , - phy_idx); + reg =rtw89_mac_reg_by_idx (rtwdev,R_P80_AT_HIGH_FREQ_BB_WRP , phy_idx);if (chan->primary_channel > chan->channel) { rtw89_phy_write32_mask(rtwdev, R_P80_AT_HIGH_FREQ_RU_ALLOC,
@@ -1859,12 +1857,12 @@ void rtw8852c_set_txpwr_ul_tb_offset(struct rtw89_dev *rtwdev,for (i =0 ; i <4 ; i++) {/* 1TX */ - reg =rtw89_mac_reg_by_idx (R_AX_PWR_UL_TB_1T , mac_idx); + reg =rtw89_mac_reg_by_idx (rtwdev,R_AX_PWR_UL_TB_1T , mac_idx);rtw89_write32_mask (rtwdev, reg,B_AX_PWR_UL_TB_1T_V1_MASK << (8 * i), val_1t);/* 2TX */ - reg =rtw89_mac_reg_by_idx (R_AX_PWR_UL_TB_2T , mac_idx); + reg =rtw89_mac_reg_by_idx (rtwdev,R_AX_PWR_UL_TB_2T , mac_idx);rtw89_write32_mask (rtwdev, reg,B_AX_PWR_UL_TB_2T_V1_MASK << (8 * i), val_2t);
@@ -2181,7 +2179,7 @@ static void rtw8852c_ctrl_tx_path_tmac(struct rtw89_dev *rtwdev, u8 tx_path,for (addr =R_AX_MACID_ANT_TABLE ; addr <=R_AX_MACID_ANT_TABLE_LAST ; addr +=4 ) { - reg =rtw89_mac_reg_by_idx (addr, mac_idx); + reg =rtw89_mac_reg_by_idx (rtwdev, addr, mac_idx);rtw89_write32 (rtwdev, reg,0 ); }
@@ -2211,7 +2209,7 @@ static void rtw8852c_ctrl_tx_path_tmac(struct rtw89_dev *rtwdev, u8 tx_path,for (i =0 ; i < cr_size; i++) {rtw89_debug (rtwdev,RTW89_DBG_TSSI ,"0x%x = 0x%x\n" , path_com[i].addr, path_com[i].data); - reg =rtw89_mac_reg_by_idx (path_com[i].addr, mac_idx); + reg =rtw89_mac_reg_by_idx (rtwdev, path_com[i].addr, mac_idx);rtw89_write32 (rtwdev, reg, path_com[i].data); } }
@@ -2804,6 +2802,7 @@ const struct rtw89_chip_info rtw8852c_chip_info = { .chip_id = RTL8852C, .chip_gen = RTW89_CHIP_AX, .ops = &rtw8852c_chip_ops, + .mac_def = &rtw89_mac_gen_ax, .fw_basename = RTW8852C_FW_BASENAME, .fw_format_max = RTW8852C_FW_FORMAT_MAX, .try_ce_fw = false,
Signature · 1 line
2.25.1
Re: [PATCH 1/6] wifi: rtw89: mac: add mac_gen_def::band1_offset to map MAC band1 register address
Quoted 16 lines · Ping-Ke Shih
There are two copies of MAC hardware called band0 and band1. Basically, the only difference between them is base address, so we can share functions with a 'band' (or '
mac_idx') argument.The offset of base address of WiFi 6 and 7 are
0x2000and0x4000respectively, so addband1_offsetfield to new introduced structmac_gen_defto possibly reuse functions.Using below spatch script to convert callers:
@@
expression reg, band;
@@
-rtw89_mac_reg_by_idx(reg, band)
+rtw89_mac_reg_by_idx(rtwdev, reg, band)
Quoted 7 lines
@@
expression reg, port, band;
@@
-rtw89_mac_reg_by_port(reg, port, band)
+rtw89_mac_reg_by_port(rtwdev, reg, port, band)Signed-off-by Ping-Ke Shih <[email protected]>
6 patches applied to wireless-next.git, thanks.
c220d08e1f98 wifi: rtw89: mac: add mac_gen_def::band1_offset to map MAC band1 register address 60168f6c50ed wifi: rtw89: mac: generalize code to indirectly access WiFi internal memory 3a7e4f56eb18 wifi: rtw89: mac: define internal memory address for WiFi 7 chip 9d87e7dc930e wifi: rtw89: mac: define register address of rx_filter to generalize code 1165f5719229 wifi: rtw89: phy: add phy_gen_def::cr_base to support WiFi 7 chips 058b20748197 wifi: rtw89: phy: modify register setting of ENV_MNTR, PHYSTS and DIG
Signature · 3 lines
https://patchwork.kernel.org/project/linux-wireless/patch/[email protected]/ https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
Ping-Ke Shih
maintainerPATCH 2/6 wifi: rtw89: mac: generalize code to indirectly access WiFi internal memory
In reply to Ping-Ke ShihTo diagnose abnormal behavior, we need to dump certain internal memory. For example, dump security CAM when debugging encryption/decryption problems, or dump BA CAM when debugging abnormal BlockAck.
Since the indirect address and internal memory base address are different between WiFi 6 and 7 chips, add fields to reuse codes.
Also, only WiFi 6 chips initialize DMAC and CMAC tables via this indirect interface, so no need to change the constant register address, and new firmware will help to initialize these tables.
--- drivers/net/wireless/realtek/rtw89/debug.c | 13 ++++++----- drivers/net/wireless/realtek/rtw89/mac.c | 25 ++++++++++++++++------ drivers/net/wireless/realtek/rtw89/mac.h | 5 +++-- drivers/net/wireless/realtek/rtw89/ser.c | 20 +++++++++++------ 4 files changed, 42 insertions(+), 21 deletions(-)
drivers/net/wireless/realtek/rtw89/debug.c +8 -5
@@ -793,6 +793,9 @@ static void rtw89_debug_dump_mac_mem(struct seq_file *m,struct rtw89_dev *rtwdev, u8 sel, u32 start_addr, u32 len) { + const struct rtw89_mac_gen_def *mac = rtwdev->chip->mac_def; +u32 filter_model_addr = mac->filter_model_addr; +u32 indir_access_addr = mac->indir_access_addr;u32 base_addr, start_page, residue;u32 i, j, p, pages;u32 dump_len, remain;
@@ -802,17 +805,17 @@ static void rtw89_debug_dump_mac_mem(struct seq_file *m, pages = len /MAC_MEM_DUMP_PAGE_SIZE +1 ; start_page = start_addr /MAC_MEM_DUMP_PAGE_SIZE ; residue = start_addr %MAC_MEM_DUMP_PAGE_SIZE ; - base_addr = rtw89_mac_mem_base_addrs[sel]; + base_addr = mac->mem_base_addrs[sel]; base_addr += start_page *MAC_MEM_DUMP_PAGE_SIZE ;for (p =0 ; p < pages; p++) { dump_len =min_t (u32, remain,MAC_MEM_DUMP_PAGE_SIZE ); -rtw89_write32 (rtwdev,R_AX_FILTER_MODEL_ADDR , base_addr); -for (i =R_AX_INDIR_ACCESS_ENTRY + residue; - i <R_AX_INDIR_ACCESS_ENTRY + dump_len;) { +rtw89_write32 (rtwdev, filter_model_addr, base_addr); +for (i = indir_access_addr + residue; + i < indir_access_addr + dump_len;) {seq_printf (m,"%08xh:" , i);for (j =0 ; - j <4 && i <R_AX_INDIR_ACCESS_ENTRY + dump_len; + j <4 && i < indir_access_addr + dump_len; j++, i +=4 ) { val =rtw89_read32 (rtwdev, i);seq_printf (m," %08x" , val);
drivers/net/wireless/realtek/rtw89/mac.c +18 -7
@@ -12,7 +12,7 @@#include "reg.h" #include "util.h" -const u32 rtw89_mac_mem_base_addrs[RTW89_MAC_MEM_NUM ] = { +static const u32 rtw89_mac_mem_base_addrs_ax[RTW89_MAC_MEM_NUM ] = { [RTW89_MAC_MEM_AXIDMA ] =AXIDMA_BASE_ADDR , [RTW89_MAC_MEM_SHARED_BUF ] =SHARED_BUF_BASE_ADDR , [RTW89_MAC_MEM_DMAC_TBL ] =DMAC_TBL_BASE_ADDR ,
@@ -39,19 +39,21 @@ const u32 rtw89_mac_mem_base_addrs[RTW89_MAC_MEM_NUM] = {static void rtw89_mac_mem_write (struct rtw89_dev *rtwdev,u32 offset,u32 val,enum rtw89_mac_mem_sel sel) { -u32 addr = rtw89_mac_mem_base_addrs[sel] + offset; +const struct rtw89_mac_gen_def *mac = rtwdev->chip->mac_def; +u32 addr = mac->mem_base_addrs[sel] + offset; -rtw89_write32 (rtwdev,R_AX_FILTER_MODEL_ADDR , addr); -rtw89_write32 (rtwdev,R_AX_INDIR_ACCESS_ENTRY , val); +rtw89_write32 (rtwdev, mac->filter_model_addr, addr); +rtw89_write32 (rtwdev, mac->indir_access_addr, val); }static u32 rtw89_mac_mem_read (struct rtw89_dev *rtwdev,u32 offset,enum rtw89_mac_mem_sel sel) { -u32 addr = rtw89_mac_mem_base_addrs[sel] + offset; +const struct rtw89_mac_gen_def *mac = rtwdev->chip->mac_def; +u32 addr = mac->mem_base_addrs[sel] + offset; -rtw89_write32 (rtwdev,R_AX_FILTER_MODEL_ADDR , addr); -return rtw89_read32 (rtwdev,R_AX_INDIR_ACCESS_ENTRY ); +rtw89_write32 (rtwdev, mac->filter_model_addr, addr); +return rtw89_read32 (rtwdev, mac->indir_access_addr); } int rtw89_mac_check_mac_en(struct rtw89_dev *rtwdev, u8 mac_idx,
@@ -3661,6 +3663,9 @@ static void rtw89_mac_dmac_tbl_init(struct rtw89_dev *rtwdev, u8 macid) {u8 i; +if (rtwdev->chip->chip_gen !=RTW89_CHIP_AX ) +return ; +for (i =0 ; i <4 ; i++) {rtw89_write32 (rtwdev,R_AX_FILTER_MODEL_ADDR ,DMAC_TBL_BASE_ADDR + (macid <<4 ) + (i <<2 ));
@@ -3670,6 +3675,9 @@ static void rtw89_mac_dmac_tbl_init(struct rtw89_dev *rtwdev, u8 macid)static void rtw89_mac_cmac_tbl_init (struct rtw89_dev *rtwdev,u8 macid) { +if (rtwdev->chip->chip_gen !=RTW89_CHIP_AX ) +return ; +rtw89_write32 (rtwdev,R_AX_FILTER_MODEL_ADDR ,CMAC_TBL_BASE_ADDR + macid *CCTL_INFO_SIZE );rtw89_write32 (rtwdev,R_AX_INDIR_ACCESS_ENTRY ,0x4 );
@@ -5678,5 +5686,8 @@ int rtw89_mac_ptk_drop_by_band_and_wait(struct rtw89_dev *rtwdev,const struct rtw89_mac_gen_def rtw89_mac_gen_ax = { .band1_offset =RTW89_MAC_AX_BAND_REG_OFFSET , + .filter_model_addr =R_AX_FILTER_MODEL_ADDR , + .indir_access_addr =R_AX_INDIR_ACCESS_ENTRY , + .mem_base_addrs = rtw89_mac_mem_base_addrs_ax, };EXPORT_SYMBOL (rtw89_mac_gen_ax);
drivers/net/wireless/realtek/rtw89/mac.h +3 -2
@@ -327,8 +327,6 @@ enum rtw89_mac_mem_sel { RTW89_MAC_MEM_NUM, }; -extern const u32 rtw89_mac_mem_base_addrs[]; -enum rtw89_rpwm_req_pwr_state {RTW89_MAC_RPWM_REQ_PWR_STATE_ACTIVE =0 ,RTW89_MAC_RPWM_REQ_PWR_STATE_BAND0_RFON =1 ,
@@ -829,6 +827,9 @@ extern const struct rtw89_mac_size_set rtw89_mac_size;struct rtw89_mac_gen_def {u32 band1_offset; +u32 filter_model_addr; +u32 indir_access_addr; +const u32 *mem_base_addrs; };extern const struct rtw89_mac_gen_def rtw89_mac_gen_ax;
drivers/net/wireless/realtek/rtw89/ser.c +13 -7
@@ -529,6 +529,9 @@ static void ser_do_hci_st_hdl(struct rtw89_ser *ser, u8 evt)static void ser_mac_mem_dump (struct rtw89_dev *rtwdev,u8 *buf,u8 sel,u32 start_addr,u32 len) { +const struct rtw89_mac_gen_def *mac = rtwdev->chip->mac_def; +u32 filter_model_addr = mac->filter_model_addr; +u32 indir_access_addr = mac->indir_access_addr;u32 *ptr = (u32 *)buf;u32 base_addr, start_page, residue;u32 cnt =0 ;
@@ -536,14 +539,14 @@ static void ser_mac_mem_dump(struct rtw89_dev *rtwdev, u8 *buf, start_page = start_addr /MAC_MEM_DUMP_PAGE_SIZE ; residue = start_addr %MAC_MEM_DUMP_PAGE_SIZE ; - base_addr = rtw89_mac_mem_base_addrs[sel]; + base_addr = mac->mem_base_addrs[sel]; base_addr += start_page *MAC_MEM_DUMP_PAGE_SIZE ;while (cnt < len) { -rtw89_write32 (rtwdev,R_AX_FILTER_MODEL_ADDR , base_addr); +rtw89_write32 (rtwdev, filter_model_addr, base_addr); -for (i =R_AX_INDIR_ACCESS_ENTRY + residue; - i <R_AX_INDIR_ACCESS_ENTRY +MAC_MEM_DUMP_PAGE_SIZE ; +for (i = indir_access_addr + residue; + i < indir_access_addr +MAC_MEM_DUMP_PAGE_SIZE ; i +=4 , ptr++) { *ptr =rtw89_read32 (rtwdev, i); cnt +=4 ;
@@ -585,6 +588,9 @@ static int rtw89_ser_fw_backtrace_dump(struct rtw89_dev *rtwdev, u8 *buf, const struct __fw_backtrace_entry *ent) {struct __fw_backtrace_info *ptr = (struct __fw_backtrace_info *)buf; +const struct rtw89_mac_gen_def *mac = rtwdev->chip->mac_def; +u32 filter_model_addr = mac->filter_model_addr; +u32 indir_access_addr = mac->indir_access_addr;u32 fwbt_addr = ent->wcpu_addr &RTW89_WCPU_BASE_MASK ;u32 fwbt_size = ent->size;u32 fwbt_key = ent->key;
@@ -610,10 +616,10 @@ static int rtw89_ser_fw_backtrace_dump(struct rtw89_dev *rtwdev, u8 *buf, }rtw89_debug (rtwdev,RTW89_DBG_SER ,"dump fw backtrace start\n" ); -rtw89_write32 (rtwdev,R_AX_FILTER_MODEL_ADDR , fwbt_addr); +rtw89_write32 (rtwdev, filter_model_addr, fwbt_addr); -for (i =R_AX_INDIR_ACCESS_ENTRY ; - i <R_AX_INDIR_ACCESS_ENTRY + fwbt_size; +for (i = indir_access_addr; + i < indir_access_addr + fwbt_size; i +=RTW89_FW_BACKTRACE_INFO_SIZE , ptr++) { *ptr = (struct __fw_backtrace_info ){ .ra =rtw89_read32 (rtwdev, i),
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 3/6 wifi: rtw89: mac: define internal memory address for WiFi 7 chip
In reply to Ping-Ke ShihDefine base address of WiFi 7 internal memory according to design to provide the same functions as existing WiFi 6 chips.
--- drivers/net/wireless/realtek/rtw89/mac.h | 27 +++++++++++++++++++++ drivers/net/wireless/realtek/rtw89/mac_be.c | 27 +++++++++++++++++++++ drivers/net/wireless/realtek/rtw89/reg.h | 2 ++ 3 files changed, 56 insertions(+)
drivers/net/wireless/realtek/rtw89/mac.h +27 -0
@@ -275,6 +275,7 @@ enum rtw89_mac_dbg_port_sel {/* SRAM mem dump */ #define R_AX_INDIR_ACCESS_ENTRY 0x40000 +#define R_BE_INDIR_ACCESS_ENTRY 0x80000#define AXIDMA_BASE_ADDR 0x18006000#define STA_SCHED_BASE_ADDR 0x18808000
@@ -298,6 +299,31 @@ enum rtw89_mac_dbg_port_sel {#define TXDATA_FIFO_1_BASE_ADDR 0x188A1000#define CPU_LOCAL_BASE_ADDR 0x18003000 +#define WD_PAGE_BASE_ADDR_BE 0x0 +#define CPU_LOCAL_BASE_ADDR_BE 0x18003000 +#define AXIDMA_BASE_ADDR_BE 0x18006000 +#define SHARED_BUF_BASE_ADDR_BE 0x18700000 +#define DMAC_TBL_BASE_ADDR_BE 0x18800000 +#define SHCUT_MACHDR_BASE_ADDR_BE 0x18800800 +#define STA_SCHED_BASE_ADDR_BE 0x18818000 +#define NAT25_CAM_BASE_ADDR_BE 0x18820000 +#define RXPLD_FLTR_CAM_BASE_ADDR_BE 0x18823000 +#define SEC_CAM_BASE_ADDR_BE 0x18824000 +#define WOW_CAM_BASE_ADDR_BE 0x18828000 +#define MLD_TBL_BASE_ADDR_BE 0x18829000 +#define RX_CLSF_CAM_BASE_ADDR_BE 0x1882A000 +#define CMAC_TBL_BASE_ADDR_BE 0x18840000 +#define ADDR_CAM_BASE_ADDR_BE 0x18850000 +#define BSSID_CAM_BASE_ADDR_BE 0x18858000 +#define BA_CAM_BASE_ADDR_BE 0x18859000 +#define BCN_IE_CAM0_BASE_ADDR_BE 0x18860000 +#define TXDATA_FIFO_0_BASE_ADDR_BE 0x18861000 +#define TXD_FIFO_0_BASE_ADDR_BE 0x18862000 +#define BCN_IE_CAM1_BASE_ADDR_BE 0x18880000 +#define TXDATA_FIFO_1_BASE_ADDR_BE 0x18881000 +#define TXD_FIFO_1_BASE_ADDR_BE 0x18881800 +#define DCPU_LOCAL_BASE_ADDR_BE 0x19C02000 +#define CCTL_INFO_SIZE 32enum rtw89_mac_mem_sel {
@@ -322,6 +348,7 @@ enum rtw89_mac_mem_sel {RTW89_MAC_MEM_BSSID_CAM ,RTW89_MAC_MEM_TXD_FIFO_0_V1 ,RTW89_MAC_MEM_TXD_FIFO_1_V1 , +RTW89_MAC_MEM_WD_PAGE ,/* keep last */ RTW89_MAC_MEM_NUM,
drivers/net/wireless/realtek/rtw89/mac_be.c +27 -0
@@ -3,8 +3,35 @@*/ #include "mac.h" +#include "reg.h" + +static const u32 rtw89_mac_mem_base_addrs_be[RTW89_MAC_MEM_NUM ] = { + [RTW89_MAC_MEM_AXIDMA ] =AXIDMA_BASE_ADDR_BE , + [RTW89_MAC_MEM_SHARED_BUF ] =SHARED_BUF_BASE_ADDR_BE , + [RTW89_MAC_MEM_DMAC_TBL ] =DMAC_TBL_BASE_ADDR_BE , + [RTW89_MAC_MEM_SHCUT_MACHDR ] =SHCUT_MACHDR_BASE_ADDR_BE , + [RTW89_MAC_MEM_STA_SCHED ] =STA_SCHED_BASE_ADDR_BE , + [RTW89_MAC_MEM_RXPLD_FLTR_CAM ] =RXPLD_FLTR_CAM_BASE_ADDR_BE , + [RTW89_MAC_MEM_SECURITY_CAM ] =SEC_CAM_BASE_ADDR_BE , + [RTW89_MAC_MEM_WOW_CAM ] =WOW_CAM_BASE_ADDR_BE , + [RTW89_MAC_MEM_CMAC_TBL ] =CMAC_TBL_BASE_ADDR_BE , + [RTW89_MAC_MEM_ADDR_CAM ] =ADDR_CAM_BASE_ADDR_BE , + [RTW89_MAC_MEM_BA_CAM ] =BA_CAM_BASE_ADDR_BE , + [RTW89_MAC_MEM_BCN_IE_CAM0 ] =BCN_IE_CAM0_BASE_ADDR_BE , + [RTW89_MAC_MEM_BCN_IE_CAM1 ] =BCN_IE_CAM1_BASE_ADDR_BE , + [RTW89_MAC_MEM_TXD_FIFO_0 ] =TXD_FIFO_0_BASE_ADDR_BE , + [RTW89_MAC_MEM_TXD_FIFO_1 ] =TXD_FIFO_1_BASE_ADDR_BE , + [RTW89_MAC_MEM_TXDATA_FIFO_0 ] =TXDATA_FIFO_0_BASE_ADDR_BE , + [RTW89_MAC_MEM_TXDATA_FIFO_1 ] =TXDATA_FIFO_1_BASE_ADDR_BE , + [RTW89_MAC_MEM_CPU_LOCAL ] =CPU_LOCAL_BASE_ADDR_BE , + [RTW89_MAC_MEM_BSSID_CAM ] =BSSID_CAM_BASE_ADDR_BE , + [RTW89_MAC_MEM_WD_PAGE ] =WD_PAGE_BASE_ADDR_BE , +};const struct rtw89_mac_gen_def rtw89_mac_gen_be = { .band1_offset =RTW89_MAC_BE_BAND_REG_OFFSET , + .filter_model_addr =R_BE_FILTER_MODEL_ADDR , + .indir_access_addr =R_BE_INDIR_ACCESS_ENTRY , + .mem_base_addrs = rtw89_mac_mem_base_addrs_be, };EXPORT_SYMBOL (rtw89_mac_gen_be);
drivers/net/wireless/realtek/rtw89/reg.h +2 -0
@@ -3625,6 +3625,8 @@#define B_AX_GNT_BT_TX_SW_VAL BIT(1)#define B_AX_GNT_BT_TX_SW_CTRL BIT(0) +#define R_BE_FILTER_MODEL_ADDR 0x0C04 +#define RR_MOD 0x00#define RR_MOD_V1 0x10000#define RR_MOD_IQK GENMASK(19, 4)
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 4/6 wifi: rtw89: mac: define register address of rx_filter to generalize code
In reply to Ping-Ke Shihrx_filter is used to decide which kind of packets are received to driver, or just dropped by MAC layer to reduce bus traffic.
The bit definitions of old and new chips are the sames, but only address is changed, so define a field to generalize usage.
--- drivers/net/wireless/realtek/rtw89/core.c | 6 ++++-- drivers/net/wireless/realtek/rtw89/fw.c | 6 ++++-- drivers/net/wireless/realtek/rtw89/mac.c | 1 + drivers/net/wireless/realtek/rtw89/mac.h | 1 + drivers/net/wireless/realtek/rtw89/mac80211.c | 5 +++-- drivers/net/wireless/realtek/rtw89/mac_be.c | 1 + drivers/net/wireless/realtek/rtw89/reg.h | 19 +++++++++++++++++++ drivers/net/wireless/realtek/rtw89/wow.c | 3 ++- 8 files changed, 35 insertions(+), 7 deletions(-)
drivers/net/wireless/realtek/rtw89/core.c +4 -2
@@ -2451,6 +2451,7 @@ static int rtw89_core_send_nullfunc(struct rtw89_dev *rtwdev,void rtw89_roc_start (struct rtw89_dev *rtwdev,struct rtw89_vif *rtwvif) { +const struct rtw89_mac_gen_def *mac = rtwdev->chip->mac_def;struct ieee80211_hw *hw = rtwdev->hw;struct rtw89_roc *roc = &rtwvif->roc;struct cfg80211_chan_def roc_chan;
@@ -2478,7 +2479,7 @@ void rtw89_roc_start(struct rtw89_dev *rtwdev, struct rtw89_vif *rtwvif)rtw89_config_roc_chandef (rtwdev, rtwvif->sub_entity_idx, &roc_chan);rtw89_set_channel (rtwdev);rtw89_write32_clr (rtwdev, -rtw89_mac_reg_by_idx (rtwdev,R_AX_RX_FLTR_OPT ,RTW89_MAC_0 ), +rtw89_mac_reg_by_idx (rtwdev, mac->rx_fltr,RTW89_MAC_0 ),B_AX_A_UC_CAM_MATCH |B_AX_A_BC_CAM_MATCH );ieee80211_ready_on_channel (hw);
@@ -2486,6 +2487,7 @@ void rtw89_roc_start(struct rtw89_dev *rtwdev, struct rtw89_vif *rtwvif)void rtw89_roc_end (struct rtw89_dev *rtwdev,struct rtw89_vif *rtwvif) { +const struct rtw89_mac_gen_def *mac = rtwdev->chip->mac_def;struct ieee80211_hw *hw = rtwdev->hw;struct rtw89_roc *roc = &rtwvif->roc;struct rtw89_vif *tmp;
@@ -2499,7 +2501,7 @@ void rtw89_roc_end(struct rtw89_dev *rtwdev, struct rtw89_vif *rtwvif)rtw89_leave_lps (rtwdev);rtw89_write32_mask (rtwdev, -rtw89_mac_reg_by_idx (rtwdev,R_AX_RX_FLTR_OPT ,RTW89_MAC_0 ), +rtw89_mac_reg_by_idx (rtwdev, mac->rx_fltr,RTW89_MAC_0 ),B_AX_RX_FLTR_CFG_MASK , rtwdev->hal.rx_fltr);
drivers/net/wireless/realtek/rtw89/fw.c +4 -2
@@ -3851,6 +3851,7 @@ void rtw89_hw_scan_start(struct rtw89_dev *rtwdev, struct ieee80211_vif *vif, struct ieee80211_scan_request *scan_req) {struct rtw89_vif *rtwvif = (struct rtw89_vif *)vif->drv_priv; +const struct rtw89_mac_gen_def *mac = rtwdev->chip->mac_def;struct cfg80211_scan_request *req = &scan_req->req;u32 rx_fltr = rtwdev->hal.rx_fltr;u8 mac_addr[ETH_ALEN ];
@@ -3873,7 +3874,7 @@ void rtw89_hw_scan_start(struct rtw89_dev *rtwdev, struct ieee80211_vif *vif, rx_fltr &= ~B_AX_A_BC ; rx_fltr &= ~B_AX_A_A1_MATCH ;rtw89_write32_mask (rtwdev, -rtw89_mac_reg_by_idx (rtwdev,R_AX_RX_FLTR_OPT ,RTW89_MAC_0 ), +rtw89_mac_reg_by_idx (rtwdev, mac->rx_fltr,RTW89_MAC_0 ),B_AX_RX_FLTR_CFG_MASK , rx_fltr); }
@@ -3881,6 +3882,7 @@ void rtw89_hw_scan_start(struct rtw89_dev *rtwdev, struct ieee80211_vif *vif,void rtw89_hw_scan_complete (struct rtw89_dev *rtwdev,struct ieee80211_vif *vif,bool aborted) { +const struct rtw89_mac_gen_def *mac = rtwdev->chip->mac_def;struct rtw89_hw_scan_info *scan_info = &rtwdev->scan_info;struct cfg80211_scan_info info = { .aborted = aborted,
@@ -3891,7 +3893,7 @@ void rtw89_hw_scan_complete(struct rtw89_dev *rtwdev, struct ieee80211_vif *vif,return ;rtw89_write32_mask (rtwdev, -rtw89_mac_reg_by_idx (rtwdev,R_AX_RX_FLTR_OPT ,RTW89_MAC_0 ), +rtw89_mac_reg_by_idx (rtwdev, mac->rx_fltr,RTW89_MAC_0 ),B_AX_RX_FLTR_CFG_MASK , rtwdev->hal.rx_fltr);
drivers/net/wireless/realtek/rtw89/mac.c +1 -0
@@ -5689,5 +5689,6 @@ const struct rtw89_mac_gen_def rtw89_mac_gen_ax = { .filter_model_addr = R_AX_FILTER_MODEL_ADDR, .indir_access_addr = R_AX_INDIR_ACCESS_ENTRY, .mem_base_addrs = rtw89_mac_mem_base_addrs_ax, + .rx_fltr = R_AX_RX_FLTR_OPT, };EXPORT_SYMBOL (rtw89_mac_gen_ax);
drivers/net/wireless/realtek/rtw89/mac.h +1 -0
@@ -857,6 +857,7 @@ struct rtw89_mac_gen_def {u32 filter_model_addr;u32 indir_access_addr;const u32 *mem_base_addrs; +u32 rx_fltr; };extern const struct rtw89_mac_gen_def rtw89_mac_gen_ax;
drivers/net/wireless/realtek/rtw89/mac80211.c +3 -2
@@ -224,6 +224,7 @@ static void rtw89_ops_configure_filter(struct ieee80211_hw *hw, u64 multicast) {struct rtw89_dev *rtwdev = hw->priv; +const struct rtw89_mac_gen_def *mac = rtwdev->chip->mac_def;mutex_lock (&rtwdev->mutex);rtw89_leave_ps_mode (rtwdev);
@@ -271,13 +272,13 @@ static void rtw89_ops_configure_filter(struct ieee80211_hw *hw, }rtw89_write32_mask (rtwdev, -rtw89_mac_reg_by_idx (rtwdev,R_AX_RX_FLTR_OPT ,RTW89_MAC_0 ), +rtw89_mac_reg_by_idx (rtwdev, mac->rx_fltr,RTW89_MAC_0 ),B_AX_RX_FLTR_CFG_MASK , rtwdev->hal.rx_fltr);if (!rtwdev->dbcc_en) goto out;rtw89_write32_mask (rtwdev, -rtw89_mac_reg_by_idx (rtwdev,R_AX_RX_FLTR_OPT ,RTW89_MAC_1 ), +rtw89_mac_reg_by_idx (rtwdev, mac->rx_fltr,RTW89_MAC_1 ),B_AX_RX_FLTR_CFG_MASK , rtwdev->hal.rx_fltr);
drivers/net/wireless/realtek/rtw89/mac_be.c +1 -0
@@ -33,5 +33,6 @@ const struct rtw89_mac_gen_def rtw89_mac_gen_be = { .filter_model_addr = R_BE_FILTER_MODEL_ADDR, .indir_access_addr = R_BE_INDIR_ACCESS_ENTRY, .mem_base_addrs = rtw89_mac_mem_base_addrs_be, + .rx_fltr = R_BE_RX_FLTR_OPT, };EXPORT_SYMBOL (rtw89_mac_gen_be);
drivers/net/wireless/realtek/rtw89/reg.h +19 -0
@@ -3627,6 +3627,25 @@#define R_BE_FILTER_MODEL_ADDR 0x0C04 +#define R_BE_RX_FLTR_OPT 0x11420 +#define R_BE_RX_FLTR_OPT_C1 0x15420 +#define B_BE_UID_FILTER_MASK GENMASK(31, 24) +#define B_BE_UNSPT_TYPE BIT(22) +#define B_BE_RX_MPDU_MAX_LEN_MASK GENMASK(21, 16) +#define B_BE_A_FTM_REQ BIT(14) +#define B_BE_A_ERR_PKT BIT(13) +#define B_BE_A_UNSUP_PKT BIT(12) +#define B_BE_A_CRC32_ERR BIT(11) +#define B_BE_A_BCN_CHK_RULE_MASK GENMASK(9, 8) +#define B_BE_A_BCN_CHK_EN BIT(7) +#define B_BE_A_MC_LIST_CAM_MATCH BIT(6) +#define B_BE_A_BC_CAM_MATCH BIT(5) +#define B_BE_A_UC_CAM_MATCH BIT(4) +#define B_BE_A_MC BIT(3) +#define B_BE_A_BC BIT(2) +#define B_BE_A_A1_MATCH BIT(1) +#define B_BE_SNIFFER_MODE BIT(0) +#define RR_MOD 0x00#define RR_MOD_V1 0x10000#define RR_MOD_IQK GENMASK(19, 4)
drivers/net/wireless/realtek/rtw89/wow.c +2 -1
@@ -40,6 +40,7 @@ static void rtw89_wow_leave_lps(struct rtw89_dev *rtwdev)static int rtw89_wow_config_mac (struct rtw89_dev *rtwdev,bool enable_wow) { +const struct rtw89_mac_gen_def *mac = rtwdev->chip->mac_def;int ret;if (enable_wow) {
@@ -49,7 +50,7 @@ static int rtw89_wow_config_mac(struct rtw89_dev *rtwdev, bool enable_wow)return ret; }rtw89_write32_set (rtwdev,R_AX_RX_FUNCTION_STOP ,B_AX_HDR_RX_STOP ); -rtw89_write32_clr (rtwdev,R_AX_RX_FLTR_OPT ,B_AX_SNIFFER_MODE ); +rtw89_write32_clr (rtwdev, mac->rx_fltr,B_AX_SNIFFER_MODE );rtw89_mac_cfg_ppdu_status (rtwdev,RTW89_MAC_0 , false);rtw89_write32 (rtwdev,R_AX_ACTION_FWD0 ,0 );rtw89_write32 (rtwdev,R_AX_ACTION_FWD1 ,0 );
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 5/6 wifi: rtw89: phy: add phy_gen_def::cr_base to support WiFi 7 chips
In reply to Ping-Ke Shihcr_base is base address of PHY control register. The base of WiFi 6 and 7 chips are 0x1_0000 and 0x2_0000 respectively, so define them accordingly. For example, if PHY address is 0x1330, absolute address is 0x1_1330 for WiFi 6 chips, and 0x2_1330 for WiFi 7 chips.
Meanwhile, there are two copies of PHY hardware named PHY0 and PHY1. The offset between them is 0x2_0000, so the base address of PHY0 and PHY1 are 0x2_0000 and 0x4_0000 respectively.
--- drivers/net/wireless/realtek/rtw89/core.h | 2 + drivers/net/wireless/realtek/rtw89/phy.c | 8 ++++ drivers/net/wireless/realtek/rtw89/phy.h | 48 ++++++++++++++----- drivers/net/wireless/realtek/rtw89/phy_be.c | 10 ++++ drivers/net/wireless/realtek/rtw89/rtw8851b.c | 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 + 8 files changed, 61 insertions(+), 11 deletions(-) create mode 100644 drivers/net/wireless/realtek/rtw89/phy_be.c
drivers/net/wireless/realtek/rtw89/core.h +2 -0
@@ -15,6 +15,7 @@struct rtw89_dev ;struct rtw89_pci_info ;struct rtw89_mac_gen_def ; +struct rtw89_phy_gen_def ;extern const struct ieee80211_ops rtw89_ops;
@@ -3381,6 +3382,7 @@ struct rtw89_chip_info {enum rtw89_chip_gen chip_gen;const struct rtw89_chip_ops *ops;const struct rtw89_mac_gen_def *mac_def; +const struct rtw89_phy_gen_def *phy_def;const char *fw_basename;u8 fw_format_max;bool try_ce_fw;
drivers/net/wireless/realtek/rtw89/phy.c +8 -0
@@ -1446,6 +1446,9 @@ static u32 rtw89_phy0_phy1_offset(struct rtw89_dev *rtwdev, u32 addr)u32 phy_page = addr >>8 ;u32 ofst =0 ; +if (rtwdev->chip->chip_gen ==RTW89_CHIP_BE ) +return addr <0x10000 ?0x20000 :0 ; +switch (phy_page) {case 0x6 :case 0x7 :
@@ -4725,3 +4728,8 @@ void rtw89_phy_config_edcca(struct rtw89_dev *rtwdev, bool scan)rtw89_phy_write32 (rtwdev, reg, hal->edcca_bak); } } + +const struct rtw89_phy_gen_def rtw89_phy_gen_ax = { + .cr_base =0x10000 , +}; +EXPORT_SYMBOL (rtw89_phy_gen_ax);
drivers/net/wireless/realtek/rtw89/phy.h +37 -11
105 lines not on this page · raw message
drivers/net/wireless/realtek/rtw89/phy_be.c new file +10 -0
@@ -0,0 +1,10 @@ +// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause +/* Copyright(c) 2023 Realtek Corporation +*/ + +#include "phy.h" + +const struct rtw89_phy_gen_def rtw89_phy_gen_be = { + .cr_base =0x20000 , +}; +EXPORT_SYMBOL (rtw89_phy_gen_be);
drivers/net/wireless/realtek/rtw89/rtw8851b.c +1 -0
@@ -2337,6 +2337,7 @@ const struct rtw89_chip_info rtw8851b_chip_info = { .chip_gen = RTW89_CHIP_AX, .ops = &rtw8851b_chip_ops, .mac_def = &rtw89_mac_gen_ax, + .phy_def = &rtw89_phy_gen_ax, .fw_basename = RTW8851B_FW_BASENAME, .fw_format_max = RTW8851B_FW_FORMAT_MAX, .try_ce_fw = true,
drivers/net/wireless/realtek/rtw89/rtw8852a.c +1 -0
@@ -2073,6 +2073,7 @@ const struct rtw89_chip_info rtw8852a_chip_info = { .chip_gen = RTW89_CHIP_AX, .ops = &rtw8852a_chip_ops, .mac_def = &rtw89_mac_gen_ax, + .phy_def = &rtw89_phy_gen_ax, .fw_basename = RTW8852A_FW_BASENAME, .fw_format_max = RTW8852A_FW_FORMAT_MAX, .try_ce_fw = false,
drivers/net/wireless/realtek/rtw89/rtw8852b.c +1 -0
@@ -2506,6 +2506,7 @@ const struct rtw89_chip_info rtw8852b_chip_info = { .chip_gen = RTW89_CHIP_AX, .ops = &rtw8852b_chip_ops, .mac_def = &rtw89_mac_gen_ax, + .phy_def = &rtw89_phy_gen_ax, .fw_basename = RTW8852B_FW_BASENAME, .fw_format_max = RTW8852B_FW_FORMAT_MAX, .try_ce_fw = true,
drivers/net/wireless/realtek/rtw89/rtw8852c.c +1 -0
@@ -2803,6 +2803,7 @@ const struct rtw89_chip_info rtw8852c_chip_info = { .chip_gen = RTW89_CHIP_AX, .ops = &rtw8852c_chip_ops, .mac_def = &rtw89_mac_gen_ax, + .phy_def = &rtw89_phy_gen_ax, .fw_basename = RTW8852C_FW_BASENAME, .fw_format_max = RTW8852C_FW_FORMAT_MAX, .try_ce_fw = false,
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 6/6 wifi: rtw89: phy: modify register setting of ENV_MNTR, PHYSTS and DIG
In reply to Ping-Ke ShihFrom: Cheng-Chieh Hsieh <[email protected]>
The ENV_MNTR(environment monitor) is the dynamic mechanism which based on the HW of CCX(Cisco Compatible Extensions) which provide the channel loading and noisy level indicator to debug or support the 802.11k. The PHYSTS provide the detail PHY information per packet we received for debugging. The DIG(dynamic initial gain) is the dynamic mechanism to adjust the packet detect power level by received signal strength to avoid false detection of the WiFi packet.
The address of registers used for ENV_MNTR, PHYSTS and DIG of WiFi 7 IC are different with WiFi 6 series, so we modify the method to access the register address in order to compatible with all WiFi 7 and 6 ICs.
--- drivers/net/wireless/realtek/rtw89/core.h | 4 + drivers/net/wireless/realtek/rtw89/phy.c | 223 +++++++++++++----- drivers/net/wireless/realtek/rtw89/phy.h | 66 ++++++ drivers/net/wireless/realtek/rtw89/phy_be.c | 67 ++++++ drivers/net/wireless/realtek/rtw89/reg.h | 13 + drivers/net/wireless/realtek/rtw89/rtw8851b.c | 4 + drivers/net/wireless/realtek/rtw89/rtw8852a.c | 4 + drivers/net/wireless/realtek/rtw89/rtw8852b.c | 4 + drivers/net/wireless/realtek/rtw89/rtw8852c.c | 4 + 9 files changed, 325 insertions(+), 64 deletions(-)
drivers/net/wireless/realtek/rtw89/core.h +4 -0
@@ -3341,6 +3341,10 @@ struct rtw89_dig_regs {u32 seg0_pd_reg;u32 pd_lower_bound_mask;u32 pd_spatial_reuse_en; +u32 bmode_pd_reg; +u32 bmode_cca_rssi_limit_en; +u32 bmode_pd_lower_bound_reg; +u32 bmode_rssi_nocca_low_th_mask;struct rtw89_reg_def p0_lna_init;struct rtw89_reg_def p1_lna_init;struct rtw89_reg_def p0_tia_init;
drivers/net/wireless/realtek/rtw89/phy.c +159 -64
345 lines not on this page · raw message
drivers/net/wireless/realtek/rtw89/phy.h +66 -0
74 lines not on this page · raw message
drivers/net/wireless/realtek/rtw89/phy_be.c +67 -0
75 lines not on this page · raw message
drivers/net/wireless/realtek/rtw89/reg.h +13 -0
@@ -3998,6 +3998,7 @@#define B_DBCC_80P80_SEL_EVM_RPT_EN BIT(0)#define R_CCX 0x0C00#define B_CCX_EDCCA_OPT_MSK GENMASK(6, 4) +#define B_CCX_EDCCA_OPT_MSK_V1 GENMASK(7, 4)#define B_MEASUREMENT_TRIG_MSK BIT(2)#define B_CCX_TRIG_OPT_MSK BIT(1)#define B_CCX_EN_MSK BIT(0)
@@ -4089,32 +4090,41 @@#define B_SWSI_R_DATA_DONE_V1 BIT(26)#define R_TX_COUNTER 0x1A40#define R_IFS_CLM_TX_CNT 0x1ACC +#define R_IFS_CLM_TX_CNT_V1 0x0ECC#define B_IFS_CLM_EDCCA_EXCLUDE_CCA_FA_MSK GENMASK(31, 16)#define B_IFS_CLM_TX_CNT_MSK GENMASK(15, 0)#define R_IFS_CLM_CCA 0x1AD0 +#define R_IFS_CLM_CCA_V1 0x0ED0#define B_IFS_CLM_OFDMCCA_EXCLUDE_FA_MSK GENMASK(31, 16)#define B_IFS_CLM_CCKCCA_EXCLUDE_FA_MSK GENMASK(15, 0)#define R_IFS_CLM_FA 0x1AD4 +#define R_IFS_CLM_FA_V1 0x0ED4#define B_IFS_CLM_OFDM_FA_MSK GENMASK(31, 16)#define B_IFS_CLM_CCK_FA_MSK GENMASK(15, 0)#define R_IFS_HIS 0x1AD8 +#define R_IFS_HIS_V1 0x0ED8#define B_IFS_T4_HIS_MSK GENMASK(31, 24)#define B_IFS_T3_HIS_MSK GENMASK(23, 16)#define B_IFS_T2_HIS_MSK GENMASK(15, 8)#define B_IFS_T1_HIS_MSK GENMASK(7, 0)#define R_IFS_AVG_L 0x1ADC +#define R_IFS_AVG_L_V1 0x0EDC#define B_IFS_T2_AVG_MSK GENMASK(31, 16)#define B_IFS_T1_AVG_MSK GENMASK(15, 0)#define R_IFS_AVG_H 0x1AE0 +#define R_IFS_AVG_H_V1 0x0EE0#define B_IFS_T4_AVG_MSK GENMASK(31, 16)#define B_IFS_T3_AVG_MSK GENMASK(15, 0)#define R_IFS_CCA_L 0x1AE4 +#define R_IFS_CCA_L_V1 0x0EE4#define B_IFS_T2_CCA_MSK GENMASK(31, 16)#define B_IFS_T1_CCA_MSK GENMASK(15, 0)#define R_IFS_CCA_H 0x1AE8 +#define R_IFS_CCA_H_V1 0x0EE8#define B_IFS_T4_CCA_MSK GENMASK(31, 16)#define B_IFS_T3_CCA_MSK GENMASK(15, 0)#define R_IFSCNT 0x1AEC +#define R_IFSCNT_V1 0x0EEC#define B_IFSCNT_DONE_MSK BIT(16)#define B_IFSCNT_TOTAL_CNT_MSK GENMASK(15, 0)#define R_TXAGC_TP 0x1C04
@@ -4385,6 +4395,7 @@#define B_PKT_POP_EN BIT(8)#define R_SEG0R_PD 0x481C#define R_SEG0R_PD_V1 0x4860 +#define R_SEG0R_PD_V2 0x6A74#define R_SEG0R_EDCCA_LVL 0x4840#define R_SEG0R_EDCCA_LVL_V1 0x4884#define B_SEG0R_PPDU_LVL_MSK GENMASK(31, 24)
@@ -4503,8 +4514,10 @@#define R_DCFO_COMP_S0_V1 0x4A40#define B_DCFO_COMP_S0_V1_MSK GENMASK(13, 0)#define R_BMODE_PDTH_V1 0x4B64 +#define R_BMODE_PDTH_V2 0x6708#define B_BMODE_PDTH_LOWER_BOUND_MSK_V1 GENMASK(31, 24)#define R_BMODE_PDTH_EN_V1 0x4B74 +#define R_BMODE_PDTH_EN_V2 0x6718#define B_BMODE_PDTH_LIMIT_EN_MSK_V1 BIT(30)#define R_CFO_COMP_SEG1_L 0x5384#define R_CFO_COMP_SEG1_H 0x5388
drivers/net/wireless/realtek/rtw89/rtw8851b.c +4 -0
@@ -185,6 +185,10 @@ static const struct rtw89_dig_regs rtw8851b_dig_regs = { .seg0_pd_reg = R_SEG0R_PD_V1, .pd_lower_bound_mask = B_SEG0R_PD_LOWER_BOUND_MSK, .pd_spatial_reuse_en = B_SEG0R_PD_SPATIAL_REUSE_EN_MSK_V1, + .bmode_pd_reg = R_BMODE_PDTH_EN_V1, + .bmode_cca_rssi_limit_en = B_BMODE_PDTH_LIMIT_EN_MSK_V1, + .bmode_pd_lower_bound_reg = R_BMODE_PDTH_V1, + .bmode_rssi_nocca_low_th_mask = B_BMODE_PDTH_LOWER_BOUND_MSK_V1, .p0_lna_init = {R_PATH0_LNA_INIT_V1, B_PATH0_LNA_INIT_IDX_MSK}, .p1_lna_init = {R_PATH1_LNA_INIT_V1, B_PATH1_LNA_INIT_IDX_MSK}, .p0_tia_init = {R_PATH0_TIA_INIT_V1, B_PATH0_TIA_INIT_IDX_MSK_V1},
drivers/net/wireless/realtek/rtw89/rtw8852a.c +4 -0
@@ -478,6 +478,10 @@ static const struct rtw89_dig_regs rtw8852a_dig_regs = { .seg0_pd_reg = R_SEG0R_PD, .pd_lower_bound_mask = B_SEG0R_PD_LOWER_BOUND_MSK, .pd_spatial_reuse_en = B_SEG0R_PD_SPATIAL_REUSE_EN_MSK, + .bmode_pd_reg = R_BMODE_PDTH_EN_V1, + .bmode_cca_rssi_limit_en = B_BMODE_PDTH_LIMIT_EN_MSK_V1, + .bmode_pd_lower_bound_reg = R_BMODE_PDTH_V1, + .bmode_rssi_nocca_low_th_mask = B_BMODE_PDTH_LOWER_BOUND_MSK_V1, .p0_lna_init = {R_PATH0_LNA_INIT, B_PATH0_LNA_INIT_IDX_MSK}, .p1_lna_init = {R_PATH1_LNA_INIT, B_PATH1_LNA_INIT_IDX_MSK}, .p0_tia_init = {R_PATH0_TIA_INIT, B_PATH0_TIA_INIT_IDX_MSK},
drivers/net/wireless/realtek/rtw89/rtw8852b.c +4 -0
@@ -310,6 +310,10 @@ static const struct rtw89_dig_regs rtw8852b_dig_regs = { .seg0_pd_reg = R_SEG0R_PD_V1, .pd_lower_bound_mask = B_SEG0R_PD_LOWER_BOUND_MSK, .pd_spatial_reuse_en = B_SEG0R_PD_SPATIAL_REUSE_EN_MSK_V1, + .bmode_pd_reg = R_BMODE_PDTH_EN_V1, + .bmode_cca_rssi_limit_en = B_BMODE_PDTH_LIMIT_EN_MSK_V1, + .bmode_pd_lower_bound_reg = R_BMODE_PDTH_V1, + .bmode_rssi_nocca_low_th_mask = B_BMODE_PDTH_LOWER_BOUND_MSK_V1, .p0_lna_init = {R_PATH0_LNA_INIT_V1, B_PATH0_LNA_INIT_IDX_MSK}, .p1_lna_init = {R_PATH1_LNA_INIT_V1, B_PATH1_LNA_INIT_IDX_MSK}, .p0_tia_init = {R_PATH0_TIA_INIT_V1, B_PATH0_TIA_INIT_IDX_MSK_V1},
drivers/net/wireless/realtek/rtw89/rtw8852c.c +4 -0
@@ -146,6 +146,10 @@ static const struct rtw89_dig_regs rtw8852c_dig_regs = { .seg0_pd_reg = R_SEG0R_PD, .pd_lower_bound_mask = B_SEG0R_PD_LOWER_BOUND_MSK, .pd_spatial_reuse_en = B_SEG0R_PD_SPATIAL_REUSE_EN_MSK, + .bmode_pd_reg = R_BMODE_PDTH_EN_V1, + .bmode_cca_rssi_limit_en = B_BMODE_PDTH_LIMIT_EN_MSK_V1, + .bmode_pd_lower_bound_reg = R_BMODE_PDTH_V1, + .bmode_rssi_nocca_low_th_mask = B_BMODE_PDTH_LOWER_BOUND_MSK_V1, .p0_lna_init = {R_PATH0_LNA_INIT_V1, B_PATH0_LNA_INIT_IDX_MSK}, .p1_lna_init = {R_PATH1_LNA_INIT_V1, B_PATH1_LNA_INIT_IDX_MSK}, .p0_tia_init = {R_PATH0_TIA_INIT_V1, B_PATH0_TIA_INIT_IDX_MSK_V1},
Signature · 1 line
2.25.1