wifi: rtw89: prepare changes of MAC part for RTL8922D
Ping-Ke Shih
maintainercover wifi: rtw89: prepare changes of MAC part for RTL8922D
The MAC part changes of RTL8922D includes helper of coex, quota of PLE/MPDU/WP, pre-load, pre-init, EDCCA and etc. Add them according to hardware changes.
Chia-Yuan Li (1):
wifi: rtw89: coex: update coex software control for RTL8922D
Ping-Ke Shih (12):
wifi: rtw89: coex: make coex scoreboard as chip info
wifi: rtw89: coex: update scoreboard value according to power state
for two BT
wifi: rtw89: mac: remove unnecessary return from
rtw89_fwdl_secure_idmem_share_mode()
wifi: rtw89: mac: add dle_mem and ple_{min,max}_qt quota for RTL8922D
wifi: rtw89: mac: set quota 13 for PLE SNRPT
wifi: rtw89: mac: update MPDU quota according to chip DLE definition
wifi: rtw89: mac: update WP quota for RTL8922D
wifi: rtw89: mac: define preload_init for generations
wifi: rtw89: mac: configure DMA_STOP1 by predefined mask
wifi: rtw89: mac: separate functions of CMAC power and function enable
wifi: rtw89: mac: add an entry to enable MAC function in preinit
wifi: rtw89: mac: set EDCCA configurations for RTL8922D
drivers/net/wireless/realtek/rtw89/core.c | 1 + drivers/net/wireless/realtek/rtw89/core.h | 36 +- drivers/net/wireless/realtek/rtw89/mac.c | 70 +++- drivers/net/wireless/realtek/rtw89/mac.h | 49 ++- drivers/net/wireless/realtek/rtw89/mac_be.c | 348 ++++++++++++++++-- drivers/net/wireless/realtek/rtw89/pci.h | 25 -- drivers/net/wireless/realtek/rtw89/pci_be.c | 4 + drivers/net/wireless/realtek/rtw89/reg.h | 294 ++++++++++++++- drivers/net/wireless/realtek/rtw89/rtw8851b.c | 1 + drivers/net/wireless/realtek/rtw89/rtw8852a.c | 1 + drivers/net/wireless/realtek/rtw89/rtw8852b.c | 1 + .../net/wireless/realtek/rtw89/rtw8852bt.c | 1 + drivers/net/wireless/realtek/rtw89/rtw8852c.c | 1 + drivers/net/wireless/realtek/rtw89/rtw8922a.c | 1 + 14 files changed, 767 insertions(+), 66 deletions(-)
base-commit: baef3d5d96d2f7530011cdebd7aeecdc85cd93a7
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 1/13 wifi: rtw89: coex: make coex scoreboard as chip info
The coex scoreboard is to exchange WiFi and BT profiles, and the coming chip 8922D changes the design including extend to two scoreboards and individual register for cfg/get. Follow the changes to abstract current code, but not change logic for existing chips at all.
--- drivers/net/wireless/realtek/rtw89/core.h | 8 ++++++++ drivers/net/wireless/realtek/rtw89/mac.c | 16 +++++++++++----- drivers/net/wireless/realtek/rtw89/reg.h | 4 ++++ 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/rtw8852bt.c | 1 + drivers/net/wireless/realtek/rtw89/rtw8852c.c | 1 + drivers/net/wireless/realtek/rtw89/rtw8922a.c | 1 + 9 files changed, 29 insertions(+), 5 deletions(-)
drivers/net/wireless/realtek/rtw89/core.h +8 -0
@@ -4338,6 +4338,13 @@ struct rtw89_rfkill_regs {struct rtw89_reg3_def mode; }; +struct rtw89_sb_regs { +struct { +u32 cfg; +u32 get; + } n[2 ]; +}; +struct rtw89_dig_regs {u32 seg0_pd_reg;u32 pd_lower_bound_mask;
@@ -4555,6 +4562,7 @@ struct rtw89_chip_info {u32 bss_clr_map_reg;const struct rtw89_rfkill_regs *rfkill_init;struct rtw89_reg_def rfkill_get; +struct rtw89_sb_regs btc_sb;u32 dma_ch_mask;const struct rtw89_edcca_regs *edcca_regs;const struct wiphy_wowlan_support *wowlan_stub;
drivers/net/wireless/realtek/rtw89/mac.c +11 -5
@@ -1498,6 +1498,7 @@ static int rtw89_mac_power_switch(struct rtw89_dev *rtwdev, bool on)const struct rtw89_chip_info *chip = rtwdev->chip;const struct rtw89_pwr_cfg *const *cfg_seq;int (*cfg_func)(struct rtw89_dev *rtwdev); +u32 reg = chip->btc_sb.n[0 ].cfg;int ret;rtw89_mac_power_switch_boot_mode (rtwdev);
@@ -1537,14 +1538,14 @@ static int rtw89_mac_power_switch(struct rtw89_dev *rtwdev, bool on)set_bit (RTW89_FLAG_POWERON , rtwdev->flags);set_bit (RTW89_FLAG_DMAC_FUNC , rtwdev->flags);set_bit (RTW89_FLAG_CMAC0_FUNC , rtwdev->flags); -rtw89_write8 (rtwdev,R_AX_SCOREBOARD +3 ,MAC_AX_NOTIFY_TP_MAJOR ); +rtw89_write8 (rtwdev, reg +3 ,MAC_AX_NOTIFY_TP_MAJOR ); }else {clear_bit (RTW89_FLAG_POWERON , rtwdev->flags);clear_bit (RTW89_FLAG_DMAC_FUNC , rtwdev->flags);clear_bit (RTW89_FLAG_CMAC0_FUNC , rtwdev->flags);clear_bit (RTW89_FLAG_CMAC1_FUNC , rtwdev->flags);clear_bit (RTW89_FLAG_FW_RDY , rtwdev->flags); -rtw89_write8 (rtwdev,R_AX_SCOREBOARD +3 ,MAC_AX_NOTIFY_PWR_MAJOR ); +rtw89_write8 (rtwdev, reg +3 ,MAC_AX_NOTIFY_PWR_MAJOR );rtw89_set_entity_state (rtwdev,RTW89_PHY_0 , false);rtw89_set_entity_state (rtwdev,RTW89_PHY_1 , false); }
@@ -6413,9 +6414,11 @@ int rtw89_mac_cfg_plt_ax(struct rtw89_dev *rtwdev, struct rtw89_mac_ax_plt *plt)void rtw89_mac_cfg_sb (struct rtw89_dev *rtwdev,u32 val) { +const struct rtw89_chip_info *chip = rtwdev->chip; +u32 reg = chip->btc_sb.n[0 ].cfg;u32 fw_sb; - fw_sb =rtw89_read32 (rtwdev,R_AX_SCOREBOARD ); + fw_sb =rtw89_read32 (rtwdev, reg); fw_sb =FIELD_GET (B_MAC_AX_SB_FW_MASK , fw_sb); fw_sb = fw_sb & ~B_MAC_AX_BTGS1_NOTIFY ;if (!test_bit (RTW89_FLAG_POWERON , rtwdev->flags))
@@ -6426,13 +6429,16 @@ void rtw89_mac_cfg_sb(struct rtw89_dev *rtwdev, u32 val) val =B_AX_TOGGLE |FIELD_PREP (B_MAC_AX_SB_DRV_MASK , val) |FIELD_PREP (B_MAC_AX_SB_FW_MASK , fw_sb); -rtw89_write32 (rtwdev,R_AX_SCOREBOARD , val); +rtw89_write32 (rtwdev, reg, val);fsleep (1000 );/* avoid BT FW loss information */ }u32 rtw89_mac_get_sb (struct rtw89_dev *rtwdev) { -return rtw89_read32 (rtwdev,R_AX_SCOREBOARD ); +const struct rtw89_chip_info *chip = rtwdev->chip; +u32 reg = chip->btc_sb.n[0 ].get; + +return rtw89_read32 (rtwdev, reg); }int rtw89_mac_cfg_ctrl_path (struct rtw89_dev *rtwdev,bool wl)
drivers/net/wireless/realtek/rtw89/reg.h +4 -0
@@ -4220,6 +4220,10 @@#define B_BE_EF_DSB_EN BIT(11)#define B_BE_EF_DLY_SEL_MASK GENMASK(3, 0) +#define R_BE_SCOREBOARD 0x00AC +#define B_BE_TOGGLE BIT(31) +#define B_BE_DATA_LINE_MASK GENMASK(30, 0) +#define R_BE_PMC_DBG_CTRL2 0x00CC#define B_BE_EFUSE_BURN_GNT_MASK GENMASK(31, 24)#define B_BE_DIS_IOWRAP_TIMEOUT BIT(16)
drivers/net/wireless/realtek/rtw89/rtw8851b.c +1 -0
@@ -2707,6 +2707,7 @@ const struct rtw89_chip_info rtw8851b_chip_info = { .bss_clr_map_reg = R_BSS_CLR_MAP_V1, .rfkill_init = &rtw8851b_rfkill_regs, .rfkill_get = {R_AX_GPIO_EXT_CTRL, B_AX_GPIO_IN_9}, + .btc_sb = {{{R_AX_SCOREBOARD, R_AX_SCOREBOARD},}}, .dma_ch_mask = BIT(RTW89_DMA_ACH4) | BIT(RTW89_DMA_ACH5) |BIT (RTW89_DMA_ACH6 ) |BIT (RTW89_DMA_ACH7 ) | BIT(RTW89_DMA_B1MG) | BIT(RTW89_DMA_B1HI),
drivers/net/wireless/realtek/rtw89/rtw8852a.c +1 -0
@@ -2394,6 +2394,7 @@ const struct rtw89_chip_info rtw8852a_chip_info = { .bss_clr_map_reg = R_BSS_CLR_MAP, .rfkill_init = &rtw8852a_rfkill_regs, .rfkill_get = {R_AX_GPIO_EXT_CTRL, B_AX_GPIO_IN_9}, + .btc_sb = {{{R_AX_SCOREBOARD, R_AX_SCOREBOARD},}}, .dma_ch_mask = 0, .edcca_regs = &rtw8852a_edcca_regs, #ifdef CONFIG_PM
drivers/net/wireless/realtek/rtw89/rtw8852b.c +1 -0
@@ -1041,6 +1041,7 @@ const struct rtw89_chip_info rtw8852b_chip_info = { .bss_clr_map_reg = R_BSS_CLR_MAP_V1, .rfkill_init = &rtw8852b_rfkill_regs, .rfkill_get = {R_AX_GPIO_EXT_CTRL, B_AX_GPIO_IN_9}, + .btc_sb = {{{R_AX_SCOREBOARD, R_AX_SCOREBOARD},}}, .dma_ch_mask = BIT(RTW89_DMA_ACH4) | BIT(RTW89_DMA_ACH5) |BIT (RTW89_DMA_ACH6 ) |BIT (RTW89_DMA_ACH7 ) | BIT(RTW89_DMA_B1MG) | BIT(RTW89_DMA_B1HI),
drivers/net/wireless/realtek/rtw89/rtw8852bt.c +1 -0
@@ -878,6 +878,7 @@ const struct rtw89_chip_info rtw8852bt_chip_info = { .bss_clr_map_reg = R_BSS_CLR_MAP_V1, .rfkill_init = &rtw8852bt_rfkill_regs, .rfkill_get = {R_AX_GPIO_EXT_CTRL, B_AX_GPIO_IN_9}, + .btc_sb = {{{R_AX_SCOREBOARD, R_AX_SCOREBOARD},}}, .dma_ch_mask = BIT(RTW89_DMA_ACH4) | BIT(RTW89_DMA_ACH5) |BIT (RTW89_DMA_ACH6 ) |BIT (RTW89_DMA_ACH7 ) | BIT(RTW89_DMA_B1MG) | BIT(RTW89_DMA_B1HI),
drivers/net/wireless/realtek/rtw89/rtw8852c.c +1 -0
@@ -3239,6 +3239,7 @@ const struct rtw89_chip_info rtw8852c_chip_info = { .bss_clr_map_reg = R_BSS_CLR_MAP, .rfkill_init = &rtw8852c_rfkill_regs, .rfkill_get = {R_AX_GPIO_EXT_CTRL, B_AX_GPIO_IN_9}, + .btc_sb = {{{R_AX_SCOREBOARD, R_AX_SCOREBOARD},}}, .dma_ch_mask = 0, .edcca_regs = &rtw8852c_edcca_regs, #ifdef CONFIG_PM
drivers/net/wireless/realtek/rtw89/rtw8922a.c +1 -0
@@ -3005,6 +3005,7 @@ const struct rtw89_chip_info rtw8922a_chip_info = { .bss_clr_map_reg = R_BSS_CLR_MAP_V2, .rfkill_init = &rtw8922a_rfkill_regs, .rfkill_get = {R_BE_GPIO_EXT_CTRL, B_BE_GPIO_IN_9}, + .btc_sb = {{{R_BE_SCOREBOARD, R_BE_SCOREBOARD},}}, .dma_ch_mask = 0, .edcca_regs = &rtw8922a_edcca_regs, #ifdef CONFIG_PM
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerRe: [PATCH rtw-next 01/13] wifi: rtw89: coex: make coex scoreboard as chip info
Quoted 6 lines · Ping-Ke Shih
The coex scoreboard is to exchange WiFi and BT profiles, and the coming chip 8922D changes the design including extend to two scoreboards and individual register for cfg/get. Follow the changes to abstract current code, but not change logic for existing chips at all.
Signed-off-by Ping-Ke Shih <[email protected]>
13 patch(es) applied to rtw-next branch of rtw.git, thanks.
95052ab2d794 wifi: rtw89: coex: make coex scoreboard as chip infoed2feda12f36 wifi: rtw89: coex: update scoreboard value according to power state for two BT 286bb07889c1 wifi: rtw89: coex: update coex software control for RTL8922D 9d6a2a636c9f wifi: rtw89: mac: remove unnecessary return from rtw89_fwdl_secure_idmem_share_mode() 5afb451bb5e0 wifi: rtw89: mac: add dle_mem and ple_{min,max}_qt quota for RTL8922D 70cd273aae23 wifi: rtw89: mac: set quota 13 for PLE SNRPT9cf039ee49b5 wifi: rtw89: mac: update MPDU quota according to chip DLE definition a69c2c9a587d wifi: rtw89: mac: update WP quota for RTL8922D7ded59e69ab3 wifi: rtw89: mac: define preload_init for generationsbaf38631460b wifi: rtw89: mac: configure DMA_STOP1 by predefined maskc16673247b40 wifi: rtw89: mac: separate functions of CMAC power and function enable 6996a4c97ad6 wifi: rtw89: mac: add an entry to enable MAC function in preinit 40714b8a2137 wifi: rtw89: mac: set EDCCA configurations for RTL8922D
Ping-Ke Shih
maintainerPATCH 2/13 wifi: rtw89: coex: update scoreboard value according to power state for two BT
In reply to Ping-Ke ShihAssign timeslot to WiFi if power state is on. Since firmware isn't working at this moment, write scoreboard register to notify BT. Extend the code to support two BT for coming chips.
--- drivers/net/wireless/realtek/rtw89/mac.c | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-)
drivers/net/wireless/realtek/rtw89/mac.c +19 -3
@@ -1492,13 +1492,27 @@ static int rtw89_mac_pwr_off_func_for_unplugged(struct rtw89_dev *rtwdev)return 0 ; } +static void rtw89_mac_update_scoreboard (struct rtw89_dev *rtwdev,u8 val) +{ +const struct rtw89_chip_info *chip = rtwdev->chip; +u32 reg; +int i; + +for (i =0 ; i <ARRAY_SIZE (chip->btc_sb.n); i++) { + reg = chip->btc_sb.n[i].cfg; +if (!reg) +continue ; + +rtw89_write8 (rtwdev, reg +3 , val); + } +} +static int rtw89_mac_power_switch (struct rtw89_dev *rtwdev,bool on) {const struct rtw89_mac_gen_def *mac = rtwdev->chip->mac_def;const struct rtw89_chip_info *chip = rtwdev->chip;const struct rtw89_pwr_cfg *const *cfg_seq;int (*cfg_func)(struct rtw89_dev *rtwdev); -u32 reg = chip->btc_sb.n[0 ].cfg;int ret;rtw89_mac_power_switch_boot_mode (rtwdev);
@@ -1538,14 +1552,16 @@ static int rtw89_mac_power_switch(struct rtw89_dev *rtwdev, bool on)set_bit (RTW89_FLAG_POWERON , rtwdev->flags);set_bit (RTW89_FLAG_DMAC_FUNC , rtwdev->flags);set_bit (RTW89_FLAG_CMAC0_FUNC , rtwdev->flags); -rtw89_write8 (rtwdev, reg +3 ,MAC_AX_NOTIFY_TP_MAJOR ); + +rtw89_mac_update_scoreboard (rtwdev,MAC_AX_NOTIFY_TP_MAJOR ); }else {clear_bit (RTW89_FLAG_POWERON , rtwdev->flags);clear_bit (RTW89_FLAG_DMAC_FUNC , rtwdev->flags);clear_bit (RTW89_FLAG_CMAC0_FUNC , rtwdev->flags);clear_bit (RTW89_FLAG_CMAC1_FUNC , rtwdev->flags);clear_bit (RTW89_FLAG_FW_RDY , rtwdev->flags); -rtw89_write8 (rtwdev, reg +3 ,MAC_AX_NOTIFY_PWR_MAJOR ); + +rtw89_mac_update_scoreboard (rtwdev,MAC_AX_NOTIFY_PWR_MAJOR );rtw89_set_entity_state (rtwdev,RTW89_PHY_0 , false);rtw89_set_entity_state (rtwdev,RTW89_PHY_1 , false); }
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 3/13 wifi: rtw89: coex: update coex software control for RTL8922D
In reply to Ping-Ke ShihFrom: Chia-Yuan Li <[email protected]>
Update software control API due to 8922D PTA hardware changes.
--- drivers/net/wireless/realtek/rtw89/mac.h | 2 + drivers/net/wireless/realtek/rtw89/mac_be.c | 59 +++++++++++++++++- drivers/net/wireless/realtek/rtw89/reg.h | 69 +++++++++++++++++++++ 3 files changed, 129 insertions(+), 1 deletion(-)
drivers/net/wireless/realtek/rtw89/mac.h +2 -0
@@ -1358,6 +1358,8 @@ int rtw89_mac_cfg_gnt_v1(struct rtw89_dev *rtwdev, const struct rtw89_mac_ax_coex_gnt *gnt_cfg);int rtw89_mac_cfg_gnt_v2 (struct rtw89_dev *rtwdev,const struct rtw89_mac_ax_coex_gnt *gnt_cfg); +int rtw89_mac_cfg_gnt_v3 (struct rtw89_dev *rtwdev, +const struct rtw89_mac_ax_coex_gnt *gnt_cfg);static inline int rtw89_mac_cfg_plt (struct rtw89_dev *rtwdev,struct rtw89_mac_ax_plt *plt)
drivers/net/wireless/realtek/rtw89/mac_be.c +58 -1
77 lines not on this page · raw message
drivers/net/wireless/realtek/rtw89/reg.h +69 -0
75 lines not on this page · raw message
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 4/13 wifi: rtw89: mac: remove unnecessary return from rtw89_fwdl_secure_idmem_share_mode()
In reply to Ping-Ke ShihThe return type of rtw89_fwdl_secure_idmem_share_mode() is void, so no need a return.
--- drivers/net/wireless/realtek/rtw89/mac.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/realtek/rtw89/mac.h +1 -1
@@ -1625,7 +1625,7 @@ void rtw89_fwdl_secure_idmem_share_mode(struct rtw89_dev *rtwdev, u8 mode)if (!mac->fwdl_secure_idmem_share_mode)return ; -return mac->fwdl_secure_idmem_share_mode (rtwdev, mode); + mac->fwdl_secure_idmem_share_mode (rtwdev, mode); } static inline
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 5/13 wifi: rtw89: mac: add dle_mem and ple_{min,max}_qt quota for RTL8922D
In reply to Ping-Ke ShihThe quota of DLE and PLE depends on hardware design and consideration of performance and application. Define them accordingly.
--- drivers/net/wireless/realtek/rtw89/core.h | 20 ++++++++++++++++++-- drivers/net/wireless/realtek/rtw89/mac.c | 14 ++++++++++++++ drivers/net/wireless/realtek/rtw89/mac.h | 15 +++++++++++++++ 3 files changed, 47 insertions(+), 2 deletions(-)
drivers/net/wireless/realtek/rtw89/core.h +18 -2
@@ -4002,13 +4002,14 @@ struct rtw89_dle_size {u16 pge_size;u16 lnk_pge_num;u16 unlnk_pge_num; -/* for WiFi 7 chips below */ +/* for WiFi 7 chips below (suffix v1) */ u32 srt_ofst; };struct rtw89_wde_quota {u16 hif;u16 wcpu; +/* unused dcpu isn't listed */ u16 pkt_in;u16 cpu_io; };
@@ -4026,8 +4027,10 @@ struct rtw89_ple_quota {u16 wd_rel;u16 cpu_io;u16 tx_rpt; -/* for WiFi 7 chips below */ +/* for WiFi 7 chips below (suffix v1) */ u16 h2d; +/* for WiFi 7 chips after 8922D (suffix v2) */ +u16 snrpt; };struct rtw89_rsvd_quota {
@@ -4048,6 +4051,17 @@ struct rtw89_dle_rsvd_size {u32 size; }; +struct rtw89_dle_input { +u32 tx_ampdu_num_b0; +u32 tx_ampdu_num_b1; +u32 tx_amsdu_size;/* unit: KB */ +u32 h2c_max_size; +u32 rx_amsdu_size;/* unit: KB */ +u32 c2h_max_size; +u32 mpdu_info_tbl_b0; +u32 mpdu_info_tbl_b1; +}; +struct rtw89_dle_mem {enum rtw89_qta_mode mode;const struct rtw89_dle_size *wde_size;
@@ -4060,6 +4074,8 @@ struct rtw89_dle_mem {const struct rtw89_rsvd_quota *rsvd_qt;const struct rtw89_dle_rsvd_size *rsvd0_size;const struct rtw89_dle_rsvd_size *rsvd1_size; +/* for WiFi 7 chips after 8922D */ +const struct rtw89_dle_input *dle_input; };struct rtw89_reg_def {
drivers/net/wireless/realtek/rtw89/mac.c +14 -0
@@ -1717,10 +1717,12 @@ const struct rtw89_mac_size_set rtw89_mac_size = { .wde_size7 = {RTW89_WDE_PG_64, 510, 2,},/* DLFW */ .wde_size9 = {RTW89_WDE_PG_64, 0, 1024,}, + .wde_size16_v1 = {RTW89_WDE_PG_64, 639, 1, 0,},/* 8852C USB3.0 */ .wde_size17 = {RTW89_WDE_PG_64, 354, 30,},/* 8852C DLFW */ .wde_size18 = {RTW89_WDE_PG_64, 0, 2048,}, + .wde_size18_v1 = {RTW89_WDE_PG_64, 0, 640, 0,},/* 8852C PCIE SCC */ .wde_size19 = {RTW89_WDE_PG_64, 3328, 0,}, .wde_size23 = {RTW89_WDE_PG_64, 1022, 2,},
@@ -1747,6 +1749,8 @@ const struct rtw89_mac_size_set rtw89_mac_size = { .ple_size18 = {RTW89_PLE_PG_128, 2544, 16,},/* 8852C PCIE SCC */ .ple_size19 = {RTW89_PLE_PG_128, 1904, 16,}, + .ple_size20_v1 = {RTW89_PLE_PG_128, 2554, 182, 40960,}, + .ple_size22_v1 = {RTW89_PLE_PG_128, 2736, 0, 40960,},/* 8852B USB2.0 SCC */ .ple_size32 = {RTW89_PLE_PG_128, 620, 20,},/* 8852B USB3.0 SCC */
@@ -1758,6 +1762,7 @@ const struct rtw89_mac_size_set rtw89_mac_size = { .wde_qt0_v1 = {3302, 6, 0, 20,},/* 8852A USB */ .wde_qt1 = {512, 196, 0, 60,}, + .wde_qt3 = {0, 0, 0, 0,},/* DLFW */ .wde_qt4 = {0, 0, 0, 0,},/* PCIE 64 */
@@ -1770,6 +1775,7 @@ const struct rtw89_mac_size_set rtw89_mac_size = { .wde_qt17 = {0, 0, 0, 0,},/* 8852C PCIE SCC */ .wde_qt18 = {3228, 60, 0, 40,}, + .wde_qt19_v1 = {613, 6, 0, 20,}, .wde_qt23 = {958, 48, 0, 16,},/* 8852B USB2.0/USB3.0 SCC */ .wde_qt25 = {152, 2, 0, 8,},
@@ -1781,6 +1787,7 @@ const struct rtw89_mac_size_set rtw89_mac_size = { .ple_qt4 = {264, 0, 16, 20, 26, 13, 356, 0, 32, 40, 8,},/* PCIE SCC */ .ple_qt5 = {264, 0, 32, 20, 64, 13, 1101, 0, 64, 128, 120,}, + .ple_qt5_v2 = {0, 0, 32, 256, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0,}, .ple_qt9 = {0, 0, 32, 256, 0, 0, 0, 0, 0, 0, 1, 0, 0,},/* DLFW */ .ple_qt13 = {0, 0, 16, 48, 0, 0, 0, 0, 0, 0, 0,},
@@ -1791,8 +1798,10 @@ const struct rtw89_mac_size_set rtw89_mac_size = { .ple_qt26 = {2654, 0, 1134, 48, 64, 13, 1478, 0, 64, 128, 120, 0,},/* USB 52C USB3.0 */ .ple_qt42 = {1068, 0, 16, 48, 4, 13, 178, 0, 16, 1, 8, 16, 0,}, + .ple_qt42_v2 = {91, 91, 32, 16, 19, 13, 91, 91, 44, 18, 1, 4, 0, 0,},/* USB 52C USB3.0 */ .ple_qt43 = {3068, 0, 32, 48, 4, 13, 178, 0, 16, 1, 8, 16, 0,}, + .ple_qt43_v2 = {645, 645, 32, 16, 2062, 2056, 2134, 2134, 2087, 2061, 1, 2047, 0, 0,},/* DLFW 52C */ .ple_qt44 = {0, 0, 16, 256, 0, 0, 0, 0, 0, 0, 0, 0,},/* DLFW 52C */
@@ -1826,8 +1835,13 @@ const struct rtw89_mac_size_set rtw89_mac_size = { .ple_qt_51b_wow = {147, 0, 16, 20, 157, 13, 133, 0, 172, 14, 24, 0,}, .ple_rsvd_qt0 = {2, 107, 107, 6, 6, 6, 6, 0, 0, 0,}, .ple_rsvd_qt1 = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0,}, + .ple_rsvd_qt9 = {1, 44, 44, 6, 6, 6, 6, 69, 0, 0,}, .rsvd0_size0 = {212992, 0,}, + .rsvd0_size6 = {40960, 0,}, .rsvd1_size0 = {587776, 2048,}, + .rsvd1_size2 = {391168, 2048,}, + .dle_input3 = {0, 0, 0, 16384, 0, 2048, 0, 0,}, + .dle_input18 = {128, 128, 11454, 2048, 0, 2048, 24, 24,}, };EXPORT_SYMBOL (rtw89_mac_size);
drivers/net/wireless/realtek/rtw89/mac.h +15 -0
@@ -932,8 +932,10 @@ struct rtw89_mac_size_set {const struct rtw89_dle_size wde_size6;const struct rtw89_dle_size wde_size7;const struct rtw89_dle_size wde_size9; +const struct rtw89_dle_size wde_size16_v1;const struct rtw89_dle_size wde_size17;const struct rtw89_dle_size wde_size18; +const struct rtw89_dle_size wde_size18_v1;const struct rtw89_dle_size wde_size19;const struct rtw89_dle_size wde_size23;const struct rtw89_dle_size wde_size25;
@@ -949,18 +951,22 @@ struct rtw89_mac_size_set {const struct rtw89_dle_size ple_size17;const struct rtw89_dle_size ple_size18;const struct rtw89_dle_size ple_size19; +const struct rtw89_dle_size ple_size20_v1; +const struct rtw89_dle_size ple_size22_v1;const struct rtw89_dle_size ple_size32;const struct rtw89_dle_size ple_size33;const struct rtw89_dle_size ple_size34;const struct rtw89_wde_quota wde_qt0;const struct rtw89_wde_quota wde_qt1;const struct rtw89_wde_quota wde_qt0_v1; +const struct rtw89_wde_quota wde_qt3;const struct rtw89_wde_quota wde_qt4;const struct rtw89_wde_quota wde_qt6;const struct rtw89_wde_quota wde_qt7;const struct rtw89_wde_quota wde_qt16;const struct rtw89_wde_quota wde_qt17;const struct rtw89_wde_quota wde_qt18; +const struct rtw89_wde_quota wde_qt19_v1;const struct rtw89_wde_quota wde_qt23;const struct rtw89_wde_quota wde_qt25;const struct rtw89_wde_quota wde_qt31;
@@ -968,13 +974,16 @@ struct rtw89_mac_size_set {const struct rtw89_ple_quota ple_qt1;const struct rtw89_ple_quota ple_qt4;const struct rtw89_ple_quota ple_qt5; +const struct rtw89_ple_quota ple_qt5_v2;const struct rtw89_ple_quota ple_qt9;const struct rtw89_ple_quota ple_qt13;const struct rtw89_ple_quota ple_qt18;const struct rtw89_ple_quota ple_qt25;const struct rtw89_ple_quota ple_qt26;const struct rtw89_ple_quota ple_qt42; +const struct rtw89_ple_quota ple_qt42_v2;const struct rtw89_ple_quota ple_qt43; +const struct rtw89_ple_quota ple_qt43_v2;const struct rtw89_ple_quota ple_qt44;const struct rtw89_ple_quota ple_qt45;const struct rtw89_ple_quota ple_qt46;
@@ -994,8 +1003,14 @@ struct rtw89_mac_size_set {const struct rtw89_ple_quota ple_qt_51b_wow;const struct rtw89_rsvd_quota ple_rsvd_qt0;const struct rtw89_rsvd_quota ple_rsvd_qt1; +const struct rtw89_rsvd_quota ple_rsvd_qt1_v1; +const struct rtw89_rsvd_quota ple_rsvd_qt9;const struct rtw89_dle_rsvd_size rsvd0_size0; +const struct rtw89_dle_rsvd_size rsvd0_size6;const struct rtw89_dle_rsvd_size rsvd1_size0; +const struct rtw89_dle_rsvd_size rsvd1_size2; +const struct rtw89_dle_input dle_input3; +const struct rtw89_dle_input dle_input18; };extern const struct rtw89_mac_size_set rtw89_mac_size;
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 6/13 wifi: rtw89: mac: set quota 13 for PLE SNRPT
In reply to Ping-Ke ShihThe RTL8922D has additional quota 13 of SNRPT for PLE (payload engine). Set value to the quota according to predefined tables.
--- drivers/net/wireless/realtek/rtw89/mac_be.c | 5 +++++ drivers/net/wireless/realtek/rtw89/reg.h | 4 ++++ 2 files changed, 9 insertions(+)
drivers/net/wireless/realtek/rtw89/mac_be.c +5 -0
@@ -331,6 +331,11 @@ static void ple_quota_cfg_be(struct rtw89_dev *rtwdev,SET_QUOTA (cpu_io,PLE ,10 );SET_QUOTA (tx_rpt,PLE ,11 );SET_QUOTA (h2d,PLE ,12 ); + +if (rtwdev->chip->chip_id ==RTL8922A ) +return ; + +SET_QUOTA (snrpt,PLE ,13 ); }static void rtw89_mac_hci_func_en_be (struct rtw89_dev *rtwdev)
drivers/net/wireless/realtek/rtw89/reg.h +4 -0
@@ -5514,6 +5514,10 @@#define B_BE_PLE_Q12_MAX_SIZE_MASK GENMASK(27, 16)#define B_BE_PLE_Q12_MIN_SIZE_MASK GENMASK(11, 0) +#define R_BE_PLE_QTA13_CFG 0x9074 +#define B_BE_PLE_Q13_MAX_SIZE_MASK GENMASK(27, 16) +#define B_BE_PLE_Q13_MIN_SIZE_MASK GENMASK(11, 0) +#define R_BE_PLE_ERRFLAG1_IMR 0x90C0#define B_BE_PLE_SRCHPG_PGOFST_IMR BIT(26)#define B_BE_PLE_SRCHPG_STRPG_IMR BIT(25)
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 7/13 wifi: rtw89: mac: update MPDU quota according to chip DLE definition
In reply to Ping-Ke ShihMPDU quota is to define number of memory used to handle packets in DLE (Data Link Engine). All chips use the same value before, but the RTL8922D need to use chip specific value.
--- drivers/net/wireless/realtek/rtw89/core.h | 1 + drivers/net/wireless/realtek/rtw89/mac.c | 1 + drivers/net/wireless/realtek/rtw89/mac_be.c | 12 +++++++++++- drivers/net/wireless/realtek/rtw89/reg.h | 1 + 4 files changed, 14 insertions(+), 1 deletion(-)
drivers/net/wireless/realtek/rtw89/core.h +1 -0
@@ -4614,6 +4614,7 @@ enum rtw89_hcifc_mode {struct rtw89_dle_info {const struct rtw89_rsvd_quota *rsvd_qt; +const struct rtw89_dle_input *dle_input;enum rtw89_qta_mode qta_mode;u16 ple_pg_size;u16 ple_free_pg;
drivers/net/wireless/realtek/rtw89/mac.c +1 -0
@@ -1862,6 +1862,7 @@ static const struct rtw89_dle_mem *get_dle_mem_cfg(struct rtw89_dev *rtwdev, } mac->dle_info.rsvd_qt = cfg->rsvd_qt; + mac->dle_info.dle_input = cfg->dle_input; mac->dle_info.ple_pg_size = cfg->ple_size->pge_size; mac->dle_info.ple_free_pg = cfg->ple_size->lnk_pge_num; mac->dle_info.qta_mode = mode;
drivers/net/wireless/realtek/rtw89/mac_be.c +11 -1
@@ -873,7 +873,10 @@ static int sec_eng_init_be(struct rtw89_dev *rtwdev)static int txpktctrl_init_be (struct rtw89_dev *rtwdev) { +struct rtw89_mac_info *mac = &rtwdev->mac;struct rtw89_mac_dle_rsvd_qt_cfg qt_cfg; +const struct rtw89_dle_input *dle_input; +u32 mpdu_info_b1_ofst;u32 val32;int ret;
@@ -884,9 +887,16 @@ static int txpktctrl_init_be(struct rtw89_dev *rtwdev)return ret; } + dle_input = mac->dle_info.dle_input; +if (dle_input) + mpdu_info_b1_ofst =DIV_ROUND_UP (dle_input->mpdu_info_tbl_b0, +BIT (MPDU_INFO_TBL_FACTOR )); +else + mpdu_info_b1_ofst =MPDU_INFO_B1_OFST ; + val32 =rtw89_read32 (rtwdev,R_BE_TXPKTCTL_MPDUINFO_CFG ); val32 =u32_replace_bits (val32, qt_cfg.pktid,B_BE_MPDUINFO_PKTID_MASK ); - val32 =u32_replace_bits (val32,MPDU_INFO_B1_OFST ,B_BE_MPDUINFO_B1_BADDR_MASK ); + val32 =u32_replace_bits (val32, mpdu_info_b1_ofst,B_BE_MPDUINFO_B1_BADDR_MASK ); val32 |=B_BE_MPDUINFO_FEN ;rtw89_write32 (rtwdev,R_BE_TXPKTCTL_MPDUINFO_CFG , val32);
drivers/net/wireless/realtek/rtw89/reg.h +1 -0
@@ -5869,6 +5869,7 @@#define B_BE_MPDUINFO_PKTID_MASK GENMASK(27, 16)#define B_BE_MPDUINFO_B1_BADDR_MASK GENMASK(5, 0)#define MPDU_INFO_B1_OFST 18 +#define MPDU_INFO_TBL_FACTOR 3#define R_BE_TXPKTCTL_B0_PRELD_CFG0 0x9F48#define B_BE_B0_PRELD_FEN BIT(31)
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 8/13 wifi: rtw89: mac: update WP quota for RTL8922D
In reply to Ping-Ke ShihWP (WiFi payload) quota is to point to payload being transmitting in memory. Assign quota to indicate WP page full.
--- drivers/net/wireless/realtek/rtw89/core.h | 5 ++++ drivers/net/wireless/realtek/rtw89/mac.c | 4 +-- drivers/net/wireless/realtek/rtw89/mac_be.c | 27 ++++++++++++++++++--- drivers/net/wireless/realtek/rtw89/reg.h | 5 ++++ 4 files changed, 35 insertions(+), 6 deletions(-)
drivers/net/wireless/realtek/rtw89/core.h +5 -0
@@ -3978,6 +3978,11 @@ struct rtw89_hfc_prec_cfg {u8 h2c_full_cond;u8 wp_ch07_full_cond;u8 wp_ch811_full_cond; +/* for WiFi 7 chips after 8922D */ +u16 ch011_full_page; +u16 h2c_full_page; +u16 wp_ch07_full_page; +u16 wp_ch811_full_page; };struct rtw89_hfc_param {
drivers/net/wireless/realtek/rtw89/mac.c +2 -2
@@ -1701,8 +1701,8 @@ static int sys_init_ax(struct rtw89_dev *rtwdev)const struct rtw89_mac_size_set rtw89_mac_size = { .hfc_preccfg_pcie = {2 ,40 ,0 ,0 ,1 ,0 ,0 ,0 }, - .hfc_prec_cfg_c0 = {2 ,32 ,0 ,0 ,0 ,0 ,0 ,0 }, - .hfc_prec_cfg_c2 = {0 ,256 ,0 ,0 ,0 ,0 ,0 ,0 }, + .hfc_prec_cfg_c0 = {2 ,32 ,0 ,0 ,0 ,0 ,0 ,0 ,2 ,32 ,0 ,0 }, + .hfc_prec_cfg_c2 = {0 ,256 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,256 ,0 ,0 },/* PCIE 64 */ .wde_size0 = {RTW89_WDE_PG_64 ,4095 ,1 ,}, .wde_size0_v1 = {RTW89_WDE_PG_64 ,3328 ,0 ,0 ,},
drivers/net/wireless/realtek/rtw89/mac_be.c +23 -4
@@ -89,6 +89,7 @@ static void hfc_get_mix_info_be(struct rtw89_dev *rtwdev)struct rtw89_hfc_prec_cfg *prec_cfg = ¶m->prec_cfg;struct rtw89_hfc_pub_cfg *pub_cfg = ¶m->pub_cfg;struct rtw89_hfc_pub_info *info = ¶m->pub_info; +const struct rtw89_chip_info *chip = rtwdev->chip;u32 val; val =rtw89_read32 (rtwdev,R_BE_PUB_PAGE_INFO1 );
@@ -116,14 +117,23 @@ static void hfc_get_mix_info_be(struct rtw89_dev *rtwdev) val =rtw89_read32 (rtwdev,R_BE_CH_PAGE_CTRL ); prec_cfg->ch011_prec =u32_get_bits (val,B_BE_PREC_PAGE_CH011_V1_MASK ); +if (chip->chip_id ==RTL8922D ) + prec_cfg->ch011_full_page =u32_get_bits (val,B_BE_FULL_WD_PG_MASK ); prec_cfg->h2c_prec =u32_get_bits (val,B_BE_PREC_PAGE_CH12_V1_MASK ); val =rtw89_read32 (rtwdev,R_BE_PUB_PAGE_CTRL2 ); pub_cfg->pub_max =u32_get_bits (val,B_BE_PUBPG_ALL_MASK ); val =rtw89_read32 (rtwdev,R_BE_WP_PAGE_CTRL1 ); - prec_cfg->wp_ch07_prec =u32_get_bits (val,B_BE_PREC_PAGE_WP_CH07_MASK ); - prec_cfg->wp_ch811_prec =u32_get_bits (val,B_BE_PREC_PAGE_WP_CH811_MASK ); +if (chip->chip_id ==RTL8922D ) { + prec_cfg->wp_ch07_prec =u32_get_bits (val,B_BE_PREC_PAGE_WP_CH07_V1_MASK ); + prec_cfg->wp_ch07_full_page =u32_get_bits (val,B_BE_FULL_PAGE_WP_CH07_MASK ); + prec_cfg->wp_ch811_prec =u32_get_bits (val,B_BE_PREC_PAGE_WP_CH811_V1_MASK ); + prec_cfg->wp_ch811_full_page =u32_get_bits (val,B_BE_FULL_PAGE_WP_CH811_MASK ); + }else { + prec_cfg->wp_ch07_prec =u32_get_bits (val,B_BE_PREC_PAGE_WP_CH07_MASK ); + prec_cfg->wp_ch811_prec =u32_get_bits (val,B_BE_PREC_PAGE_WP_CH811_MASK ); + } val =rtw89_read32 (rtwdev,R_BE_WP_PAGE_CTRL2 ); pub_cfg->wp_thrd =u32_get_bits (val,B_BE_WP_THRD_MASK );
@@ -148,17 +158,26 @@ static void hfc_mix_cfg_be(struct rtw89_dev *rtwdev)struct rtw89_hfc_param *param = &rtwdev->mac.hfc_param;const struct rtw89_hfc_prec_cfg *prec_cfg = ¶m->prec_cfg;const struct rtw89_hfc_pub_cfg *pub_cfg = ¶m->pub_cfg; +const struct rtw89_chip_info *chip = rtwdev->chip;u32 val; val =u32_encode_bits (prec_cfg->ch011_prec,B_BE_PREC_PAGE_CH011_V1_MASK ) |u32_encode_bits (prec_cfg->h2c_prec,B_BE_PREC_PAGE_CH12_V1_MASK ); +if (chip->chip_id ==RTL8922D ) + val =u32_replace_bits (val, prec_cfg->ch011_full_page,B_BE_FULL_WD_PG_MASK );rtw89_write32 (rtwdev,R_BE_CH_PAGE_CTRL , val); val =u32_encode_bits (pub_cfg->pub_max,B_BE_PUBPG_ALL_MASK );rtw89_write32 (rtwdev,R_BE_PUB_PAGE_CTRL2 , val); - val =u32_encode_bits (prec_cfg->wp_ch07_prec,B_BE_PREC_PAGE_WP_CH07_MASK ) | -u32_encode_bits (prec_cfg->wp_ch811_prec,B_BE_PREC_PAGE_WP_CH811_MASK ); +if (chip->chip_id ==RTL8922D ) + val =u32_encode_bits (prec_cfg->wp_ch07_prec,B_BE_PREC_PAGE_WP_CH07_V1_MASK ) | +u32_encode_bits (prec_cfg->wp_ch07_full_page,B_BE_FULL_PAGE_WP_CH07_MASK ) | +u32_encode_bits (prec_cfg->wp_ch811_prec,B_BE_PREC_PAGE_WP_CH811_V1_MASK ) | +u32_encode_bits (prec_cfg->wp_ch811_full_page,B_BE_FULL_PAGE_WP_CH811_MASK ); +else + val =u32_encode_bits (prec_cfg->wp_ch07_prec,B_BE_PREC_PAGE_WP_CH07_MASK ) | +u32_encode_bits (prec_cfg->wp_ch811_prec,B_BE_PREC_PAGE_WP_CH811_MASK );rtw89_write32 (rtwdev,R_BE_WP_PAGE_CTRL1 , val); val = u32_replace_bits(rtw89_read32(rtwdev, R_BE_HCI_FC_CTRL),
drivers/net/wireless/realtek/rtw89/reg.h +5 -0
@@ -6117,6 +6117,7 @@#define R_BE_CH_PAGE_CTRL 0xB704#define B_BE_PREC_PAGE_CH12_V1_MASK GENMASK(21, 16) +#define B_BE_FULL_WD_PG_MASK GENMASK(15, 8)#define B_BE_PREC_PAGE_CH011_V1_MASK GENMASK(5, 0)#define R_BE_CH0_PAGE_CTRL 0xB718
@@ -6149,6 +6150,10 @@#define R_BE_WP_PAGE_CTRL1 0xB7A4#define B_BE_PREC_PAGE_WP_CH811_MASK GENMASK(24, 16)#define B_BE_PREC_PAGE_WP_CH07_MASK GENMASK(8, 0) +#define B_BE_FULL_PAGE_WP_CH811_MASK GENMASK(31, 24) +#define B_BE_PREC_PAGE_WP_CH811_V1_MASK GENMASK(23, 16) +#define B_BE_FULL_PAGE_WP_CH07_MASK GENMASK(15, 8) +#define B_BE_PREC_PAGE_WP_CH07_V1_MASK GENMASK(7, 0)#define R_BE_WP_PAGE_CTRL2 0xB7A8#define B_BE_WP_THRD_MASK GENMASK(12, 0)
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 9/13 wifi: rtw89: mac: define preload_init for generations
In reply to Ping-Ke ShihThe preload_init is to define preload size from memory to transmitting buffer. The different generations should call its callback respectively but suddenly it is missed. However, the register definitions of WiFi 6/7 are the same, things are well. For the coming RTL8922D, settings are different, so abstract it.
--- drivers/net/wireless/realtek/rtw89/mac.c | 8 +++++--- drivers/net/wireless/realtek/rtw89/mac.h | 2 ++ drivers/net/wireless/realtek/rtw89/mac_be.c | 1 + 3 files changed, 8 insertions(+), 3 deletions(-)
drivers/net/wireless/realtek/rtw89/mac.c +5 -3
@@ -2283,8 +2283,8 @@ int rtw89_mac_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) +static int preload_init_set_ax (struct rtw89_dev *rtwdev,u8 mac_idx, +enum rtw89_qta_mode mode) {u32 reg, max_preld_size, min_rsvd_size;
@@ -2312,13 +2312,14 @@ static bool is_qta_poh(struct rtw89_dev *rtwdev)int rtw89_mac_preload_init (struct rtw89_dev *rtwdev,enum rtw89_mac_idx mac_idx,enum rtw89_qta_mode mode) { +const struct rtw89_mac_gen_def *mac = rtwdev->chip->mac_def;const struct rtw89_chip_info *chip = rtwdev->chip;if (chip->chip_id ==RTL8852A ||rtw89_is_rtl885xb (rtwdev) || !is_qta_poh (rtwdev))return 0 ; -return preload_init_set (rtwdev, mac_idx, mode); +return mac->preload_init (rtwdev, mac_idx, mode); }static bool dle_is_txq_empty (struct rtw89_dev *rtwdev)
@@ -7287,6 +7288,7 @@ const struct rtw89_mac_gen_def rtw89_mac_gen_ax = { .check_mac_en = rtw89_mac_check_mac_en_ax, .sys_init = sys_init_ax, .trx_init = trx_init_ax, + .preload_init = preload_init_set_ax, .err_imr_ctrl = err_imr_ctrl_ax, .hci_func_en = rtw89_mac_hci_func_en_ax, .dmac_func_pre_en = rtw89_mac_dmac_func_pre_en_ax,
drivers/net/wireless/realtek/rtw89/mac.h +2 -0
@@ -1037,6 +1037,8 @@ struct rtw89_mac_gen_def { enum rtw89_mac_hwmod_sel sel);int (*sys_init)(struct rtw89_dev *rtwdev);int (*trx_init)(struct rtw89_dev *rtwdev); +int (*preload_init)(struct rtw89_dev *rtwdev,u8 mac_idx, +enum rtw89_qta_mode mode);void (*err_imr_ctrl)(struct rtw89_dev *rtwdev,bool en);void (*hci_func_en)(struct rtw89_dev *rtwdev);void (*dmac_func_pre_en)(struct rtw89_dev *rtwdev);
drivers/net/wireless/realtek/rtw89/mac_be.c +1 -0
@@ -2832,6 +2832,7 @@ const struct rtw89_mac_gen_def rtw89_mac_gen_be = { .check_mac_en = rtw89_mac_check_mac_en_be, .sys_init = sys_init_be, .trx_init = trx_init_be, + .preload_init = preload_init_be, .err_imr_ctrl = err_imr_ctrl_be, .hci_func_en = rtw89_mac_hci_func_en_be, .dmac_func_pre_en = rtw89_mac_dmac_func_pre_en_be,
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 10/13 wifi: rtw89: mac: configure DMA_STOP1 by predefined mask
In reply to Ping-Ke ShihFor coming chip 8922DE, the DMA channel set is different from existing one, so use predefined mask to handle the difference.
--- drivers/net/wireless/realtek/rtw89/mac_be.c | 14 +++++++----- drivers/net/wireless/realtek/rtw89/pci.h | 25 --------------------- drivers/net/wireless/realtek/rtw89/pci_be.c | 4 ++++ drivers/net/wireless/realtek/rtw89/reg.h | 12 ++++++++++ 4 files changed, 24 insertions(+), 31 deletions(-)
drivers/net/wireless/realtek/rtw89/mac_be.c +8 -6
@@ -365,6 +365,8 @@ static void rtw89_mac_hci_func_en_be(struct rtw89_dev *rtwdev)static void rtw89_mac_dmac_func_pre_en_be (struct rtw89_dev *rtwdev) { +const struct rtw89_chip_info *chip = rtwdev->chip; +u32 mask;u32 val; val =rtw89_read32 (rtwdev,R_BE_HAXI_INIT_CFG1 );
@@ -388,12 +390,12 @@ static void rtw89_mac_dmac_func_pre_en_be(struct rtw89_dev *rtwdev)rtw89_write32 (rtwdev,R_BE_HAXI_INIT_CFG1 , val); -rtw89_write32_clr (rtwdev,R_BE_HAXI_DMA_STOP1 , -B_BE_STOP_CH0 |B_BE_STOP_CH1 |B_BE_STOP_CH2 | -B_BE_STOP_CH3 |B_BE_STOP_CH4 |B_BE_STOP_CH5 | -B_BE_STOP_CH6 |B_BE_STOP_CH7 |B_BE_STOP_CH8 | -B_BE_STOP_CH9 |B_BE_STOP_CH10 |B_BE_STOP_CH11 | -B_BE_STOP_CH12 |B_BE_STOP_CH13 |B_BE_STOP_CH14 ); +if (chip->chip_id ==RTL8922A ) + mask =B_BE_TX_STOP1_MASK ; +else + mask =B_BE_TX_STOP1_MASK_V1 ; + +rtw89_write32_clr (rtwdev,R_BE_HAXI_DMA_STOP1 , mask);rtw89_write32_set (rtwdev,R_BE_DMAC_TABLE_CTRL ,B_BE_DMAC_ADDR_MODE ); }
drivers/net/wireless/realtek/rtw89/pci.h +0 -25
@@ -767,31 +767,6 @@#define R_AX_WP_ADDR_H_SEL8_11 0x133C#define R_AX_WP_ADDR_H_SEL12_15 0x1340 -#define R_BE_HAXI_DMA_STOP1 0xB010 -#define B_BE_STOP_WPDMA BIT(31) -#define B_BE_STOP_CH14 BIT(14) -#define B_BE_STOP_CH13 BIT(13) -#define B_BE_STOP_CH12 BIT(12) -#define B_BE_STOP_CH11 BIT(11) -#define B_BE_STOP_CH10 BIT(10) -#define B_BE_STOP_CH9 BIT(9) -#define B_BE_STOP_CH8 BIT(8) -#define B_BE_STOP_CH7 BIT(7) -#define B_BE_STOP_CH6 BIT(6) -#define B_BE_STOP_CH5 BIT(5) -#define B_BE_STOP_CH4 BIT(4) -#define B_BE_STOP_CH3 BIT(3) -#define B_BE_STOP_CH2 BIT(2) -#define B_BE_STOP_CH1 BIT(1) -#define B_BE_STOP_CH0 BIT(0) -#define B_BE_TX_STOP1_MASK (B_BE_STOP_CH0 | B_BE_STOP_CH1 | \ - B_BE_STOP_CH2 | B_BE_STOP_CH3 | \ - B_BE_STOP_CH4 | B_BE_STOP_CH5 | \ - B_BE_STOP_CH6 | B_BE_STOP_CH7 | \ - B_BE_STOP_CH8 | B_BE_STOP_CH9 | \ - B_BE_STOP_CH10 | B_BE_STOP_CH11 | \ - B_BE_STOP_CH12) -#define R_BE_CH0_TXBD_NUM_V1 0xB030#define R_BE_CH1_TXBD_NUM_V1 0xB032#define R_BE_CH2_TXBD_NUM_V1 0xB034
drivers/net/wireless/realtek/rtw89/pci_be.c +4 -0
@@ -322,6 +322,7 @@ static void rtw89_pci_ser_setting_be(struct rtw89_dev *rtwdev)static void rtw89_pci_ctrl_txdma_ch_be (struct rtw89_dev *rtwdev,bool enable) { +const struct rtw89_pci_info *info = rtwdev->pci_info;u32 mask_all;u32 val;
@@ -330,6 +331,9 @@ static void rtw89_pci_ctrl_txdma_ch_be(struct rtw89_dev *rtwdev, bool enable)B_BE_STOP_CH6 |B_BE_STOP_CH7 |B_BE_STOP_CH8 |B_BE_STOP_CH9 |B_BE_STOP_CH10 |B_BE_STOP_CH11 ; +/* mask out unsupported channels for certains chips */ + mask_all &= info->dma_stop1.mask; + val =rtw89_read32 (rtwdev,R_BE_HAXI_DMA_STOP1 ); val |=B_BE_STOP_CH13 |B_BE_STOP_CH14 ;
drivers/net/wireless/realtek/rtw89/reg.h +12 -0
@@ -6065,6 +6065,18 @@#define B_BE_STOP_CH2 BIT(2)#define B_BE_STOP_CH1 BIT(1)#define B_BE_STOP_CH0 BIT(0) +#define B_BE_TX_STOP1_MASK (B_BE_STOP_CH0 | B_BE_STOP_CH1 | \ + B_BE_STOP_CH2 | B_BE_STOP_CH3 | \ + B_BE_STOP_CH4 | B_BE_STOP_CH5 | \ + B_BE_STOP_CH6 | B_BE_STOP_CH7 | \ + B_BE_STOP_CH8 | B_BE_STOP_CH9 | \ + B_BE_STOP_CH10 | B_BE_STOP_CH11 | \ + B_BE_STOP_CH12 | B_BE_STOP_CH13 | \ + B_BE_STOP_CH14) +#define B_BE_TX_STOP1_MASK_V1 (B_BE_STOP_CH0 | B_BE_STOP_CH2 | \ + B_BE_STOP_CH4 | B_BE_STOP_CH6 | \ + B_BE_STOP_CH8 | B_BE_STOP_CH10 | \ + B_BE_STOP_CH12)#define R_BE_HAXI_MST_WDT_TIMEOUT_SEL_V1 0xB02C#define B_BE_HAXI_MST_WDT_TIMEOUT_SEL_MASK GENMASK(4, 0)
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 11/13 wifi: rtw89: mac: separate functions of CMAC power and function enable
In reply to Ping-Ke ShihTo enable/disable CMAC function somewhere, separate controls of CMAC power and function into individual functions. Also correct the hardware settings by the way.
--- drivers/net/wireless/realtek/rtw89/core.h | 2 + drivers/net/wireless/realtek/rtw89/mac.c | 2 + drivers/net/wireless/realtek/rtw89/mac_be.c | 97 ++++++++++++++++++--- drivers/net/wireless/realtek/rtw89/reg.h | 15 ++-- 4 files changed, 100 insertions(+), 16 deletions(-)
drivers/net/wireless/realtek/rtw89/core.h +2 -0
@@ -5138,6 +5138,8 @@ enum rtw89_flags {RTW89_FLAG_DMAC_FUNC ,RTW89_FLAG_CMAC0_FUNC ,RTW89_FLAG_CMAC1_FUNC , +RTW89_FLAG_CMAC0_PWR , +RTW89_FLAG_CMAC1_PWR ,RTW89_FLAG_FW_RDY ,RTW89_FLAG_RUNNING , RTW89_FLAG_PROBE_DONE,
drivers/net/wireless/realtek/rtw89/mac.c +2 -0
@@ -1559,6 +1559,8 @@ static int rtw89_mac_power_switch(struct rtw89_dev *rtwdev, bool on)clear_bit (RTW89_FLAG_DMAC_FUNC , rtwdev->flags);clear_bit (RTW89_FLAG_CMAC0_FUNC , rtwdev->flags);clear_bit (RTW89_FLAG_CMAC1_FUNC , rtwdev->flags); +clear_bit (RTW89_FLAG_CMAC0_PWR , rtwdev->flags); +clear_bit (RTW89_FLAG_CMAC1_PWR , rtwdev->flags);clear_bit (RTW89_FLAG_FW_RDY , rtwdev->flags);rtw89_mac_update_scoreboard (rtwdev,MAC_AX_NOTIFY_PWR_MAJOR );
drivers/net/wireless/realtek/rtw89/mac_be.c +86 -11
143 lines not on this page · raw message
drivers/net/wireless/realtek/rtw89/reg.h +10 -5
@@ -3943,6 +3943,11 @@#define B_BE_R_SYM_WLCMAC0_P2_PC_EN BIT(26)#define B_BE_R_SYM_WLCMAC0_P1_PC_EN BIT(25)#define B_BE_R_SYM_WLCMAC0_PC_EN BIT(24) +#define B_BE_R_SYM_WLCMAC0_ALL_EN (B_BE_R_SYM_WLCMAC0_PC_EN | \ + B_BE_R_SYM_WLCMAC0_P1_PC_EN | \ + B_BE_R_SYM_WLCMAC0_P2_PC_EN | \ + B_BE_R_SYM_WLCMAC0_P3_PC_EN | \ + B_BE_R_SYM_WLCMAC0_P4_PC_EN)#define B_BE_DATAMEM_PC3_EN BIT(23)#define B_BE_DATAMEM_PC2_EN BIT(22)#define B_BE_DATAMEM_PC1_EN BIT(21)
@@ -3964,11 +3969,11 @@#define B_BE_R_SYM_WLCMAC1_P2_PC_EN BIT(2)#define B_BE_R_SYM_WLCMAC1_P1_PC_EN BIT(1)#define B_BE_R_SYM_WLCMAC1_PC_EN BIT(0) -#define B_BE_AFE_CTRL1_SET (B_BE_R_SYM_WLCMAC1_PC_EN | \ - B_BE_R_SYM_WLCMAC1_P1_PC_EN | \ - B_BE_R_SYM_WLCMAC1_P2_PC_EN | \ - B_BE_R_SYM_WLCMAC1_P3_PC_EN | \ - B_BE_R_SYM_WLCMAC1_P4_PC_EN) +#define B_BE_R_SYM_WLCMAC1_ALL_EN (B_BE_R_SYM_WLCMAC1_PC_EN | \ + B_BE_R_SYM_WLCMAC1_P1_PC_EN | \ + B_BE_R_SYM_WLCMAC1_P2_PC_EN | \ + B_BE_R_SYM_WLCMAC1_P3_PC_EN | \ + B_BE_R_SYM_WLCMAC1_P4_PC_EN)#define R_BE_EFUSE_CTRL 0x0030#define B_BE_EF_MODE_SEL_MASK GENMASK(31, 30)
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 12/13 wifi: rtw89: mac: add an entry to enable MAC function in preinit
In reply to Ping-Ke ShihThe preinit is to initialize partial MAC hardware needed before downloading firmware, and then does post-init after firmware runs.
For RTL8922D, initialize some DMAC and CMAC at this step.
--- drivers/net/wireless/realtek/rtw89/mac.c | 8 +++ drivers/net/wireless/realtek/rtw89/mac.h | 1 + drivers/net/wireless/realtek/rtw89/mac_be.c | 73 +++++++++++++++++++++ 3 files changed, 82 insertions(+)
drivers/net/wireless/realtek/rtw89/mac.c +8 -0
@@ -4223,12 +4223,19 @@ int rtw89_mac_partial_init(struct rtw89_dev *rtwdev, bool include_bb)int rtw89_mac_preinit (struct rtw89_dev *rtwdev) { +const struct rtw89_mac_gen_def *mac = rtwdev->chip->mac_def;int ret; ret =rtw89_mac_pwr_on (rtwdev);if (ret)return ret; +if (mac->mac_func_en) { + ret = mac->mac_func_en (rtwdev); +if (ret) +return ret; + } +return 0 ; }
@@ -7292,6 +7299,7 @@ const struct rtw89_mac_gen_def rtw89_mac_gen_ax = { .trx_init = trx_init_ax, .preload_init = preload_init_set_ax, .err_imr_ctrl = err_imr_ctrl_ax, + .mac_func_en = NULL, .hci_func_en = rtw89_mac_hci_func_en_ax, .dmac_func_pre_en = rtw89_mac_dmac_func_pre_en_ax, .dle_func_en = dle_func_en_ax,
drivers/net/wireless/realtek/rtw89/mac.h +1 -0
@@ -1040,6 +1040,7 @@ struct rtw89_mac_gen_def {int (*preload_init)(struct rtw89_dev *rtwdev,u8 mac_idx,enum rtw89_qta_mode mode);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);void (*dmac_func_pre_en)(struct rtw89_dev *rtwdev);void (*dle_func_en)(struct rtw89_dev *rtwdev,bool enable);
drivers/net/wireless/realtek/rtw89/mac_be.c +73 -0
97 lines not on this page · raw message
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 13/13 wifi: rtw89: mac: set EDCCA configurations for RTL8922D
In reply to Ping-Ke ShihUpdate EDCCA settings of MAC part for RTL8922D to consider EDCCA state signaled by BB circuit.
--- drivers/net/wireless/realtek/rtw89/core.c | 1 + drivers/net/wireless/realtek/rtw89/mac.c | 1 + drivers/net/wireless/realtek/rtw89/mac.h | 27 +++ drivers/net/wireless/realtek/rtw89/mac_be.c | 60 +++++++ drivers/net/wireless/realtek/rtw89/reg.h | 184 ++++++++++++++++++++ 5 files changed, 273 insertions(+)
drivers/net/wireless/realtek/rtw89/core.c +1 -0
@@ -5686,6 +5686,7 @@ int rtw89_core_start(struct rtw89_dev *rtwdev)rtw89_phy_dm_init (rtwdev); +rtw89_mac_set_edcca_mode_bands (rtwdev, true);rtw89_mac_cfg_ppdu_status_bands (rtwdev, true);rtw89_mac_cfg_phy_rpt_bands (rtwdev, true);rtw89_mac_update_rts_threshold (rtwdev);
drivers/net/wireless/realtek/rtw89/mac.c +1 -0
@@ -7309,6 +7309,7 @@ const struct rtw89_mac_gen_def rtw89_mac_gen_ax = { .typ_fltr_opt = rtw89_mac_typ_fltr_opt_ax, .cfg_ppdu_status = rtw89_mac_cfg_ppdu_status_ax, .cfg_phy_rpt = NULL, + .set_edcca_mode = NULL, .dle_mix_cfg = dle_mix_cfg_ax, .chk_dle_rdy = chk_dle_rdy_ax,
drivers/net/wireless/realtek/rtw89/mac.h +27 -0
@@ -1055,6 +1055,7 @@ struct rtw89_mac_gen_def { u8 mac_idx);int (*cfg_ppdu_status)(struct rtw89_dev *rtwdev,u8 mac_idx,bool enable);void (*cfg_phy_rpt)(struct rtw89_dev *rtwdev,u8 mac_idx,bool enable); +void (*set_edcca_mode)(struct rtw89_dev *rtwdev,u8 mac_idx,bool normal);int (*dle_mix_cfg)(struct rtw89_dev *rtwdev,const struct rtw89_dle_mem *cfg);int (*chk_dle_rdy)(struct rtw89_dev *rtwdev,bool wde_or_ple);
@@ -1129,6 +1130,14 @@ u32 rtw89_mac_reg_by_idx(struct rtw89_dev *rtwdev, u32 reg_base, u8 band)return band ==0 ? reg_base : (reg_base + mac->band1_offset); } +static inline void +rtw89_write16_idx (struct rtw89_dev *rtwdev,u32 addr,u16 data,u8 band) +{ + addr =rtw89_mac_reg_by_idx (rtwdev, addr, band); + +rtw89_write16 (rtwdev, addr, data); +} +static inline u32 rtw89_mac_reg_by_port (struct rtw89_dev *rtwdev,u32 base,u8 port,u8 mac_idx) {
@@ -1364,6 +1373,24 @@ int rtw89_mac_cfg_ppdu_status_bands(struct rtw89_dev *rtwdev, bool enable)return rtw89_mac_cfg_ppdu_status (rtwdev,RTW89_MAC_1 , enable); } +static inline +void rtw89_mac_set_edcca_mode (struct rtw89_dev *rtwdev,u8 mac_idx,bool normal) +{ +const struct rtw89_mac_gen_def *mac = rtwdev->chip->mac_def; + +if (!mac->set_edcca_mode) +return ; + + mac->set_edcca_mode (rtwdev, mac_idx, normal); +} + +static inline +void rtw89_mac_set_edcca_mode_bands (struct rtw89_dev *rtwdev,bool normal) +{ +rtw89_mac_set_edcca_mode (rtwdev,RTW89_MAC_0 , normal); +rtw89_mac_set_edcca_mode (rtwdev,RTW89_MAC_1 , normal); +} +void rtw89_mac_set_rx_fltr (struct rtw89_dev *rtwdev,u8 mac_idx,u32 rx_fltr);void rtw89_mac_update_rts_threshold (struct rtw89_dev *rtwdev);void rtw89_mac_flush_txq (struct rtw89_dev *rtwdev,u32 queues,bool drop);
drivers/net/wireless/realtek/rtw89/mac_be.c +60 -0
72 lines not on this page · raw message
drivers/net/wireless/realtek/rtw89/reg.h +184 -0
196 lines not on this page · raw message
Signature · 1 line
2.25.1