rtw89: prepare more shared code to work with 8852c
Ping-Ke Shih
maintainerv2 cover rtw89: prepare more shared code to work with 8852c
This patchset contains MAC, BB and RF functions. The BB part changes CFO (central frequency offset) tracking functions to be general. The MAC part makes the function work on 8852c. Propose new V1 method to access new design of RF register.
As usual, this doesn't affect existing chip, and 8852C is built internally.
v2: patch 9/12: assign data in 'if' branch instead of '? :' style.
patch 10/12: add this patch because of the same reason of patch 9/12. others don't change
Chia-Yuan Li (3):
rtw89: modify MAC enable functions
rtw89: disable FW and H2C function if CPU disabled
rtw89: 8852c: add mac_ctrl_path and mac_cfg_gnt APIs
Chung-Hsuan Hung (1):
rtw89: 8852c: add read/write rf register function
Ping-Ke Shih (5):
rtw89: add config_rf_reg_v1 to configure RF parameter tables
rtw89: initialize preload window of D-MAC
rtw89: change value assignment style of rtw89_mac_cfg_gnt()
rtw89: extend mac tx_en bits from 16 to 32
rtw89: implement stop and resume channels transmission v1
Yuan-Han Zhang (3):
rtw89: modify dcfo_comp to share with chips
rtw89: 8852c: add write/read crystal function in CFO tracking
rtw89: 8852c: add setting of TB UL TX power offset
drivers/net/wireless/realtek/rtw89/coex.c | 24 +- drivers/net/wireless/realtek/rtw89/core.h | 47 ++- drivers/net/wireless/realtek/rtw89/mac.c | 283 +++++++++++++++--- drivers/net/wireless/realtek/rtw89/mac.h | 12 +- drivers/net/wireless/realtek/rtw89/phy.c | 164 +++++++++- drivers/net/wireless/realtek/rtw89/phy.h | 9 + drivers/net/wireless/realtek/rtw89/reg.h | 77 +++++ drivers/net/wireless/realtek/rtw89/rtw8852a.c | 22 +- .../net/wireless/realtek/rtw89/rtw8852a_rfk.c | 24 +- drivers/net/wireless/realtek/rtw89/rtw8852c.c | 50 ++++ 10 files changed, 630 insertions(+), 82 deletions(-)
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH v2 1/12 rtw89: modify dcfo_comp to share with chips
From: Yuan-Han Zhang <[email protected]>
The dcfo_comp is digital CFO (central frequency offset) compensation. Since the flow can be shared with all chips, add chip parameters to support variant register address and format.
--- drivers/net/wireless/realtek/rtw89/core.h | 2 ++ drivers/net/wireless/realtek/rtw89/phy.c | 10 ++++++---- drivers/net/wireless/realtek/rtw89/reg.h | 2 ++ drivers/net/wireless/realtek/rtw89/rtw8852a.c | 6 ++++++ drivers/net/wireless/realtek/rtw89/rtw8852c.c | 6 ++++++ 5 files changed, 22 insertions(+), 4 deletions(-)
drivers/net/wireless/realtek/rtw89/core.h +2 -0
@@ -2332,6 +2332,8 @@ struct rtw89_chip_info {u32 c2h_ctrl_reg;const u32 *c2h_regs;const struct rtw89_page_regs *page_regs; +const struct rtw89_reg_def *dcfo_comp; +u8 dcfo_comp_sft; };union rtw89_bus_info {
drivers/net/wireless/realtek/rtw89/phy.c +6 -4
@@ -1705,9 +1705,11 @@ static void rtw89_phy_cfo_reset(struct rtw89_dev *rtwdev)static void rtw89_dcfo_comp (struct rtw89_dev *rtwdev,s32 curr_cfo) { +const struct rtw89_reg_def *dcfo_comp = rtwdev->chip->dcfo_comp;bool is_linked = rtwdev->total_sta_assoc >0 ;s32 cfo_avg_312; -s32 dcfo_comp; +s32 dcfo_comp_val; +u8 dcfo_comp_sft = rtwdev->chip->dcfo_comp_sft;int sign;if (!is_linked) {
@@ -1718,13 +1720,13 @@ static void rtw89_dcfo_comp(struct rtw89_dev *rtwdev, s32 curr_cfo)rtw89_debug (rtwdev,RTW89_DBG_CFO ,"DCFO: curr_cfo=%d\n" , curr_cfo);if (curr_cfo ==0 )return ; - dcfo_comp =rtw89_phy_read32_mask (rtwdev,R_DCFO ,B_DCFO ); + dcfo_comp_val =rtw89_phy_read32_mask (rtwdev,R_DCFO ,B_DCFO ); sign = curr_cfo >0 ?1 :-1 ; - cfo_avg_312 = (curr_cfo <<3 ) /5 + sign * dcfo_comp; + cfo_avg_312 = (curr_cfo << dcfo_comp_sft) /5 + sign * dcfo_comp_val;rtw89_debug (rtwdev,RTW89_DBG_CFO ,"DCFO: avg_cfo=%d\n" , cfo_avg_312);if (rtwdev->chip->chip_id ==RTL8852A && rtwdev->hal.cv ==CHIP_CBV ) cfo_avg_312 = -cfo_avg_312; -rtw89_phy_set_phy_regs (rtwdev,R_DCFO_COMP_S0 ,B_DCFO_COMP_S0_MSK , +rtw89_phy_set_phy_regs (rtwdev, dcfo_comp->addr, dcfo_comp->mask, cfo_avg_312); }
drivers/net/wireless/realtek/rtw89/reg.h +2 -0
@@ -2093,6 +2093,8 @@#define R_CHBW_MOD 0x4978#define B_CHBW_MOD_PRICH GENMASK(11, 8)#define B_CHBW_MOD_SBW GENMASK(13, 12) +#define R_DCFO_COMP_S0_V1 0x4A40 +#define B_DCFO_COMP_S0_V1_MSK GENMASK(13, 0)#define R_BMODE_PDTH_V1 0x4B64#define B_BMODE_PDTH_LOWER_BOUND_MSK_V1 GENMASK(31, 24)#define R_BMODE_PDTH_EN_V1 0x4B74
drivers/net/wireless/realtek/rtw89/rtw8852a.c +6 -0
@@ -402,6 +402,10 @@ static const struct rtw89_page_regs rtw8852a_page_regs = { .wp_page_info1 = R_AX_WP_PAGE_INFO1, }; +static const struct rtw89_reg_def rtw8852a_dcfo_comp = { +R_DCFO_COMP_S0 ,B_DCFO_COMP_S0_MSK +}; +static void rtw8852ae_efuse_parsing (struct rtw89_efuse *efuse,struct rtw8852a_efuse *map) {
@@ -2091,6 +2095,8 @@ const struct rtw89_chip_info rtw8852a_chip_info = { .c2h_ctrl_reg = R_AX_C2HREG_CTRL, .c2h_regs = rtw8852a_c2h_regs, .page_regs = &rtw8852a_page_regs, + .dcfo_comp = &rtw8852a_dcfo_comp, + .dcfo_comp_sft = 3, };EXPORT_SYMBOL (rtw8852a_chip_info);
drivers/net/wireless/realtek/rtw89/rtw8852c.c +6 -0
@@ -44,6 +44,10 @@ static const struct rtw89_page_regs rtw8852c_page_regs = { .wp_page_info1 = R_AX_WP_PAGE_INFO1_V1, }; +static const struct rtw89_reg_def rtw8852c_dcfo_comp = { +R_DCFO_COMP_S0_V1 ,B_DCFO_COMP_S0_V1_MSK +}; +static int rtw8852c_pwr_on_func (struct rtw89_dev *rtwdev) {u32 val32;
@@ -470,6 +474,8 @@ const struct rtw89_chip_info rtw8852c_chip_info = { .c2h_ctrl_reg = R_AX_C2HREG_CTRL_V1, .c2h_regs = rtw8852c_c2h_regs, .page_regs = &rtw8852c_page_regs, + .dcfo_comp = &rtw8852c_dcfo_comp, + .dcfo_comp_sft = 5, };EXPORT_SYMBOL (rtw8852c_chip_info);
Signature · 1 line
2.25.1
Re: [PATCH v2 01/12] rtw89: modify dcfo_comp to share with chips
Quoted 8 lines · Ping-Ke Shih
From: Yuan-Han Zhang <[email protected]>
The
dcfo_compis digital CFO (central frequency offset) compensation. Since the flow can be shared with all chips, add chip parameters to support variant register address and format.Signed-off-by Yuan-Han Zhang <[email protected]>Signed-off-by Ping-Ke Shih <[email protected]>
12 patches applied to wireless-next.git, thanks.
b7379148f598 rtw89: modify dcfo_comp to share with chips 8379fa611536 rtw89: 8852c: add write/read crystal function in CFO tracking a9ffae8d3f9d rtw89: 8852c: add setting of TB UL TX power offset 84d0e33e51df rtw89: 8852c: add read/write rf register function 2a5f2b32639a rtw89: add config_rf_reg_v1 to configure RF parameter tables 828a4396e52a rtw89: modify MAC enable functionse07a99682972 rtw89: initialize preload window of D-MAC de78869d1f48 rtw89: disable FW and H2C function if CPU disabled feed65417847 rtw89: 8852c: add mac_ctrl_path and mac_cfg_gnt APIs 8001c741e351 rtw89: change value assignment style of rtw89_mac_cfg_gnt() d780f926d633 rtw89: extend mac tx_en bits from 16 to 32 de7ba639e6c5 rtw89: implement stop and resume channels transmission v1
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 v2 2/12 rtw89: 8852c: add write/read crystal function in CFO tracking
In reply to Ping-Ke ShihFrom: Yuan-Han Zhang <[email protected]>
The CFO tracking algorithm is the same, but control methods are different. Set parameters via xtal serial interfaces (SI).
--- drivers/net/wireless/realtek/rtw89/mac.h | 2 ++ drivers/net/wireless/realtek/rtw89/phy.c | 19 +++++++++++++++---- 2 files changed, 17 insertions(+), 4 deletions(-)
drivers/net/wireless/realtek/rtw89/mac.h +2 -0
@@ -884,7 +884,9 @@ int rtw89_mac_get_tx_retry_limit(struct rtw89_dev *rtwdev,enum rtw89_mac_xtal_si_offset {XTAL_SI_XTAL_SC_XI =0x04 , +#define XTAL_SC_XI_MASK GENMASK(7, 0) XTAL_SI_XTAL_SC_XO = 0x05, +#define XTAL_SC_XO_MASK GENMASK(7, 0) XTAL_SI_PWR_CUT = 0x10,#define XTAL_SI_SMALL_PWR_CUT BIT(0) #define XTAL_SI_BIG_PWR_CUT BIT(1)
drivers/net/wireless/realtek/rtw89/phy.c +15 -4
@@ -4,6 +4,7 @@#include "debug.h" #include "fw.h" +#include "mac.h" #include "phy.h" #include "ps.h" #include "reg.h"
@@ -1667,15 +1668,25 @@ static void rtw89_phy_cfo_set_crystal_cap(struct rtw89_dev *rtwdev, u8 crystal_cap, bool force) {struct rtw89_cfo_tracking_info *cfo = &rtwdev->cfo_tracking; +const struct rtw89_chip_info *chip = rtwdev->chip;u8 sc_xi_val, sc_xo_val;if (!force && cfo->crystal_cap == crystal_cap)return ; crystal_cap =clamp_t (u8, crystal_cap,0 ,127 ); -rtw89_phy_cfo_set_xcap_reg (rtwdev, true, crystal_cap); -rtw89_phy_cfo_set_xcap_reg (rtwdev, false, crystal_cap); - sc_xo_val =rtw89_phy_cfo_get_xcap_reg (rtwdev, true); - sc_xi_val =rtw89_phy_cfo_get_xcap_reg (rtwdev, false); +if (chip->chip_id ==RTL8852A ) { +rtw89_phy_cfo_set_xcap_reg (rtwdev, true, crystal_cap); +rtw89_phy_cfo_set_xcap_reg (rtwdev, false, crystal_cap); + sc_xo_val =rtw89_phy_cfo_get_xcap_reg (rtwdev, true); + sc_xi_val =rtw89_phy_cfo_get_xcap_reg (rtwdev, false); + }else { +rtw89_mac_write_xtal_si (rtwdev,XTAL_SI_XTAL_SC_XO , + crystal_cap,XTAL_SC_XO_MASK ); +rtw89_mac_write_xtal_si (rtwdev,XTAL_SI_XTAL_SC_XI , + crystal_cap,XTAL_SC_XI_MASK ); +rtw89_mac_read_xtal_si (rtwdev,XTAL_SI_XTAL_SC_XO , &sc_xo_val); +rtw89_mac_read_xtal_si (rtwdev,XTAL_SI_XTAL_SC_XI , &sc_xi_val); + } cfo->crystal_cap = sc_xi_val; cfo->x_cap_ofst = (s8)((int )cfo->crystal_cap - cfo->def_x_cap);
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH v2 3/12 rtw89: 8852c: add setting of TB UL TX power offset
In reply to Ping-Ke ShihFrom: Yuan-Han Zhang <[email protected]>
Configure this TX power to indicate TX power offset that uses to transmit TB (trigger base) uplink frames.
Also, shrink the unit of TX power offset changes to suitable type s8.
--- drivers/net/wireless/realtek/rtw89/core.h | 2 +- drivers/net/wireless/realtek/rtw89/reg.h | 2 ++ drivers/net/wireless/realtek/rtw89/rtw8852a.c | 8 ++--- drivers/net/wireless/realtek/rtw89/rtw8852c.c | 36 +++++++++++++++++++ 4 files changed, 43 insertions(+), 5 deletions(-)
drivers/net/wireless/realtek/rtw89/core.h +1 -1
@@ -2065,7 +2065,7 @@ struct rtw89_chip_ops { struct ieee80211_rx_status *status);void (*bb_ctrl_btc_preagc)(struct rtw89_dev *rtwdev,bool bt_en);void (*set_txpwr_ul_tb_offset)(struct rtw89_dev *rtwdev, -s16 pw_ofst,enum rtw89_mac_idx mac_idx); +s8 pw_ofst,enum rtw89_mac_idx mac_idx);int (*pwr_on_func)(struct rtw89_dev *rtwdev);int (*pwr_off_func)(struct rtw89_dev *rtwdev);
drivers/net/wireless/realtek/rtw89/reg.h +2 -0
@@ -1525,8 +1525,10 @@#define B_AX_PWR_UL_TB_CTRL_EN BIT(31)#define R_AX_PWR_UL_TB_1T 0xD28C#define B_AX_PWR_UL_TB_1T_MASK GENMASK(4, 0) +#define B_AX_PWR_UL_TB_1T_V1_MASK GENMASK(7, 0)#define R_AX_PWR_UL_TB_2T 0xD290#define B_AX_PWR_UL_TB_2T_MASK GENMASK(4, 0) +#define B_AX_PWR_UL_TB_2T_V1_MASK GENMASK(7, 0)#define R_AX_PWR_BY_RATE_TABLE0 0xD2C0#define R_AX_PWR_BY_RATE_TABLE10 0xD2E8#define R_AX_PWR_BY_RATE R_AX_PWR_BY_RATE_TABLE0
drivers/net/wireless/realtek/rtw89/rtw8852a.c +4 -4
@@ -1275,10 +1275,10 @@ static u32 rtw8852a_bb_cal_txpwr_ref(struct rtw89_dev *rtwdev,static void rtw8852a_set_txpwr_ul_tb_offset (struct rtw89_dev *rtwdev, -s16 pw_ofst,enum rtw89_mac_idx mac_idx) +s8 pw_ofst,enum rtw89_mac_idx mac_idx) { -s32 val_1t =0 ; -s32 val_2t =0 ; +s8 val_1t =0 ; +s8 val_2t =0 ;u32 reg;if (pw_ofst <-16 || pw_ofst >15 ) {
@@ -1288,7 +1288,7 @@ void rtw8852a_set_txpwr_ul_tb_offset(struct rtw89_dev *rtwdev, } reg =rtw89_mac_reg_by_idx (R_AX_PWR_UL_TB_CTRL , mac_idx);rtw89_write32_set (rtwdev, reg,B_AX_PWR_UL_TB_CTRL_EN ); - val_1t = (s32 )pw_ofst; + val_1t = pw_ofst; reg =rtw89_mac_reg_by_idx (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 );
drivers/net/wireless/realtek/rtw89/rtw8852c.c +36 -0
@@ -445,10 +445,46 @@ static void rtw8852c_power_trim(struct rtw89_dev *rtwdev)rtw8852c_pa_bias_trim (rtwdev); } +static +void rtw8852c_set_txpwr_ul_tb_offset (struct rtw89_dev *rtwdev, +s8 pw_ofst,enum rtw89_mac_idx mac_idx) +{ +s8 pw_ofst_2tx; +s8 val_1t; +s8 val_2t; +u32 reg; +u8 i; + +if (pw_ofst <-32 || pw_ofst >31 ) { +rtw89_warn (rtwdev,"[ULTB] Err pwr_offset=%d\n" , pw_ofst); +return ; + } + val_1t = pw_ofst <<2 ; + pw_ofst_2tx =max (pw_ofst -3 ,-32 ); + val_2t = pw_ofst_2tx <<2 ; + +rtw89_debug (rtwdev,RTW89_DBG_TXPWR ,"[ULTB] val_1tx=0x%x\n" , val_1t); +rtw89_debug (rtwdev,RTW89_DBG_TXPWR ,"[ULTB] val_2tx=0x%x\n" , val_2t); + +for (i =0 ; i <4 ; i++) { +/* 1TX */ + reg =rtw89_mac_reg_by_idx (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); +rtw89_write32_mask (rtwdev, reg, +B_AX_PWR_UL_TB_2T_V1_MASK << (8 * i), + val_2t); + } +} +static const struct rtw89_chip_ops rtw8852c_chip_ops = { .read_efuse = rtw8852c_read_efuse, .read_phycap = rtw8852c_read_phycap, .power_trim = rtw8852c_power_trim, + .set_txpwr_ul_tb_offset = rtw8852c_set_txpwr_ul_tb_offset, .pwr_on_func = rtw8852c_pwr_on_func, .pwr_off_func = rtw8852c_pwr_off_func, };
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH v2 4/12 rtw89: 8852c: add read/write rf register function
In reply to Ping-Ke ShihFrom: Chung-Hsuan Hung <[email protected]>
Using encoded address which BIT(16) is used to discriminate which region is going to access. Illustrate the calling flow as below
rtw89_phy_write_rf_v1() -+-> rtw89_phy_write_rf() // old interface
+-> rtw89_phy_write_rf_a() // new interface
--- drivers/net/wireless/realtek/rtw89/phy.c | 110 ++++++++++++++++++ drivers/net/wireless/realtek/rtw89/phy.h | 5 + drivers/net/wireless/realtek/rtw89/reg.h | 15 +++ drivers/net/wireless/realtek/rtw89/rtw8852c.c | 4 + 4 files changed, 134 insertions(+)
drivers/net/wireless/realtek/rtw89/phy.c +110 -0
@@ -604,6 +604,12 @@ u8 rtw89_phy_get_txsc(struct rtw89_dev *rtwdev, }EXPORT_SYMBOL (rtw89_phy_get_txsc); +static bool rtw89_phy_check_swsi_busy (struct rtw89_dev *rtwdev) +{ +return !!rtw89_phy_read32_mask (rtwdev,R_SWSI_V1 ,B_SWSI_W_BUSY_V1 ) || + !!rtw89_phy_read32_mask (rtwdev,R_SWSI_V1 ,B_SWSI_R_BUSY_V1 ); +} +u32 rtw89_phy_read_rf (struct rtw89_dev *rtwdev,enum rtw89_rf_path rf_path,u32 addr,u32 mask) {
@@ -626,6 +632,56 @@ u32 rtw89_phy_read_rf(struct rtw89_dev *rtwdev, enum rtw89_rf_path rf_path, }EXPORT_SYMBOL (rtw89_phy_read_rf); +static u32 rtw89_phy_read_rf_a (struct rtw89_dev *rtwdev, +enum rtw89_rf_path rf_path,u32 addr,u32 mask) +{ +bool busy; +bool done; +u32 val; +int ret; + + ret =read_poll_timeout_atomic (rtw89_phy_check_swsi_busy, busy, !busy, +1 ,30 , false, rtwdev); +if (ret) { +rtw89_err (rtwdev,"read rf busy swsi\n" ); +return INV_RF_DATA ; + } + + mask &=RFREG_MASK ; + + val =FIELD_PREP (B_SWSI_READ_ADDR_PATH_V1 , rf_path) | +FIELD_PREP (B_SWSI_READ_ADDR_ADDR_V1 , addr); +rtw89_phy_write32_mask (rtwdev,R_SWSI_READ_ADDR_V1 ,B_SWSI_READ_ADDR_V1 , val); +udelay (2 ); + + ret =read_poll_timeout_atomic (rtw89_phy_read32_mask, done, done,1 , +30 , false, rtwdev,R_SWSI_V1 , +B_SWSI_R_DATA_DONE_V1 ); +if (ret) { +rtw89_err (rtwdev,"read swsi busy\n" ); +return INV_RF_DATA ; + } + +return rtw89_phy_read32_mask (rtwdev,R_SWSI_V1 , mask); +} + +u32 rtw89_phy_read_rf_v1 (struct rtw89_dev *rtwdev,enum rtw89_rf_path rf_path, +u32 addr,u32 mask) +{ +bool ad_sel =FIELD_GET (RTW89_RF_ADDR_ADSEL_MASK , addr); + +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_a (rtwdev, rf_path, addr, mask); +} +EXPORT_SYMBOL (rtw89_phy_read_rf_v1); +bool rtw89_phy_write_rf (struct rtw89_dev *rtwdev,enum rtw89_rf_path rf_path,u32 addr,u32 mask,u32 data) {
@@ -651,6 +707,60 @@ bool rtw89_phy_write_rf(struct rtw89_dev *rtwdev, enum rtw89_rf_path rf_path, }EXPORT_SYMBOL (rtw89_phy_write_rf); +static bool rtw89_phy_write_rf_a (struct rtw89_dev *rtwdev, +enum rtw89_rf_path rf_path,u32 addr,u32 mask, +u32 data) +{ +u8 bit_shift; +u32 val; +bool busy, b_msk_en = false; +int ret; + + ret =read_poll_timeout_atomic (rtw89_phy_check_swsi_busy, busy, !busy, +1 ,30 , false, rtwdev); +if (ret) { +rtw89_err (rtwdev,"write rf busy swsi\n" ); +return false; + } + + data &=RFREG_MASK ; + mask &=RFREG_MASK ; + +if (mask !=RFREG_MASK ) { + b_msk_en = true; +rtw89_phy_write32_mask (rtwdev,R_SWSI_BIT_MASK_V1 ,RFREG_MASK , + mask); + bit_shift =__ffs (mask); + data = (data << bit_shift) &RFREG_MASK ; + } + + val =FIELD_PREP (B_SWSI_DATA_BIT_MASK_EN_V1 , b_msk_en) | +FIELD_PREP (B_SWSI_DATA_PATH_V1 , rf_path) | +FIELD_PREP (B_SWSI_DATA_ADDR_V1 , addr) | +FIELD_PREP (B_SWSI_DATA_VAL_V1 , data); + +rtw89_phy_write32_mask (rtwdev,R_SWSI_DATA_V1 ,MASKDWORD , val); + +return true; +} + +bool rtw89_phy_write_rf_v1 (struct rtw89_dev *rtwdev,enum rtw89_rf_path rf_path, +u32 addr,u32 mask,u32 data) +{ +bool ad_sel =FIELD_GET (RTW89_RF_ADDR_ADSEL_MASK , addr); + +if (rf_path >= rtwdev->chip->rf_path_num) { +rtw89_err (rtwdev,"unsupported rf path (%d)\n" , rf_path); +return false; + } + +if (ad_sel) +return rtw89_phy_write_rf (rtwdev, rf_path, addr, mask, data); +else +return rtw89_phy_write_rf_a (rtwdev, rf_path, addr, mask, data); +} +EXPORT_SYMBOL (rtw89_phy_write_rf_v1); +static void rtw89_phy_bb_reset (struct rtw89_dev *rtwdev,enum rtw89_phy_idx phy_idx) {
drivers/net/wireless/realtek/rtw89/phy.h +5 -0
@@ -8,6 +8,7 @@#include "core.h" #define RTW89_PHY_ADDR_OFFSET 0x10000 +#define RTW89_RF_ADDR_ADSEL_MASK BIT(16)#define get_phy_headline (addr) FIELD_GET(GENMASK(31, 28), addr)#define PHY_HEADLINE_VALID 0xf
@@ -395,8 +396,12 @@ u8 rtw89_phy_get_txsc(struct rtw89_dev *rtwdev, enum rtw89_bandwidth dbw);u32 rtw89_phy_read_rf (struct rtw89_dev *rtwdev,enum rtw89_rf_path rf_path,u32 addr,u32 mask); +u32 rtw89_phy_read_rf_v1 (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);void rtw89_phy_init_bb_reg (struct rtw89_dev *rtwdev);void rtw89_phy_init_rf_reg (struct rtw89_dev *rtwdev);void rtw89_phy_dm_init (struct rtw89_dev *rtwdev);
drivers/net/wireless/realtek/rtw89/reg.h +15 -0
@@ -1805,6 +1805,17 @@#define B_ANAPAR_FLTRST BIT(22)#define B_ANAPAR_CRXBB GENMASK(18, 16)#define B_ANAPAR_14 GENMASK(15, 0) +#define R_SWSI_DATA_V1 0x0370 +#define B_SWSI_DATA_VAL_V1 GENMASK(19, 0) +#define B_SWSI_DATA_ADDR_V1 GENMASK(27, 20) +#define B_SWSI_DATA_PATH_V1 GENMASK(30, 28) +#define B_SWSI_DATA_BIT_MASK_EN_V1 BIT(31) +#define R_SWSI_BIT_MASK_V1 0x0374 +#define B_SWSI_BIT_MASK_V1 GENMASK(19, 0) +#define R_SWSI_READ_ADDR_V1 0x0378 +#define B_SWSI_READ_ADDR_ADDR_V1 GENMASK(7, 0) +#define B_SWSI_READ_ADDR_PATH_V1 GENMASK(10, 8) +#define B_SWSI_READ_ADDR_V1 GENMASK(10, 0)#define R_UPD_CLK_ADC 0x0700#define B_UPD_CLK_ADC_ON BIT(24)#define B_UPD_CLK_ADC_VAL GENMASK(26, 25)
@@ -1912,6 +1923,10 @@#define R_CFO_COMP_SEG0_H 0x1388#define R_CFO_COMP_SEG0_CTRL 0x138C#define R_DBG32_D 0x1730 +#define R_SWSI_V1 0x174C +#define B_SWSI_W_BUSY_V1 BIT(24) +#define B_SWSI_R_BUSY_V1 BIT(25) +#define B_SWSI_R_DATA_DONE_V1 BIT(26)#define R_TX_COUNTER 0x1A40#define R_IFS_CLM_TX_CNT 0x1ACC#define B_IFS_CLM_EDCCA_EXCLUDE_CCA_FA_MSK GENMASK(31, 16)
drivers/net/wireless/realtek/rtw89/rtw8852c.c +4 -0
@@ -5,6 +5,7 @@#include "debug.h" #include "fw.h" #include "mac.h" +#include "phy.h" #include "reg.h" #include "rtw8852c.h"
@@ -484,6 +485,8 @@ static const struct rtw89_chip_ops rtw8852c_chip_ops = { .read_efuse = rtw8852c_read_efuse, .read_phycap = rtw8852c_read_phycap, .power_trim = rtw8852c_power_trim, + .read_rf = rtw89_phy_read_rf_v1, + .write_rf = rtw89_phy_write_rf_v1, .set_txpwr_ul_tb_offset = rtw8852c_set_txpwr_ul_tb_offset, .pwr_on_func = rtw8852c_pwr_on_func, .pwr_off_func = rtw8852c_pwr_off_func,
@@ -494,6 +497,7 @@ const struct rtw89_chip_info rtw8852c_chip_info = { .ops = &rtw8852c_chip_ops, .fw_name = "rtw89/rtw8852c_fw.bin", .dle_mem = rtw8852c_dle_mem_pcie, + .rf_base_addr = {0xe000, 0xf000}, .pwr_on_seq = NULL, .pwr_off_seq = NULL, .sec_ctrl_efuse_size = 4,
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH v2 5/12 rtw89: add config_rf_reg_v1 to configure RF parameter tables
In reply to Ping-Ke ShihThe format of RF parameter is changed; it doesn't encode delay parameters into table, but the delay coding becomes regular pair of register address and value.
To help firmware to recover RF register settings, we need to download these parameters to firmware. For v1 format, only download partial parameters (ignore them with addr < 0x100).
--- drivers/net/wireless/realtek/rtw89/core.h | 2 ++ drivers/net/wireless/realtek/rtw89/phy.c | 25 +++++++++++++++++++---- drivers/net/wireless/realtek/rtw89/phy.h | 4 ++++ 3 files changed, 27 insertions(+), 4 deletions(-)
drivers/net/wireless/realtek/rtw89/core.h +2 -0
@@ -2229,6 +2229,8 @@ struct rtw89_phy_table {const struct rtw89_reg2_def *regs;u32 n_regs;enum rtw89_rf_path rf_path; +void (*config)(struct rtw89_dev *rtwdev,const struct rtw89_reg2_def *reg, +enum rtw89_rf_path rf_path,void *data); };struct rtw89_txpwr_table {
drivers/net/wireless/realtek/rtw89/phy.c +21 -4
@@ -862,6 +862,21 @@ static void rtw89_phy_config_rf_reg(struct rtw89_dev *rtwdev, } } +void rtw89_phy_config_rf_reg_v1 (struct rtw89_dev *rtwdev, +const struct rtw89_reg2_def *reg, +enum rtw89_rf_path rf_path, +void *extra_data) +{ +rtw89_write_rf (rtwdev, rf_path, reg->addr,RFREG_MASK , reg->data); + +if (reg->addr <0x100 ) +return ; + +rtw89_phy_cofig_rf_reg_store (rtwdev, reg, rf_path, + (struct rtw89_fw_h2c_rf_reg_info *)extra_data); +} +EXPORT_SYMBOL (rtw89_phy_config_rf_reg_v1); + static int rtw89_phy_sel_headline(struct rtw89_dev *rtwdev, const struct rtw89_phy_table *table, u32 *headline_size, u32 *headline_idx,
@@ -1033,6 +1048,8 @@ static u32 rtw89_phy_nctl_poll(struct rtw89_dev *rtwdev)void rtw89_phy_init_rf_reg (struct rtw89_dev *rtwdev) { +void (*config)(struct rtw89_dev *rtwdev,const struct rtw89_reg2_def *reg, +enum rtw89_rf_path rf_path,void *data);const struct rtw89_chip_info *chip = rtwdev->chip;const struct rtw89_phy_table *rf_table;struct rtw89_fw_h2c_rf_reg_info *rf_reg_info;
@@ -1043,13 +1060,13 @@ void rtw89_phy_init_rf_reg(struct rtw89_dev *rtwdev)return ;for (path =RF_PATH_A ; path < chip->rf_path_num; path++) { - rf_reg_info->rf_path = path; rf_table = chip->rf_table[path]; -rtw89_phy_init_reg (rtwdev, rf_table, rtw89_phy_config_rf_reg, - (void *)rf_reg_info); + rf_reg_info->rf_path = rf_table->rf_path; + config = rf_table->config ? rf_table->config : rtw89_phy_config_rf_reg; +rtw89_phy_init_reg (rtwdev, rf_table, config, (void *)rf_reg_info);if (rtw89_phy_config_rf_reg_fw (rtwdev, rf_reg_info))rtw89_warn (rtwdev,"rf path %d reg h2c config failed\n" , - path); + rf_reg_info->rf_path); }kfree (rf_reg_info); }
drivers/net/wireless/realtek/rtw89/phy.h +4 -0
@@ -404,6 +404,10 @@ bool rtw89_phy_write_rf_v1(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_rf_reg (struct rtw89_dev *rtwdev); +void rtw89_phy_config_rf_reg_v1 (struct rtw89_dev *rtwdev, +const struct rtw89_reg2_def *reg, +enum rtw89_rf_path rf_path, +void *extra_data);void rtw89_phy_dm_init (struct rtw89_dev *rtwdev);void rtw89_phy_write32_idx (struct rtw89_dev *rtwdev,u32 addr,u32 mask,u32 data,enum rtw89_phy_idx phy_idx);
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH v2 6/12 rtw89: modify MAC enable functions
In reply to Ping-Ke ShihFrom: Chia-Yuan Li <[email protected]>
Modify functions that control D-MAC (data MAC) and LDO to support variant chips.
--- drivers/net/wireless/realtek/rtw89/mac.c | 29 +++++++++++++++++++----- drivers/net/wireless/realtek/rtw89/reg.h | 2 ++ 2 files changed, 25 insertions(+), 6 deletions(-)
drivers/net/wireless/realtek/rtw89/mac.c +23 -6
@@ -1128,18 +1128,31 @@ static int cmac_func_en(struct rtw89_dev *rtwdev, u8 mac_idx, bool en)static int dmac_func_en (struct rtw89_dev *rtwdev) { +enum rtw89_core_chip_id chip_id = rtwdev->chip->chip_id;u32 val32; - val32 = (B_AX_MAC_FUNC_EN |B_AX_DMAC_FUNC_EN |B_AX_MAC_SEC_EN | -B_AX_DISPATCHER_EN |B_AX_DLE_CPUIO_EN |B_AX_PKT_IN_EN | -B_AX_DMAC_TBL_EN |B_AX_PKT_BUF_EN |B_AX_STA_SCH_EN | -B_AX_TXPKT_CTRL_EN |B_AX_WD_RLS_EN |B_AX_MPDU_PROC_EN ); +if (chip_id ==RTL8852C ) + val32 = (B_AX_MAC_FUNC_EN |B_AX_DMAC_FUNC_EN | +B_AX_MAC_SEC_EN |B_AX_DISPATCHER_EN | +B_AX_DLE_CPUIO_EN |B_AX_PKT_IN_EN | +B_AX_DMAC_TBL_EN |B_AX_PKT_BUF_EN | +B_AX_STA_SCH_EN |B_AX_TXPKT_CTRL_EN | +B_AX_WD_RLS_EN |B_AX_MPDU_PROC_EN | +B_AX_DMAC_CRPRT |B_AX_H_AXIDMA_EN ); +else + val32 = (B_AX_MAC_FUNC_EN |B_AX_DMAC_FUNC_EN | +B_AX_MAC_SEC_EN |B_AX_DISPATCHER_EN | +B_AX_DLE_CPUIO_EN |B_AX_PKT_IN_EN | +B_AX_DMAC_TBL_EN |B_AX_PKT_BUF_EN | +B_AX_STA_SCH_EN |B_AX_TXPKT_CTRL_EN | +B_AX_WD_RLS_EN |B_AX_MPDU_PROC_EN | +B_AX_DMAC_CRPRT );rtw89_write32 (rtwdev,R_AX_DMAC_FUNC_EN , val32); val32 = (B_AX_MAC_SEC_CLK_EN |B_AX_DISPATCHER_CLK_EN |B_AX_DLE_CPUIO_CLK_EN |B_AX_PKT_IN_CLK_EN |B_AX_STA_SCH_CLK_EN |B_AX_TXPKT_CTRL_CLK_EN | -B_AX_WD_RLS_CLK_EN ); +B_AX_WD_RLS_CLK_EN |B_AX_BBRPT_CLK_EN );rtw89_write32 (rtwdev,R_AX_DMAC_CLK_EN , val32);return 0 ;
@@ -1147,7 +1160,11 @@ static int dmac_func_en(struct rtw89_dev *rtwdev)static int chip_func_en (struct rtw89_dev *rtwdev) { -rtw89_write32_set (rtwdev,R_AX_SPSLDO_ON_CTRL0 ,B_AX_OCP_L1_MASK ); +enum rtw89_core_chip_id chip_id = rtwdev->chip->chip_id; + +if (chip_id ==RTL8852A ) +rtw89_write32_set (rtwdev,R_AX_SPSLDO_ON_CTRL0 , +B_AX_OCP_L1_MASK );return 0 ; }
drivers/net/wireless/realtek/rtw89/reg.h +2 -0
@@ -312,6 +312,7 @@#define R_AX_BOOT_DBG 0x83F0#define R_AX_DMAC_FUNC_EN 0x8400 +#define B_AX_DMAC_CRPRT BIT(31)#define B_AX_MAC_FUNC_EN BIT(30)#define B_AX_DMAC_FUNC_EN BIT(29)#define B_AX_MPDU_PROC_EN BIT(28)
@@ -339,6 +340,7 @@#define B_AX_PKT_IN_CLK_EN BIT(20)#define B_AX_DLE_CPUIO_CLK_EN BIT(19)#define B_AX_DISPATCHER_CLK_EN BIT(18) +#define B_AX_BBRPT_CLK_EN BIT(17)#define B_AX_MAC_SEC_CLK_EN BIT(16)#define PCI_LTR_IDLE_TIMER_1US 0
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH v2 7/12 rtw89: initialize preload window of D-MAC
In reply to Ping-Ke Shih8852C add new hardware feature -- preload window, which is used to load more data to D-MAC, so it can possibly yield better performance.
This patch is to configure preload and reserved size for next window.
--- drivers/net/wireless/realtek/rtw89/mac.c | 43 ++++++++++++++++++++++++ drivers/net/wireless/realtek/rtw89/reg.h | 24 +++++++++++++ 2 files changed, 67 insertions(+)
drivers/net/wireless/realtek/rtw89/mac.c +43 -0
@@ -1545,6 +1545,43 @@ static int dle_init(struct rtw89_dev *rtwdev, enum rtw89_qta_mode mode,return ret; } +static int preload_init_set (struct rtw89_dev *rtwdev,enum rtw89_mac_idx mac_idx, +enum rtw89_qta_mode mode) +{ +u32 reg, max_preld_size, min_rsvd_size; + + max_preld_size = (mac_idx ==RTW89_MAC_0 ? +PRELD_B0_ENT_NUM :PRELD_B1_ENT_NUM ) *PRELD_AMSDU_SIZE ; + reg = mac_idx ==RTW89_MAC_0 ? +R_AX_TXPKTCTL_B0_PRELD_CFG0 :R_AX_TXPKTCTL_B1_PRELD_CFG0 ; +rtw89_write32_mask (rtwdev, reg,B_AX_B0_PRELD_USEMAXSZ_MASK , max_preld_size); +rtw89_write32_set (rtwdev, reg,B_AX_B0_PRELD_FEN ); + + min_rsvd_size =PRELD_AMSDU_SIZE ; + reg = mac_idx ==RTW89_MAC_0 ? +R_AX_TXPKTCTL_B0_PRELD_CFG1 :R_AX_TXPKTCTL_B1_PRELD_CFG1 ; +rtw89_write32_mask (rtwdev, reg,B_AX_B0_PRELD_NXT_TXENDWIN_MASK ,PRELD_NEXT_WND ); +rtw89_write32_mask (rtwdev, reg,B_AX_B0_PRELD_NXT_RSVMINSZ_MASK , min_rsvd_size); + +return 0 ; +} + +static bool is_qta_poh (struct rtw89_dev *rtwdev) +{ +return rtwdev->hci.type ==RTW89_HCI_TYPE_PCIE ; +} + +static int preload_init (struct rtw89_dev *rtwdev,enum rtw89_mac_idx mac_idx, +enum rtw89_qta_mode mode) +{ +const struct rtw89_chip_info *chip = rtwdev->chip; + +if (chip->chip_id ==RTL8852A || chip->chip_id ==RTL8852B || !is_qta_poh (rtwdev)) +return 0 ; + +return preload_init_set (rtwdev, mac_idx, mode); +} +static bool dle_is_txq_empty (struct rtw89_dev *rtwdev) {u32 msk32;
@@ -1652,6 +1689,12 @@ static int dmac_init(struct rtw89_dev *rtwdev, u8 mac_idx)return ret; } + ret =preload_init (rtwdev,RTW89_MAC_0 , rtwdev->mac.qta_mode); +if (ret) { +rtw89_err (rtwdev,"[ERR]preload init %d\n" , ret); +return ret; + } + ret =hfc_init (rtwdev, true, true, true);if (ret) {rtw89_err (rtwdev,"[ERR]HCI FC init %d\n" , ret);
drivers/net/wireless/realtek/rtw89/reg.h +24 -0
@@ -742,6 +742,30 @@#define R_AX_DBG_FUN_INTF_DATA 0x9F34#define B_AX_DFI_DATA_MASK GENMASK(31, 0) +#define R_AX_TXPKTCTL_B0_PRELD_CFG0 0x9F48 +#define B_AX_B0_PRELD_FEN BIT(31) +#define B_AX_B0_PRELD_USEMAXSZ_MASK GENMASK(25, 16) +#define PRELD_B0_ENT_NUM 10 +#define PRELD_AMSDU_SIZE 52 +#define B_AX_B0_PRELD_CAM_G1ENTNUM_MASK GENMASK(12, 8) +#define B_AX_B0_PRELD_CAM_G0ENTNUM_MASK GENMASK(4, 0) + +#define R_AX_TXPKTCTL_B0_PRELD_CFG1 0x9F4C +#define B_AX_B0_PRELD_NXT_TXENDWIN_MASK GENMASK(11, 8) +#define PRELD_NEXT_WND 1 +#define B_AX_B0_PRELD_NXT_RSVMINSZ_MASK GENMASK(7, 0) + +#define R_AX_TXPKTCTL_B1_PRELD_CFG0 0x9F88 +#define B_AX_B1_PRELD_FEN BIT(31) +#define B_AX_B1_PRELD_USEMAXSZ_MASK GENMASK(25, 16) +#define PRELD_B1_ENT_NUM 4 +#define B_AX_B1_PRELD_CAM_G1ENTNUM_MASK GENMASK(12, 8) +#define B_AX_B1_PRELD_CAM_G0ENTNUM_MASK GENMASK(4, 0) + +#define R_AX_TXPKTCTL_B1_PRELD_CFG1 0x9F8C +#define B_AX_B1_PRELD_NXT_TXENDWIN_MASK GENMASK(11, 8) +#define B_AX_B1_PRELD_NXT_RSVMINSZ_MASK GENMASK(7, 0) +#define R_AX_AFE_CTRL1 0x0024#define B_AX_R_SYM_WLCMAC1_P4_PC_EN BIT(4)
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH v2 8/12 rtw89: disable FW and H2C function if CPU disabled
In reply to Ping-Ke ShihFrom: Chia-Yuan Li <[email protected]>
Initialize FW status and disabled H2C function if CPU disabled. Then, it can reset to initial state.
--- drivers/net/wireless/realtek/rtw89/mac.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/net/wireless/realtek/rtw89/mac.c +4 -0
@@ -2685,7 +2685,11 @@ static void rtw89_mac_disable_cpu(struct rtw89_dev *rtwdev)clear_bit (RTW89_FLAG_FW_RDY , rtwdev->flags);rtw89_write32_clr (rtwdev,R_AX_PLATFORM_ENABLE ,B_AX_WCPU_EN ); +rtw89_write32_clr (rtwdev,R_AX_WCPU_FW_CTRL ,B_AX_WCPU_FWDL_EN | +B_AX_H2C_PATH_RDY |B_AX_FWDL_PATH_RDY );rtw89_write32_clr (rtwdev,R_AX_SYS_CLK_CTRL ,B_AX_CPU_CLK_EN ); +rtw89_write32_clr (rtwdev,R_AX_PLATFORM_ENABLE ,B_AX_PLATFORM_EN ); +rtw89_write32_set (rtwdev,R_AX_PLATFORM_ENABLE ,B_AX_PLATFORM_EN ); } static int rtw89_mac_enable_cpu(struct rtw89_dev *rtwdev, u8 boot_reason,
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH v2 9/12 rtw89: 8852c: add mac_ctrl_path and mac_cfg_gnt APIs
In reply to Ping-Ke ShihFrom: Chia-Yuan Li <[email protected]>
The BT-coexistence uses these function to control antenna and TDMA, so implement the variant type to support all chips.
--- drivers/net/wireless/realtek/rtw89/coex.c | 24 +++---- drivers/net/wireless/realtek/rtw89/core.h | 19 +++++ drivers/net/wireless/realtek/rtw89/mac.c | 70 +++++++++++++++++++ drivers/net/wireless/realtek/rtw89/mac.h | 3 + drivers/net/wireless/realtek/rtw89/reg.h | 25 +++++++ drivers/net/wireless/realtek/rtw89/rtw8852a.c | 2 + drivers/net/wireless/realtek/rtw89/rtw8852c.c | 2 + 7 files changed, 133 insertions(+), 12 deletions(-)
drivers/net/wireless/realtek/rtw89/coex.c +12 -12
@@ -1478,7 +1478,7 @@ static void _set_gnt_wl(struct rtw89_dev *rtwdev, u8 phy_map, u8 state) } } -rtw89_mac_cfg_gnt (rtwdev, &dm->gnt); +rtw89_chip_mac_cfg_gnt (rtwdev, &dm->gnt); }#define BTC_TDMA_WLROLE_MAX 2
@@ -2233,7 +2233,7 @@ static void _set_gnt_bt(struct rtw89_dev *rtwdev, u8 phy_map, u8 state) } } -rtw89_mac_cfg_gnt (rtwdev, &dm->gnt); +rtw89_chip_mac_cfg_gnt (rtwdev, &dm->gnt); } static void _set_bt_plut(struct rtw89_dev *rtwdev, u8 phy_map,
@@ -2300,7 +2300,7 @@ static void _set_ant(struct rtw89_dev *rtwdev, bool force_exec,switch (type) {case BTC_ANT_WPOWERON : -rtw89_mac_cfg_ctrl_path (rtwdev, false); +rtw89_chip_cfg_ctrl_path (rtwdev, false);break ;case BTC_ANT_WINIT :if (bt->enable.now) {
@@ -2310,21 +2310,21 @@ static void _set_ant(struct rtw89_dev *rtwdev, bool force_exec,_set_gnt_wl (rtwdev, phy_map,BTC_GNT_SW_HI );_set_gnt_bt (rtwdev, phy_map,BTC_GNT_SW_LO ); } -rtw89_mac_cfg_ctrl_path (rtwdev, true); +rtw89_chip_cfg_ctrl_path (rtwdev, true);_set_bt_plut (rtwdev,BTC_PHY_ALL ,BTC_PLT_BT ,BTC_PLT_BT );break ;case BTC_ANT_WONLY :_set_gnt_wl (rtwdev, phy_map,BTC_GNT_SW_HI );_set_gnt_bt (rtwdev, phy_map,BTC_GNT_SW_LO ); -rtw89_mac_cfg_ctrl_path (rtwdev, true); +rtw89_chip_cfg_ctrl_path (rtwdev, true);_set_bt_plut (rtwdev,BTC_PHY_ALL ,BTC_PLT_NONE ,BTC_PLT_NONE );break ;case BTC_ANT_WOFF : -rtw89_mac_cfg_ctrl_path (rtwdev, false); +rtw89_chip_cfg_ctrl_path (rtwdev, false);_set_bt_plut (rtwdev,BTC_PHY_ALL ,BTC_PLT_NONE ,BTC_PLT_NONE );break ;case BTC_ANT_W2G : -rtw89_mac_cfg_ctrl_path (rtwdev, true); +rtw89_chip_cfg_ctrl_path (rtwdev, true);if (rtwdev->dbcc_en) {for (i =0 ; i <RTW89_PHY_MAX ; i++) { b2g = (wl_dinfo->real_band[i] ==RTW89_BAND_2G );
@@ -2352,32 +2352,32 @@ static void _set_ant(struct rtw89_dev *rtwdev, bool force_exec, }break ;case BTC_ANT_W5G : -rtw89_mac_cfg_ctrl_path (rtwdev, true); +rtw89_chip_cfg_ctrl_path (rtwdev, true);_set_gnt_wl (rtwdev, phy_map,BTC_GNT_SW_HI );_set_gnt_bt (rtwdev, phy_map,BTC_GNT_HW );_set_bt_plut (rtwdev,BTC_PHY_ALL ,BTC_PLT_NONE ,BTC_PLT_NONE );break ;case BTC_ANT_W25G : -rtw89_mac_cfg_ctrl_path (rtwdev, true); +rtw89_chip_cfg_ctrl_path (rtwdev, true);_set_gnt_wl (rtwdev, phy_map,BTC_GNT_HW );_set_gnt_bt (rtwdev, phy_map,BTC_GNT_HW );_set_bt_plut (rtwdev,BTC_PHY_ALL ,BTC_PLT_GNT_WL ,BTC_PLT_GNT_WL );break ;case BTC_ANT_FREERUN : -rtw89_mac_cfg_ctrl_path (rtwdev, true); +rtw89_chip_cfg_ctrl_path (rtwdev, true);_set_gnt_wl (rtwdev, phy_map,BTC_GNT_SW_HI );_set_gnt_bt (rtwdev, phy_map,BTC_GNT_SW_HI );_set_bt_plut (rtwdev,BTC_PHY_ALL ,BTC_PLT_NONE ,BTC_PLT_NONE );break ;case BTC_ANT_WRFK : -rtw89_mac_cfg_ctrl_path (rtwdev, true); +rtw89_chip_cfg_ctrl_path (rtwdev, true);_set_gnt_wl (rtwdev, phy_map,BTC_GNT_SW_HI );_set_gnt_bt (rtwdev, phy_map,BTC_GNT_SW_LO );_set_bt_plut (rtwdev, phy_map,BTC_PLT_NONE ,BTC_PLT_NONE );break ;case BTC_ANT_BRFK : -rtw89_mac_cfg_ctrl_path (rtwdev, false); +rtw89_chip_cfg_ctrl_path (rtwdev, false);_set_gnt_wl (rtwdev, phy_map,BTC_GNT_SW_LO );_set_gnt_bt (rtwdev, phy_map,BTC_GNT_SW_HI );_set_bt_plut (rtwdev, phy_map,BTC_PLT_NONE ,BTC_PLT_NONE );
drivers/net/wireless/realtek/rtw89/core.h +19 -0
@@ -2068,6 +2068,9 @@ struct rtw89_chip_ops { s8 pw_ofst, enum rtw89_mac_idx mac_idx);int (*pwr_on_func)(struct rtw89_dev *rtwdev);int (*pwr_off_func)(struct rtw89_dev *rtwdev); +int (*cfg_ctrl_path)(struct rtw89_dev *rtwdev,bool wl); +int (*mac_cfg_gnt)(struct rtw89_dev *rtwdev, +const struct rtw89_mac_ax_coex_gnt *gnt_cfg);void (*btc_set_rfe)(struct rtw89_dev *rtwdev);void (*btc_init_cfg)(struct rtw89_dev *rtwdev);
@@ -3467,6 +3470,22 @@ static inline void rtw89_ctrl_btg(struct rtw89_dev *rtwdev, bool btg) chip->ops->ctrl_btg (rtwdev, btg); } +static inline +void rtw89_chip_mac_cfg_gnt (struct rtw89_dev *rtwdev, +const struct rtw89_mac_ax_coex_gnt *gnt_cfg) +{ +const struct rtw89_chip_info *chip = rtwdev->chip; + + chip->ops->mac_cfg_gnt (rtwdev, gnt_cfg); +} + +static inline void rtw89_chip_cfg_ctrl_path (struct rtw89_dev *rtwdev,bool wl) +{ +const struct rtw89_chip_info *chip = rtwdev->chip; + + chip->ops->cfg_ctrl_path (rtwdev, wl); +} +static inline u8 *get_hdr_bssid (struct ieee80211_hdr *hdr) {__le16 fc = hdr->frame_control;
drivers/net/wireless/realtek/rtw89/mac.c +70 -0
82 lines not on this page · raw message
drivers/net/wireless/realtek/rtw89/mac.h +3 -0
@@ -799,12 +799,15 @@ void rtw89_mac_flush_txq(struct rtw89_dev *rtwdev, u32 queues, bool drop);int rtw89_mac_coex_init (struct rtw89_dev *rtwdev,const struct rtw89_mac_ax_coex *coex);int rtw89_mac_cfg_gnt (struct rtw89_dev *rtwdev,const struct rtw89_mac_ax_coex_gnt *gnt_cfg); +int rtw89_mac_cfg_gnt_v1 (struct rtw89_dev *rtwdev, +const struct rtw89_mac_ax_coex_gnt *gnt_cfg);int rtw89_mac_cfg_plt (struct rtw89_dev *rtwdev,struct rtw89_mac_ax_plt *plt);u16 rtw89_mac_get_plt_cnt (struct rtw89_dev *rtwdev,u8 band);void rtw89_mac_cfg_sb (struct rtw89_dev *rtwdev,u32 val);u32 rtw89_mac_get_sb (struct rtw89_dev *rtwdev);bool rtw89_mac_get_ctrl_path (struct rtw89_dev *rtwdev);int rtw89_mac_cfg_ctrl_path (struct rtw89_dev *rtwdev,bool wl); +int rtw89_mac_cfg_ctrl_path_v1 (struct rtw89_dev *rtwdev,bool wl);bool rtw89_mac_get_txpwr_cr (struct rtw89_dev *rtwdev,enum rtw89_phy_idx phy_idx,u32 reg_base,u32 *cr);
drivers/net/wireless/realtek/rtw89/reg.h +25 -0
@@ -1620,6 +1620,31 @@#define B_AX_STATIS_BT_LO_TX_1_MASK GENMASK(15, 0)#define B_AX_STATIS_BT_LO_RX_1_MASK GENMASK(31, 16) +#define R_AX_GNT_SW_CTRL 0xDA48 +#define R_AX_GNT_SW_CTRL_C1 0xFA48 +#define B_AX_WL_ACT2_VAL BIT(21) +#define B_AX_WL_ACT2_SWCTRL BIT(20) +#define B_AX_WL_ACT_VAL BIT(19) +#define B_AX_WL_ACT_SWCTRL BIT(18) +#define B_AX_GNT_BT_RX_VAL BIT(17) +#define B_AX_GNT_BT_RX_SWCTRL BIT(16) +#define B_AX_GNT_BT_TX_VAL BIT(15) +#define B_AX_GNT_BT_TX_SWCTRL BIT(14) +#define B_AX_GNT_WL_RX_VAL BIT(13) +#define B_AX_GNT_WL_RX_SWCTRL BIT(12) +#define B_AX_GNT_WL_TX_VAL BIT(11) +#define B_AX_GNT_WL_TX_SWCTRL BIT(10) +#define B_AX_GNT_BT_RFC_S1_VAL BIT(9) +#define B_AX_GNT_BT_RFC_S1_SWCTRL BIT(8) +#define B_AX_GNT_WL_RFC_S1_VAL BIT(7) +#define B_AX_GNT_WL_RFC_S1_SWCTRL BIT(6) +#define B_AX_GNT_BT_RFC_S0_VAL BIT(5) +#define B_AX_GNT_BT_RFC_S0_SWCTRL BIT(4) +#define B_AX_GNT_WL_RFC_S0_VAL BIT(3) +#define B_AX_GNT_WL_RFC_S0_SWCTRL BIT(2) +#define B_AX_GNT_WL_BB_VAL BIT(1) +#define B_AX_GNT_WL_BB_SWCTRL BIT(0) +#define R_AX_TDMA_MODE 0xDA4C#define R_AX_TDMA_MODE_C1 0xFA4C#define B_AX_R_BT_CMD_RPT_MASK GENMASK(31, 16)
drivers/net/wireless/realtek/rtw89/rtw8852a.c +2 -0
@@ -2019,6 +2019,8 @@ static const struct rtw89_chip_ops rtw8852a_chip_ops = { .set_txpwr_ul_tb_offset = rtw8852a_set_txpwr_ul_tb_offset, .pwr_on_func = NULL, .pwr_off_func = NULL, + .cfg_ctrl_path = rtw89_mac_cfg_ctrl_path, + .mac_cfg_gnt = rtw89_mac_cfg_gnt, .btc_set_rfe = rtw8852a_btc_set_rfe, .btc_init_cfg = rtw8852a_btc_init_cfg,
drivers/net/wireless/realtek/rtw89/rtw8852c.c +2 -0
@@ -490,6 +490,8 @@ static const struct rtw89_chip_ops rtw8852c_chip_ops = { .set_txpwr_ul_tb_offset = rtw8852c_set_txpwr_ul_tb_offset, .pwr_on_func = rtw8852c_pwr_on_func, .pwr_off_func = rtw8852c_pwr_off_func, + .cfg_ctrl_path = rtw89_mac_cfg_ctrl_path_v1, + .mac_cfg_gnt = rtw89_mac_cfg_gnt_v1, };const struct rtw89_chip_info rtw8852c_chip_info = {
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH v2 10/12 rtw89: change value assignment style of rtw89_mac_cfg_gnt()
In reply to Ping-Ke ShihUse if() style would be clear than "? :", because the else cases are always 0. The read val from rtw89_mac_read_lte() isn't used, so remove this statement.
--- drivers/net/wireless/realtek/rtw89/mac.c | 47 +++++++++++++----------- 1 file changed, 25 insertions(+), 22 deletions(-)
drivers/net/wireless/realtek/rtw89/mac.c +25 -22
@@ -3621,29 +3621,32 @@ EXPORT_SYMBOL(rtw89_mac_coex_init);int rtw89_mac_cfg_gnt (struct rtw89_dev *rtwdev,const struct rtw89_mac_ax_coex_gnt *gnt_cfg) { -u32 val, ret; +u32 val =0 , ret; + +if (gnt_cfg->band[0 ].gnt_bt) + val |=B_AX_GNT_BT_RFC_S0_SW_VAL |B_AX_GNT_BT_BB_S0_SW_VAL ; + +if (gnt_cfg->band[0 ].gnt_bt_sw_en) + val |=B_AX_GNT_BT_RFC_S0_SW_CTRL |B_AX_GNT_BT_BB_S0_SW_CTRL ; + +if (gnt_cfg->band[0 ].gnt_wl) + val |=B_AX_GNT_WL_RFC_S0_SW_VAL |B_AX_GNT_WL_BB_S0_SW_VAL ; + +if (gnt_cfg->band[0 ].gnt_wl_sw_en) + val |=B_AX_GNT_WL_RFC_S0_SW_CTRL |B_AX_GNT_WL_BB_S0_SW_CTRL ; + +if (gnt_cfg->band[1 ].gnt_bt) + val |=B_AX_GNT_BT_RFC_S1_SW_VAL |B_AX_GNT_BT_BB_S1_SW_VAL ; + +if (gnt_cfg->band[1 ].gnt_bt_sw_en) + val |=B_AX_GNT_BT_RFC_S1_SW_CTRL |B_AX_GNT_BT_BB_S1_SW_CTRL ; + +if (gnt_cfg->band[1 ].gnt_wl) + val |=B_AX_GNT_WL_RFC_S1_SW_VAL |B_AX_GNT_WL_BB_S1_SW_VAL ; + +if (gnt_cfg->band[1 ].gnt_wl_sw_en) + val |=B_AX_GNT_WL_RFC_S1_SW_CTRL |B_AX_GNT_WL_BB_S1_SW_CTRL ; - ret =rtw89_mac_read_lte (rtwdev,R_AX_LTE_SW_CFG_1 , &val); -if (ret) { -rtw89_err (rtwdev,"Read LTE fail!\n" ); -return ret; - } - val = (gnt_cfg->band[0 ].gnt_bt ? -B_AX_GNT_BT_RFC_S0_SW_VAL |B_AX_GNT_BT_BB_S0_SW_VAL :0 ) | - (gnt_cfg->band[0 ].gnt_bt_sw_en ? -B_AX_GNT_BT_RFC_S0_SW_CTRL |B_AX_GNT_BT_BB_S0_SW_CTRL :0 ) | - (gnt_cfg->band[0 ].gnt_wl ? -B_AX_GNT_WL_RFC_S0_SW_VAL |B_AX_GNT_WL_BB_S0_SW_VAL :0 ) | - (gnt_cfg->band[0 ].gnt_wl_sw_en ? -B_AX_GNT_WL_RFC_S0_SW_CTRL |B_AX_GNT_WL_BB_S0_SW_CTRL :0 ) | - (gnt_cfg->band[1 ].gnt_bt ? -B_AX_GNT_BT_RFC_S1_SW_VAL |B_AX_GNT_BT_BB_S1_SW_VAL :0 ) | - (gnt_cfg->band[1 ].gnt_bt_sw_en ? -B_AX_GNT_BT_RFC_S1_SW_CTRL |B_AX_GNT_BT_BB_S1_SW_CTRL :0 ) | - (gnt_cfg->band[1 ].gnt_wl ? -B_AX_GNT_WL_RFC_S1_SW_VAL |B_AX_GNT_WL_BB_S1_SW_VAL :0 ) | - (gnt_cfg->band[1 ].gnt_wl_sw_en ? -B_AX_GNT_WL_RFC_S1_SW_CTRL |B_AX_GNT_WL_BB_S1_SW_CTRL :0 ); ret =rtw89_mac_write_lte (rtwdev,R_AX_LTE_SW_CFG_1 , val);if (ret) {rtw89_err (rtwdev,"Write LTE fail!\n" );
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH v2 11/12 rtw89: extend mac tx_en bits from 16 to 32
In reply to Ping-Ke ShihIn order to support 8852C that uses 32 bits to control TX types.
This patch doesn't really use 32 bits tx_en yet, but next patch will use it.
--- drivers/net/wireless/realtek/rtw89/core.h | 2 +- drivers/net/wireless/realtek/rtw89/mac.c | 6 +++--- drivers/net/wireless/realtek/rtw89/mac.h | 4 ++-- drivers/net/wireless/realtek/rtw89/rtw8852a_rfk.c | 8 ++++---- 4 files changed, 10 insertions(+), 10 deletions(-)
drivers/net/wireless/realtek/rtw89/core.h +1 -1
@@ -609,7 +609,7 @@ struct rtw89_channel_params { };struct rtw89_channel_help_params { -u16 tx_en; +u32 tx_en; };struct rtw89_port_reg {
drivers/net/wireless/realtek/rtw89/mac.c +3 -3
@@ -2247,7 +2247,7 @@ static int rtw89_set_hw_sch_tx_en(struct rtw89_dev *rtwdev, u8 mac_idx, }int rtw89_mac_stop_sch_tx (struct rtw89_dev *rtwdev,u8 mac_idx, -u16 *tx_en,enum rtw89_sch_tx_sel sel) +u32 *tx_en,enum rtw89_sch_tx_sel sel) {int ret;
@@ -2285,7 +2285,7 @@ int rtw89_mac_stop_sch_tx(struct rtw89_dev *rtwdev, u8 mac_idx, }EXPORT_SYMBOL (rtw89_mac_stop_sch_tx); -int rtw89_mac_resume_sch_tx (struct rtw89_dev *rtwdev,u8 mac_idx,u16 tx_en) +int rtw89_mac_resume_sch_tx (struct rtw89_dev *rtwdev,u8 mac_idx,u32 tx_en) {int ret;
@@ -2459,7 +2459,7 @@ static int band1_enable(struct rtw89_dev *rtwdev)int ret, i;u32 sleep_bak[4 ] = {0 };u32 pause_bak[4 ] = {0 }; -u16 tx_en; +u32 tx_en; ret =rtw89_mac_stop_sch_tx (rtwdev,0 , &tx_en,RTW89_SCH_TX_SEL_ALL );if (ret) {
drivers/net/wireless/realtek/rtw89/mac.h +2 -2
@@ -791,8 +791,8 @@ void rtw89_mac_c2h_handle(struct rtw89_dev *rtwdev, struct sk_buff *skb, u32 len, u8 class, u8 func);int rtw89_mac_setup_phycap (struct rtw89_dev *rtwdev);int rtw89_mac_stop_sch_tx (struct rtw89_dev *rtwdev,u8 mac_idx, -u16 *tx_en,enum rtw89_sch_tx_sel sel); -int rtw89_mac_resume_sch_tx (struct rtw89_dev *rtwdev,u8 mac_idx,u16 tx_en); +u32 *tx_en,enum rtw89_sch_tx_sel sel); +int rtw89_mac_resume_sch_tx (struct rtw89_dev *rtwdev,u8 mac_idx,u32 tx_en);int rtw89_mac_cfg_ppdu_status (struct rtw89_dev *rtwdev,u8 mac_ids,bool enable);void rtw89_mac_update_rts_threshold (struct rtw89_dev *rtwdev,u8 mac_idx);void rtw89_mac_flush_txq (struct rtw89_dev *rtwdev,u32 queues,bool drop);
drivers/net/wireless/realtek/rtw89/rtw8852a_rfk.c +4 -4
@@ -3526,7 +3526,7 @@ static void _tssi_pre_tx(struct rtw89_dev *rtwdev, enum rtw89_phy_idx phy)const struct rtw89_chip_info *mac_reg = rtwdev->chip;u8 ch = rtwdev->hal.current_channel, ch_tmp;u8 bw = rtwdev->hal.current_band_width; -u16 tx_en; +u32 tx_en;u8 phy_map =rtw89_btc_phymap (rtwdev, phy,0 );s8 power;s16 xdbm;
@@ -3623,7 +3623,7 @@ void rtw8852a_dack(struct rtw89_dev *rtwdev)void rtw8852a_iqk (struct rtw89_dev *rtwdev,enum rtw89_phy_idx phy_idx) { -u16 tx_en; +u32 tx_en;u8 phy_map =rtw89_btc_phymap (rtwdev, phy_idx,0 );rtw89_btc_ntfy_wl_rfk (rtwdev, phy_map,BTC_WRFKT_IQK ,BTC_WRFK_START );
@@ -3648,7 +3648,7 @@ void rtw8852a_iqk_track(struct rtw89_dev *rtwdev)void rtw8852a_rx_dck (struct rtw89_dev *rtwdev,enum rtw89_phy_idx phy_idx,bool is_afe) { -u16 tx_en; +u32 tx_en;u8 phy_map =rtw89_btc_phymap (rtwdev, phy_idx,0 );rtw89_btc_ntfy_wl_rfk (rtwdev, phy_map,BTC_WRFKT_RXDCK ,BTC_WRFK_START );
@@ -3663,7 +3663,7 @@ void rtw8852a_rx_dck(struct rtw89_dev *rtwdev, enum rtw89_phy_idx phy_idx,void rtw8852a_dpk (struct rtw89_dev *rtwdev,enum rtw89_phy_idx phy_idx) { -u16 tx_en; +u32 tx_en;u8 phy_map =rtw89_btc_phymap (rtwdev, phy_idx,0 );rtw89_btc_ntfy_wl_rfk (rtwdev, phy_map,BTC_WRFKT_DPK ,BTC_WRFK_START );
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH v2 12/12 rtw89: implement stop and resume channels transmission v1
In reply to Ping-Ke ShihThese function is used to stop transmitting when we are going to switch channels or do some RF calibration. Before these operations, we need to stop channel transmission and backup setting into parameter tx_en. After operations are done, resume transmitting by backup parameter tx_en.
--- drivers/net/wireless/realtek/rtw89/core.h | 20 +++++ drivers/net/wireless/realtek/rtw89/mac.c | 84 +++++++++++++++++-- drivers/net/wireless/realtek/rtw89/mac.h | 3 + drivers/net/wireless/realtek/rtw89/reg.h | 7 ++ drivers/net/wireless/realtek/rtw89/rtw8852a.c | 6 +- .../net/wireless/realtek/rtw89/rtw8852a_rfk.c | 16 ++-- drivers/net/wireless/realtek/rtw89/rtw8852c.c | 2 + 7 files changed, 123 insertions(+), 15 deletions(-)
drivers/net/wireless/realtek/rtw89/core.h +20 -0
@@ -2071,6 +2071,9 @@ struct rtw89_chip_ops {int (*cfg_ctrl_path)(struct rtw89_dev *rtwdev,bool wl);int (*mac_cfg_gnt)(struct rtw89_dev *rtwdev,const struct rtw89_mac_ax_coex_gnt *gnt_cfg); +int (*stop_sch_tx)(struct rtw89_dev *rtwdev,u8 mac_idx, +u32 *tx_en,enum rtw89_sch_tx_sel sel); +int (*resume_sch_tx)(struct rtw89_dev *rtwdev,u8 mac_idx,u32 tx_en);void (*btc_set_rfe)(struct rtw89_dev *rtwdev);void (*btc_init_cfg)(struct rtw89_dev *rtwdev);
@@ -3486,6 +3489,23 @@ static inline void rtw89_chip_cfg_ctrl_path(struct rtw89_dev *rtwdev, bool wl) chip->ops->cfg_ctrl_path (rtwdev, wl); } +static inline +int rtw89_chip_stop_sch_tx (struct rtw89_dev *rtwdev,u8 mac_idx, +u32 *tx_en,enum rtw89_sch_tx_sel sel) +{ +const struct rtw89_chip_info *chip = rtwdev->chip; + +return chip->ops->stop_sch_tx (rtwdev, mac_idx, tx_en, sel); +} + +static inline +int rtw89_chip_resume_sch_tx (struct rtw89_dev *rtwdev,u8 mac_idx,u32 tx_en) +{ +const struct rtw89_chip_info *chip = rtwdev->chip; + +return chip->ops->resume_sch_tx (rtwdev, mac_idx, tx_en); +} +static inline u8 *get_hdr_bssid (struct ieee80211_hdr *hdr) {__le16 fc = hdr->frame_control;
drivers/net/wireless/realtek/rtw89/mac.c +79 -5
130 lines not on this page · raw message
drivers/net/wireless/realtek/rtw89/mac.h +3 -0
@@ -792,7 +792,10 @@ void rtw89_mac_c2h_handle(struct rtw89_dev *rtwdev, struct sk_buff *skb,int rtw89_mac_setup_phycap (struct rtw89_dev *rtwdev);int rtw89_mac_stop_sch_tx (struct rtw89_dev *rtwdev,u8 mac_idx,u32 *tx_en,enum rtw89_sch_tx_sel sel); +int rtw89_mac_stop_sch_tx_v1 (struct rtw89_dev *rtwdev,u8 mac_idx, +u32 *tx_en,enum rtw89_sch_tx_sel sel);int rtw89_mac_resume_sch_tx (struct rtw89_dev *rtwdev,u8 mac_idx,u32 tx_en); +int rtw89_mac_resume_sch_tx_v1 (struct rtw89_dev *rtwdev,u8 mac_idx,u32 tx_en);int rtw89_mac_cfg_ppdu_status (struct rtw89_dev *rtwdev,u8 mac_ids,bool enable);void rtw89_mac_update_rts_threshold (struct rtw89_dev *rtwdev,u8 mac_idx);void rtw89_mac_flush_txq (struct rtw89_dev *rtwdev,u32 queues,bool drop);
drivers/net/wireless/realtek/rtw89/reg.h +7 -0
@@ -893,6 +893,7 @@#define B_AX_CTN_TXEN_VI_0 BIT(2)#define B_AX_CTN_TXEN_BK_0 BIT(1)#define B_AX_CTN_TXEN_BE_0 BIT(0) +#define B_AX_CTN_TXEN_ALL_MASK GENMASK(15, 0)#define R_AX_MUEDCA_BE_PARAM_0 0xC350#define R_AX_MUEDCA_BE_PARAM_0_C1 0xE350
@@ -939,6 +940,12 @@#define B_AX_CTN_CHK_CCA_S20 BIT(1)#define B_AX_CTN_CHK_CCA_P20 BIT(0) +#define R_AX_CTN_DRV_TXEN 0xC398 +#define R_AX_CTN_DRV_TXEN_C1 0xE398 +#define B_AX_CTN_TXEN_TWT_3 BIT(17) +#define B_AX_CTN_TXEN_TWT_2 BIT(16) +#define B_AX_CTN_TXEN_ALL_MASK_V1 GENMASK(17, 0) +#define R_AX_SCHEDULE_ERR_IMR 0xC3E8#define R_AX_SCHEDULE_ERR_IMR_C1 0xE3E8#define B_AX_SORT_NON_IDLE_ERR_INT_EN BIT(1)
drivers/net/wireless/realtek/rtw89/rtw8852a.c +4 -2
@@ -1167,7 +1167,7 @@ static void rtw8852a_set_channel_help(struct rtw89_dev *rtwdev, bool enter,u8 phy_idx =RTW89_PHY_0 ;if (enter) { -rtw89_mac_stop_sch_tx (rtwdev,RTW89_MAC_0 , &p->tx_en,RTW89_SCH_TX_SEL_ALL ); +rtw89_chip_stop_sch_tx (rtwdev,RTW89_MAC_0 , &p->tx_en,RTW89_SCH_TX_SEL_ALL );rtw89_mac_cfg_ppdu_status (rtwdev,RTW89_MAC_0 , false);rtw8852a_dfs_en (rtwdev, false);rtw8852a_tssi_cont_en_phyidx (rtwdev, false,RTW89_PHY_0 );
@@ -1180,7 +1180,7 @@ static void rtw8852a_set_channel_help(struct rtw89_dev *rtwdev, bool enter,rtw8852a_dfs_en (rtwdev, true);rtw8852a_tssi_cont_en_phyidx (rtwdev, true,RTW89_PHY_0 );rtw8852a_bb_reset_en (rtwdev, phy_idx, true); -rtw89_mac_resume_sch_tx (rtwdev,RTW89_MAC_0 , p->tx_en); +rtw89_chip_resume_sch_tx (rtwdev,RTW89_MAC_0 , p->tx_en); } }
@@ -2021,6 +2021,8 @@ static const struct rtw89_chip_ops rtw8852a_chip_ops = { .pwr_off_func = NULL, .cfg_ctrl_path = rtw89_mac_cfg_ctrl_path, .mac_cfg_gnt = rtw89_mac_cfg_gnt, + .stop_sch_tx = rtw89_mac_stop_sch_tx, + .resume_sch_tx = rtw89_mac_resume_sch_tx, .btc_set_rfe = rtw8852a_btc_set_rfe, .btc_init_cfg = rtw8852a_btc_init_cfg,
drivers/net/wireless/realtek/rtw89/rtw8852a_rfk.c +8 -8
@@ -3554,7 +3554,7 @@ static void _tssi_pre_tx(struct rtw89_dev *rtwdev, enum rtw89_phy_idx phy) __func__, phy, power, xdbm);rtw89_btc_ntfy_wl_rfk (rtwdev, phy_map,BTC_WRFKT_DPK ,BTC_WRFK_START ); -rtw89_mac_stop_sch_tx (rtwdev, phy, &tx_en,RTW89_SCH_TX_SEL_ALL ); +rtw89_chip_stop_sch_tx (rtwdev, phy, &tx_en,RTW89_SCH_TX_SEL_ALL );_wait_rx_mode (rtwdev,_kpath (rtwdev, phy)); tx_counter =rtw89_phy_read32_mask (rtwdev,R_TX_COUNTER ,MASKLWORD );
@@ -3600,7 +3600,7 @@ static void _tssi_pre_tx(struct rtw89_dev *rtwdev, enum rtw89_phy_idx phy)rtw8852a_bb_tx_mode_switch (rtwdev, phy,0 ); -rtw89_mac_resume_sch_tx (rtwdev, phy, tx_en); +rtw89_chip_resume_sch_tx (rtwdev, phy, tx_en);rtw89_btc_ntfy_wl_rfk (rtwdev, phy_map,BTC_WRFKT_DPK ,BTC_WRFK_STOP ); }
@@ -3627,7 +3627,7 @@ void rtw8852a_iqk(struct rtw89_dev *rtwdev, enum rtw89_phy_idx phy_idx)u8 phy_map =rtw89_btc_phymap (rtwdev, phy_idx,0 );rtw89_btc_ntfy_wl_rfk (rtwdev, phy_map,BTC_WRFKT_IQK ,BTC_WRFK_START ); -rtw89_mac_stop_sch_tx (rtwdev, phy_idx, &tx_en,RTW89_SCH_TX_SEL_ALL ); +rtw89_chip_stop_sch_tx (rtwdev, phy_idx, &tx_en,RTW89_SCH_TX_SEL_ALL );_wait_rx_mode (rtwdev,_kpath (rtwdev, phy_idx));_iqk_init (rtwdev);
@@ -3636,7 +3636,7 @@ void rtw8852a_iqk(struct rtw89_dev *rtwdev, enum rtw89_phy_idx phy_idx)else _iqk (rtwdev, phy_idx, false); -rtw89_mac_resume_sch_tx (rtwdev, phy_idx, tx_en); +rtw89_chip_resume_sch_tx (rtwdev, phy_idx, tx_en);rtw89_btc_ntfy_wl_rfk (rtwdev, phy_map,BTC_WRFKT_IQK ,BTC_WRFK_STOP ); }
@@ -3652,12 +3652,12 @@ void rtw8852a_rx_dck(struct rtw89_dev *rtwdev, enum rtw89_phy_idx phy_idx,u8 phy_map =rtw89_btc_phymap (rtwdev, phy_idx,0 );rtw89_btc_ntfy_wl_rfk (rtwdev, phy_map,BTC_WRFKT_RXDCK ,BTC_WRFK_START ); -rtw89_mac_stop_sch_tx (rtwdev, phy_idx, &tx_en,RTW89_SCH_TX_SEL_ALL ); +rtw89_chip_stop_sch_tx (rtwdev, phy_idx, &tx_en,RTW89_SCH_TX_SEL_ALL );_wait_rx_mode (rtwdev,_kpath (rtwdev, phy_idx));_rx_dck (rtwdev, phy_idx, is_afe); -rtw89_mac_resume_sch_tx (rtwdev, phy_idx, tx_en); +rtw89_chip_resume_sch_tx (rtwdev, phy_idx, tx_en);rtw89_btc_ntfy_wl_rfk (rtwdev, phy_map,BTC_WRFKT_RXDCK ,BTC_WRFK_STOP ); }
@@ -3667,14 +3667,14 @@ void rtw8852a_dpk(struct rtw89_dev *rtwdev, enum rtw89_phy_idx phy_idx)u8 phy_map =rtw89_btc_phymap (rtwdev, phy_idx,0 );rtw89_btc_ntfy_wl_rfk (rtwdev, phy_map,BTC_WRFKT_DPK ,BTC_WRFK_START ); -rtw89_mac_stop_sch_tx (rtwdev, phy_idx, &tx_en,RTW89_SCH_TX_SEL_ALL ); +rtw89_chip_stop_sch_tx (rtwdev, phy_idx, &tx_en,RTW89_SCH_TX_SEL_ALL );_wait_rx_mode (rtwdev,_kpath (rtwdev, phy_idx)); rtwdev->dpk.is_dpk_enable = true; rtwdev->dpk.is_dpk_reload_en = false;_dpk (rtwdev, phy_idx, false); -rtw89_mac_resume_sch_tx (rtwdev, phy_idx, tx_en); +rtw89_chip_resume_sch_tx (rtwdev, phy_idx, tx_en);rtw89_btc_ntfy_wl_rfk (rtwdev, phy_map,BTC_WRFKT_DPK ,BTC_WRFK_STOP ); }
drivers/net/wireless/realtek/rtw89/rtw8852c.c +2 -0
@@ -492,6 +492,8 @@ static const struct rtw89_chip_ops rtw8852c_chip_ops = { .pwr_off_func = rtw8852c_pwr_off_func, .cfg_ctrl_path = rtw89_mac_cfg_ctrl_path_v1, .mac_cfg_gnt = rtw89_mac_cfg_gnt_v1, + .stop_sch_tx = rtw89_mac_stop_sch_tx_v1, + .resume_sch_tx = rtw89_mac_resume_sch_tx_v1, };const struct rtw89_chip_info rtw8852c_chip_info = {
Signature · 1 line
2.25.1