wifi: rtw89: refactor PHY flow/setting for RTL8922D
Ping-Ke Shih
maintainercover wifi: rtw89: refactor PHY flow/setting for RTL8922D
The RTL8922D uses different PHY settings like MAC part. Refactor to adopt RTL8922D. Additionally, the last patch is to correct MLO connection for a specific condition found by testing.
Eric Huang (2):
wifi: rtw89: phy: extend register to read history 2 of PHY env_monitor
wifi: rtw89: phy: update bb wrapper TPU init
Ping-Ke Shih (8):
wifi: rtw89: mac: clear global interrupt right after power-on
wifi: rtw89: phy: add {read,write}_rf_v3 for RTL8922D
wifi: rtw89: phy: add ops rtw89_phy_gen_be_v1 for RTL8922D
wifi: rtw89: phy: abstract start address and EHT of PHY status bitmap
wifi: rtw89: phy: abstract BB wrap registers to share initial flow
wifi: rtw89: phy: update BB wrapper RFSI
wifi: rtw89: phy: write BB wrapper registers with flush
wifi: rtw89: phy: refine initial flow of BB wrapper
Po-Hao Huang (2):
wifi: rtw89: phy: fix incorrect power limit by mac_id
wifi: rtw89: fix unable to receive probe responses under MLO
connection
drivers/net/wireless/realtek/rtw89/core.h | 2 +- drivers/net/wireless/realtek/rtw89/fw.c | 3 + drivers/net/wireless/realtek/rtw89/mac.c | 2 + drivers/net/wireless/realtek/rtw89/mac.h | 17 + drivers/net/wireless/realtek/rtw89/mac_be.c | 10 + drivers/net/wireless/realtek/rtw89/phy.c | 160 +++++- drivers/net/wireless/realtek/rtw89/phy.h | 20 + drivers/net/wireless/realtek/rtw89/phy_be.c | 563 +++++++++++++++++++- drivers/net/wireless/realtek/rtw89/reg.h | 350 +++++++++++- 9 files changed, 1095 insertions(+), 32 deletions(-)
base-commit: 292c0bc8acb687de7e83fc454bb98af19187b6bf
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 1/12 wifi: rtw89: mac: clear global interrupt right after power-on
The global interrupt indicator is always persistent, and firmware will handle it right after boot. To prevent this unnecessary handling, clear the indicator before downloading firmware.
--- drivers/net/wireless/realtek/rtw89/mac.c | 2 + drivers/net/wireless/realtek/rtw89/mac.h | 9 +++ drivers/net/wireless/realtek/rtw89/mac_be.c | 10 ++++ drivers/net/wireless/realtek/rtw89/reg.h | 66 +++++++++++++++++++++ 4 files changed, 87 insertions(+)
drivers/net/wireless/realtek/rtw89/mac.c +2 -0
@@ -1554,6 +1554,7 @@ static int rtw89_mac_power_switch(struct rtw89_dev *rtwdev, bool on)set_bit (RTW89_FLAG_CMAC0_FUNC , rtwdev->flags);rtw89_mac_update_scoreboard (rtwdev,MAC_AX_NOTIFY_TP_MAJOR ); +rtw89_mac_clr_aon_intr (rtwdev); }else {clear_bit (RTW89_FLAG_POWERON , rtwdev->flags);clear_bit (RTW89_FLAG_DMAC_FUNC , rtwdev->flags);
@@ -7298,6 +7299,7 @@ const struct rtw89_mac_gen_def rtw89_mac_gen_ax = { .sys_init = sys_init_ax, .trx_init = trx_init_ax, .preload_init = preload_init_set_ax, + .clr_aon_intr = NULL, .err_imr_ctrl = err_imr_ctrl_ax, .mac_func_en = NULL, .hci_func_en = rtw89_mac_hci_func_en_ax,
drivers/net/wireless/realtek/rtw89/mac.h +9 -0
@@ -1039,6 +1039,7 @@ struct rtw89_mac_gen_def {int (*trx_init)(struct rtw89_dev *rtwdev);int (*preload_init)(struct rtw89_dev *rtwdev,u8 mac_idx,enum rtw89_qta_mode mode); +void (*clr_aon_intr)(struct rtw89_dev *rtwdev);void (*err_imr_ctrl)(struct rtw89_dev *rtwdev,bool en);int (*mac_func_en)(struct rtw89_dev *rtwdev);void (*hci_func_en)(struct rtw89_dev *rtwdev);
@@ -1251,6 +1252,14 @@ int rtw89_mac_check_mac_en(struct rtw89_dev *rtwdev, u8 band,return mac->check_mac_en (rtwdev, band, sel); } +static inline void rtw89_mac_clr_aon_intr (struct rtw89_dev *rtwdev) +{ +const struct rtw89_mac_gen_def *mac = rtwdev->chip->mac_def; + +if (mac->clr_aon_intr) + mac->clr_aon_intr (rtwdev); +} +int rtw89_mac_write_lte (struct rtw89_dev *rtwdev,const u32 offset,u32 val);int rtw89_mac_read_lte (struct rtw89_dev *rtwdev,const u32 offset,u32 *val);int rtw89_mac_dle_dfi_cfg (struct rtw89_dev *rtwdev,struct rtw89_mac_dle_dfi_ctrl *ctrl);
drivers/net/wireless/realtek/rtw89/mac_be.c +10 -0
@@ -1870,6 +1870,15 @@ static int preload_init_be(struct rtw89_dev *rtwdev, u8 mac_idx,return 0 ; } +static void clr_aon_intr_be (struct rtw89_dev *rtwdev) +{ +if (rtwdev->hci.type !=RTW89_HCI_TYPE_PCIE ) +return ; + +rtw89_write32_clr (rtwdev,R_BE_FWS0IMR ,B_BE_FS_GPIOA_INT_EN ); +rtw89_write32_set (rtwdev,R_BE_FWS0ISR ,B_BE_FS_GPIOA_INT ); +} +static int dbcc_bb_ctrl_be (struct rtw89_dev *rtwdev,bool bb1_en) {u32 set =B_BE_FEN_BB1PLAT_RSTB |B_BE_FEN_BB1_IP_RSTN ;
@@ -3041,6 +3050,7 @@ const struct rtw89_mac_gen_def rtw89_mac_gen_be = { .sys_init = sys_init_be, .trx_init = trx_init_be, .preload_init = preload_init_be, + .clr_aon_intr = clr_aon_intr_be, .err_imr_ctrl = err_imr_ctrl_be, .mac_func_en = mac_func_en_be, .hci_func_en = rtw89_mac_hci_func_en_be,
drivers/net/wireless/realtek/rtw89/reg.h +66 -0
72 lines not on this page · raw message
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerRe: [PATCH rtw-next 01/12] wifi: rtw89: mac: clear global interrupt right after power-on
Quoted 5 lines · Ping-Ke Shih
The global interrupt indicator is always persistent, and firmware will handle it right after boot. To prevent this unnecessary handling, clear the indicator before downloading firmware.
Signed-off-by Ping-Ke Shih <[email protected]>
12 patch(es) applied to rtw-next branch of rtw.git, thanks.
e497fc05e9f5 wifi: rtw89: mac: clear global interrupt right after power-on 1e3c50e0b491 wifi: rtw89: phy: add {read,write}_rf_v3 for RTL8922D 3b99dac7bf91 wifi: rtw89: phy: add ops rtw89_phy_gen_be_v1 for RTL8922D fc31826cbc24 wifi: rtw89: phy: abstract start address and EHT of PHY status bitmap 0e8818a309f7 wifi: rtw89: phy: extend register to read history 2 of PHY env_monitor ace51dc80334 wifi: rtw89: phy: abstract BB wrap registers to share initial flow d6cc6e12c15b wifi: rtw89: phy: update bb wrapper TPU init51cc8220f8ce wifi: rtw89: phy: update BB wrapper RFSIee866bb4aa78 wifi: rtw89: phy: write BB wrapper registers with flush a0343cdc7767 wifi: rtw89: phy: refine initial flow of BB wrapper 76bada91a41a wifi: rtw89: phy: fix incorrect power limit by mac_id 6f6d7a325fbd wifi: rtw89: fix unable to receive probe responses under MLO connection
Ping-Ke Shih
maintainerPATCH 2/12 wifi: rtw89: phy: add {read,write}_rf_v3 for RTL8922D
In reply to Ping-Ke ShihImplement to access RF registers for RTL8922D.
--- drivers/net/wireless/realtek/rtw89/phy.c | 122 +++++++++++++++++++++++ drivers/net/wireless/realtek/rtw89/phy.h | 4 + drivers/net/wireless/realtek/rtw89/reg.h | 13 +++ 3 files changed, 139 insertions(+)
drivers/net/wireless/realtek/rtw89/phy.c +122 -0
@@ -1028,6 +1028,68 @@ u32 rtw89_phy_read_rf_v2(struct rtw89_dev *rtwdev, enum rtw89_rf_path rf_path, }EXPORT_SYMBOL (rtw89_phy_read_rf_v2); +static u32 rtw89_phy_read_full_rf_v3_a (struct rtw89_dev *rtwdev, +enum rtw89_rf_path rf_path,u32 addr) +{ +bool done; +u32 busy; +int ret; +u32 val; + + ret =read_poll_timeout_atomic (rtw89_phy_read32_mask, busy, !busy, +1 ,30 , false, + rtwdev,R_SW_SI_DATA_BE4 , +B_SW_SI_W_BUSY_BE4 |B_SW_SI_R_BUSY_BE4 ); +if (ret) { +rtw89_warn (rtwdev,"poll HWSI is busy\n" ); +return INV_RF_DATA ; + } + + val =u32_encode_bits (rf_path,GENMASK (10 ,8 )) | +u32_encode_bits (addr,GENMASK (7 ,0 )); + +rtw89_phy_write32_mask (rtwdev,R_SW_SI_READ_ADDR_BE4 ,B_SW_SI_READ_ADDR_BE4 , val); + + ret =read_poll_timeout_atomic (rtw89_phy_read32_mask, done, done, +1 ,30 , false, + rtwdev,R_SW_SI_DATA_BE4 ,B_SW_SI_READ_DATA_DONE_BE4 ); +if (ret) { +rtw89_warn (rtwdev,"read HWSI is busy\n" ); +return INV_RF_DATA ; + } + + val =rtw89_phy_read32_mask (rtwdev,R_SW_SI_DATA_BE4 ,B_SW_SI_READ_DATA_BE4 ); + +return val; +} + +static u32 rtw89_phy_read_rf_v3_a (struct rtw89_dev *rtwdev, +enum rtw89_rf_path rf_path,u32 addr,u32 mask) +{ +u32 val; + + val =rtw89_phy_read_full_rf_v3_a (rtwdev, rf_path, addr); + +return (val & mask) >>__ffs (mask); +} + +u32 rtw89_phy_read_rf_v3 (struct rtw89_dev *rtwdev,enum rtw89_rf_path rf_path, +u32 addr,u32 mask) +{ +bool ad_sel =u32_get_bits (addr,RTW89_RF_ADDR_ADSEL_MASK ); + +if (rf_path >= rtwdev->chip->rf_path_num) { +rtw89_err (rtwdev,"unsupported rf path (%d)\n" , rf_path); +return INV_RF_DATA ; + } + +if (ad_sel) +return rtw89_phy_read_rf (rtwdev, rf_path, addr, mask); +else +return rtw89_phy_read_rf_v3_a (rtwdev, rf_path, addr, mask); +} +EXPORT_SYMBOL (rtw89_phy_read_rf_v3); +bool rtw89_phy_write_rf (struct rtw89_dev *rtwdev,enum rtw89_rf_path rf_path,u32 addr,u32 mask,u32 data) {
@@ -1167,6 +1229,66 @@ bool rtw89_phy_write_rf_v2(struct rtw89_dev *rtwdev, enum rtw89_rf_path rf_path, }EXPORT_SYMBOL (rtw89_phy_write_rf_v2); +static +bool rtw89_phy_write_full_rf_v3_a (struct rtw89_dev *rtwdev,enum rtw89_rf_path rf_path, +u32 addr,u32 data) +{ +u32 busy; +u32 val; +int ret; + + ret =read_poll_timeout_atomic (rtw89_phy_read32_mask, busy, !busy, +1 ,30 , false, + rtwdev,R_SW_SI_DATA_BE4 , +B_SW_SI_W_BUSY_BE4 |B_SW_SI_R_BUSY_BE4 ); +if (ret) { +rtw89_warn (rtwdev,"[%s] HWSI is busy\n" , __func__); +return false; + } + + val =u32_encode_bits (rf_path,B_SW_SI_DATA_PATH_BE4 ) | +u32_encode_bits (addr,B_SW_SI_DATA_ADR_BE4 ) | +u32_encode_bits (data,B_SW_SI_DATA_DAT_BE4 ); + +rtw89_phy_write32 (rtwdev,R_SW_SI_WDATA_BE4 , val); + +return true; +} + +static +bool rtw89_phy_write_rf_a_v3 (struct rtw89_dev *rtwdev,enum rtw89_rf_path rf_path, +u32 addr,u32 mask,u32 data) +{ +u32 val; + +if (mask ==RFREG_MASK ) { + val = data; + }else { + val =rtw89_phy_read_full_rf_v3_a (rtwdev, rf_path, addr); + val &= ~mask; + val |= (data <<__ffs (mask)) & mask; + } + +return rtw89_phy_write_full_rf_v3_a (rtwdev, rf_path, addr, val); +} + +bool rtw89_phy_write_rf_v3 (struct rtw89_dev *rtwdev,enum rtw89_rf_path rf_path, +u32 addr,u32 mask,u32 data) +{ +bool ad_sel =u32_get_bits (addr,RTW89_RF_ADDR_ADSEL_MASK ); + +if (rf_path >= rtwdev->chip->rf_path_num) { +rtw89_err (rtwdev,"unsupported rf path (%d)\n" , rf_path); +return INV_RF_DATA ; + } + +if (ad_sel) +return rtw89_phy_write_rf (rtwdev, rf_path, addr, mask, data); +else +return rtw89_phy_write_rf_a_v3 (rtwdev, rf_path, addr, mask, data); +} +EXPORT_SYMBOL (rtw89_phy_write_rf_v3); +static bool rtw89_chip_rf_v1 (struct rtw89_dev *rtwdev) {return rtwdev->chip->ops->write_rf == rtw89_phy_write_rf_v1;
drivers/net/wireless/realtek/rtw89/phy.h +4 -0
@@ -823,12 +823,16 @@ u32 rtw89_phy_read_rf_v1(struct rtw89_dev *rtwdev, enum rtw89_rf_path rf_path, u32 addr, u32 mask);u32 rtw89_phy_read_rf_v2 (struct rtw89_dev *rtwdev,enum rtw89_rf_path rf_path,u32 addr,u32 mask); +u32 rtw89_phy_read_rf_v3 (struct rtw89_dev *rtwdev,enum rtw89_rf_path rf_path, +u32 addr,u32 mask);bool rtw89_phy_write_rf (struct rtw89_dev *rtwdev,enum rtw89_rf_path rf_path,u32 addr,u32 mask,u32 data);bool rtw89_phy_write_rf_v1 (struct rtw89_dev *rtwdev,enum rtw89_rf_path rf_path,u32 addr,u32 mask,u32 data);bool rtw89_phy_write_rf_v2 (struct rtw89_dev *rtwdev,enum rtw89_rf_path rf_path,u32 addr,u32 mask,u32 data); +bool rtw89_phy_write_rf_v3 (struct rtw89_dev *rtwdev,enum rtw89_rf_path rf_path, +u32 addr,u32 mask,u32 data);void rtw89_phy_init_bb_reg (struct rtw89_dev *rtwdev);void rtw89_phy_init_bb_afe (struct rtw89_dev *rtwdev);void rtw89_phy_init_rf_reg (struct rtw89_dev *rtwdev,bool noio);
drivers/net/wireless/realtek/rtw89/reg.h +13 -0
@@ -9893,6 +9893,19 @@#define R_TSSI_K_P1 0xE7A0#define B_TSSI_K_OFDM_P1 GENMASK(29, 20) +#define R_SW_SI_WDATA_BE4 0x20370 +#define B_SW_SI_DATA_PATH_BE4 GENMASK(31, 28) +#define B_SW_SI_DATA_ADR_BE4 GENMASK(27, 20) +#define B_SW_SI_DATA_DAT_BE4 GENMASK(19, 0) +#define R_SW_SI_READ_ADDR_BE4 0x20378 +#define B_SW_SI_READ_ADDR_BE4 GENMASK(10, 0) + +#define R_SW_SI_DATA_BE4 0x2CF4C +#define B_SW_SI_READ_DATA_BE4 GENMASK(19, 0) +#define B_SW_SI_W_BUSY_BE4 BIT(24) +#define B_SW_SI_R_BUSY_BE4 BIT(25) +#define B_SW_SI_READ_DATA_DONE_BE4 BIT(26) +/* WiFi CPU local domain */ #define R_AX_WDT_CTRL 0x0040#define B_AX_WDT_EN BIT(31)
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 3/12 wifi: rtw89: phy: add ops rtw89_phy_gen_be_v1 for RTL8922D
In reply to Ping-Ke ShihDefine RTL8922D specific registers, including PHY base control register, PHY status, CFO registers, and TX power registers.
--- drivers/net/wireless/realtek/rtw89/phy.h | 1 + drivers/net/wireless/realtek/rtw89/phy_be.c | 134 +++++++++++++++++++- drivers/net/wireless/realtek/rtw89/reg.h | 58 ++++++++- 3 files changed, 185 insertions(+), 8 deletions(-)
drivers/net/wireless/realtek/rtw89/phy.h +1 -0
@@ -559,6 +559,7 @@ struct rtw89_phy_gen_def {extern const struct rtw89_phy_gen_def rtw89_phy_gen_ax;extern const struct rtw89_phy_gen_def rtw89_phy_gen_be; +extern const struct rtw89_phy_gen_def rtw89_phy_gen_be_v1;static inline void rtw89_phy_write8 (struct rtw89_dev *rtwdev,u32 addr,u8 data)
drivers/net/wireless/realtek/rtw89/phy_be.c +130 -4
168 lines not on this page · raw message
drivers/net/wireless/realtek/rtw89/reg.h +54 -4
148 lines not on this page · raw message
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 4/12 wifi: rtw89: phy: abstract start address and EHT of PHY status bitmap
In reply to Ping-Ke ShihSelect PHY status being reported by a set of addresses. Abstract the address and EHT bitmap to share common flow.
--- drivers/net/wireless/realtek/rtw89/phy.c | 31 +++++++++++++++++---- drivers/net/wireless/realtek/rtw89/phy.h | 2 ++ drivers/net/wireless/realtek/rtw89/phy_be.c | 4 +++ drivers/net/wireless/realtek/rtw89/reg.h | 5 +++- 4 files changed, 36 insertions(+), 6 deletions(-)
drivers/net/wireless/realtek/rtw89/phy.c +26 -5
@@ -6399,14 +6399,16 @@ static bool rtw89_physts_ie_page_valid(struct rtw89_dev *rtwdev,return true; } -static u32 rtw89_phy_get_ie_bitmap_addr (enum rtw89_phy_status_bitmap ie_page) +static u32 rtw89_phy_get_ie_bitmap_addr (struct rtw89_dev *rtwdev, +enum rtw89_phy_status_bitmap ie_page) { +const struct rtw89_phy_gen_def *phy = rtwdev->chip->phy_def;static const u8 ie_page_shift =2 ;if (ie_page ==RTW89_EHT_PKT ) -return R_PHY_STS_BITMAP_EHT ; +return phy->physt_bmp_eht; -return R_PHY_STS_BITMAP_ADDR_START + (ie_page << ie_page_shift); +return phy->physt_bmp_start + (ie_page << ie_page_shift); } static u32 rtw89_physts_get_ie_bitmap(struct rtw89_dev *rtwdev,
@@ -6418,7 +6420,7 @@ static u32 rtw89_physts_get_ie_bitmap(struct rtw89_dev *rtwdev,if (!rtw89_physts_ie_page_valid (rtwdev, &ie_page))return 0 ; - addr =rtw89_phy_get_ie_bitmap_addr (ie_page); + addr =rtw89_phy_get_ie_bitmap_addr (rtwdev, ie_page);return rtw89_phy_read32_idx (rtwdev, addr,MASKDWORD , phy_idx); }
@@ -6436,7 +6438,7 @@ static void rtw89_physts_set_ie_bitmap(struct rtw89_dev *rtwdev,if (chip->chip_id ==RTL8852A ) val &=B_PHY_STS_BITMAP_MSK_52A ; - addr =rtw89_phy_get_ie_bitmap_addr (ie_page); + addr =rtw89_phy_get_ie_bitmap_addr (rtwdev, ie_page);rtw89_phy_write32_idx (rtwdev, addr,MASKDWORD , val, phy_idx); }
@@ -6460,6 +6462,17 @@ static void rtw89_physts_enable_fail_report(struct rtw89_dev *rtwdev, } } +static void rtw89_physts_enable_hdr_2 (struct rtw89_dev *rtwdev,enum rtw89_phy_idx phy_idx) +{ +const struct rtw89_chip_info *chip = rtwdev->chip; + +if (chip->chip_gen ==RTW89_CHIP_AX || chip->chip_id ==RTL8922A ) +return ; + +rtw89_phy_write32_idx_set (rtwdev,R_STS_HDR2_PARSING_BE4 , +B_STS_HDR2_PARSING_BE4 , phy_idx); +} +static void __rtw89_physts_parsing_init (struct rtw89_dev *rtwdev,enum rtw89_phy_idx phy_idx) {
@@ -6469,6 +6482,9 @@ static void __rtw89_physts_parsing_init(struct rtw89_dev *rtwdev,rtw89_physts_enable_fail_report (rtwdev, false, phy_idx); +/* enable hdr_2 for 8922D (PHYSTS_BE_GEN2 above) */ +rtw89_physts_enable_hdr_2 (rtwdev, phy_idx); +for (i =0 ; i <RTW89_PHYSTS_BITMAP_NUM ; i++) {if (i ==RTW89_RSVD_9 || (i ==RTW89_EHT_PKT && chip->chip_gen ==RTW89_CHIP_AX ))
@@ -6834,6 +6850,9 @@ static void rtw89_phy_dig_sdagc_follow_pagc_config(struct rtw89_dev *rtwdev, {const struct rtw89_dig_regs *dig_regs = rtwdev->chip->dig_regs; +if (rtwdev->chip->chip_gen !=RTW89_CHIP_AX ) +return ; +rtw89_phy_write32_idx (rtwdev, dig_regs->p0_p20_pagcugc_en.addr, dig_regs->p0_p20_pagcugc_en.mask, enable, bb->phy_idx); rtw89_phy_write32_idx(rtwdev, dig_regs->p0_s20_pagcugc_en.addr,
@@ -8203,6 +8222,8 @@ static const struct rtw89_cfo_regs rtw89_cfo_regs_ax = {const struct rtw89_phy_gen_def rtw89_phy_gen_ax = { .cr_base =0x10000 , + .physt_bmp_start =R_PHY_STS_BITMAP_ADDR_START , + .physt_bmp_eht =0xfc , .ccx = &rtw89_ccx_regs_ax, .physts = &rtw89_physts_regs_ax, .cfo = &rtw89_cfo_regs_ax,
drivers/net/wireless/realtek/rtw89/phy.h +2 -0
@@ -531,6 +531,8 @@ struct rtw89_phy_rfk_log_fmt {struct rtw89_phy_gen_def {u32 cr_base; +u32 physt_bmp_start; +u32 physt_bmp_eht;const struct rtw89_ccx_regs *ccx;const struct rtw89_physts_regs *physts;const struct rtw89_cfo_regs *cfo;
drivers/net/wireless/realtek/rtw89/phy_be.c +4 -0
@@ -1112,6 +1112,8 @@ static void rtw89_phy_set_txpwr_limit_ru_be(struct rtw89_dev *rtwdev,const struct rtw89_phy_gen_def rtw89_phy_gen_be = { .cr_base =0x20000 , + .physt_bmp_start =R_PHY_STS_BITMAP_ADDR_START , + .physt_bmp_eht =R_PHY_STS_BITMAP_EHT , .ccx = &rtw89_ccx_regs_be, .physts = &rtw89_physts_regs_be, .cfo = &rtw89_cfo_regs_be,
@@ -1130,6 +1132,8 @@ EXPORT_SYMBOL(rtw89_phy_gen_be);const struct rtw89_phy_gen_def rtw89_phy_gen_be_v1 = { .cr_base =0x0 , + .physt_bmp_start =R_PHY_STS_BITMAP_ADDR_START_BE4 , + .physt_bmp_eht =R_PHY_STS_BITMAP_EHT_BE4 , .ccx = &rtw89_ccx_regs_be_v1, .physts = &rtw89_physts_regs_be_v1, .cfo = &rtw89_cfo_regs_be_v1,
drivers/net/wireless/realtek/rtw89/reg.h +4 -1
@@ -8464,6 +8464,7 @@#define B_STS_DIS_TRIG_BY_FAIL BIT(3)#define B_STS_DIS_TRIG_BY_BRK BIT(2)#define R_PHY_STS_BITMAP_ADDR_START R_PHY_STS_BITMAP_SEARCH_FAIL +#define R_PHY_STS_BITMAP_ADDR_START_BE4 0x2073C#define B_PHY_STS_BITMAP_ADDR_MASK GENMASK(6, 2)#define R_PHY_STS_BITMAP_SEARCH_FAIL 0x073C#define B_PHY_STS_BITMAP_MSK_52A 0x337cff3f
@@ -8482,6 +8483,7 @@#define R_PHY_STS_BITMAP_VHT 0x0770#define R_PHY_STS_BITMAP_HE 0x0774#define R_PHY_STS_BITMAP_EHT 0x0788 +#define R_PHY_STS_BITMAP_EHT_BE4 0x20788#define R_EDCCA_RPTREG_SEL_BE 0x078C#define B_EDCCA_RPTREG_SEL_BE_MSK GENMASK(22, 20)#define R_PMAC_GNT 0x0980
@@ -9914,7 +9916,8 @@#define R_CHINFO_SEG_BE4 0x200B4#define B_CHINFO_SEG_LEN_BE4 GENMASK(12, 10) - +#define R_STS_HDR2_PARSING_BE4 0x2070C +#define B_STS_HDR2_PARSING_BE4 BIT(10)#define R_SW_SI_WDATA_BE4 0x20370#define B_SW_SI_DATA_PATH_BE4 GENMASK(31, 28)#define B_SW_SI_DATA_ADR_BE4 GENMASK(27, 20)
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 5/12 wifi: rtw89: phy: extend register to read history 2 of PHY env_monitor
In reply to Ping-Ke ShihFrom: Eric Huang <[email protected]>
For old chips, history is 8 bits storing in single one register, and RTL8922D's one is 16 bits and two registers. Extend to common flow accordingly.
--- drivers/net/wireless/realtek/rtw89/core.h | 2 +- drivers/net/wireless/realtek/rtw89/phy.c | 6 ++++-- drivers/net/wireless/realtek/rtw89/phy.h | 1 + drivers/net/wireless/realtek/rtw89/phy_be.c | 2 ++ 4 files changed, 8 insertions(+), 3 deletions(-)
drivers/net/wireless/realtek/rtw89/core.h +1 -1
@@ -5683,7 +5683,7 @@ struct rtw89_env_monitor_info {u16 ifs_clm_cckfa;u16 ifs_clm_cckcca_excl_fa;u16 ifs_clm_total_ifs; -u8 ifs_clm_his[RTW89_IFS_CLM_NUM ]; +u16 ifs_clm_his[RTW89_IFS_CLM_NUM ];u16 ifs_clm_avg[RTW89_IFS_CLM_NUM ];u16 ifs_clm_cca[RTW89_IFS_CLM_NUM ];u8 ifs_clm_tx_ratio;
drivers/net/wireless/realtek/rtw89/phy.c +4 -2
@@ -6132,11 +6132,12 @@ static bool rtw89_phy_ifs_clm_get_result(struct rtw89_dev *rtwdev, env->ifs_clm_his[1 ] =rtw89_phy_read32_idx (rtwdev, ccx->ifs_his_addr, ccx->ifs_t2_his_mask, bb->phy_idx); + env->ifs_clm_his[2 ] = -rtw89_phy_read32_idx (rtwdev, ccx->ifs_his_addr, +rtw89_phy_read32_idx (rtwdev, ccx->ifs_his_addr2, ccx->ifs_t3_his_mask, bb->phy_idx); env->ifs_clm_his[3 ] = -rtw89_phy_read32_idx (rtwdev, ccx->ifs_his_addr, +rtw89_phy_read32_idx (rtwdev, ccx->ifs_his_addr2, ccx->ifs_t4_his_mask, bb->phy_idx); env->ifs_clm_avg[0] =
@@ -8177,6 +8178,7 @@ static const struct rtw89_ccx_regs rtw89_ccx_regs_ax = { .ifs_clm_ofdm_fa_mask = B_IFS_CLM_OFDM_FA_MSK, .ifs_clm_cck_fa_mask = B_IFS_CLM_CCK_FA_MSK, .ifs_his_addr = R_IFS_HIS, + .ifs_his_addr2 = R_IFS_HIS, .ifs_t4_his_mask = B_IFS_T4_HIS_MSK, .ifs_t3_his_mask = B_IFS_T3_HIS_MSK, .ifs_t2_his_mask = B_IFS_T2_HIS_MSK,
drivers/net/wireless/realtek/rtw89/phy.h +1 -0
@@ -416,6 +416,7 @@ struct rtw89_ccx_regs {u32 ifs_clm_ofdm_fa_mask;u32 ifs_clm_cck_fa_mask;u32 ifs_his_addr; +u32 ifs_his_addr2;u32 ifs_t4_his_mask;u32 ifs_t3_his_mask;u32 ifs_t2_his_mask;
drivers/net/wireless/realtek/rtw89/phy_be.c +2 -0
@@ -44,6 +44,7 @@ static const struct rtw89_ccx_regs rtw89_ccx_regs_be = { .ifs_clm_ofdm_fa_mask = B_IFS_CLM_OFDM_FA_MSK, .ifs_clm_cck_fa_mask = B_IFS_CLM_CCK_FA_MSK, .ifs_his_addr = R_IFS_HIS_V1, + .ifs_his_addr2 = R_IFS_HIS_V1, .ifs_t4_his_mask = B_IFS_T4_HIS_MSK, .ifs_t3_his_mask = B_IFS_T3_HIS_MSK, .ifs_t2_his_mask = B_IFS_T2_HIS_MSK,
@@ -111,6 +112,7 @@ static const struct rtw89_ccx_regs rtw89_ccx_regs_be_v1 = { .ifs_clm_ofdm_fa_mask = B_IFS_CLM_OFDM_FA_MSK, .ifs_clm_cck_fa_mask = B_IFS_CLM_CCK_FA_MSK, .ifs_his_addr = R_IFS_T1_HIS_BE4, + .ifs_his_addr2 = R_IFS_T3_HIS_BE4, /* for 3/4 */ .ifs_t4_his_mask = B_IFS_T4_HIS_BE4, .ifs_t3_his_mask = B_IFS_T3_HIS_BE4, .ifs_t2_his_mask = B_IFS_T2_HIS_BE4,
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 6/12 wifi: rtw89: phy: abstract BB wrap registers to share initial flow
In reply to Ping-Ke ShihBB wrap registers are to configure TX power in MAC register domain, but they are controlled and designed by BB layer. Since coming chips use different register address, add a struct to define them.
--- drivers/net/wireless/realtek/rtw89/phy.c | 1 + drivers/net/wireless/realtek/rtw89/phy.h | 6 ++++++ drivers/net/wireless/realtek/rtw89/phy_be.c | 20 ++++++++++++++++++-- drivers/net/wireless/realtek/rtw89/reg.h | 2 ++ 4 files changed, 27 insertions(+), 2 deletions(-)
drivers/net/wireless/realtek/rtw89/phy.c +1 -0
@@ -8229,6 +8229,7 @@ const struct rtw89_phy_gen_def rtw89_phy_gen_ax = { .ccx = &rtw89_ccx_regs_ax, .physts = &rtw89_physts_regs_ax, .cfo = &rtw89_cfo_regs_ax, + .bb_wrap = NULL, .phy0_phy1_offset = rtw89_phy0_phy1_offset_ax, .config_bb_gain = rtw89_phy_config_bb_gain_ax, .preinit_rf_nctl = rtw89_phy_preinit_rf_nctl_ax,
drivers/net/wireless/realtek/rtw89/phy.h +6 -0
@@ -460,6 +460,11 @@ struct rtw89_cfo_regs {u32 valid_0_mask; }; +struct rtw89_bb_wrap_regs { +u32 pwr_macid_lmt; +u32 pwr_macid_path; +}; +enum rtw89_bandwidth_section_num_ax {RTW89_BW20_SEC_NUM_AX =8 ,RTW89_BW40_SEC_NUM_AX =4 ,
@@ -537,6 +542,7 @@ struct rtw89_phy_gen_def {const struct rtw89_ccx_regs *ccx;const struct rtw89_physts_regs *physts;const struct rtw89_cfo_regs *cfo; +const struct rtw89_bb_wrap_regs *bb_wrap;u32 (*phy0_phy1_offset)(struct rtw89_dev *rtwdev,u32 addr); void (*config_bb_gain)(struct rtw89_dev *rtwdev, const struct rtw89_reg2_def *reg,
drivers/net/wireless/realtek/rtw89/phy_be.c +18 -2
@@ -160,6 +160,16 @@ static const struct rtw89_cfo_regs rtw89_cfo_regs_be_v1 = { .valid_0_mask = B_DCFO_OPT_EN_BE, }; +static const struct rtw89_bb_wrap_regs rtw89_bb_wrap_regs_be = { + .pwr_macid_lmt =R_BE_PWR_MACID_LMT_BASE , + .pwr_macid_path =R_BE_PWR_MACID_PATH_BASE , +}; + +static const struct rtw89_bb_wrap_regs rtw89_bb_wrap_regs_be_v1 = { + .pwr_macid_lmt =R_BE_PWR_MACID_LMT_BASE_V1 , + .pwr_macid_path =R_BE_PWR_MACID_PATH_BASE_V1 , +}; +static u32 rtw89_phy0_phy1_offset_be (struct rtw89_dev *rtwdev,u32 addr) {u32 phy_page = addr >>8 ;
@@ -406,9 +416,11 @@ static void rtw89_phy_preinit_rf_nctl_be_v1(struct rtw89_dev *rtwdev)static void rtw89_phy_bb_wrap_pwr_by_macid_init (struct rtw89_dev *rtwdev) { +const struct rtw89_phy_gen_def *phy = rtwdev->chip->phy_def; +const struct rtw89_bb_wrap_regs *bb_wrap = phy->bb_wrap;u32 macid_idx, cr, base_macid_lmt, max_macid =32 ; - base_macid_lmt =R_BE_PWR_MACID_LMT_BASE ; + base_macid_lmt = bb_wrap->pwr_macid_lmt;for (macid_idx =0 ; macid_idx <4 * max_macid; macid_idx +=4 ) { cr = base_macid_lmt + macid_idx;
@@ -419,8 +431,10 @@ void rtw89_phy_bb_wrap_pwr_by_macid_init(struct rtw89_dev *rtwdev)static void rtw89_phy_bb_wrap_tx_path_by_macid_init (struct rtw89_dev *rtwdev) { +const struct rtw89_phy_gen_def *phy = rtwdev->chip->phy_def; +const struct rtw89_bb_wrap_regs *bb_wrap = phy->bb_wrap; +u32 cr = bb_wrap->pwr_macid_path;int i, max_macid =32 ; -u32 cr =R_BE_PWR_MACID_PATH_BASE ;for (i =0 ; i < max_macid; i++, cr +=4 )rtw89_write32 (rtwdev, cr,0x03C86000 );
@@ -1119,6 +1133,7 @@ const struct rtw89_phy_gen_def rtw89_phy_gen_be = { .ccx = &rtw89_ccx_regs_be, .physts = &rtw89_physts_regs_be, .cfo = &rtw89_cfo_regs_be, + .bb_wrap = &rtw89_bb_wrap_regs_be, .phy0_phy1_offset = rtw89_phy0_phy1_offset_be, .config_bb_gain = rtw89_phy_config_bb_gain_be, .preinit_rf_nctl = rtw89_phy_preinit_rf_nctl_be,
@@ -1139,6 +1154,7 @@ const struct rtw89_phy_gen_def rtw89_phy_gen_be_v1 = { .ccx = &rtw89_ccx_regs_be_v1, .physts = &rtw89_physts_regs_be_v1, .cfo = &rtw89_cfo_regs_be_v1, + .bb_wrap = &rtw89_bb_wrap_regs_be_v1, .phy0_phy1_offset = rtw89_phy0_phy1_offset_be_v1, .config_bb_gain = rtw89_phy_config_bb_gain_be, .preinit_rf_nctl = rtw89_phy_preinit_rf_nctl_be_v1,
drivers/net/wireless/realtek/rtw89/reg.h +2 -0
@@ -6365,7 +6365,9 @@#define B_BE_PTA_GNT_BT1_BB_SWCTRL BIT(0)#define R_BE_PWR_MACID_PATH_BASE 0x0E500 +#define R_BE_PWR_MACID_PATH_BASE_V1 0x1C000#define R_BE_PWR_MACID_LMT_BASE 0x0ED00 +#define R_BE_PWR_MACID_LMT_BASE_V1 0x1C800#define R_BE_CMAC_FUNC_EN 0x10000#define R_BE_CMAC_FUNC_EN_C1 0x14000
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 7/12 wifi: rtw89: phy: update bb wrapper TPU init
In reply to Ping-Ke ShihFrom: Eric Huang <[email protected]>
Set DBW by rate to on in TPU (TX Power Unit) init, and extend to initialize two hardware bands.
--- drivers/net/wireless/realtek/rtw89/phy_be.c | 23 ++++++++++++++------- drivers/net/wireless/realtek/rtw89/reg.h | 1 + 2 files changed, 17 insertions(+), 7 deletions(-)
drivers/net/wireless/realtek/rtw89/phy_be.c +16 -7
@@ -443,14 +443,23 @@ void rtw89_phy_bb_wrap_tx_path_by_macid_init(struct rtw89_dev *rtwdev)static void rtw89_phy_bb_wrap_tpu_set_all (struct rtw89_dev *rtwdev,enum rtw89_mac_idx mac_idx) { -u32 addr; +u32 addr, t; + + addr =rtw89_mac_reg_by_idx (rtwdev,R_BE_PWR_FTM_SS , mac_idx); +rtw89_write32_mask (rtwdev, addr,B_BE_PWR_BY_RATE_DBW_ON ,0x3 ); -for (addr =R_BE_PWR_BY_RATE ; addr <=R_BE_PWR_BY_RATE_END ; addr +=4 ) -rtw89_write32 (rtwdev, addr,0 ); -for (addr =R_BE_PWR_RULMT_START ; addr <=R_BE_PWR_RULMT_END ; addr +=4 ) -rtw89_write32 (rtwdev, addr,0 ); -for (addr =R_BE_PWR_RATE_OFST_CTRL ; addr <=R_BE_PWR_RATE_OFST_END ; addr +=4 ) -rtw89_write32 (rtwdev, addr,0 ); +for (addr =R_BE_PWR_BY_RATE ; addr <=R_BE_PWR_BY_RATE_END ; addr +=4 ) { + t =rtw89_mac_reg_by_idx (rtwdev, addr, mac_idx); +rtw89_write32 (rtwdev, t,0 ); + } +for (addr =R_BE_PWR_RULMT_START ; addr <=R_BE_PWR_RULMT_END ; addr +=4 ) { + t =rtw89_mac_reg_by_idx (rtwdev, addr, mac_idx); +rtw89_write32 (rtwdev, t,0 ); + } +for (addr =R_BE_PWR_RATE_OFST_CTRL ; addr <=R_BE_PWR_RATE_OFST_END ; addr +=4 ) { + t =rtw89_mac_reg_by_idx (rtwdev, addr, mac_idx); +rtw89_write32 (rtwdev, t,0 ); + } addr =rtw89_mac_reg_by_idx (rtwdev,R_BE_PWR_REF_CTRL , mac_idx);rtw89_write32_mask (rtwdev, addr,B_BE_PWR_OFST_LMT_DB ,0 );
drivers/net/wireless/realtek/rtw89/reg.h +1 -0
@@ -8084,6 +8084,7 @@#define R_BE_PWR_FTM 0x11B00#define R_BE_PWR_FTM_SS 0x11B04 +#define B_BE_PWR_BY_RATE_DBW_ON GENMASK(27, 26)#define R_BE_PWR_BY_RATE 0x11E00#define R_BE_PWR_BY_RATE_MAX 0x11FA8
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 8/12 wifi: rtw89: phy: update BB wrapper RFSI
In reply to Ping-Ke ShihRTL8922D adds newly BB wrapper RFSI, including compensation values and threshold, bandedge settings, and CIM3K coefficient.
--- drivers/net/wireless/realtek/rtw89/mac.h | 8 + drivers/net/wireless/realtek/rtw89/phy.h | 6 + drivers/net/wireless/realtek/rtw89/phy_be.c | 328 ++++++++++++++++++++ drivers/net/wireless/realtek/rtw89/reg.h | 207 ++++++++++++ 4 files changed, 549 insertions(+)
drivers/net/wireless/realtek/rtw89/mac.h +8 -0
@@ -1139,6 +1139,14 @@ rtw89_write16_idx(struct rtw89_dev *rtwdev, u32 addr, u16 data, u8 band)rtw89_write16 (rtwdev, addr, data); } +static inline void +rtw89_write32_idx (struct rtw89_dev *rtwdev,u32 addr,u32 mask,u32 data,u8 band) +{ + addr =rtw89_mac_reg_by_idx (rtwdev, addr, band); + +rtw89_write32_mask (rtwdev, addr, mask, data); +} +static inline u32 rtw89_mac_reg_by_port (struct rtw89_dev *rtwdev,u32 base,u8 port,u8 mac_idx) {
drivers/net/wireless/realtek/rtw89/phy.h +6 -0
@@ -893,6 +893,12 @@ static inline void rtw89_phy_bb_wrap_init(struct rtw89_dev *rtwdev) phy->bb_wrap_init (rtwdev); } +void rtw89_phy_bb_wrap_set_rfsi_ct_opt (struct rtw89_dev *rtwdev, +enum rtw89_phy_idx phy_idx); +void rtw89_phy_bb_wrap_set_rfsi_bandedge_ch (struct rtw89_dev *rtwdev, +const struct rtw89_chan *chan, +enum rtw89_phy_idx phy_idx); +static inline void rtw89_phy_ch_info_init (struct rtw89_dev *rtwdev) {const struct rtw89_phy_gen_def *phy = rtwdev->chip->phy_def;
drivers/net/wireless/realtek/rtw89/phy_be.c +328 -0
346 lines not on this page · raw message
drivers/net/wireless/realtek/rtw89/reg.h +207 -0
219 lines not on this page · raw message
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 9/12 wifi: rtw89: phy: write BB wrapper registers with flush
In reply to Ping-Ke ShihBB wrapper is a hardware circuit to control TX power, and for single writing it needs an additional flush to ensure writing is properly completed.
--- drivers/net/wireless/realtek/rtw89/phy_be.c | 40 +++++++++++++++++++-- 1 file changed, 38 insertions(+), 2 deletions(-)
drivers/net/wireless/realtek/rtw89/phy_be.c +38 -2
@@ -414,6 +414,42 @@ static void rtw89_phy_preinit_rf_nctl_be_v1(struct rtw89_dev *rtwdev)rtw89_phy_write32_mask (rtwdev,R_IQK_DPK_PRST_C1_BE4 ,B_IQK_DPK_PRST ,0x1 ); } +static u32 rtw89_phy_bb_wrap_flush_addr (struct rtw89_dev *rtwdev,u32 addr) +{ +struct rtw89_hal *hal = &rtwdev->hal; + +if (!test_bit (RTW89_FLAG_RUNNING , rtwdev->flags)) +return 0 ; + +if (rtwdev->chip->chip_id ==RTL8922D && hal->cid ==RTL8922D_CID7025 ) { +if (addr >=R_BE_PWR_MACID_PATH_BASE_V1 && + addr <=R_BE_PWR_MACID_PATH_BASE_V1 +0xFF ) +return addr +0x800 ; + +if (addr >=R_BE_PWR_MACID_LMT_BASE_V1 && + addr <=R_BE_PWR_MACID_LMT_BASE_V1 +0xFF ) +return addr -0x800 ; + } + +return 0 ; +} + +static +void rtw89_write_bb_wrap_flush (struct rtw89_dev *rtwdev,u32 addr,u32 data) +{ +/* To write registers of pwr_macid_lmt and pwr_macid_path with flush */ +u32 flush_addr; +u32 val32; + + flush_addr =rtw89_phy_bb_wrap_flush_addr (rtwdev, addr); +if (flush_addr) { + val32 =rtw89_read32 (rtwdev, flush_addr); +rtw89_write32 (rtwdev, flush_addr, val32); + } + +rtw89_write32 (rtwdev, addr, data); +} +static void rtw89_phy_bb_wrap_pwr_by_macid_init (struct rtw89_dev *rtwdev) {
@@ -425,7 +461,7 @@ void rtw89_phy_bb_wrap_pwr_by_macid_init(struct rtw89_dev *rtwdev)for (macid_idx =0 ; macid_idx <4 * max_macid; macid_idx +=4 ) { cr = base_macid_lmt + macid_idx; -rtw89_write32 (rtwdev, cr,0x03007F7F ); +rtw89_write_bb_wrap_flush (rtwdev, cr,0x03007F7F ); } }
@@ -438,7 +474,7 @@ void rtw89_phy_bb_wrap_tx_path_by_macid_init(struct rtw89_dev *rtwdev)int i, max_macid =32 ;for (i =0 ; i < max_macid; i++, cr +=4 ) -rtw89_write32 (rtwdev, cr,0x03C86000 ); +rtw89_write_bb_wrap_flush (rtwdev, cr,0x03C86000 ); } static void rtw89_phy_bb_wrap_tpu_set_all(struct rtw89_dev *rtwdev,
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 10/12 wifi: rtw89: phy: refine initial flow of BB wrapper
In reply to Ping-Ke ShihSet initial value of TX power and TX path per MAC ID to 0x0, and reorder initial flow as vendor driver does.
--- drivers/net/wireless/realtek/rtw89/phy_be.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
drivers/net/wireless/realtek/rtw89/phy_be.c +6 -6
@@ -461,7 +461,7 @@ void rtw89_phy_bb_wrap_pwr_by_macid_init(struct rtw89_dev *rtwdev)for (macid_idx =0 ; macid_idx <4 * max_macid; macid_idx +=4 ) { cr = base_macid_lmt + macid_idx; -rtw89_write_bb_wrap_flush (rtwdev, cr,0x03007F7F ); +rtw89_write_bb_wrap_flush (rtwdev, cr,0 ); } }
@@ -474,7 +474,7 @@ void rtw89_phy_bb_wrap_tx_path_by_macid_init(struct rtw89_dev *rtwdev)int i, max_macid =32 ;for (i =0 ; i < max_macid; i++, cr +=4 ) -rtw89_write_bb_wrap_flush (rtwdev, cr,0x03C86000 ); +rtw89_write_bb_wrap_flush (rtwdev, cr,0 ); } static void rtw89_phy_bb_wrap_tpu_set_all(struct rtw89_dev *rtwdev,
@@ -902,13 +902,13 @@ static void rtw89_phy_bb_wrap_ul_pwr(struct rtw89_dev *rtwdev)static void __rtw89_phy_bb_wrap_init_be (struct rtw89_dev *rtwdev,enum rtw89_mac_idx mac_idx) { -rtw89_phy_bb_wrap_pwr_by_macid_init (rtwdev);rtw89_phy_bb_wrap_tx_path_by_macid_init (rtwdev); -rtw89_phy_bb_wrap_listen_path_en_init (rtwdev); -rtw89_phy_bb_wrap_force_cr_init (rtwdev, mac_idx); -rtw89_phy_bb_wrap_ftm_init (rtwdev, mac_idx); +rtw89_phy_bb_wrap_pwr_by_macid_init (rtwdev);rtw89_phy_bb_wrap_tpu_set_all (rtwdev, mac_idx);rtw89_phy_bb_wrap_tx_rfsi_ctrl_init (rtwdev, mac_idx); +rtw89_phy_bb_wrap_force_cr_init (rtwdev, mac_idx); +rtw89_phy_bb_wrap_ftm_init (rtwdev, mac_idx); +rtw89_phy_bb_wrap_listen_path_en_init (rtwdev);rtw89_phy_bb_wrap_ul_pwr (rtwdev); }
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 11/12 wifi: rtw89: phy: fix incorrect power limit by mac_id
In reply to Ping-Ke ShihFrom: Po-Hao Huang <[email protected]>
Modify the power register range based on chip ability. When not set, the default value is random. This fixes incorrect power limit on some ICs.
--- drivers/net/wireless/realtek/rtw89/phy_be.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/net/wireless/realtek/rtw89/phy_be.c +4 -2
@@ -455,7 +455,8 @@ void rtw89_phy_bb_wrap_pwr_by_macid_init(struct rtw89_dev *rtwdev) {const struct rtw89_phy_gen_def *phy = rtwdev->chip->phy_def;const struct rtw89_bb_wrap_regs *bb_wrap = phy->bb_wrap; -u32 macid_idx, cr, base_macid_lmt, max_macid =32 ; +u32 max_macid = rtwdev->chip->support_macid_num; +u32 macid_idx, cr, base_macid_lmt; base_macid_lmt = bb_wrap->pwr_macid_lmt;
@@ -470,8 +471,9 @@ void rtw89_phy_bb_wrap_tx_path_by_macid_init(struct rtw89_dev *rtwdev) {const struct rtw89_phy_gen_def *phy = rtwdev->chip->phy_def;const struct rtw89_bb_wrap_regs *bb_wrap = phy->bb_wrap; +u32 max_macid = rtwdev->chip->support_macid_num;u32 cr = bb_wrap->pwr_macid_path; -int i, max_macid =32 ; +int i;for (i =0 ; i < max_macid; i++, cr +=4 )rtw89_write_bb_wrap_flush (rtwdev, cr,0 );
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 12/12 wifi: rtw89: fix unable to receive probe responses under MLO connection
In reply to Ping-Ke ShihFrom: Po-Hao Huang <[email protected]>
During MLO connections, A1 of the probe responses we received are in link address, these frames will then be dropped by mac80211 due to not matching the MLD address in ieee80211_scan_accept_presp(). Fix this by using MLD address to scan when not using random MAC address.
--- drivers/net/wireless/realtek/rtw89/fw.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/net/wireless/realtek/rtw89/fw.c +3 -0
@@ -8779,6 +8779,7 @@ int rtw89_hw_scan_start(struct rtw89_dev *rtwdev,struct cfg80211_scan_request *req = &scan_req->req;const struct rtw89_chan *chan =rtw89_chan_get (rtwdev, rtwvif_link->chanctx_idx); +struct ieee80211_vif *vif =rtwvif_link_to_vif (rtwvif_link);struct rtw89_vif *rtwvif = rtwvif_link->rtwvif;struct rtw89_chanctx_pause_parm pause_parm = { .rsn =RTW89_CHANCTX_PAUSE_REASON_HW_SCAN ,
@@ -8807,6 +8808,8 @@ int rtw89_hw_scan_start(struct rtw89_dev *rtwdev,if (req->flags &NL80211_SCAN_FLAG_RANDOM_ADDR )get_random_mask_addr (mac_addr, req->mac_addr, req->mac_addr_mask); +else if (ieee80211_vif_is_mld (vif)) +ether_addr_copy (mac_addr, vif->addr);else ether_addr_copy (mac_addr, rtwvif_link->mac_addr);
Signature · 1 line
2.25.1