wifi: rtw88: usb: Support USB 3 with RTL8822CU/RTL8822BU
PATCH v2 1/1 wifi: rtw88: usb: Support USB 3 with RTL8822CU/RTL8822BU
The Realtek wifi 5 devices which support USB 3 are weird: when first plugged in, they pretend to be USB 2. The driver needs to send some commands to the device, which make it disappear and come back as a USB 3 device.
Implement the required commands in rtw88.
When a USB 3 device is plugged into a USB 2 port, rtw88 will try to switch it to USB 3 mode only once. The device will disappear and come back still in USB 2 mode, of course.
Some people experience heavy interference in the 2.4 GHz band in USB 3 mode, so add a module parameter switch_usb_mode with the default value 1 to let people disable the switching.
---
v2:
- Make the module parameter description clearer.
- Replace rtw_info with rtw_dbg. Add RTW_DBG_USB flag for this purpose.
- Delete unnecessary parentheses pointed out by checkpatch.
--- drivers/net/wireless/realtek/rtw88/debug.h | 1 + drivers/net/wireless/realtek/rtw88/main.h | 2 + drivers/net/wireless/realtek/rtw88/reg.h | 11 +++ drivers/net/wireless/realtek/rtw88/rtw8822b.c | 1 + drivers/net/wireless/realtek/rtw88/rtw8822b.h | 4 +- drivers/net/wireless/realtek/rtw88/rtw8822c.c | 1 + drivers/net/wireless/realtek/rtw88/rtw8822c.h | 24 +++--- drivers/net/wireless/realtek/rtw88/usb.c | 84 +++++++++++++++++++ 8 files changed, 116 insertions(+), 12 deletions(-)
drivers/net/wireless/realtek/rtw88/debug.h +1 -0
@@ -25,6 +25,7 @@ enum rtw_debug_mask {RTW_DBG_HW_SCAN =0x00010000 ,RTW_DBG_STATE =0x00020000 ,RTW_DBG_SDIO =0x00040000 , +RTW_DBG_USB =0x00080000 ,RTW_DBG_UNEXP =0x80000000 ,RTW_DBG_ALL =0xffffffff
drivers/net/wireless/realtek/rtw88/main.h +2 -0
@@ -1785,6 +1785,8 @@ struct rtw_efuse {bool share_ant;u8 bt_setting; +u8 usb_mode_switch; +struct {u8 hci;u8 bw;
drivers/net/wireless/realtek/rtw88/reg.h +11 -0
@@ -15,6 +15,7 @@#define BIT_WLOCK_1C_B6 BIT(5)#define REG_SYS_PW_CTRL 0x0004#define BIT_PFM_WOWL BIT(3) +#define BIT_APFM_OFFMAC BIT(9)#define REG_SYS_CLK_CTRL 0x0008#define BIT_CPU_CLK_EN BIT(14)
@@ -133,6 +134,14 @@#define REG_PMC_DBG_CTRL1 0xa8#define BITS_PMC_BT_IQK_STS GENMASK(22, 21) +#define REG_PAD_CTRL2 0x00C4 +#define BIT_RSM_EN_V1 BIT(16) +#define BIT_NO_PDN_CHIPOFF_V1 BIT(17) +#define BIT_MASK_USB23_SW_MODE_V1 GENMASK(19, 18) +#define BIT_USB3_USB2_TRANSITION BIT(20) +#define BIT_USB_MODE_U2 1 +#define BIT_USB_MODE_U3 2 +#define REG_EFUSE_ACCESS 0x00CF#define EFUSE_ACCESS_ON 0x69#define EFUSE_ACCESS_OFF 0x00
@@ -568,6 +577,8 @@#define BIT_WL_SECURITY_CLK BIT(15)#define BIT_DDMA_EN BIT(8) +#define REG_SW_MDIO 0x10C0 +#define REG_H2C_PKT_READADDR 0x10D0#define REG_H2C_PKT_WRITEADDR 0x10D4#define REG_FW_DBG6 0x10F8
drivers/net/wireless/realtek/rtw88/rtw8822b.c +1 -0
@@ -46,6 +46,7 @@ static int rtw8822b_read_efuse(struct rtw_dev *rtwdev, u8 *log_map) map = (struct rtw8822b_efuse *)log_map; + efuse->usb_mode_switch =u8_get_bits (map->usb_mode,BIT (7 )); efuse->rfe_option = map->rfe_option; efuse->rf_board_option = map->rf_board_option; efuse->crystal_cap = map->xtal_k;
drivers/net/wireless/realtek/rtw88/rtw8822b.h +3 -1
@@ -72,7 +72,9 @@ struct rtw8822bs_efuse {struct rtw8822b_efuse {__le16 rtl_id; -u8 res0[0x0e ]; +u8 res0[4 ]; +u8 usb_mode; +u8 res1[0x09 ];/* power index for four RF paths */ struct rtw_txpwr_idx txpwr_idx_table[4 ];
drivers/net/wireless/realtek/rtw88/rtw8822c.c +1 -0
@@ -49,6 +49,7 @@ static int rtw8822c_read_efuse(struct rtw_dev *rtwdev, u8 *log_map) map = (struct rtw8822c_efuse *)log_map; + efuse->usb_mode_switch =u8_get_bits (map->usb_mode,BIT (7 )); efuse->rfe_option = map->rfe_option; efuse->rf_board_option = map->rf_board_option; efuse->crystal_cap = map->xtal_k &XCAP_MASK ;
drivers/net/wireless/realtek/rtw88/rtw8822c.h +13 -11
@@ -59,16 +59,18 @@ struct rtw8822ce_efuse {struct rtw8822c_efuse {__le16 rtl_id; -u8 res0[0x0e ]; +u8 res0[4 ]; +u8 usb_mode; +u8 res1[0x09 ];/* power index for four RF paths */ struct rtw_txpwr_idx txpwr_idx_table[4 ];u8 channel_plan;/* 0xb8 */ u8 xtal_k; -u8 res1; +u8 res2;u8 iqk_lck; -u8 res2[5 ];/* 0xbc */ +u8 res3[5 ];/* 0xbc */ u8 rf_board_option;u8 rf_feature_option;u8 rf_bt_setting;
@@ -80,21 +82,21 @@ struct rtw8822c_efuse {u8 rf_antenna_option;/* 0xc9 */ u8 rfe_option;u8 country_code[2 ]; -u8 res3[3 ]; +u8 res4[3 ];u8 path_a_thermal;/* 0xd0 */ u8 path_b_thermal; -u8 res4[2 ]; +u8 res5[2 ];u8 rx_gain_gap_2g_ofdm; -u8 res5; -u8 rx_gain_gap_2g_cck;u8 res6; -u8 rx_gain_gap_5gl; +u8 rx_gain_gap_2g_cck;u8 res7; -u8 rx_gain_gap_5gm; +u8 rx_gain_gap_5gl;u8 res8; -u8 rx_gain_gap_5gh; +u8 rx_gain_gap_5gm;u8 res9; -u8 res10[0x42 ]; +u8 rx_gain_gap_5gh; +u8 res10; +u8 res11[0x42 ];union {struct rtw8822ce_efuse e;struct rtw8822cu_efuse u;
drivers/net/wireless/realtek/rtw88/usb.c +84 -0
102 lines not on this page · raw message
Signature · 1 line
2.45.2
Quoted 11 lines · Bitterblue Smith
The Realtek wifi 5 devices which support USB 3 are weird: when first plugged in, they pretend to be USB 2. The driver needs to send some commands to the device, which make it disappear and come back as a USB 3 device.
Implement the required commands in rtw88.
When a USB 3 device is plugged into a USB 2 port, rtw88 will try to switch it to USB 3 mode only once. The device will disappear and come back still in USB 2 mode, of course.
Quoted 5 lines
Some people experience heavy interference in the 2.4 GHz band in USB 3 mode, so add a module parameter
switch_usb_modewith the default value 1 to let people disable the switching.Signed-off-by Bitterblue Smith <[email protected]>
Ping-Ke Shih
maintainerQuoted 11 lines · Bitterblue Smith
The Realtek wifi 5 devices which support USB 3 are weird: when first plugged in, they pretend to be USB 2. The driver needs to send some commands to the device, which make it disappear and come back as a USB 3 device.
Implement the required commands in rtw88.
When a USB 3 device is plugged into a USB 2 port, rtw88 will try to switch it to USB 3 mode only once. The device will disappear and come back still in USB 2 mode, of course.
Quoted 6 lines
Some people experience heavy interference in the 2.4 GHz band in USB 3 mode, so add a module parameter
switch_usb_modewith the default value 1 to let people disable the switching.Signed-off-by Bitterblue Smith <[email protected]>Acked-by Ping-Ke Shih <[email protected]>
1 patch(es) applied to rtw-next branch of rtw.git, thanks.
315c23a64e99 wifi: rtw88: usb: Support USB 3 with RTL8822CU/RTL8822BU