wifi: rtw89: 8852bt: enable 8852BE-VT
Ping-Ke Shih
maintainerv3 cover wifi: rtw89: 8852bt: enable 8852BE-VT
Add remaining materials and enable 8852BE-VT. Fow now, STA, AP and P2P modes can work well, and throughput is around 900+ Mbps for TX/RX. Only BT-coexistence code needs further update to work with BT enabled.
v3:
- add an new patch at 2/7 to avoid clang warning of precedence of '?:' and '&'.
v2:
- add missing RTW89_8852BT entry to Kconfig by patch 6/6 (Reported by kernel test robot)
Ping-Ke Shih (7):
wifi: rtw89: 8852bt: add set_channel_rf
wifi: rtw89: 8852bt: rfk: use predefined string choice for DPK
enable/disable
wifi: rtw89: 8852bt: add chip_info of RTL8852BT
wifi: rtw89: 8852bt: add chip_ops of RTL8852BT
wifi: rtw89: 8852bt: declare firmware features of RTL8852BT
wifi: rtw89: 8852bte: add PCI entry of 8852BE-VT
wifi: rtw89: 8852bt: add 8852BE-VT to Makefile and Kconfig
drivers/net/wireless/realtek/rtw89/Kconfig | 15 + drivers/net/wireless/realtek/rtw89/Makefile | 8 + drivers/net/wireless/realtek/rtw89/coex.h | 2 + drivers/net/wireless/realtek/rtw89/fw.c | 4 + drivers/net/wireless/realtek/rtw89/fw.h | 17 +- drivers/net/wireless/realtek/rtw89/mac.c | 7 + drivers/net/wireless/realtek/rtw89/mac.h | 6 + drivers/net/wireless/realtek/rtw89/reg.h | 58 +- .../net/wireless/realtek/rtw89/rtw8852bt.c | 830 ++++++++++++++++++ .../net/wireless/realtek/rtw89/rtw8852bt.h | 2 + .../wireless/realtek/rtw89/rtw8852bt_rfk.c | 228 ++++- .../wireless/realtek/rtw89/rtw8852bt_rfk.h | 3 + .../net/wireless/realtek/rtw89/rtw8852bte.c | 93 ++ 13 files changed, 1268 insertions(+), 5 deletions(-) create mode 100644 drivers/net/wireless/realtek/rtw89/rtw8852bt.c create mode 100644 drivers/net/wireless/realtek/rtw89/rtw8852bte.c
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH v3 1/7 wifi: rtw89: 8852bt: add set_channel_rf
Add RF part of set_channel() is to configure RF registers, and then hardware can TX/RX on specified frequency and bandwidth.
---
v3: no change
v2: no change
--- .../wireless/realtek/rtw89/rtw8852bt_rfk.c | 226 ++++++++++++++++++ .../wireless/realtek/rtw89/rtw8852bt_rfk.h | 3 + 2 files changed, 229 insertions(+)
drivers/net/wireless/realtek/rtw89/rtw8852bt_rfk.c +226 -0
@@ -4017,3 +4017,229 @@ void rtw8852bt_wifi_scan_notify(struct rtw89_dev *rtwdev, bool scan_start,else rtw8852bt_tssi_default_txagc (rtwdev, phy_idx, false); } + +static void _bw_setting (struct rtw89_dev *rtwdev,enum rtw89_rf_path path, +enum rtw89_bandwidth bw,bool dav) +{ +u32 rf_reg18; +u32 reg18_addr = dav ?RR_CFGCH :RR_CFGCH_V1 ; + +rtw89_debug (rtwdev,RTW89_DBG_RFK ,"[RFK]===> %s\n" , __func__); + + rf_reg18 =rtw89_read_rf (rtwdev, path, reg18_addr,RFREG_MASK ); +if (rf_reg18 ==INV_RF_DATA ) { +rtw89_debug (rtwdev,RTW89_DBG_RFK , +"[RFK]Invalid RF_0x18 for Path-%d\n" , path); +return ; + } + rf_reg18 &= ~RR_CFGCH_BW ; + +switch (bw) { +case RTW89_CHANNEL_WIDTH_5 : +case RTW89_CHANNEL_WIDTH_10 : +case RTW89_CHANNEL_WIDTH_20 : + rf_reg18 |=FIELD_PREP (RR_CFGCH_BW ,CFGCH_BW_20M ); +break ; +case RTW89_CHANNEL_WIDTH_40 : + rf_reg18 |=FIELD_PREP (RR_CFGCH_BW ,CFGCH_BW_40M ); +break ; +case RTW89_CHANNEL_WIDTH_80 : + rf_reg18 |=FIELD_PREP (RR_CFGCH_BW ,CFGCH_BW_80M ); +break ; +default : +rtw89_debug (rtwdev,RTW89_DBG_RFK ,"[RFK]Fail to set CH\n" ); + } + + rf_reg18 &= ~(RR_CFGCH_POW_LCK |RR_CFGCH_TRX_AH |RR_CFGCH_BCN | +RR_CFGCH_BW2 ) &RFREG_MASK ; + rf_reg18 |=RR_CFGCH_BW2 ; +rtw89_write_rf (rtwdev, path, reg18_addr,RFREG_MASK , rf_reg18); + +rtw89_debug (rtwdev,RTW89_DBG_RFK ,"[RFK] set %x at path%d, %x =0x%x\n" , + bw, path, reg18_addr, +rtw89_read_rf (rtwdev, path, reg18_addr,RFREG_MASK )); +} + +static void _ctrl_bw (struct rtw89_dev *rtwdev,enum rtw89_phy_idx phy, +enum rtw89_bandwidth bw) +{ +_bw_setting (rtwdev,RF_PATH_A , bw, true); +_bw_setting (rtwdev,RF_PATH_B , bw, true); +_bw_setting (rtwdev,RF_PATH_A , bw, false); +_bw_setting (rtwdev,RF_PATH_B , bw, false); +} + +static bool _set_s0_arfc18 (struct rtw89_dev *rtwdev,u32 val) +{ +u32 tmp; +int ret; + +rtw89_write_rf (rtwdev,RF_PATH_A ,RR_LCK_TRG ,RR_LCK_TRGSEL ,0x1 ); +rtw89_write_rf (rtwdev,RF_PATH_A ,RR_CFGCH ,RFREG_MASK , val); + + ret =read_poll_timeout_atomic (rtw89_read_rf, tmp, tmp ==0 ,1 ,1000 , + false, rtwdev,RF_PATH_A ,RR_LPF ,RR_LPF_BUSY ); +if (ret) +rtw89_debug (rtwdev,RTW89_DBG_RFK ,"[LCK]LCK timeout\n" ); + +rtw89_write_rf (rtwdev,RF_PATH_A ,RR_LCK_TRG ,RR_LCK_TRGSEL ,0x0 ); +return !!ret; +} + +static void _lck_check (struct rtw89_dev *rtwdev) +{ +u32 tmp; + +if (rtw89_read_rf (rtwdev,RF_PATH_A ,RR_SYNFB ,RR_SYNFB_LK ) ==0 ) { +rtw89_debug (rtwdev,RTW89_DBG_RFK ,"[LCK]SYN MMD reset\n" ); + +rtw89_write_rf (rtwdev,RF_PATH_A ,RR_MMD ,RR_MMD_RST_EN ,0x1 ); +rtw89_write_rf (rtwdev,RF_PATH_A ,RR_MMD ,RR_MMD_RST_SYN ,0x0 ); +rtw89_write_rf (rtwdev,RF_PATH_A ,RR_MMD ,RR_MMD_RST_SYN ,0x1 ); +rtw89_write_rf (rtwdev,RF_PATH_A ,RR_MMD ,RR_MMD_RST_EN ,0x0 ); + } + +udelay (10 ); + +if (rtw89_read_rf (rtwdev,RF_PATH_A ,RR_SYNFB ,RR_SYNFB_LK ) ==0 ) { +rtw89_debug (rtwdev,RTW89_DBG_RFK ,"[LCK]re-set RF 0x18\n" ); + +rtw89_write_rf (rtwdev,RF_PATH_A ,RR_LCK_TRG ,RR_LCK_TRGSEL ,0x1 ); + tmp =rtw89_read_rf (rtwdev,RF_PATH_A ,RR_CFGCH ,RFREG_MASK ); +_set_s0_arfc18 (rtwdev, tmp); +rtw89_write_rf (rtwdev,RF_PATH_A ,RR_LCK_TRG ,RR_LCK_TRGSEL ,0x0 ); + } + +if (rtw89_read_rf (rtwdev,RF_PATH_A ,RR_SYNFB ,RR_SYNFB_LK ) ==0 ) { +rtw89_debug (rtwdev,RTW89_DBG_RFK ,"[LCK]SYN off/on\n" ); + + tmp =rtw89_read_rf (rtwdev,RF_PATH_A ,RR_POW ,RFREG_MASK ); +rtw89_write_rf (rtwdev,RF_PATH_A ,RR_POW ,RFREG_MASK , tmp); + tmp =rtw89_read_rf (rtwdev,RF_PATH_A ,RR_SX ,RFREG_MASK ); +rtw89_write_rf (rtwdev,RF_PATH_A ,RR_SX ,RFREG_MASK , tmp); + +rtw89_write_rf (rtwdev,RF_PATH_A ,RR_SYNLUT ,RR_SYNLUT_MOD ,0x1 ); +rtw89_write_rf (rtwdev,RF_PATH_A ,RR_POW ,RR_POW_SYN ,0x0 ); +rtw89_write_rf (rtwdev,RF_PATH_A ,RR_POW ,RR_POW_SYN ,0x3 ); +rtw89_write_rf (rtwdev,RF_PATH_A ,RR_SYNLUT ,RR_SYNLUT_MOD ,0x0 ); + +rtw89_write_rf (rtwdev,RF_PATH_A ,RR_LCK_TRG ,RR_LCK_TRGSEL ,0x1 ); + tmp =rtw89_read_rf (rtwdev,RF_PATH_A ,RR_CFGCH ,RFREG_MASK ); +_set_s0_arfc18 (rtwdev, tmp); +rtw89_write_rf (rtwdev,RF_PATH_A ,RR_LCK_TRG ,RR_LCK_TRGSEL ,0x0 ); + +rtw89_debug (rtwdev,RTW89_DBG_RFK ,"[LCK]0xb2=%x, 0xc5=%x\n" , +rtw89_read_rf (rtwdev,RF_PATH_A ,RR_VCO ,RFREG_MASK ), +rtw89_read_rf (rtwdev,RF_PATH_A ,RR_SYNFB ,RFREG_MASK )); + } +} + +static void _set_ch (struct rtw89_dev *rtwdev,u32 val) +{ +bool timeout; +u32 bak; + + bak =rtw89_read_rf (rtwdev,RF_PATH_A ,RR_LDO ,RFREG_MASK ); +rtw89_write_rf (rtwdev,RF_PATH_A ,RR_LDO ,RR_LDO_SEL ,0x1 ); + timeout =_set_s0_arfc18 (rtwdev, val); +rtw89_write_rf (rtwdev,RF_PATH_A ,RR_LDO ,RFREG_MASK , bak); +if (!timeout) +_lck_check (rtwdev); +} + +static void _ch_setting (struct rtw89_dev *rtwdev,enum rtw89_rf_path path, +u8 central_ch,bool dav) +{ +u32 reg18_addr = dav ?RR_CFGCH :RR_CFGCH_V1 ; +bool is_2g_ch = central_ch <=14 ; +u32 rf_reg18; + +rtw89_debug (rtwdev,RTW89_DBG_RFK ,"[RFK]===> %s\n" , __func__); + + rf_reg18 =rtw89_read_rf (rtwdev, path, reg18_addr,RFREG_MASK ); + rf_reg18 &= ~(RR_CFGCH_BAND1 |RR_CFGCH_POW_LCK |RR_CFGCH_TRX_AH | +RR_CFGCH_BCN |RR_CFGCH_BAND0 |RR_CFGCH_CH ); + rf_reg18 |=FIELD_PREP (RR_CFGCH_CH , central_ch); + +if (!is_2g_ch) + rf_reg18 |=FIELD_PREP (RR_CFGCH_BAND1 ,CFGCH_BAND1_5G ) | +FIELD_PREP (RR_CFGCH_BAND0 ,CFGCH_BAND0_5G ); + + rf_reg18 &= ~(RR_CFGCH_POW_LCK |RR_CFGCH_TRX_AH |RR_CFGCH_BCN | +RR_CFGCH_BW2 ) &RFREG_MASK ; + rf_reg18 |=RR_CFGCH_BW2 ; + +if (path ==RF_PATH_A && dav) +_set_ch (rtwdev, rf_reg18); +else +rtw89_write_rf (rtwdev, path, reg18_addr,RFREG_MASK , rf_reg18); + +rtw89_write_rf (rtwdev, path,RR_LCKST ,RR_LCKST_BIN ,0 ); +rtw89_write_rf (rtwdev, path,RR_LCKST ,RR_LCKST_BIN ,1 ); + +rtw89_debug (rtwdev,RTW89_DBG_RFK , +"[RFK]CH: %d for Path-%d, reg0x%x = 0x%x\n" , + central_ch, path, reg18_addr, +rtw89_read_rf (rtwdev, path, reg18_addr,RFREG_MASK )); +} + +static void _ctrl_ch (struct rtw89_dev *rtwdev,u8 central_ch) +{ +_ch_setting (rtwdev,RF_PATH_A , central_ch, true); +_ch_setting (rtwdev,RF_PATH_B , central_ch, true); +_ch_setting (rtwdev,RF_PATH_A , central_ch, false); +_ch_setting (rtwdev,RF_PATH_B , central_ch, false); +} + +static void _set_rxbb_bw (struct rtw89_dev *rtwdev,enum rtw89_bandwidth bw, +enum rtw89_rf_path path) +{ +rtw89_write_rf (rtwdev, path,RR_LUTWE2 ,RR_LUTWE2_RTXBW ,0x1 ); +rtw89_write_rf (rtwdev, path,RR_LUTWA ,RR_LUTWA_M2 ,0x12 ); + +if (bw ==RTW89_CHANNEL_WIDTH_20 ) +rtw89_write_rf (rtwdev, path,RR_LUTWD0 ,RR_LUTWD0_LB ,0x1b ); +else if (bw ==RTW89_CHANNEL_WIDTH_40 ) +rtw89_write_rf (rtwdev, path,RR_LUTWD0 ,RR_LUTWD0_LB ,0x13 ); +else if (bw ==RTW89_CHANNEL_WIDTH_80 ) +rtw89_write_rf (rtwdev, path,RR_LUTWD0 ,RR_LUTWD0_LB ,0xb ); +else +rtw89_write_rf (rtwdev, path,RR_LUTWD0 ,RR_LUTWD0_LB ,0x3 ); + +rtw89_debug (rtwdev,RTW89_DBG_RFK ,"[RFK] set S%d RXBB BW 0x3F = 0x%x\n" , + path,rtw89_read_rf (rtwdev, path,RR_LUTWD0 ,RR_LUTWD0_LB )); + +rtw89_write_rf (rtwdev, path,RR_LUTWE2 ,RR_LUTWE2_RTXBW ,0x0 ); +} + +static void _rxbb_bw (struct rtw89_dev *rtwdev,enum rtw89_phy_idx phy, +enum rtw89_bandwidth bw) +{ +u8 kpath, path; + + kpath =_kpath (rtwdev, phy); + +for (path =0 ; path <RF_PATH_NUM_8852BT ; path++) { +if (!(kpath &BIT (path))) +continue ; + +_set_rxbb_bw (rtwdev, bw, path); + } +} + +static void rtw8852bt_ctrl_bw_ch (struct rtw89_dev *rtwdev, +enum rtw89_phy_idx phy,u8 central_ch, +enum rtw89_band band,enum rtw89_bandwidth bw) +{ +_ctrl_ch (rtwdev, central_ch); +_ctrl_bw (rtwdev, phy, bw); +_rxbb_bw (rtwdev, phy, bw); +} + +void rtw8852bt_set_channel_rf (struct rtw89_dev *rtwdev, +const struct rtw89_chan *chan, +enum rtw89_phy_idx phy_idx) +{ +rtw8852bt_ctrl_bw_ch (rtwdev, phy_idx, chan->channel, chan->band_type, + chan->band_width); +}
drivers/net/wireless/realtek/rtw89/rtw8852bt_rfk.h +3 -0
@@ -18,5 +18,8 @@ void rtw8852bt_tssi(struct rtw89_dev *rtwdev, enum rtw89_phy_idx phy, bool hwtx_void rtw8852bt_tssi_scan (struct rtw89_dev *rtwdev,enum rtw89_phy_idx phy);void rtw8852bt_wifi_scan_notify (struct rtw89_dev *rtwdev,bool scan_start,enum rtw89_phy_idx phy_idx); +void rtw8852bt_set_channel_rf (struct rtw89_dev *rtwdev, +const struct rtw89_chan *chan, +enum rtw89_phy_idx phy_idx);#endif
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerRe: [PATCH v3 1/7] wifi: rtw89: 8852bt: add set_channel_rf
Quoted 4 lines · Ping-Ke Shih
Add RF part of
set_channel()is to configure RF registers, and then hardware can TX/RX on specified frequency and bandwidth.Signed-off-by Ping-Ke Shih <[email protected]>
7 patch(es) applied to rtw-next branch of rtw.git, thanks.
6bd63e44e98e wifi: rtw89: 8852bt: add set_channel_rfbe457fbacea9 wifi: rtw89: 8852bt: rfk: use predefined string choice for DPK enable/disable c4dea0481e23 wifi: rtw89: 8852bt: add chip_info of RTL8852BT62eddca4d296 wifi: rtw89: 8852bt: add chip_ops of RTL8852BTe67e15cb867c wifi: rtw89: 8852bt: declare firmware features of RTL8852BT bbe48c328ff8 wifi: rtw89: 8852bte: add PCI entry of 8852BE-VTb9cdbb06d4fc wifi: rtw89: 8852bt: add 8852BE-VT to Makefile and Kconfig
Ping-Ke Shih
maintainerPATCH v3 2/7 wifi: rtw89: 8852bt: rfk: use predefined string choice for DPK enable/disable
In reply to Ping-Ke Shihclang warns precedence of '?:' and '&'. Even though original logic is correct, use str_enable_disable() to avoid clang confusing. Another way to fix is to add parentheses around '&', but I choose former one.
Quoted 1 line
Quoted 1 line
drivers/net/wireless/realtek/rtw89/rtw8852bt_rfk.c:1827:46: warning:
operator '?:' has lower precedence than '&'; '&' will be evaluated
first [-Wbitwise-conditional-parentheses]
1827 | kidx, dpk->is_dpk_enable & off_reverse ? "enable" : "disable");
| ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ^---
v3: add by v3
--- drivers/net/wireless/realtek/rtw89/rtw8852bt_rfk.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/realtek/rtw89/rtw8852bt_rfk.c +1 -1
@@ -1824,7 +1824,7 @@ static void _dpk_onoff(struct rtw89_dev *rtwdev, enum rtw89_rf_path path, bool o BIT(24), val);rtw89_debug (rtwdev,RTW89_DBG_RFK ,"[DPK] S%d[%d] DPK %s !!!\n" , path, - kidx, dpk->is_dpk_enable & off_reverse ?"enable" :"disable" ); + kidx,str_enable_disable (dpk->is_dpk_enable & off_reverse)); } static void _dpk_one_shot(struct rtw89_dev *rtwdev, enum rtw89_phy_idx phy,
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH v3 3/7 wifi: rtw89: 8852bt: add chip_info of RTL8852BT
In reply to Ping-Ke ShihAdd chip_info of RTL8852BT accordingly, including firmware elements support, MAC memory quota (WDE, PLE and etc), SER IMR used by firmware, BTC registers, register based H2C/C2H, WoWLAN stub.
---
v3: no change
v2: no change
--- drivers/net/wireless/realtek/rtw89/fw.h | 17 +- drivers/net/wireless/realtek/rtw89/mac.c | 7 + drivers/net/wireless/realtek/rtw89/mac.h | 6 + drivers/net/wireless/realtek/rtw89/reg.h | 58 ++- .../net/wireless/realtek/rtw89/rtw8852bt.c | 369 ++++++++++++++++++ .../net/wireless/realtek/rtw89/rtw8852bt.h | 2 + 6 files changed, 455 insertions(+), 4 deletions(-) create mode 100644 drivers/net/wireless/realtek/rtw89/rtw8852bt.c
drivers/net/wireless/realtek/rtw89/fw.h +14 -3
@@ -3741,17 +3741,28 @@ enum rtw89_fw_element_id { RTW89_FW_ELEMENT_ID_NUM, }; -#define BITS_OF_RTW89_TXPWR_FW_ELEMENTS \ +#define BITS_OF_RTW89_TXPWR_FW_ELEMENTS_NO_6GHZ \ (BIT(RTW89_FW_ELEMENT_ID_TXPWR_BYRATE) | \ BIT(RTW89_FW_ELEMENT_ID_TXPWR_LMT_2GHZ) | \ BIT(RTW89_FW_ELEMENT_ID_TXPWR_LMT_5GHZ) | \ - BIT(RTW89_FW_ELEMENT_ID_TXPWR_LMT_6GHZ) | \ BIT(RTW89_FW_ELEMENT_ID_TXPWR_LMT_RU_2GHZ) | \ BIT(RTW89_FW_ELEMENT_ID_TXPWR_LMT_RU_5GHZ) | \ - BIT(RTW89_FW_ELEMENT_ID_TXPWR_LMT_RU_6GHZ) | \ BIT(RTW89_FW_ELEMENT_ID_TX_SHAPE_LMT) | \ BIT(RTW89_FW_ELEMENT_ID_TX_SHAPE_LMT_RU)) +#define BITS_OF_RTW89_TXPWR_FW_ELEMENTS \ + (BITS_OF_RTW89_TXPWR_FW_ELEMENTS_NO_6GHZ | \ + BIT(RTW89_FW_ELEMENT_ID_TXPWR_LMT_6GHZ) | \ + BIT(RTW89_FW_ELEMENT_ID_TXPWR_LMT_RU_6GHZ)) + +#define RTW89_AX_GEN_DEF_NEEDED_FW_ELEMENTS_NO_6GHZ \ + (BIT(RTW89_FW_ELEMENT_ID_BB_REG) | \ + BIT(RTW89_FW_ELEMENT_ID_RADIO_A) | \ + BIT(RTW89_FW_ELEMENT_ID_RADIO_B) | \ + BIT(RTW89_FW_ELEMENT_ID_RF_NCTL) | \ + BIT(RTW89_FW_ELEMENT_ID_TXPWR_TRK) | \ + BITS_OF_RTW89_TXPWR_FW_ELEMENTS_NO_6GHZ) +#define RTW89_BE_GEN_DEF_NEEDED_FW_ELEMENTS (BIT(RTW89_FW_ELEMENT_ID_BBMCU0) | \ BIT(RTW89_FW_ELEMENT_ID_BB_REG) | \ BIT(RTW89_FW_ELEMENT_ID_RADIO_A) | \
drivers/net/wireless/realtek/rtw89/mac.c +7 -0
@@ -1625,6 +1625,7 @@ const struct rtw89_mac_size_set rtw89_mac_size = { .wde_size18 = {RTW89_WDE_PG_64, 0, 2048,},/* 8852C PCIE SCC */ .wde_size19 = {RTW89_WDE_PG_64, 3328, 0,}, + .wde_size23 = {RTW89_WDE_PG_64, 1022, 2,},/* PCIE */ .ple_size0 = {RTW89_PLE_PG_128, 1520, 16,}, .ple_size0_v1 = {RTW89_PLE_PG_128, 2688, 240, 212992,},
@@ -1635,6 +1636,7 @@ const struct rtw89_mac_size_set rtw89_mac_size = { .ple_size6 = {RTW89_PLE_PG_128, 496, 16,},/* DLFW */ .ple_size8 = {RTW89_PLE_PG_128, 64, 960,}, + .ple_size9 = {RTW89_PLE_PG_128, 2288, 16,},/* 8852C DLFW */ .ple_size18 = {RTW89_PLE_PG_128, 2544, 16,},/* 8852C PCIE SCC */
@@ -1652,6 +1654,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_qt23 = {958, 48, 0, 16,}, .ple_qt0 = {320, 320, 32, 16, 13, 13, 292, 292, 64, 18, 1, 4, 0,}, .ple_qt1 = {320, 320, 32, 16, 1316, 1316, 1595, 1595, 1367, 1321, 1, 1307, 0,},/* PCIE SCC */
@@ -1671,12 +1674,16 @@ const struct rtw89_mac_size_set rtw89_mac_size = { .ple_qt46 = {525, 0, 16, 20, 13, 13, 178, 0, 32, 62, 8, 16,},/* 8852C PCIE SCC */ .ple_qt47 = {525, 0, 32, 20, 1034, 13, 1199, 0, 1053, 62, 160, 1037,}, + .ple_qt57 = {147, 0, 16, 20, 13, 13, 178, 0, 32, 14, 8, 0,},/* PCIE 64 */ .ple_qt58 = {147, 0, 16, 20, 157, 13, 229, 0, 172, 14, 24, 0,}, + .ple_qt59 = {147, 0, 32, 20, 1860, 13, 2025, 0, 1879, 14, 24, 0,},/* 8852A PCIE WOW */ .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,}, +/* 8852BT PCIE WOW */ + .ple_qt_52bt_wow = {147, 0, 32, 20, 1860, 13, 1929, 0, 1879, 14, 24, 0,},/* 8851B PCIE WOW */ .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,},
drivers/net/wireless/realtek/rtw89/mac.h +6 -0
@@ -885,12 +885,14 @@ struct rtw89_mac_size_set {const struct rtw89_dle_size wde_size9;const struct rtw89_dle_size wde_size18;const struct rtw89_dle_size wde_size19; +const struct rtw89_dle_size wde_size23;const struct rtw89_dle_size ple_size0;const struct rtw89_dle_size ple_size0_v1;const struct rtw89_dle_size ple_size3_v1;const struct rtw89_dle_size ple_size4;const struct rtw89_dle_size ple_size6;const struct rtw89_dle_size ple_size8; +const struct rtw89_dle_size ple_size9;const struct rtw89_dle_size ple_size18;const struct rtw89_dle_size ple_size19;const struct rtw89_wde_quota wde_qt0;
@@ -900,6 +902,7 @@ struct rtw89_mac_size_set {const struct rtw89_wde_quota wde_qt7;const struct rtw89_wde_quota wde_qt17;const struct rtw89_wde_quota wde_qt18; +const struct rtw89_wde_quota wde_qt23;const struct rtw89_ple_quota ple_qt0;const struct rtw89_ple_quota ple_qt1;const struct rtw89_ple_quota ple_qt4;
@@ -911,9 +914,12 @@ struct rtw89_mac_size_set {const struct rtw89_ple_quota ple_qt45;const struct rtw89_ple_quota ple_qt46;const struct rtw89_ple_quota ple_qt47; +const struct rtw89_ple_quota ple_qt57;const struct rtw89_ple_quota ple_qt58; +const struct rtw89_ple_quota ple_qt59;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_52bt_wow;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;
drivers/net/wireless/realtek/rtw89/reg.h +57 -1
88 lines not on this page · raw message
drivers/net/wireless/realtek/rtw89/rtw8852bt.c new file +369 -0
369 lines not on this page · raw message
drivers/net/wireless/realtek/rtw89/rtw8852bt.h +2 -0
@@ -10,4 +10,6 @@#define RF_PATH_NUM_8852BT 2#define BB_PATH_NUM_8852BT 2 +extern const struct rtw89_chip_info rtw8852bt_chip_info; +#endif
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH v3 4/7 wifi: rtw89: 8852bt: add chip_ops of RTL8852BT
In reply to Ping-Ke ShihAdd chip_info of RTL8852BT accordingly, including power on/off function, BB reset, TSSI settings while setting channel, RF calibration, and BT coexistence.
---
v3: no change
v2: no change
--- drivers/net/wireless/realtek/rtw89/coex.h | 2 + .../net/wireless/realtek/rtw89/rtw8852bt.c | 461 ++++++++++++++++++ 2 files changed, 463 insertions(+)
drivers/net/wireless/realtek/rtw89/coex.h +2 -0
@@ -193,6 +193,8 @@ enum btc_wa_type {BTC_WA_5G_HI_CH_RX =BIT (0 ),BTC_WA_NULL_AP =BIT (1 ),BTC_WA_HFP_ZB =BIT (2 ),/* HFP PTA req bit4 define issue */ +BTC_WA_HFP_LAG =BIT (3 ),/* 52BT WL break BT Rx lag issue */ +BTC_WA_INIT_SCAN =BIT (4 )/* 52A/C/D init scan move to wl slot WA */ }; enum btc_3cx_type {
drivers/net/wireless/realtek/rtw89/rtw8852bt.c +461 -0
474 lines not on this page · raw message
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH v3 5/7 wifi: rtw89: 8852bt: declare firmware features of RTL8852BT
In reply to Ping-Ke ShihFirmware features are enabled after being supported, including TX wake, firmware crash simulation, hardware scan.
---
v3: no change
v2: no change
--- drivers/net/wireless/realtek/rtw89/fw.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/net/wireless/realtek/rtw89/fw.c +4 -0
@@ -670,6 +670,10 @@ static const struct __fw_feat_cfg fw_feat_tbl[] = {__CFG_FW_FEAT (RTL8852B , ge,0 ,29 ,26 ,0 ,TX_WAKE ),__CFG_FW_FEAT (RTL8852B , ge,0 ,29 ,29 ,0 ,CRASH_TRIGGER ),__CFG_FW_FEAT (RTL8852B , ge,0 ,29 ,29 ,0 ,SCAN_OFFLOAD ), +__CFG_FW_FEAT (RTL8852BT , ge,0 ,29 ,74 ,0 ,NO_LPS_PG ), +__CFG_FW_FEAT (RTL8852BT , ge,0 ,29 ,74 ,0 ,TX_WAKE ), +__CFG_FW_FEAT (RTL8852BT , ge,0 ,29 ,90 ,0 ,CRASH_TRIGGER ), +__CFG_FW_FEAT (RTL8852BT , ge,0 ,29 ,91 ,0 ,SCAN_OFFLOAD ),__CFG_FW_FEAT (RTL8852C , le,0 ,27 ,33 ,0 ,NO_DEEP_PS ),__CFG_FW_FEAT (RTL8852C , ge,0 ,27 ,34 ,0 ,TX_WAKE ), __CFG_FW_FEAT(RTL8852C, ge, 0, 27, 36, 0, SCAN_OFFLOAD),
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH v3 6/7 wifi: rtw89: 8852bte: add PCI entry of 8852BE-VT
In reply to Ping-Ke ShihPCI device ID 10ec:b520 of RTL8852BE-VT is added as PCI entry, and define chip capabilities for driver common routines.
---
v3: no change
v2: no change
--- .../net/wireless/realtek/rtw89/rtw8852bte.c | 93 +++++++++++++++++++ 1 file changed, 93 insertions(+) create mode 100644 drivers/net/wireless/realtek/rtw89/rtw8852bte.c
drivers/net/wireless/realtek/rtw89/rtw8852bte.c new file +93 -0
@@ -0,0 +1,93 @@ +// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause +/* Copyright(c) 2024 Realtek Corporation +*/ + +#include <linux/module.h> +#include <linux/pci.h> + +#include "pci.h" +#include "reg.h" +#include "rtw8852bt.h" + +static const struct rtw89_pci_info rtw8852bt_pci_info = { + .gen_def = &rtw89_pci_gen_ax, + .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 , + .rx_ring_eq_is_full = false, + .check_rx_tag = false, + + .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_io_stop = {R_AX_PCIE_DMA_STOP1 ,B_AX_STOP_PCIEIO }, + .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 , + .mit_addr =R_AX_INT_MIT_RX , + .wp_sel_addr =0 , + .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_8852bte_info = { + .chip = &rtw8852bt_chip_info, + .quirks =NULL , + .bus = { + .pci = &rtw8852bt_pci_info, + }, +}; + +static const struct pci_device_id rtw89_8852bte_id_table[] = { + { +PCI_DEVICE (PCI_VENDOR_ID_REALTEK ,0xb520 ), + .driver_data = (kernel_ulong_t)&rtw89_8852bte_info, + }, + {}, +}; +MODULE_DEVICE_TABLE (pci, rtw89_8852bte_id_table); + +static struct pci_driver rtw89_8852bte_driver = { + .name ="rtw89_8852bte" , + .id_table = rtw89_8852bte_id_table, + .probe = rtw89_pci_probe, + .remove = rtw89_pci_remove, + .driver.pm = &rtw89_pm_ops, +}; +module_pci_driver (rtw89_8852bte_driver); + +MODULE_AUTHOR ("Realtek Corporation" ); +MODULE_DESCRIPTION ("Realtek 802.11ax wireless 8852BE-VT driver" ); +MODULE_LICENSE ("Dual BSD/GPL" );
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH v3 7/7 wifi: rtw89: 8852bt: add 8852BE-VT to Makefile and Kconfig
In reply to Ping-Ke ShihRTL8852BE-VT is a WiFi 6 2x2 chip, which can operate on 2/5 GHz channels and 80MHz bandwidth.
---
v3: no change
v2: add missing RTW89_8852BT
--- drivers/net/wireless/realtek/rtw89/Kconfig | 15 +++++++++++++++ drivers/net/wireless/realtek/rtw89/Makefile | 8 ++++++++ 2 files changed, 23 insertions(+)
drivers/net/wireless/realtek/rtw89/Kconfig +15 -0
@@ -28,6 +28,9 @@ config RTW89_8852B_COMMON config RTW89_8852B tristate +config RTW89_8852BT + tristate + config RTW89_8852C tristate
@@ -68,6 +71,18 @@ config RTW89_8852BE 802.11ax PCIe wireless network (Wi-Fi 6) adapter +config RTW89_8852BTE + tristate "Realtek 8852BE-VT PCI wireless network (Wi-Fi 6) adapter" + depends on PCI + select RTW89_CORE + select RTW89_PCI + select RTW89_8852BT + select RTW89_8852B_COMMON + help + Select this option will enable support for 8852BE-VT chipset + + 802.11ax PCIe wireless network (Wi-Fi 6) adapter + config RTW89_8852CE tristate "Realtek 8852CE PCI wireless network (Wi-Fi 6E) adapter" depends on PCI
drivers/net/wireless/realtek/rtw89/Makefile +8 -0
@@ -52,6 +52,14 @@ rtw89_8852b-objs := rtw8852b.o \ obj-$(CONFIG_RTW89_8852BE) += rtw89_8852be.o rtw89_8852be-objs := rtw8852be.o +obj-$(CONFIG_RTW89_8852BT) += rtw89_8852bt.o +rtw89_8852bt-objs := rtw8852bt.o \ + rtw8852bt_rfk.o \ + rtw8852bt_rfk_table.o + +obj-$(CONFIG_RTW89_8852BTE) += rtw89_8852bte.o +rtw89_8852bte-objs := rtw8852bte.o + obj-$(CONFIG_RTW89_8852C) += rtw89_8852c.o rtw89_8852c-objs := rtw8852c.o \ rtw8852c_table.o \
Signature · 1 line
2.25.1