wifi: rtw89: 8851b: add basic chip information of 8851B
Ping-Ke Shih
maintainercover wifi: rtw89: 8851b: add basic chip information of 8851B
Add new files rtw8851b.c/.h and rtw8851be.c with basic chip information. The more functions will be added by upcoming patches.
Chia-Yuan Li (1):
wifi: rtw89: add CFO XTAL registers field to support 8851B
Chih-Kang Chang (1):
wifi: rtw89: 8851b: add support WoWLAN to 8851B
Ping-Ke Shih (6):
wifi: rtw89: 8851b: add 8851B basic chip_info
wifi: rtw89: 8851be: add 8851BE PCI entry and fill PCI capabilities
wifi: rtw89: 8851b: add NCTL post table
wifi: rtw89: use chip_info::small_fifo_size to choose debug_mask
wifi: rtw89: change naming of BA CAM from V1 to V0_EXT
wifi: rtw89: 8851b: add DLE mem and HFC quota
drivers/net/wireless/realtek/rtw89/core.h | 18 +- drivers/net/wireless/realtek/rtw89/fw.c | 12 +- drivers/net/wireless/realtek/rtw89/fw.h | 6 +- drivers/net/wireless/realtek/rtw89/mac.c | 2 + drivers/net/wireless/realtek/rtw89/mac.h | 1 + drivers/net/wireless/realtek/rtw89/pci.c | 4 +- drivers/net/wireless/realtek/rtw89/phy.c | 22 ++- drivers/net/wireless/realtek/rtw89/reg.h | 6 + drivers/net/wireless/realtek/rtw89/rtw8851b.c | 173 ++++++++++++++++++ drivers/net/wireless/realtek/rtw89/rtw8851b.h | 15 ++ .../net/wireless/realtek/rtw89/rtw8851be.c | 86 +++++++++ drivers/net/wireless/realtek/rtw89/rtw8852a.c | 11 +- drivers/net/wireless/realtek/rtw89/rtw8852b.c | 5 +- drivers/net/wireless/realtek/rtw89/rtw8852c.c | 5 +- drivers/net/wireless/realtek/rtw89/wow.c | 2 +- 15 files changed, 344 insertions(+), 24 deletions(-) create mode 100644 drivers/net/wireless/realtek/rtw89/rtw8851b.c create mode 100644 drivers/net/wireless/realtek/rtw89/rtw8851b.h create mode 100644 drivers/net/wireless/realtek/rtw89/rtw8851be.c
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 1/8 wifi: rtw89: 8851b: add 8851B basic chip_info
8851B is a 1x1 80 MHz bandwidth chip working on 2/5 GHz. Add these basic information, and more settings will be added by functions.
--- drivers/net/wireless/realtek/rtw89/rtw8851b.c | 101 ++++++++++++++++++ drivers/net/wireless/realtek/rtw89/rtw8851b.h | 15 +++ 2 files changed, 116 insertions(+) create mode 100644 drivers/net/wireless/realtek/rtw89/rtw8851b.c create mode 100644 drivers/net/wireless/realtek/rtw89/rtw8851b.h
drivers/net/wireless/realtek/rtw89/rtw8851b.c new file +101 -0
@@ -0,0 +1,101 @@ +// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause +/* Copyright(c) 2022-2023 Realtek Corporation +*/ + +#include "coex.h" +#include "fw.h" +#include "mac.h" +#include "phy.h" +#include "reg.h" +#include "rtw8851b.h" +#include "rtw8851b_table.h" +#include "txrx.h" +#include "util.h" + +#define RTW8851B_FW_FORMAT_MAX 0 +#define RTW8851B_FW_BASENAME "rtw89/rtw8851b_fw" +#define RTW8851B_MODULE_FIRMWARE \ + RTW8851B_FW_BASENAME ".bin" + +static const struct rtw89_chip_ops rtw8851b_chip_ops = { + .fem_setup =NULL , + .fill_txdesc = rtw89_core_fill_txdesc, + .fill_txdesc_fwcmd = rtw89_core_fill_txdesc, + .h2c_dctl_sec_cam =NULL , +}; + +const struct rtw89_chip_info rtw8851b_chip_info = { + .chip_id =RTL8851B , + .ops = &rtw8851b_chip_ops, + .fw_basename =RTW8851B_FW_BASENAME , + .fw_format_max =RTW8851B_FW_FORMAT_MAX , + .try_ce_fw = true, + .fifo_size =196608 , + .dle_scc_rsvd_size =98304 , + .max_amsdu_limit =3500 , + .dis_2g_40m_ul_ofdma = true, + .rsvd_ple_ofst =0x2f800 , + .wde_qempty_acq_num =4 , + .wde_qempty_mgq_sel =4 , + .rf_base_addr = {0xe000 }, + .pwr_on_seq =NULL , + .pwr_off_seq =NULL , + .bb_table = &rtw89_8851b_phy_bb_table, + .bb_gain_table = &rtw89_8851b_phy_bb_gain_table, + .rf_table = {&rtw89_8851b_phy_radioa_table,}, + .nctl_table = &rtw89_8851b_phy_nctl_table, + .byr_table = &rtw89_8851b_byr_table, + .dflt_parms = &rtw89_8851b_dflt_parms, + .rfe_parms_conf = rtw89_8851b_rfe_parms_conf, + .txpwr_factor_rf =2 , + .txpwr_factor_mac =1 , + .dig_table =NULL , + .tssi_dbw_table =NULL , + .support_chanctx_num =0 , + .support_bands =BIT (NL80211_BAND_2GHZ ) | +BIT (NL80211_BAND_5GHZ ), + .support_bw160 = false, + .support_ul_tb_ctrl = true, + .hw_sec_hdr = false, + .rf_path_num =1 , + .tx_nss =1 , + .rx_nss =1 , + .acam_num =32 , + .bcam_num =20 , + .scam_num =128 , + .bacam_num =2 , + .bacam_dynamic_num =4 , + .bacam_v1 = false, + .sec_ctrl_efuse_size =4 , + .physical_efuse_size =1216 , + .logical_efuse_size =2048 , + .limit_efuse_size =1280 , + .dav_phy_efuse_size =0 , + .dav_log_efuse_size =0 , + .phycap_addr =0x580 , + .phycap_size =128 , + .para_ver =0 , + .wlcx_desired =0x06000000 , + .btcx_desired =0x7 , + .scbd =0x1 , + .mailbox =0x1 , + + .ps_mode_supported =BIT (RTW89_PS_MODE_RFOFF ) | +BIT (RTW89_PS_MODE_CLK_GATED ), + .low_power_hci_modes =0 , + .h2c_cctl_func_id =H2C_FUNC_MAC_CCTLINFO_UD , + .hci_func_en_addr =R_AX_HCI_FUNC_EN , + .h2c_desc_size =sizeof (struct rtw89_txwd_body ), + .txwd_body_size =sizeof (struct rtw89_txwd_body ), + .bss_clr_map_reg =R_BSS_CLR_MAP_V1 , + .dma_ch_mask =BIT (RTW89_DMA_ACH4 ) |BIT (RTW89_DMA_ACH5 ) | +BIT (RTW89_DMA_ACH6 ) |BIT (RTW89_DMA_ACH7 ) | +BIT (RTW89_DMA_B1MG ) |BIT (RTW89_DMA_B1HI ), + .edcca_lvl_reg =R_SEG0R_EDCCA_LVL_V1 , +}; +EXPORT_SYMBOL (rtw8851b_chip_info); + +MODULE_FIRMWARE (RTW8851B_MODULE_FIRMWARE ); +MODULE_AUTHOR ("Realtek Corporation" ); +MODULE_DESCRIPTION ("Realtek 802.11ax wireless 8851B driver" ); +MODULE_LICENSE ("Dual BSD/GPL" );
drivers/net/wireless/realtek/rtw89/rtw8851b.h new file +15 -0
@@ -0,0 +1,15 @@ +/* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */ +/* Copyright(c) 2022-2023 Realtek Corporation +*/ + +#ifndef __RTW89_8851B_H__ +#define __RTW89_8851B_H__ + +#include "core.h" + +#define RF_PATH_NUM_8851B 1 +#define BB_PATH_NUM_8851B 1 + +extern const struct rtw89_chip_info rtw8851b_chip_info; + +#endif
Signature · 1 line
2.25.1
Re: [PATCH 1/8] wifi: rtw89: 8851b: add 8851B basic chip_info
Quoted 4 lines · Ping-Ke Shih
8851B is a 1x1 80 MHz bandwidth chip working on 2/5 GHz. Add these basic information, and more settings will be added by functions.
Signed-off-by Ping-Ke Shih <[email protected]>
8 patches applied to wireless-next.git, thanks.
c8d89bf6b82f wifi: rtw89: 8851b: add 8851B basic chip_info 99ff8da56322 wifi: rtw89: 8851be: add 8851BE PCI entry and fill PCI capabilities a24be8bbcbd2 wifi: rtw89: 8851b: add NCTL post table0789881aa370 wifi: rtw89: add CFO XTAL registers field to support 8851B ce816ab54bc9 wifi: rtw89: use chip_info::small_fifo_size to choose debug_mask b6335d91607d wifi: rtw89: change naming of BA CAM from V1 to V0_EXT 2273dd724a6c wifi: rtw89: 8851b: add support WoWLAN to 8851B 85d1539c0273 wifi: rtw89: 8851b: add DLE mem and HFC quota
Signature · 3 lines
https://patchwork.kernel.org/project/linux-wireless/patch/[email protected]/ https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
Ping-Ke Shih
maintainerPATCH 2/8 wifi: rtw89: 8851be: add 8851BE PCI entry and fill PCI capabilities
In reply to Ping-Ke ShihAdd PCI entry to 8851BE with its device ID 10ec:b851, also fill PCI info according to its capabilities.
--- .../net/wireless/realtek/rtw89/rtw8851be.c | 86 +++++++++++++++++++ 1 file changed, 86 insertions(+) create mode 100644 drivers/net/wireless/realtek/rtw89/rtw8851be.c
drivers/net/wireless/realtek/rtw89/rtw8851be.c new file +86 -0
@@ -0,0 +1,86 @@ +// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause +/* Copyright(c) 2022-2023 Realtek Corporation +*/ + +#include <linux/module.h> +#include <linux/pci.h> + +#include "pci.h" +#include "reg.h" +#include "rtw8851b.h" + +static const struct rtw89_pci_info rtw8851b_pci_info = { + .txbd_trunc_mode =MAC_AX_BD_TRUNC , + .rxbd_trunc_mode =MAC_AX_BD_TRUNC , + .rxbd_mode =MAC_AX_RXBD_PKT , + .tag_mode =MAC_AX_TAG_MULTI , + .tx_burst =MAC_AX_TX_BURST_2048B , + .rx_burst =MAC_AX_RX_BURST_128B , + .wd_dma_idle_intvl =MAC_AX_WD_DMA_INTVL_256NS , + .wd_dma_act_intvl =MAC_AX_WD_DMA_INTVL_256NS , + .multi_tag_num =MAC_AX_TAG_NUM_8 , + .lbc_en =MAC_AX_PCIE_ENABLE , + .lbc_tmr =MAC_AX_LBC_TMR_2MS , + .autok_en =MAC_AX_PCIE_DISABLE , + .io_rcy_en =MAC_AX_PCIE_DISABLE , + .io_rcy_tmr =MAC_AX_IO_RCY_ANA_TMR_6MS , + + .init_cfg_reg =R_AX_PCIE_INIT_CFG1 , + .txhci_en_bit =B_AX_TXHCI_EN , + .rxhci_en_bit =B_AX_RXHCI_EN , + .rxbd_mode_bit =B_AX_RXBD_MODE , + .exp_ctrl_reg =R_AX_PCIE_EXP_CTRL , + .max_tag_num_mask =B_AX_MAX_TAG_NUM , + .rxbd_rwptr_clr_reg =R_AX_RXBD_RWPTR_CLR , + .txbd_rwptr_clr2_reg =0 , + .dma_stop1 = {R_AX_PCIE_DMA_STOP1 ,B_AX_TX_STOP1_MASK_V1 }, + .dma_stop2 = {0 }, + .dma_busy1 = {R_AX_PCIE_DMA_BUSY1 ,DMA_BUSY1_CHECK_V1 }, + .dma_busy2_reg =0 , + .dma_busy3_reg =R_AX_PCIE_DMA_BUSY1 , + + .rpwm_addr =R_AX_PCIE_HRPWM , + .cpwm_addr =R_AX_CPWM , + .tx_dma_ch_mask =BIT (RTW89_TXCH_ACH4 ) |BIT (RTW89_TXCH_ACH5 ) | +BIT (RTW89_TXCH_ACH6 ) |BIT (RTW89_TXCH_ACH7 ) | +BIT (RTW89_TXCH_CH10 ) |BIT (RTW89_TXCH_CH11 ), + .bd_idx_addr_low_power =NULL , + .dma_addr_set = &rtw89_pci_ch_dma_addr_set, + .bd_ram_table = &rtw89_bd_ram_table_single, + + .ltr_set = rtw89_pci_ltr_set, + .fill_txaddr_info = rtw89_pci_fill_txaddr_info, + .config_intr_mask = rtw89_pci_config_intr_mask, + .enable_intr = rtw89_pci_enable_intr, + .disable_intr = rtw89_pci_disable_intr, + .recognize_intrs = rtw89_pci_recognize_intrs, +}; + +static const struct rtw89_driver_info rtw89_8851be_info = { + .chip = &rtw8851b_chip_info, + .bus = { + .pci = &rtw8851b_pci_info, + }, +}; + +static const struct pci_device_id rtw89_8851be_id_table[] = { + { +PCI_DEVICE (PCI_VENDOR_ID_REALTEK ,0xb851 ), + .driver_data = (kernel_ulong_t)&rtw89_8851be_info, + }, + {}, +}; +MODULE_DEVICE_TABLE (pci, rtw89_8851be_id_table); + +static struct pci_driver rtw89_8851be_driver = { + .name ="rtw89_8851be" , + .id_table = rtw89_8851be_id_table, + .probe = rtw89_pci_probe, + .remove = rtw89_pci_remove, + .driver.pm = &rtw89_pm_ops, +}; +module_pci_driver (rtw89_8851be_driver); + +MODULE_AUTHOR ("Realtek Corporation" ); +MODULE_DESCRIPTION ("Realtek 802.11ax wireless 8851BE driver" ); +MODULE_LICENSE ("Dual BSD/GPL" );
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 3/8 wifi: rtw89: 8851b: add NCTL post table
In reply to Ping-Ke ShihNCTL (nano-controller) is used to assist RF calibration that sends commands to NCTL so it can reduce IO from driver. 8851B needs additional settings, so add a table to do things.
--- drivers/net/wireless/realtek/rtw89/core.h | 1 + drivers/net/wireless/realtek/rtw89/phy.c | 6 +++++- drivers/net/wireless/realtek/rtw89/rtw8851b.c | 2 ++ drivers/net/wireless/realtek/rtw89/rtw8852a.c | 1 + drivers/net/wireless/realtek/rtw89/rtw8852b.c | 1 + drivers/net/wireless/realtek/rtw89/rtw8852c.c | 1 + 6 files changed, 11 insertions(+), 1 deletion(-)
drivers/net/wireless/realtek/rtw89/core.h +1 -0
@@ -3162,6 +3162,7 @@ struct rtw89_chip_info {const struct rtw89_phy_table *bb_gain_table;const struct rtw89_phy_table *rf_table[RF_PATH_MAX ];const struct rtw89_phy_table *nctl_table; +const struct rtw89_rfk_tbl *nctl_post_table;const struct rtw89_txpwr_table *byr_table;const struct rtw89_phy_dig_gain_table *dig_table;const struct rtw89_dig_regs *dig_regs;
drivers/net/wireless/realtek/rtw89/phy.c +5 -1
@@ -1400,7 +1400,8 @@ static void rtw89_phy_init_rf_nctl(struct rtw89_dev *rtwdev)rtw89_phy_write32_set (rtwdev,R_IOQ_IQK_DPK ,0x3 );rtw89_phy_write32_set (rtwdev,R_GNT_BT_WGT_EN ,0x1 );rtw89_phy_write32_set (rtwdev,R_P0_PATH_RST ,0x8000000 ); -rtw89_phy_write32_set (rtwdev,R_P1_PATH_RST ,0x8000000 ); +if (chip->chip_id !=RTL8851B ) +rtw89_phy_write32_set (rtwdev,R_P1_PATH_RST ,0x8000000 );if (chip->chip_id ==RTL8852B )rtw89_phy_write32_set (rtwdev,R_IOQ_IQK_DPK ,0x2 );
@@ -1414,6 +1415,9 @@ static void rtw89_phy_init_rf_nctl(struct rtw89_dev *rtwdev) nctl_table = chip->nctl_table;rtw89_phy_init_reg (rtwdev, nctl_table, rtw89_phy_config_bb_reg,NULL ); + +if (chip->nctl_post_table) +rtw89_rfk_parser (rtwdev, chip->nctl_post_table); }static u32 rtw89_phy0_phy1_offset (struct rtw89_dev *rtwdev,u32 addr)
drivers/net/wireless/realtek/rtw89/rtw8851b.c +2 -0
@@ -8,6 +8,7 @@#include "phy.h" #include "reg.h" #include "rtw8851b.h" +#include "rtw8851b_rfk_table.h" #include "rtw8851b_table.h" #include "txrx.h" #include "util.h"
@@ -44,6 +45,7 @@ const struct rtw89_chip_info rtw8851b_chip_info = { .bb_gain_table = &rtw89_8851b_phy_bb_gain_table, .rf_table = {&rtw89_8851b_phy_radioa_table,}, .nctl_table = &rtw89_8851b_phy_nctl_table, + .nctl_post_table = &rtw8851b_nctl_post_defs_tbl, .byr_table = &rtw89_8851b_byr_table, .dflt_parms = &rtw89_8851b_dflt_parms, .rfe_parms_conf = rtw89_8851b_rfe_parms_conf,
drivers/net/wireless/realtek/rtw89/rtw8852a.c +1 -0
@@ -2085,6 +2085,7 @@ const struct rtw89_chip_info rtw8852a_chip_info = { .rf_table = {&rtw89_8852a_phy_radioa_table, &rtw89_8852a_phy_radiob_table,}, .nctl_table = &rtw89_8852a_phy_nctl_table, + .nctl_post_table = NULL, .byr_table = &rtw89_8852a_byr_table, .dflt_parms = &rtw89_8852a_dflt_parms, .rfe_parms_conf = NULL,
drivers/net/wireless/realtek/rtw89/rtw8852b.c +1 -0
@@ -2522,6 +2522,7 @@ const struct rtw89_chip_info rtw8852b_chip_info = { .rf_table = {&rtw89_8852b_phy_radioa_table, &rtw89_8852b_phy_radiob_table,}, .nctl_table = &rtw89_8852b_phy_nctl_table, + .nctl_post_table = NULL, .byr_table = &rtw89_8852b_byr_table, .dflt_parms = &rtw89_8852b_dflt_parms, .rfe_parms_conf = NULL,
drivers/net/wireless/realtek/rtw89/rtw8852c.c +1 -0
@@ -2821,6 +2821,7 @@ const struct rtw89_chip_info rtw8852c_chip_info = { .rf_table = {&rtw89_8852c_phy_radiob_table, &rtw89_8852c_phy_radioa_table,}, .nctl_table = &rtw89_8852c_phy_nctl_table, + .nctl_post_table = NULL, .byr_table = &rtw89_8852c_byr_table, .dflt_parms = &rtw89_8852c_dflt_parms, .rfe_parms_conf = NULL,
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 4/8 wifi: rtw89: add CFO XTAL registers field to support 8851B
In reply to Ping-Ke ShihFrom: Chia-Yuan Li <[email protected]>
Since CFO XTAL registers of 8851B is different from 8852A, add a chip_info field to define their difference. Other chips use another interface, so fill NULL to this field.
--- drivers/net/wireless/realtek/rtw89/core.h | 7 +++++++ drivers/net/wireless/realtek/rtw89/phy.c | 16 +++++++++------- drivers/net/wireless/realtek/rtw89/reg.h | 6 ++++++ drivers/net/wireless/realtek/rtw89/rtw8851b.c | 7 +++++++ drivers/net/wireless/realtek/rtw89/rtw8852a.c | 7 +++++++ drivers/net/wireless/realtek/rtw89/rtw8852b.c | 1 + drivers/net/wireless/realtek/rtw89/rtw8852c.c | 1 + 7 files changed, 38 insertions(+), 7 deletions(-)
drivers/net/wireless/realtek/rtw89/core.h +7 -0
@@ -3090,6 +3090,12 @@ struct rtw89_imr_info {u32 tmac_imr_set; }; +struct rtw89_xtal_info { +u32 xcap_reg; +u32 sc_xo_mask; +u32 sc_xi_mask; +}; +struct rtw89_rrsr_cfgs {struct rtw89_reg3_def ref_rate;struct rtw89_reg3_def rsc;
@@ -3216,6 +3222,7 @@ struct rtw89_chip_info {u32 dma_ch_mask;u32 edcca_lvl_reg;const struct wiphy_wowlan_support *wowlan_stub; +const struct rtw89_xtal_info *xtal_info; };union rtw89_bus_info {
drivers/net/wireless/realtek/rtw89/phy.c +9 -7
@@ -2342,27 +2342,29 @@ void rtw89_phy_c2h_handle(struct rtw89_dev *rtwdev, struct sk_buff *skb,static u8 rtw89_phy_cfo_get_xcap_reg (struct rtw89_dev *rtwdev,bool sc_xo) { +const struct rtw89_xtal_info *xtal = rtwdev->chip->xtal_info;u32 reg_mask;if (sc_xo) - reg_mask =B_AX_XTAL_SC_XO_MASK ; + reg_mask = xtal->sc_xo_mask;else - reg_mask =B_AX_XTAL_SC_XI_MASK ; + reg_mask = xtal->sc_xi_mask; -return (u8 )rtw89_read32_mask (rtwdev,R_AX_XTAL_ON_CTRL0 , reg_mask); +return (u8 )rtw89_read32_mask (rtwdev, xtal->xcap_reg, reg_mask); }static void rtw89_phy_cfo_set_xcap_reg (struct rtw89_dev *rtwdev,bool sc_xo,u8 val) { +const struct rtw89_xtal_info *xtal = rtwdev->chip->xtal_info;u32 reg_mask;if (sc_xo) - reg_mask =B_AX_XTAL_SC_XO_MASK ; + reg_mask = xtal->sc_xo_mask;else - reg_mask =B_AX_XTAL_SC_XI_MASK ; + reg_mask = xtal->sc_xi_mask; -rtw89_write32_mask (rtwdev,R_AX_XTAL_ON_CTRL0 , reg_mask, val); +rtw89_write32_mask (rtwdev, xtal->xcap_reg, reg_mask, val); } static void rtw89_phy_cfo_set_crystal_cap(struct rtw89_dev *rtwdev,
@@ -2375,7 +2377,7 @@ static void rtw89_phy_cfo_set_crystal_cap(struct rtw89_dev *rtwdev,if (!force && cfo->crystal_cap == crystal_cap)return ; crystal_cap =clamp_t (u8, crystal_cap,0 ,127 ); -if (chip->chip_id ==RTL8852A ) { +if (chip->chip_id ==RTL8852A || chip->chip_id ==RTL8851B ) {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);
drivers/net/wireless/realtek/rtw89/reg.h +6 -0
@@ -243,6 +243,12 @@#define B_AX_XTAL_SC_XI_MASK GENMASK(16, 10)#define B_AX_XTAL_SC_MASK GENMASK(6, 0) +#define R_AX_XTAL_ON_CTRL3 0x028C +#define B_AX_XTAL_SC_INIT_A_BLOCK_MASK GENMASK(30, 24) +#define B_AX_XTAL_SC_LPS_A_BLOCK_MASK GENMASK(22, 16) +#define B_AX_XTAL_SC_XO_A_BLOCK_MASK GENMASK(14, 8) +#define B_AX_XTAL_SC_XI_A_BLOCK_MASK GENMASK(6, 0) +#define R_AX_GPIO0_7_FUNC_SEL 0x02D0#define R_AX_EECS_EESK_FUNC_SEL 0x02D8
drivers/net/wireless/realtek/rtw89/rtw8851b.c +7 -0
@@ -18,6 +18,12 @@#define RTW8851B_MODULE_FIRMWARE \ RTW8851B_FW_BASENAME ".bin" +static const struct rtw89_xtal_info rtw8851b_xtal_info = { + .xcap_reg =R_AX_XTAL_ON_CTRL3 , + .sc_xo_mask =B_AX_XTAL_SC_XO_A_BLOCK_MASK , + .sc_xi_mask =B_AX_XTAL_SC_XI_A_BLOCK_MASK , +}; +static const struct rtw89_chip_ops rtw8851b_chip_ops = { .fem_setup =NULL , .fill_txdesc = rtw89_core_fill_txdesc,
@@ -94,6 +100,7 @@ const struct rtw89_chip_info rtw8851b_chip_info = {BIT (RTW89_DMA_ACH6 ) |BIT (RTW89_DMA_ACH7 ) | BIT(RTW89_DMA_B1MG) | BIT(RTW89_DMA_B1HI), .edcca_lvl_reg = R_SEG0R_EDCCA_LVL_V1, + .xtal_info = &rtw8851b_xtal_info, };EXPORT_SYMBOL (rtw8851b_chip_info);
drivers/net/wireless/realtek/rtw89/rtw8852a.c +7 -0
@@ -463,6 +463,12 @@ static const struct rtw89_imr_info rtw8852a_imr_info = { .tmac_imr_set = B_AX_TMAC_IMR_SET, }; +static const struct rtw89_xtal_info rtw8852a_xtal_info = { + .xcap_reg =R_AX_XTAL_ON_CTRL0 , + .sc_xo_mask =B_AX_XTAL_SC_XO_MASK , + .sc_xi_mask =B_AX_XTAL_SC_XI_MASK , +}; +static const struct rtw89_rrsr_cfgs rtw8852a_rrsr_cfgs = { .ref_rate = {R_AX_TRXPTCL_RRSR_CTL_0 ,B_AX_WMAC_RESP_REF_RATE_SEL ,0 }, .rsc = {R_AX_TRXPTCL_RRSR_CTL_0 ,B_AX_WMAC_RESP_RSC_MASK ,2 },
@@ -2160,6 +2166,7 @@ const struct rtw89_chip_info rtw8852a_chip_info = {#ifdef CONFIG_PM .wowlan_stub = &rtw_wowlan_stub_8852a, #endif + .xtal_info = &rtw8852a_xtal_info, };EXPORT_SYMBOL (rtw8852a_chip_info);
drivers/net/wireless/realtek/rtw89/rtw8852b.c +1 -0
@@ -2599,6 +2599,7 @@ const struct rtw89_chip_info rtw8852b_chip_info = {#ifdef CONFIG_PM .wowlan_stub = &rtw_wowlan_stub_8852b, #endif + .xtal_info =NULL , };EXPORT_SYMBOL (rtw8852b_chip_info);
drivers/net/wireless/realtek/rtw89/rtw8852c.c +1 -0
@@ -2898,6 +2898,7 @@ const struct rtw89_chip_info rtw8852c_chip_info = {#ifdef CONFIG_PM .wowlan_stub = &rtw_wowlan_stub_8852c, #endif + .xtal_info =NULL , };EXPORT_SYMBOL (rtw8852c_chip_info);
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 5/8 wifi: rtw89: use chip_info::small_fifo_size to choose debug_mask
In reply to Ping-Ke ShihPreviously, 8852B has smaller FIFO size than others, so I use chip_id to choose debug_mask before. 8851B has similar design, so add a field to chip_info as a general expression.
--- drivers/net/wireless/realtek/rtw89/core.h | 1 + drivers/net/wireless/realtek/rtw89/pci.c | 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/rtw8852c.c | 1 + 6 files changed, 7 insertions(+), 2 deletions(-)
drivers/net/wireless/realtek/rtw89/core.h +1 -0
@@ -3129,6 +3129,7 @@ struct rtw89_chip_info {u8 fw_format_max;bool try_ce_fw;u32 fifo_size; +bool small_fifo_size;u32 dle_scc_rsvd_size;u16 max_amsdu_limit;bool dis_2g_40m_ul_ofdma;
drivers/net/wireless/realtek/rtw89/pci.c +2 -2
@@ -1003,10 +1003,10 @@ static u32 __rtw89_pci_check_and_reclaim_tx_resource(struct rtw89_dev *rtwdev, min_cnt =min (bd_cnt, wd_cnt);if (min_cnt ==0 ) {/* This message can be frequently shown in low power mode or -* high traffic with 8852B, and we have recognized it as normal +* high traffic with small FIFO chips, and we have recognized it as normal * behavior, so print with mask RTW89_DBG_TXRX in these situations. */ -if (rtwpci->low_power || chip->chip_id ==RTL8852B ) +if (rtwpci->low_power || chip->small_fifo_size) debug_mask =RTW89_DBG_TXRX ;else debug_mask =RTW89_DBG_UNEXP ;
drivers/net/wireless/realtek/rtw89/rtw8851b.c +1 -0
@@ -38,6 +38,7 @@ const struct rtw89_chip_info rtw8851b_chip_info = { .fw_format_max = RTW8851B_FW_FORMAT_MAX, .try_ce_fw = true, .fifo_size = 196608, + .small_fifo_size = true, .dle_scc_rsvd_size = 98304, .max_amsdu_limit = 3500, .dis_2g_40m_ul_ofdma = true,
drivers/net/wireless/realtek/rtw89/rtw8852a.c +1 -0
@@ -2075,6 +2075,7 @@ const struct rtw89_chip_info rtw8852a_chip_info = { .fw_format_max = RTW8852A_FW_FORMAT_MAX, .try_ce_fw = false, .fifo_size = 458752, + .small_fifo_size = false, .dle_scc_rsvd_size = 0, .max_amsdu_limit = 3500, .dis_2g_40m_ul_ofdma = true,
drivers/net/wireless/realtek/rtw89/rtw8852b.c +1 -0
@@ -2506,6 +2506,7 @@ const struct rtw89_chip_info rtw8852b_chip_info = { .fw_format_max = RTW8852B_FW_FORMAT_MAX, .try_ce_fw = true, .fifo_size = 196608, + .small_fifo_size = true, .dle_scc_rsvd_size = 98304, .max_amsdu_limit = 3500, .dis_2g_40m_ul_ofdma = true,
drivers/net/wireless/realtek/rtw89/rtw8852c.c +1 -0
@@ -2805,6 +2805,7 @@ const struct rtw89_chip_info rtw8852c_chip_info = { .fw_format_max = RTW8852C_FW_FORMAT_MAX, .try_ce_fw = false, .fifo_size = 458752, + .small_fifo_size = false, .dle_scc_rsvd_size = 0, .max_amsdu_limit = 8000, .dis_2g_40m_ul_ofdma = false,
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 6/8 wifi: rtw89: change naming of BA CAM from V1 to V0_EXT
In reply to Ping-Ke ShihBA CAM of 8852C has more entries and more fields of H2C, and needs initialization before using. Due to differences from 8852A/8852B, we name it as V1 before. However, real V1 of BA CAM is introduced now, so change it to V0_EXT to avoid confusing with firmware design.
--- drivers/net/wireless/realtek/rtw89/core.h | 9 ++++++++- drivers/net/wireless/realtek/rtw89/fw.c | 12 ++++++------ drivers/net/wireless/realtek/rtw89/fw.h | 6 +++--- drivers/net/wireless/realtek/rtw89/rtw8851b.c | 2 +- drivers/net/wireless/realtek/rtw89/rtw8852a.c | 2 +- drivers/net/wireless/realtek/rtw89/rtw8852b.c | 2 +- drivers/net/wireless/realtek/rtw89/rtw8852c.c | 2 +- 7 files changed, 21 insertions(+), 14 deletions(-)
drivers/net/wireless/realtek/rtw89/core.h +8 -1
@@ -122,6 +122,13 @@ enum rtw89_cv { CHIP_CV_INVALID = CHIP_CV_MAX, }; +enum rtw89_bacam_ver { +RTW89_BACAM_V0 , +RTW89_BACAM_V1 , + +RTW89_BACAM_V0_EXT =99 , +}; +enum rtw89_core_tx_type {RTW89_CORE_TX_TYPE_DATA ,RTW89_CORE_TX_TYPE_MGMT ,
@@ -3152,7 +3159,7 @@ struct rtw89_chip_info {u8 scam_num;u8 bacam_num;u8 bacam_dynamic_num; -bool bacam_v1; +enum rtw89_bacam_ver bacam_ver;u8 sec_ctrl_efuse_size;u32 physical_efuse_size;
drivers/net/wireless/realtek/rtw89/fw.c +6 -6
@@ -807,7 +807,7 @@ int rtw89_fw_h2c_ba_cam(struct rtw89_dev *rtwdev, struct rtw89_sta *rtwsta, }skb_put (skb,H2C_BA_CAM_LEN );SET_BA_CAM_MACID (skb->data, macid); -if (chip->bacam_v1) +if (chip->bacam_ver ==RTW89_BACAM_V0_EXT )SET_BA_CAM_ENTRY_IDX_V1 (skb->data, entry_idx);else SET_BA_CAM_ENTRY_IDX (skb->data, entry_idx);
@@ -823,7 +823,7 @@ int rtw89_fw_h2c_ba_cam(struct rtw89_dev *rtwdev, struct rtw89_sta *rtwsta,SET_BA_CAM_INIT_REQ (skb->data,1 );SET_BA_CAM_SSN (skb->data, params->ssn); -if (chip->bacam_v1) { +if (chip->bacam_ver ==RTW89_BACAM_V0_EXT ) {SET_BA_CAM_STD_EN (skb->data,1 );SET_BA_CAM_BAND (skb->data, rtwvif->mac_idx); }
@@ -848,8 +848,8 @@ int rtw89_fw_h2c_ba_cam(struct rtw89_dev *rtwdev, struct rtw89_sta *rtwsta,return ret; } -static int rtw89_fw_h2c_init_dynamic_ba_cam_v1 (struct rtw89_dev *rtwdev, -u8 entry_idx,u8 uid) +static int rtw89_fw_h2c_init_ba_cam_v0_ext (struct rtw89_dev *rtwdev, +u8 entry_idx,u8 uid) {struct sk_buff *skb;int ret;
@@ -886,7 +886,7 @@ static int rtw89_fw_h2c_init_dynamic_ba_cam_v1(struct rtw89_dev *rtwdev,return ret; } -void rtw89_fw_h2c_init_ba_cam_v1 (struct rtw89_dev *rtwdev) +void rtw89_fw_h2c_init_dynamic_ba_cam_v0_ext (struct rtw89_dev *rtwdev) {const struct rtw89_chip_info *chip = rtwdev->chip;u8 entry_idx = chip->bacam_num;
@@ -894,7 +894,7 @@ void rtw89_fw_h2c_init_ba_cam_v1(struct rtw89_dev *rtwdev)int i;for (i =0 ; i < chip->bacam_dynamic_num; i++) { -rtw89_fw_h2c_init_dynamic_ba_cam_v1 (rtwdev, entry_idx, uid); +rtw89_fw_h2c_init_ba_cam_v0_ext (rtwdev, entry_idx, uid); entry_idx++; uid++; }
drivers/net/wireless/realtek/rtw89/fw.h +3 -3
@@ -3648,7 +3648,7 @@ void rtw89_fw_release_general_pkt_list_vif(struct rtw89_dev *rtwdev,void rtw89_fw_release_general_pkt_list (struct rtw89_dev *rtwdev,bool notify_fw);int rtw89_fw_h2c_ba_cam (struct rtw89_dev *rtwdev,struct rtw89_sta *rtwsta,bool valid,struct ieee80211_ampdu_params *params); -void rtw89_fw_h2c_init_ba_cam_v1 (struct rtw89_dev *rtwdev); +void rtw89_fw_h2c_init_dynamic_ba_cam_v0_ext (struct rtw89_dev *rtwdev);int rtw89_fw_h2c_lps_parm (struct rtw89_dev *rtwdev,struct rtw89_lps_parm *lps_param);
@@ -3711,8 +3711,8 @@ static inline void rtw89_fw_h2c_init_ba_cam(struct rtw89_dev *rtwdev) {const struct rtw89_chip_info *chip = rtwdev->chip; -if (chip->bacam_v1) -rtw89_fw_h2c_init_ba_cam_v1 (rtwdev); +if (chip->bacam_ver ==RTW89_BACAM_V0_EXT ) +rtw89_fw_h2c_init_dynamic_ba_cam_v0_ext (rtwdev); }#endif
drivers/net/wireless/realtek/rtw89/rtw8851b.c +1 -1
@@ -74,7 +74,7 @@ const struct rtw89_chip_info rtw8851b_chip_info = { .scam_num = 128, .bacam_num = 2, .bacam_dynamic_num = 4, - .bacam_v1 = false, + .bacam_ver = RTW89_BACAM_V0, .sec_ctrl_efuse_size = 4, .physical_efuse_size = 1216, .logical_efuse_size = 2048,
drivers/net/wireless/realtek/rtw89/rtw8852a.c +1 -1
@@ -2115,7 +2115,7 @@ const struct rtw89_chip_info rtw8852a_chip_info = { .scam_num = 128, .bacam_num = 2, .bacam_dynamic_num = 4, - .bacam_v1 = false, + .bacam_ver = RTW89_BACAM_V0, .sec_ctrl_efuse_size = 4, .physical_efuse_size = 1216, .logical_efuse_size = 1536,
drivers/net/wireless/realtek/rtw89/rtw8852b.c +1 -1
@@ -2546,7 +2546,7 @@ const struct rtw89_chip_info rtw8852b_chip_info = { .scam_num = 128, .bacam_num = 2, .bacam_dynamic_num = 4, - .bacam_v1 = false, + .bacam_ver = RTW89_BACAM_V0, .sec_ctrl_efuse_size = 4, .physical_efuse_size = 1216, .logical_efuse_size = 2048,
drivers/net/wireless/realtek/rtw89/rtw8852c.c +1 -1
@@ -2846,7 +2846,7 @@ const struct rtw89_chip_info rtw8852c_chip_info = { .scam_num = 128, .bacam_num = 8, .bacam_dynamic_num = 8, - .bacam_v1 = true, + .bacam_ver = RTW89_BACAM_V0_EXT, .sec_ctrl_efuse_size = 4, .physical_efuse_size = 1216, .logical_efuse_size = 2048,
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 7/8 wifi: rtw89: 8851b: add support WoWLAN to 8851B
In reply to Ping-Ke ShihFrom: Chih-Kang Chang <[email protected]>
Add WoWLAN stub to 8851B, and decalre this chip can support magic packet and disconnect wakeup.
--- drivers/net/wireless/realtek/rtw89/rtw8851b.c | 12 ++++++++++++ drivers/net/wireless/realtek/rtw89/wow.c | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-)
drivers/net/wireless/realtek/rtw89/rtw8851b.c +12 -0
@@ -31,6 +31,15 @@ static const struct rtw89_chip_ops rtw8851b_chip_ops = { .h2c_dctl_sec_cam = NULL, }; +#ifdef CONFIG_PM +static const struct wiphy_wowlan_support rtw_wowlan_stub_8851b = { + .flags =WIPHY_WOWLAN_MAGIC_PKT |WIPHY_WOWLAN_DISCONNECT , + .n_patterns =RTW89_MAX_PATTERN_NUM , + .pattern_max_len =RTW89_MAX_PATTERN_SIZE , + .pattern_min_len =1 , +}; +#endif +const struct rtw89_chip_info rtw8851b_chip_info = { .chip_id =RTL8851B , .ops = &rtw8851b_chip_ops,
@@ -101,6 +110,9 @@ const struct rtw89_chip_info rtw8851b_chip_info = {BIT (RTW89_DMA_ACH6 ) |BIT (RTW89_DMA_ACH7 ) | BIT(RTW89_DMA_B1MG) | BIT(RTW89_DMA_B1HI), .edcca_lvl_reg =R_SEG0R_EDCCA_LVL_V1 , +#ifdef CONFIG_PM + .wowlan_stub = &rtw_wowlan_stub_8851b, +#endif .xtal_info = &rtw8851b_xtal_info, };EXPORT_SYMBOL (rtw8851b_chip_info);
drivers/net/wireless/realtek/rtw89/wow.c +1 -1
@@ -91,7 +91,7 @@ static void rtw89_wow_show_wakeup_reason(struct rtw89_dev *rtwdev)u32 wow_reason_reg;u8 reason; -if (chip_id ==RTL8852A || chip_id ==RTL8852B ) +if (chip_id ==RTL8852A || chip_id ==RTL8852B || chip_id ==RTL8851B ) wow_reason_reg =R_AX_C2HREG_DATA3 +3 ;else wow_reason_reg =R_AX_C2HREG_DATA3_V1 +3 ;
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 8/8 wifi: rtw89: 8851b: add DLE mem and HFC quota
In reply to Ping-Ke ShihConfigure DLE (data link engine) memory size for operating modes. Similarly, HFC standing for HCI flow control is used to set quota according to operating modes, which are SCC or download firmware.
--- drivers/net/wireless/realtek/rtw89/mac.c | 2 + drivers/net/wireless/realtek/rtw89/mac.h | 1 + drivers/net/wireless/realtek/rtw89/rtw8851b.c | 50 +++++++++++++++++++ 3 files changed, 53 insertions(+)
drivers/net/wireless/realtek/rtw89/mac.c +2 -0
@@ -1475,6 +1475,8 @@ const struct rtw89_mac_size_set rtw89_mac_size = { .ple_qt_52a_wow = {264, 0, 32, 20, 64, 13, 1005, 0, 64, 128, 120,},/* 8852B PCIE WOW */ .ple_qt_52b_wow = {147, 0, 16, 20, 157, 13, 133, 0, 172, 14, 24, 0,}, +/* 8851B PCIE WOW */ + .ple_qt_51b_wow = {147, 0, 16, 20, 157, 13, 133, 0, 172, 14, 24, 0,}, };EXPORT_SYMBOL (rtw89_mac_size);
drivers/net/wireless/realtek/rtw89/mac.h +1 -0
@@ -817,6 +817,7 @@ struct rtw89_mac_size_set {const struct rtw89_ple_quota ple_qt58;const struct rtw89_ple_quota ple_qt_52a_wow;const struct rtw89_ple_quota ple_qt_52b_wow; +const struct rtw89_ple_quota ple_qt_51b_wow; };extern const struct rtw89_mac_size_set rtw89_mac_size;
drivers/net/wireless/realtek/rtw89/rtw8851b.c +50 -0
62 lines not on this page · raw message
Signature · 1 line
2.25.1