wifi: rtl8xxxu: Move burst init to a function
PATCH v2 1/3 wifi: rtl8xxxu: Move burst init to a function
No changes to functionality, just moving code to make rtl8xxxu_init_device look nicer.
---
v2:
- No change.
--- .../net/wireless/realtek/rtl8xxxu/rtl8xxxu.h | 2 + .../realtek/rtl8xxxu/rtl8xxxu_8188f.c | 1 + .../realtek/rtl8xxxu/rtl8xxxu_8723b.c | 1 + .../wireless/realtek/rtl8xxxu/rtl8xxxu_core.c | 89 ++++++++++--------- 4 files changed, 52 insertions(+), 41 deletions(-)
drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h +2 -0
@@ -1485,6 +1485,7 @@ struct rtl8xxxu_fileops {int (*parse_rx_desc) (struct rtl8xxxu_priv *priv,struct sk_buff *skb);void (*init_aggregation) (struct rtl8xxxu_priv *priv);void (*init_statistics) (struct rtl8xxxu_priv *priv); +void (*init_burst) (struct rtl8xxxu_priv *priv);void (*enable_rf) (struct rtl8xxxu_priv *priv);void (*disable_rf) (struct rtl8xxxu_priv *priv);void (*usb_quirks) (struct rtl8xxxu_priv *priv);
@@ -1592,6 +1593,7 @@ void rtl8xxxu_gen1_init_aggregation(struct rtl8xxxu_priv *priv);void rtl8xxxu_gen1_enable_rf (struct rtl8xxxu_priv *priv);void rtl8xxxu_gen1_disable_rf (struct rtl8xxxu_priv *priv);void rtl8xxxu_gen2_disable_rf (struct rtl8xxxu_priv *priv); +void rtl8xxxu_init_burst (struct rtl8xxxu_priv *priv);int rtl8xxxu_parse_rxdesc16 (struct rtl8xxxu_priv *priv,struct sk_buff *skb);int rtl8xxxu_parse_rxdesc24 (struct rtl8xxxu_priv *priv,struct sk_buff *skb);int rtl8xxxu_gen2_channel_to_group (int channel);
drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8188f.c +1 -0
@@ -1705,6 +1705,7 @@ struct rtl8xxxu_fileops rtl8188fu_fops = { .parse_rx_desc = rtl8xxxu_parse_rxdesc24, .init_aggregation = rtl8188fu_init_aggregation, .init_statistics = rtl8188fu_init_statistics, + .init_burst = rtl8xxxu_init_burst, .enable_rf = rtl8188f_enable_rf, .disable_rf = rtl8188f_disable_rf, .usb_quirks = rtl8188f_usb_quirks,
drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8723b.c +1 -0
@@ -1683,6 +1683,7 @@ struct rtl8xxxu_fileops rtl8723bu_fops = { .parse_rx_desc = rtl8xxxu_parse_rxdesc24, .init_aggregation = rtl8723bu_init_aggregation, .init_statistics = rtl8723bu_init_statistics, + .init_burst = rtl8xxxu_init_burst, .enable_rf = rtl8723b_enable_rf, .disable_rf = rtl8xxxu_gen2_disable_rf, .usb_quirks = rtl8xxxu_gen2_usb_quirks,
drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c +48 -41
102 lines not on this page · raw message
Signature · 1 line
2.38.0
PATCH v2 2/3 wifi: rtl8xxxu: Split up rtl8xxxu_identify_chip
Move the reusable parts into separate functions and create one identify_chip function for each chip type.
This is preparation for supporting the RTL8710BU chip, which would need too many ugly changes to this function. Another reason to do this is to get rid of the long and scary if..else if..else block in the middle of the function.
Everything should still work the same as before.
---
v2:
- Make rtl8192cu_identify_chip and rtl8192eu_identify_chip static.
--- .../net/wireless/realtek/rtl8xxxu/rtl8xxxu.h | 5 + .../realtek/rtl8xxxu/rtl8xxxu_8188f.c | 32 +++ .../realtek/rtl8xxxu/rtl8xxxu_8192c.c | 60 +++++ .../realtek/rtl8xxxu/rtl8xxxu_8192e.c | 49 +++++ .../realtek/rtl8xxxu/rtl8xxxu_8723a.c | 51 +++++ .../realtek/rtl8xxxu/rtl8xxxu_8723b.c | 49 +++++ .../wireless/realtek/rtl8xxxu/rtl8xxxu_core.c | 207 +++++------------- 7 files changed, 297 insertions(+), 156 deletions(-)
drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h +5 -0
@@ -1470,6 +1470,7 @@ struct rtl8xxxu_tx_urb { };struct rtl8xxxu_fileops { +int (*identify_chip) (struct rtl8xxxu_priv *priv);int (*parse_efuse) (struct rtl8xxxu_priv *priv);int (*load_firmware) (struct rtl8xxxu_priv *priv);int (*power_on) (struct rtl8xxxu_priv *priv);
@@ -1562,6 +1563,10 @@ int rtl8xxxu_init_phy_regs(struct rtl8xxxu_priv *priv,int rtl8xxxu_load_firmware (struct rtl8xxxu_priv *priv,char *fw_name);void rtl8xxxu_firmware_self_reset (struct rtl8xxxu_priv *priv);void rtl8xxxu_power_off (struct rtl8xxxu_priv *priv); +void rtl8xxxu_identify_vendor_1bit (struct rtl8xxxu_priv *priv,u32 vendor); +void rtl8xxxu_identify_vendor_2bits (struct rtl8xxxu_priv *priv,u32 vendor); +void rtl8xxxu_config_endpoints_sie (struct rtl8xxxu_priv *priv); +int rtl8xxxu_config_endpoints_no_sie (struct rtl8xxxu_priv *priv);int rtl8xxxu_read_efuse8 (struct rtl8xxxu_priv *priv,u16 offset,u8 *data);void rtl8xxxu_reset_8051 (struct rtl8xxxu_priv *priv);int rtl8xxxu_auto_llt_table (struct rtl8xxxu_priv *priv);
drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8188f.c +32 -0
@@ -321,6 +321,37 @@ static const struct rtl8xxxu_rfregval rtl8188fu_cut_b_radioa_init_table[] = { {0xff, 0xffffffff} }; +static int rtl8188fu_identify_chip (struct rtl8xxxu_priv *priv) +{ +struct device *dev = &priv->udev->dev; +u32 sys_cfg, vendor; +int ret =0 ; + +sprintf (priv->chip_name,"8188FU" ); + priv->rtl_chip =RTL8188F ; + priv->rf_paths =1 ; + priv->rx_paths =1 ; + priv->tx_paths =1 ; + priv->has_wifi =1 ; + + sys_cfg =rtl8xxxu_read32 (priv,REG_SYS_CFG ); + priv->chip_cut = (sys_cfg &SYS_CFG_CHIP_VERSION_MASK ) >> +SYS_CFG_CHIP_VERSION_SHIFT ; +if (sys_cfg &SYS_CFG_TRP_VAUX_EN ) { +dev_info (dev,"Unsupported test chip\n" ); + ret = -ENOTSUPP ; + goto out; + } + + vendor = sys_cfg &SYS_CFG_VENDOR_EXT_MASK ; +rtl8xxxu_identify_vendor_2bits (priv, vendor); + + ret =rtl8xxxu_config_endpoints_no_sie (priv); + +out: +return ret; +} +static void rtl8xxxu_8188f_channel_to_group (int channel,int *group,int *cck_group) {if (channel <3 )
@@ -1690,6 +1721,7 @@ static s8 rtl8188f_cck_rssi(struct rtl8xxxu_priv *priv, u8 cck_agc_rpt) }struct rtl8xxxu_fileops rtl8188fu_fops = { + .identify_chip = rtl8188fu_identify_chip, .parse_efuse = rtl8188fu_parse_efuse, .load_firmware = rtl8188fu_load_firmware, .power_on = rtl8188fu_power_on,
drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8192c.c +60 -0
72 lines not on this page · raw message
drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8192e.c +49 -0
61 lines not on this page · raw message
drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8723a.c +51 -0
63 lines not on this page · raw message
drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8723b.c +49 -0
61 lines not on this page · raw message
drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c +51 -156
240 lines not on this page · raw message
Signature · 1 line
2.38.0
RE: [PATCH v2 2/3] wifi: rtl8xxxu: Split up rtl8xxxu_identify_chip
Quoted 64 lines
-----Original Message-----
From: Bitterblue Smith <[email protected]>
Sent: Sunday, November 6, 2022 6:54 AM
To: [email protected]
Cc: Jes Sorensen <[email protected]>
Subject: [PATCH v2 2/3] wifi: rtl8xxxu: Split uprtl8xxxu_identify_chipMove the reusable parts into separate functions and create one
identify_chipfunction for each chip type.This is preparation for supporting the RTL8710BU chip, which would need too many ugly changes to this function. Another reason to do this is to get rid of the long and scary if..else if..else block in the middle of the function.
Everything should still work the same as before.
Signed-off-by Bitterblue Smith <[email protected]>---
v2:
- Makertl8192cu_identify_chipandrtl8192eu_identify_chipstatic.Reported-by kernel test robot <[email protected]>--- .../net/wireless/realtek/rtl8xxxu/rtl8xxxu.h | 5 + .../realtek/rtl8xxxu/rtl8xxxu_8188f.c | 32 +++ .../realtek/rtl8xxxu/rtl8xxxu_8192c.c | 60 +++++ .../realtek/rtl8xxxu/rtl8xxxu_8192e.c | 49 +++++ .../realtek/rtl8xxxu/rtl8xxxu_8723a.c | 51 +++++ .../realtek/rtl8xxxu/rtl8xxxu_8723b.c | 49 +++++ .../wireless/realtek/rtl8xxxu/rtl8xxxu_core.c | 207 +++++------------- 7 files changed, 297 insertions(+), 156 deletions(-)drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h +5
-0@@ -1470,6 +1470,7 @@ struct rtl8xxxu_tx_urb { };struct rtl8xxxu_fileops { +int (*identify_chip) (struct rtl8xxxu_priv *priv);int (*parse_efuse) (struct rtl8xxxu_priv *priv);int (*load_firmware) (struct rtl8xxxu_priv *priv);int (*power_on) (struct rtl8xxxu_priv *priv);@@ -1562,6 +1563,10 @@ int rtl8xxxu_init_phy_regs(struct rtl8xxxu_priv *priv,int rtl8xxxu_load_firmware (struct rtl8xxxu_priv *priv,char *fw_name);void rtl8xxxu_firmware_self_reset (struct rtl8xxxu_priv *priv);void rtl8xxxu_power_off (struct rtl8xxxu_priv *priv); +void rtl8xxxu_identify_vendor_1bit (struct rtl8xxxu_priv *priv,u32 vendor); +void rtl8xxxu_identify_vendor_2bits (struct rtl8xxxu_priv *priv,u32 vendor); +void rtl8xxxu_config_endpoints_sie (struct rtl8xxxu_priv *priv); +int rtl8xxxu_config_endpoints_no_sie (struct rtl8xxxu_priv *priv);int rtl8xxxu_read_efuse8 (struct rtl8xxxu_priv *priv,u16 offset,u8 *data);void rtl8xxxu_reset_8051 (struct rtl8xxxu_priv *priv);int rtl8xxxu_auto_llt_table (struct rtl8xxxu_priv *priv);drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8188f.c +0
-0
drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8188f.c static const struct rtl8xxxu_rfregval rtl8188fu_cut_b_radioa_init_table[] = { · line 330
Quoted 10 lines
drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8188f.c +7
-0@@ -321,6 +321,37 @@ static const struct rtl8xxxu_rfregval rtl8188fu_cut_b_radioa_init_table[] = { {0xff, 0xffffffff} }; +static int rtl8188fu_identify_chip (struct rtl8xxxu_priv *priv) +{ +struct device *dev = &priv->udev->dev; +u32 sys_cfg, vendor; +int ret =0 ; + +sprintf (priv->chip_name,"8188FU" );
strscpy(priv->chip_name, "8188FU", sizeof(priv->chip_name));
drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8188f.c static const struct rtl8xxxu_rfregval rtl8188fu_cut_b_radioa_init_table[] = { · line 339
Quoted 9 lines
drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8188f.c +9
-0+ priv->rtl_chip =RTL8188F ; + priv->rf_paths =1 ; + priv->rx_paths =1 ; + priv->tx_paths =1 ; + priv->has_wifi =1 ; + + sys_cfg =rtl8xxxu_read32 (priv,REG_SYS_CFG ); + priv->chip_cut = (sys_cfg &SYS_CFG_CHIP_VERSION_MASK ) >> +SYS_CFG_CHIP_VERSION_SHIFT ;
priv->chip_cut = FIELD_GET(SYS_CFG_CHIP_VERSION_MASK, sys_cfg);
Then, remove #define SYS_CFG_CHIP_VERSION_SHIFT.
Quoted 34 lines
drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8188f.c +16
-0+if (sys_cfg &SYS_CFG_TRP_VAUX_EN ) { +dev_info (dev,"Unsupported test chip\n" ); + ret = -ENOTSUPP ; + goto out; + } + + vendor = sys_cfg &SYS_CFG_VENDOR_EXT_MASK ; +rtl8xxxu_identify_vendor_2bits (priv, vendor); + + ret =rtl8xxxu_config_endpoints_no_sie (priv); + +out: +return ret; +} +static void rtl8xxxu_8188f_channel_to_group (int channel,int *group,int *cck_group) {if (channel <3 )@@ -1690,6 +1721,7 @@ static s8 rtl8188f_cck_rssi(struct rtl8xxxu_priv *priv, u8 cck_agc_rpt) }struct rtl8xxxu_fileops rtl8188fu_fops = { + .identify_chip = rtl8188fu_identify_chip, .parse_efuse = rtl8188fu_parse_efuse, .load_firmware = rtl8188fu_load_firmware, .power_on = rtl8188fu_power_on,drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8192c.c +0
-0@@ -326,6 +326,65 @@ static const struct rtl8xxxu_rfregval rtl8188ru_radioa_1t_highpa_table[] = { {0xff, 0xffffffff} };
drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8192c.c static const struct rtl8xxxu_rfregval rtl8188ru_radioa_1t_highpa_table[] = { · line 337
Quoted 10 lines
drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8192c.c +9
-0+static int rtl8192cu_identify_chip (struct rtl8xxxu_priv *priv) +{ +struct device *dev = &priv->udev->dev; +u32 val32, bonding, sys_cfg, vendor; +int ret =0 ; + + sys_cfg =rtl8xxxu_read32 (priv,REG_SYS_CFG ); + priv->chip_cut = (sys_cfg &SYS_CFG_CHIP_VERSION_MASK ) >> +SYS_CFG_CHIP_VERSION_SHIFT ;
ditto.
drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8192c.c static const struct rtl8xxxu_rfregval rtl8188ru_radioa_1t_highpa_table[] = { · line 348
Quoted 11 lines
drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8192c.c +11
-0+if (sys_cfg &SYS_CFG_TRP_VAUX_EN ) { +dev_info (dev,"Unsupported test chip\n" ); + ret = -ENOTSUPP ; + goto out; + } + +if (sys_cfg &SYS_CFG_TYPE_ID ) { + bonding =rtl8xxxu_read32 (priv,REG_HPON_FSM ); + bonding &=HPON_FSM_BONDING_MASK ; +if (bonding ==HPON_FSM_BONDING_1T2R ) { +sprintf (priv->chip_name,"8191CU" );
strscpy()
drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8192c.c static const struct rtl8xxxu_rfregval rtl8188ru_radioa_1t_highpa_table[] = { · line 353
Quoted 5 lines
drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8192c.c +5
-0+ priv->tx_paths =1 ; + priv->usb_interrupts =1 ; + priv->rtl_chip =RTL8191C ; + }else { +sprintf (priv->chip_name,"8192CU" );
strscpy()
drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8192c.c static const struct rtl8xxxu_rfregval rtl8188ru_radioa_1t_highpa_table[] = { · line 361
Quoted 8 lines
drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8192c.c +8
-0+ priv->tx_paths =2 ; + priv->usb_interrupts =0 ; + priv->rtl_chip =RTL8192C ; + } + priv->rf_paths =2 ; + priv->rx_paths =2 ; + }else { +sprintf (priv->chip_name,"8188CU" );
strscpy()
drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8192c.c static const struct rtl8xxxu_rfregval rtl8188ru_radioa_1t_highpa_table[] = { · line 374
Quoted 13 lines
drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8192c.c +13
-0+ priv->rf_paths =1 ; + priv->rx_paths =1 ; + priv->tx_paths =1 ; + priv->rtl_chip =RTL8188C ; + priv->usb_interrupts =0 ; + } + priv->has_wifi =1 ; + + vendor = sys_cfg &SYS_CFG_VENDOR_ID ; +rtl8xxxu_identify_vendor_1bit (priv, vendor); + + val32 =rtl8xxxu_read32 (priv,REG_GPIO_OUTSTS ); + priv->rom_rev = (val32 &GPIO_RF_RL_ID ) >>28 ;
priv->rom_rev = FIELD_GET(GPIO_RF_RL_ID, valu32);
Quoted 32 lines
drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8192c.c +14
-0+ +rtl8xxxu_config_endpoints_sie (priv); + +/* +* Fallback for devices that do not provide REG_NORMAL_SIE_EP_TX +*/ +if (!priv->ep_tx_count) + ret =rtl8xxxu_config_endpoints_no_sie (priv); + +out: +return ret; +} +static int rtl8192cu_load_firmware (struct rtl8xxxu_priv *priv) {char *fw_name;@@ -541,6 +600,7 @@ static int rtl8192cu_power_on(struct rtl8xxxu_priv *priv) }struct rtl8xxxu_fileops rtl8192cu_fops = { + .identify_chip = rtl8192cu_identify_chip, .parse_efuse = rtl8192cu_parse_efuse, .load_firmware = rtl8192cu_load_firmware, .power_on = rtl8192cu_power_on,drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8192e.c +0
-0@@ -478,6 +478,54 @@ static const struct rtl8xxxu_rfregval rtl8192eu_radiob_init_table[] = { {0xff, 0xffffffff} };
drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8192e.c static const struct rtl8xxxu_rfregval rtl8192eu_radiob_init_table[] = { · line 489
Quoted 10 lines
drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8192e.c +9
-0+static int rtl8192eu_identify_chip (struct rtl8xxxu_priv *priv) +{ +struct device *dev = &priv->udev->dev; +u32 val32, bonding, sys_cfg, vendor; +int ret =0 ; + + sys_cfg =rtl8xxxu_read32 (priv,REG_SYS_CFG ); + priv->chip_cut = (sys_cfg &SYS_CFG_CHIP_VERSION_MASK ) >> +SYS_CFG_CHIP_VERSION_SHIFT ;
= FIELD_GET(...)
drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8192e.c static const struct rtl8xxxu_rfregval rtl8192eu_radiob_init_table[] = { · line 499
Quoted 10 lines
drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8192e.c +10
-0+if (sys_cfg &SYS_CFG_TRP_VAUX_EN ) { +dev_info (dev,"Unsupported test chip\n" ); + ret = -ENOTSUPP ; + goto out; + } + + bonding =rtl8xxxu_read32 (priv,REG_HPON_FSM ); + bonding &=HPON_FSM_BONDING_MASK ; +if (bonding ==HPON_FSM_BONDING_1T2R ) { +sprintf (priv->chip_name,"8191EU" );
strscpy()
drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8192e.c static const struct rtl8xxxu_rfregval rtl8192eu_radiob_init_table[] = { · line 503
Quoted 4 lines
drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8192e.c +4
-0+ priv->tx_paths =1 ; + priv->rtl_chip =RTL8191E ; + }else { +sprintf (priv->chip_name,"8192EU" );
strscpy()
drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8192e.c static const struct rtl8xxxu_rfregval rtl8192eu_radiob_init_table[] = { · line 515
Quoted 12 lines
drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8192e.c +12
-0+ priv->tx_paths =2 ; + priv->rtl_chip =RTL8192E ; + } + priv->rf_paths =2 ; + priv->rx_paths =2 ; + priv->has_wifi =1 ; + + vendor = sys_cfg &SYS_CFG_VENDOR_EXT_MASK ; +rtl8xxxu_identify_vendor_2bits (priv, vendor); + + val32 =rtl8xxxu_read32 (priv,REG_GPIO_OUTSTS ); + priv->rom_rev = (val32 &GPIO_RF_RL_ID ) >>28 ;
FIELD_GET()
Quoted 32 lines
drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8192e.c +14
-0+ +rtl8xxxu_config_endpoints_sie (priv); + +/* +* Fallback for devices that do not provide REG_NORMAL_SIE_EP_TX +*/ +if (!priv->ep_tx_count) + ret =rtl8xxxu_config_endpoints_no_sie (priv); + +out: +return ret; +} +static void rtl8192e_set_tx_power (struct rtl8xxxu_priv *priv,int channel,bool ht40) {@@ -1693,6 +1741,7 @@ static s8 rtl8192e_cck_rssi(struct rtl8xxxu_priv *priv, u8 cck_agc_rpt) }struct rtl8xxxu_fileops rtl8192eu_fops = { + .identify_chip = rtl8192eu_identify_chip, .parse_efuse = rtl8192eu_parse_efuse, .load_firmware = rtl8192eu_load_firmware, .power_on = rtl8192eu_power_on,drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8723a.c +0
-0@@ -129,6 +129,56 @@ static const struct rtl8xxxu_rfregval rtl8723au_radioa_1t_init_table[] = { {0xff, 0xffffffff} };
drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8723a.c static const struct rtl8xxxu_rfregval rtl8723au_radioa_1t_init_table[] = { · line 140
Quoted 10 lines
drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8723a.c +9
-0+static int rtl8723au_identify_chip (struct rtl8xxxu_priv *priv) +{ +struct device *dev = &priv->udev->dev; +u32 val32, sys_cfg, vendor; +int ret =0 ; + + sys_cfg =rtl8xxxu_read32 (priv,REG_SYS_CFG ); + priv->chip_cut = (sys_cfg &SYS_CFG_CHIP_VERSION_MASK ) >> +SYS_CFG_CHIP_VERSION_SHIFT ;
FIELD_GET()
drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8723a.c static const struct rtl8xxxu_rfregval rtl8723au_radioa_1t_init_table[] = { · line 147
Quoted 7 lines
drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8723a.c +7
-0+if (sys_cfg &SYS_CFG_TRP_VAUX_EN ) { +dev_info (dev,"Unsupported test chip\n" ); + ret = -ENOTSUPP ; + goto out; + } + +sprintf (priv->chip_name,"8723AU" );
strscpy()
Quoted 11 lines
drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8723a.c +11
-0+ priv->usb_interrupts =1 ; + priv->rtl_chip =RTL8723A ; + + priv->rf_paths =1 ; + priv->rx_paths =1 ; + priv->tx_paths =1 ; + + val32 =rtl8xxxu_read32 (priv,REG_MULTI_FUNC_CTRL ); +if (val32 &MULTI_WIFI_FUNC_EN ) + priv->has_wifi =1 ; +if (val32 &MULTI_BT_FUNC_EN )
drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8723a.c static const struct rtl8xxxu_rfregval rtl8723au_radioa_1t_init_table[] = { · line 168
Quoted 10 lines
drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8723a.c +10
-0+ priv->has_bluetooth =1 ; +if (val32 &MULTI_GPS_FUNC_EN ) + priv->has_gps =1 ; + priv->is_multi_func =1 ; + + vendor = sys_cfg &SYS_CFG_VENDOR_ID ; +rtl8xxxu_identify_vendor_1bit (priv, vendor); + + val32 =rtl8xxxu_read32 (priv,REG_GPIO_OUTSTS ); + priv->rom_rev = (val32 &GPIO_RF_RL_ID ) >>28 ;
FIELD_GET()
Quoted 32 lines
drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8723a.c +14
-0+ +rtl8xxxu_config_endpoints_sie (priv); + +/* +* Fallback for devices that do not provide REG_NORMAL_SIE_EP_TX +*/ +if (!priv->ep_tx_count) + ret =rtl8xxxu_config_endpoints_no_sie (priv); + +out: +return ret; +} +static int rtl8723au_parse_efuse (struct rtl8xxxu_priv *priv) {struct rtl8723au_efuse *efuse = &priv->efuse_wifi.efuse8723;@@ -409,6 +459,7 @@ s8 rtl8723a_cck_rssi(struct rtl8xxxu_priv *priv, u8 cck_agc_rpt) }struct rtl8xxxu_fileops rtl8723au_fops = { + .identify_chip = rtl8723au_identify_chip, .parse_efuse = rtl8723au_parse_efuse, .load_firmware = rtl8723au_load_firmware, .power_on = rtl8723au_power_on,drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8723b.c +0
-0@@ -304,6 +304,54 @@ static const struct rtl8xxxu_rfregval rtl8723bu_radioa_1t_init_table[] = { {0xff, 0xffffffff} };
drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8723b.c static const struct rtl8xxxu_rfregval rtl8723bu_radioa_1t_init_table[] = { · line 315
Quoted 10 lines
drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8723b.c +9
-0+static int rtl8723bu_identify_chip (struct rtl8xxxu_priv *priv) +{ +struct device *dev = &priv->udev->dev; +u32 val32, sys_cfg, vendor; +int ret =0 ; + + sys_cfg =rtl8xxxu_read32 (priv,REG_SYS_CFG ); + priv->chip_cut = (sys_cfg &SYS_CFG_CHIP_VERSION_MASK ) >> +SYS_CFG_CHIP_VERSION_SHIFT ;
FIELD_GET()
drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8723b.c static const struct rtl8xxxu_rfregval rtl8723bu_radioa_1t_init_table[] = { · line 322
Quoted 7 lines
drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8723b.c +7
-0+if (sys_cfg &SYS_CFG_TRP_VAUX_EN ) { +dev_info (dev,"Unsupported test chip\n" ); + ret = -ENOTSUPP ; + goto out; + } + +sprintf (priv->chip_name,"8723BU" );
strscpy()
Quoted 9 lines
drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8723b.c +9
-0+ priv->rtl_chip =RTL8723B ; + priv->rf_paths =1 ; + priv->rx_paths =1 ; + priv->tx_paths =1 ; + + val32 =rtl8xxxu_read32 (priv,REG_MULTI_FUNC_CTRL ); +if (val32 &MULTI_WIFI_FUNC_EN ) + priv->has_wifi =1 ; +if (val32 &MULTI_BT_FUNC_EN )
drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8723b.c static const struct rtl8xxxu_rfregval rtl8723bu_radioa_1t_init_table[] = { · line 341
Quoted 10 lines
drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8723b.c +10
-0+ priv->has_bluetooth =1 ; +if (val32 &MULTI_GPS_FUNC_EN ) + priv->has_gps =1 ; + priv->is_multi_func =1 ; + + vendor = sys_cfg &SYS_CFG_VENDOR_EXT_MASK ; +rtl8xxxu_identify_vendor_2bits (priv, vendor); + + val32 =rtl8xxxu_read32 (priv,REG_GPIO_OUTSTS ); + priv->rom_rev = (val32 &GPIO_RF_RL_ID ) >>28 ;
FIELD_GET()
Quoted 17 lines
drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8723b.c +13
-0+ +rtl8xxxu_config_endpoints_sie (priv); + +/* +* Fallback for devices that do not provide REG_NORMAL_SIE_EP_TX +*/ +if (!priv->ep_tx_count) + ret =rtl8xxxu_config_endpoints_no_sie (priv); + +out: +return ret; +} +static void rtl8723bu_write_btreg (struct rtl8xxxu_priv *priv,u8 reg,u8 data) {struct h2c_cmd h2c;
drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8723b.c static s8 rtl8723b_cck_rssi(struct rtl8xxxu_priv *priv, u8 cck_agc_rpt) · line 1722
Quoted 7 lines
drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8723b.c +1
-0@@ -1668,6 +1716,7 @@ static s8 rtl8723b_cck_rssi(struct rtl8xxxu_priv *priv, u8 cck_agc_rpt) }struct rtl8xxxu_fileops rtl8723bu_fops = { + .identify_chip = rtl8723bu_identify_chip, .parse_efuse = rtl8723bu_parse_efuse, .load_firmware = rtl8723bu_load_firmware, .power_on = rtl8723bu_power_on,
[..]
Only some similar comments about FIELD_GET() and strscpy().
Ping-Ke
PATCH v2 3/3 wifi: rtl8xxxu: Rename rtl8xxxu_8188f_channel_to_group
In reply to Bitterblue SmithThis name is an anomaly. Change it to rtl8188f_channel_to_group to follow the same pattern as the other functions.
---
v2:
- No change.
--- drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8188f.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8188f.c +2 -2
@@ -352,7 +352,7 @@ static int rtl8188fu_identify_chip(struct rtl8xxxu_priv *priv)return ret; } -static void rtl8xxxu_8188f_channel_to_group (int channel,int *group,int *cck_group) +static void rtl8188f_channel_to_group (int channel,int *group,int *cck_group) {if (channel <3 ) *group =0 ;
@@ -378,7 +378,7 @@ rtl8188f_set_tx_power(struct rtl8xxxu_priv *priv, int channel, bool ht40)u8 cck, ofdmbase, mcsbase;int group, cck_group; -rtl8xxxu_8188f_channel_to_group (channel, &group, &cck_group); +rtl8188f_channel_to_group (channel, &group, &cck_group); cck = priv->cck_tx_power_index_A[cck_group];
Signature · 1 line
2.38.0
RE: [PATCH v2 3/3] wifi: rtl8xxxu: Rename rtl8xxxu_8188f_channel_to_group
Quoted 9 lines
-----Original Message-----
From: Bitterblue Smith <[email protected]>
Sent: Sunday, November 6, 2022 6:55 AM
To: [email protected]
Cc: Jes Sorensen <[email protected]>
Subject: [PATCH v2 3/3] wifi: rtl8xxxu: Renamertl8xxxu_8188f_channel_to_group
Quoted 4 lines
This name is an anomaly. Change it to
rtl8188f_channel_to_groupto follow the same pattern as the other functions.Signed-off-by Bitterblue Smith <[email protected]>
Quoted 34 lines
---
v2:
- No change.--- drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8188f.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8188f.c +2
-3@@ -352,7 +352,7 @@ static int rtl8188fu_identify_chip(struct rtl8xxxu_priv *priv)return ret; } -static void rtl8xxxu_8188f_channel_to_group (int channel,int *group,int *cck_group) +static void rtl8188f_channel_to_group (int channel,int *group,int *cck_group) {if (channel <3 ) *group =0 ;@@ -378,7 +378,7 @@ rtl8188f_set_tx_power(struct rtl8xxxu_priv *priv, int channel, bool ht40)u8 cck, ofdmbase, mcsbase;int group, cck_group; -rtl8xxxu_8188f_channel_to_group (channel, &group, &cck_group); +rtl8188f_channel_to_group (channel, &group, &cck_group); cck = priv->cck_tx_power_index_A[cck_group]; --2.38.0
------Please consider the environment before printing this e-mail.
Re: [PATCH v2 3/3] wifi: rtl8xxxu: Rename rtl8xxxu_8188f_channel_to_group
In reply to Bitterblue SmithQuoted 10 lines · Bitterblue Smith
This name is an anomaly. Change it to
rtl8188f_channel_to_groupto follow the same pattern as the other functions.Signed-off-by Bitterblue Smith <[email protected]>---
v2:
- No change.--- drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8188f.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
Quoted 22 lines
drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8188f.c +2
-2@@ -352,7 +352,7 @@ static int rtl8188fu_identify_chip(struct rtl8xxxu_priv *priv)return ret; } -static void rtl8xxxu_8188f_channel_to_group (int channel,int *group,int *cck_group) +static void rtl8188f_channel_to_group (int channel,int *group,int *cck_group) {if (channel <3 ) *group =0 ;@@ -378,7 +378,7 @@ rtl8188f_set_tx_power(struct rtl8xxxu_priv *priv, int channel, bool ht40)u8 cck, ofdmbase, mcsbase;int group, cck_group; -rtl8xxxu_8188f_channel_to_group (channel, &group, &cck_group); +rtl8188f_channel_to_group (channel, &group, &cck_group); cck = priv->cck_tx_power_index_A[cck_group];
Quoted 23 lines
-----Original Message-----
From: Bitterblue Smith <[email protected]>
Sent: Sunday, November 6, 2022 6:53 AM
To: [email protected]
Cc: Jes Sorensen <[email protected]>
Subject: [PATCH v2 1/3] wifi: rtl8xxxu: Move burst init to a functionNo changes to functionality, just moving code to make
rtl8xxxu_init_devicelook nicer.Signed-off-by Bitterblue Smith <[email protected]>---
v2:
- No change.--- .../net/wireless/realtek/rtl8xxxu/rtl8xxxu.h | 2 + .../realtek/rtl8xxxu/rtl8xxxu_8188f.c | 1 + .../realtek/rtl8xxxu/rtl8xxxu_8723b.c | 1 + .../wireless/realtek/rtl8xxxu/rtl8xxxu_core.c | 89 ++++++++++--------- 4 files changed, 52 insertions(+), 41 deletions(-)
[...]
Quoted 10 lines
drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c +1
-0@@ -3886,6 +3886,52 @@ static void rtl8xxxu_init_queue_reserved_page(struct rtl8xxxu_priv *priv)rtl8xxxu_write32 (priv,REG_RQPN , val32); } +void rtl8xxxu_init_burst (struct rtl8xxxu_priv *priv)
drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c static void rtl8xxxu_init_queue_reserved_page(struct rtl8xxxu_priv *priv) · line 3899
Quoted 10 lines
drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c +10
-0+{ +u8 val8; + +/* +* For USB high speed set 512B packets +*/ + val8 =rtl8xxxu_read8 (priv,REG_RXDMA_PRO_8723B ); + val8 &= ~(BIT (4 ) |BIT (5 )); + val8 |=BIT (4 ); + val8 |=BIT (1 ) |BIT (2 ) |BIT (3 );
I think we can fix these magic numbers along with your patch.
#define DMA_MODE BIT(1) // set 0x1
#define DMA_BURST_CNT GENMASK(3, 2) // set 0x3
#define DMA_BURST_SIZE GENMASK(5, 4) // set 0x1
drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c static void rtl8xxxu_init_queue_reserved_page(struct rtl8xxxu_priv *priv) · line 3906
Quoted 7 lines
drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c +7
-0+rtl8xxxu_write8 (priv,REG_RXDMA_PRO_8723B , val8); + +/* +* Enable single packet AMPDU +*/ + val8 =rtl8xxxu_read8 (priv,REG_HT_SINGLE_AMPDU_8723B ); + val8 |=BIT (7 );
#define EN_SINGLE_AMPDU BIT(7)
Quoted 15 lines
drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c +15
-0+rtl8xxxu_write8 (priv,REG_HT_SINGLE_AMPDU_8723B , val8); + +rtl8xxxu_write16 (priv,REG_MAX_AGGR_NUM ,0x0c14 ); +if (priv->rtl_chip ==RTL8723B ) + val8 =0x5e ; +else if (priv->rtl_chip ==RTL8188F ) + val8 =0x70 ;/* 0x5e would make it very slow */ +rtl8xxxu_write8 (priv,REG_AMPDU_MAX_TIME_8723B , val8); +rtl8xxxu_write32 (priv,REG_AGGLEN_LMT ,0xffffffff ); +rtl8xxxu_write8 (priv,REG_RX_PKT_LIMIT ,0x18 ); +rtl8xxxu_write8 (priv,REG_PIFS ,0x00 ); +if (priv->rtl_chip ==RTL8188F ) { +rtl8xxxu_write8 (priv,REG_FWHW_TXQ_CTRL ,FWHW_TXQ_CTRL_AMPDU_RETRY ); +rtl8xxxu_write32 (priv,REG_FAST_EDCA_CTRL ,0x03086666 ); + }
drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c static void rtl8xxxu_init_queue_reserved_page(struct rtl8xxxu_priv *priv) · line 3931
Quoted 10 lines
drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c +10
-0+if (priv->rtl_chip ==RTL8723B ) + val8 =0x50 ; +else if (priv->rtl_chip ==RTL8188F ) + val8 =0x28 ;/* 0x50 would make the upload slow */ +rtl8xxxu_write8 (priv,REG_USTIME_TSF_8723B , val8); +rtl8xxxu_write8 (priv,REG_USTIME_EDCA , val8); + +/* to prevent mac is reseted by bus. */ + val8 =rtl8xxxu_read8 (priv,REG_RSV_CTRL ); + val8 |=BIT (5 ) |BIT (6 );
#define WLOCK_1C BIT(5)
#define DIS_PRST BIT(6)
drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c static void rtl8xxxu_init_queue_reserved_page(struct rtl8xxxu_priv *priv) · line 3934
Quoted 3 lines
drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c +3
-0+rtl8xxxu_write8 (priv,REG_RSV_CTRL , val8); +} +
[...]
I find some bit definitions, so we can have them meaningful names, and please add proper prefix if need.
Ping-Ke
Quoted 49 lines · Ping-Ke Shih
Quoted 23 lines
-----Original Message-----
From: Bitterblue Smith <[email protected]>
Sent: Sunday, November 6, 2022 6:53 AM
To: [email protected]
Cc: Jes Sorensen <[email protected]>
Subject: [PATCH v2 1/3] wifi: rtl8xxxu: Move burst init to a functionNo changes to functionality, just moving code to make
rtl8xxxu_init_devicelook nicer.Signed-off-by Bitterblue Smith <[email protected]>---
v2:
- No change.--- .../net/wireless/realtek/rtl8xxxu/rtl8xxxu.h | 2 + .../realtek/rtl8xxxu/rtl8xxxu_8188f.c | 1 + .../realtek/rtl8xxxu/rtl8xxxu_8723b.c | 1 + .../wireless/realtek/rtl8xxxu/rtl8xxxu_core.c | 89 ++++++++++--------- 4 files changed, 52 insertions(+), 41 deletions(-)[...]
Quoted 10 lines
drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c +1
-0@@ -3886,6 +3886,52 @@ static void rtl8xxxu_init_queue_reserved_page(struct rtl8xxxu_priv *priv)rtl8xxxu_write32 (priv,REG_RQPN , val32); } +void rtl8xxxu_init_burst (struct rtl8xxxu_priv *priv)drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c static void rtl8xxxu_init_queue_reserved_page(struct rtl8xxxu_priv *priv) · line 3899
Quoted 10 lines
drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c +10
-0+{ +u8 val8; + +/* +* For USB high speed set 512B packets +*/ + val8 =rtl8xxxu_read8 (priv,REG_RXDMA_PRO_8723B ); + val8 &= ~(BIT (4 ) |BIT (5 )); + val8 |=BIT (4 ); + val8 |=BIT (1 ) |BIT (2 ) |BIT (3 );I think we can fix these magic numbers along with your patch.
Quoted 4 lines
#define
DMA_MODEBIT(1) // set0x1
#defineDMA_BURST_CNTGENMASK(3, 2)// set0x3
#defineDMA_BURST_SIZEGENMASK(5, 4)// set0x1
Thanks, but I think the bit definitions should be added in a separate patch, which I will send soon. Same for the changes you suggested for patch 2/3.
Jes Sorensen
maintainerQuoted 49 lines · Ping-Ke Shih
Quoted 23 lines
-----Original Message-----
From: Bitterblue Smith <[email protected]>
Sent: Sunday, November 6, 2022 6:53 AM
To: [email protected]
Cc: Jes Sorensen <[email protected]>
Subject: [PATCH v2 1/3] wifi: rtl8xxxu: Move burst init to a functionNo changes to functionality, just moving code to make
rtl8xxxu_init_devicelook nicer.Signed-off-by Bitterblue Smith <[email protected]>---
v2:
- No change.--- .../net/wireless/realtek/rtl8xxxu/rtl8xxxu.h | 2 + .../realtek/rtl8xxxu/rtl8xxxu_8188f.c | 1 + .../realtek/rtl8xxxu/rtl8xxxu_8723b.c | 1 + .../wireless/realtek/rtl8xxxu/rtl8xxxu_core.c | 89 ++++++++++--------- 4 files changed, 52 insertions(+), 41 deletions(-)[...]
Quoted 10 lines
drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c +1
-0@@ -3886,6 +3886,52 @@ static void rtl8xxxu_init_queue_reserved_page(struct rtl8xxxu_priv *priv)rtl8xxxu_write32 (priv,REG_RQPN , val32); } +void rtl8xxxu_init_burst (struct rtl8xxxu_priv *priv)drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c static void rtl8xxxu_init_queue_reserved_page(struct rtl8xxxu_priv *priv) · line 3899
Quoted 10 lines
drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c +10
-0+{ +u8 val8; + +/* +* For USB high speed set 512B packets +*/ + val8 =rtl8xxxu_read8 (priv,REG_RXDMA_PRO_8723B ); + val8 &= ~(BIT (4 ) |BIT (5 )); + val8 |=BIT (4 ); + val8 |=BIT (1 ) |BIT (2 ) |BIT (3 );I think we can fix these magic numbers along with your patch.
Quoted 3 lines
#define
DMA_MODEBIT(1) // set0x1
#defineDMA_BURST_CNTGENMASK(3, 2)// set0x3
#defineDMA_BURST_SIZEGENMASK(5, 4)// set0x1
Thanks for providing these definitions.
Jes
Quoted 4 lines · Bitterblue Smith
No changes to functionality, just moving code to make
rtl8xxxu_init_devicelook nicer.Signed-off-by Bitterblue Smith <[email protected]>
3 patches applied to wireless-next.git, thanks.
bcfcb712e414 wifi: rtl8xxxu: Move burst init to a function 14566bbfdfaf wifi: rtl8xxxu: Split up rtl8xxxu_identify_chip e948023d5fc8 wifi: rtl8xxxu: Rename rtl8xxxu_8188f_channel_to_group
Signature · 3 lines
https://patchwork.kernel.org/project/linux-wireless/patch/[email protected]/ https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches