wifi: rtlwifi: rtl_usb: Use sync register writes
PATCH v2 1/1 wifi: rtlwifi: rtl_usb: Use sync register writes
Currently rtl_usb performs register writes using the async usb_submit_urb() function. This appears to work fine for the RTL8192CU, but the RTL8192DU (soon to be supported by rtlwifi) has a problem:
it transmits everything at the 1M rate in the 2.4 GHz band. (The 5 GHz band is still untested.)
With this patch, rtl_usb performs the register writes using the synchronous usb_control_msg() function, and the RTL8192DU works normally. The RTL8192CU still works.
The vendor drivers use the async writes in only one function, rtl8192du_trigger_gpio_0 / rtl8192cu_trigger_gpio_0, which probably doesn't even run in real life. They use sync writes everywhere else.
Also, remove "sync" and "async" from the names of the members of struct rtl_io to avoid confusion:
write{8,16,32}_async -> write{8,16,32}
read{8,16,32}_sync -> read{8,16,32}
---
v2:
- Rename the members of struct rtl_io.
--- drivers/net/wireless/realtek/rtlwifi/pci.c | 12 +- drivers/net/wireless/realtek/rtlwifi/usb.c | 163 ++++++-------------- drivers/net/wireless/realtek/rtlwifi/wifi.h | 30 ++-- 3 files changed, 66 insertions(+), 139 deletions(-)
drivers/net/wireless/realtek/rtlwifi/pci.c +6 -6
@@ -378,13 +378,13 @@ static void _rtl_pci_io_handler_init(struct device *dev, rtlpriv->io.dev = dev; - rtlpriv->io.write8_async = pci_write8_async; - rtlpriv->io.write16_async = pci_write16_async; - rtlpriv->io.write32_async = pci_write32_async; + rtlpriv->io.write8 = pci_write8_async; + rtlpriv->io.write16 = pci_write16_async; + rtlpriv->io.write32 = pci_write32_async; - rtlpriv->io.read8_sync = pci_read8_sync; - rtlpriv->io.read16_sync = pci_read16_sync; - rtlpriv->io.read32_sync = pci_read32_sync; + rtlpriv->io.read8 = pci_read8_sync; + rtlpriv->io.read16 = pci_read16_sync; + rtlpriv->io.read32 = pci_read32_sync; } static bool _rtl_update_earlymode_info(struct ieee80211_hw *hw,
drivers/net/wireless/realtek/rtlwifi/usb.c +45 -118
220 lines not on this page · raw message
drivers/net/wireless/realtek/rtlwifi/wifi.h +15 -15
@@ -1447,13 +1447,13 @@ struct rtl_io {/*PCI IO map */ unsigned long pci_base_addr;/*device I/O address */ -void (*write8_async)(struct rtl_priv *rtlpriv,u32 addr,u8 val); -void (*write16_async)(struct rtl_priv *rtlpriv,u32 addr,u16 val); -void (*write32_async)(struct rtl_priv *rtlpriv,u32 addr,u32 val); +void (*write8)(struct rtl_priv *rtlpriv,u32 addr,u8 val); +void (*write16)(struct rtl_priv *rtlpriv,u32 addr,u16 val); +void (*write32)(struct rtl_priv *rtlpriv,u32 addr,u32 val); -u8 (*read8_sync)(struct rtl_priv *rtlpriv,u32 addr); -u16 (*read16_sync)(struct rtl_priv *rtlpriv,u32 addr); -u32 (*read32_sync)(struct rtl_priv *rtlpriv,u32 addr); +u8 (*read8)(struct rtl_priv *rtlpriv,u32 addr); +u16 (*read16)(struct rtl_priv *rtlpriv,u32 addr); +u32 (*read32)(struct rtl_priv *rtlpriv,u32 addr); };
@@ -2916,25 +2916,25 @@ extern u8 channel5g_80m[CHANNEL_MAX_NUMBER_5G_80M];static inline u8 rtl_read_byte (struct rtl_priv *rtlpriv,u32 addr) { -return rtlpriv->io.read8_sync (rtlpriv, addr); +return rtlpriv->io.read8 (rtlpriv, addr); }static inline u16 rtl_read_word (struct rtl_priv *rtlpriv,u32 addr) { -return rtlpriv->io.read16_sync (rtlpriv, addr); +return rtlpriv->io.read16 (rtlpriv, addr); }static inline u32 rtl_read_dword (struct rtl_priv *rtlpriv,u32 addr) { -return rtlpriv->io.read32_sync (rtlpriv, addr); +return rtlpriv->io.read32 (rtlpriv, addr); }static inline void rtl_write_byte (struct rtl_priv *rtlpriv,u32 addr,u8 val8) { - rtlpriv->io.write8_async (rtlpriv, addr, val8); + rtlpriv->io.write8 (rtlpriv, addr, val8);if (rtlpriv->cfg->write_readback) - rtlpriv->io.read8_sync (rtlpriv, addr); + rtlpriv->io.read8 (rtlpriv, addr); } static inline void rtl_write_byte_with_val32(struct ieee80211_hw *hw,
@@ -2947,19 +2947,19 @@ static inline void rtl_write_byte_with_val32(struct ieee80211_hw *hw,static inline void rtl_write_word (struct rtl_priv *rtlpriv,u32 addr,u16 val16) { - rtlpriv->io.write16_async (rtlpriv, addr, val16); + rtlpriv->io.write16 (rtlpriv, addr, val16);if (rtlpriv->cfg->write_readback) - rtlpriv->io.read16_sync (rtlpriv, addr); + rtlpriv->io.read16 (rtlpriv, addr); }static inline void rtl_write_dword (struct rtl_priv *rtlpriv,u32 addr,u32 val32) { - rtlpriv->io.write32_async (rtlpriv, addr, val32); + rtlpriv->io.write32 (rtlpriv, addr, val32);if (rtlpriv->cfg->write_readback) - rtlpriv->io.read32_sync (rtlpriv, addr); + rtlpriv->io.read32 (rtlpriv, addr); } static inline u32 rtl_get_bbreg(struct ieee80211_hw *hw,
Signature · 1 line
2.43.0
Quoted 23 lines
-----Original Message-----
From: Bitterblue Smith <[email protected]>
Sent: Wednesday, January 10, 2024 9:47 PM
To: [email protected]
Cc: Ping-Ke Shih <[email protected]>; Larry Finger <[email protected]>
Subject: [PATCH v2] wifi: rtlwifi:rtl_usb: Use sync register writesCurrently
rtl_usbperforms register writes using the asyncusb_submit_urb()function. This appears to work fine for the RTL8192CU, but the RTL8192DU (soon to be supported by rtlwifi) has a problem:
it transmits everything at the 1M rate in the 2.4 GHz band. (The 5 GHz band is still untested.)With this patch,
rtl_usbperforms the register writes using the synchronoususb_control_msg()function, and the RTL8192DU works normally. The RTL8192CU still works.The vendor drivers use the async writes in only one function,
rtl8192du_trigger_gpio_0/rtl8192cu_trigger_gpio_0, which probably doesn't even run in real life. They use sync writes everywhere else.
Quoted 7 lines
Also, remove "sync" and "async" from the names of the members of struct
rtl_ioto avoid confusion:write{8,16,32}_async -> write{8,16,32}
read{8,16,32}_sync -> read{8,16,32}Signed-off-by Bitterblue Smith <[email protected]>
Quoted 9 lines
---
v2:
- Rename the members of structrtl_io.--- drivers/net/wireless/realtek/rtlwifi/pci.c | 12 +- drivers/net/wireless/realtek/rtlwifi/usb.c | 163 ++++++-------------- drivers/net/wireless/realtek/rtlwifi/wifi.h | 30 ++-- 3 files changed, 66 insertions(+), 139 deletions(-)
[...]
drivers/net/wireless/realtek/rtlwifi/usb.c static int _usbctrl_vendorreq_sync_read(struct usb_device *udev, u8 request, · line 54
Quoted 8 lines
drivers/net/wireless/realtek/rtlwifi/usb.c +1
-3@@ -114,18 +51,15 @@ static int _usbctrl_vendorreq_sync_read(struct usb_device *udev, u8 request, }while (++vendorreq_times <MAX_USBCTRL_VENDORREQ_TIMES );if (status <0 && count++ <4 ) -pr_err ("reg 0x%x, usbctrl_vendorreq TimeOut! status:0x%x value=0x%x\n" , - value, status, *(u32 *)pdata); -return status; + pr_err("reg 0x%x, usbctrl_vendorreq TimeOut! status:0x%x value=0x%x reqtype=0x%x\n",
nit: Since you touch this, would you like to use dev_err() instead?
Quoted 3 lines
drivers/net/wireless/realtek/rtlwifi/usb.c +1
-0+ value, status, *(u32 *)pdata, reqtype); }
[...]
Quoted 48 lines · Ping-Ke Shih
Quoted 23 lines
-----Original Message-----
From: Bitterblue Smith <[email protected]>
Sent: Wednesday, January 10, 2024 9:47 PM
To: [email protected]
Cc: Ping-Ke Shih <[email protected]>; Larry Finger <[email protected]>
Subject: [PATCH v2] wifi: rtlwifi:rtl_usb: Use sync register writesCurrently
rtl_usbperforms register writes using the asyncusb_submit_urb()function. This appears to work fine for the RTL8192CU, but the RTL8192DU (soon to be supported by rtlwifi) has a problem:
it transmits everything at the 1M rate in the 2.4 GHz band. (The 5 GHz band is still untested.)With this patch,
rtl_usbperforms the register writes using the synchronoususb_control_msg()function, and the RTL8192DU works normally. The RTL8192CU still works.The vendor drivers use the async writes in only one function,
rtl8192du_trigger_gpio_0/rtl8192cu_trigger_gpio_0, which probably doesn't even run in real life. They use sync writes everywhere else.Quoted 7 lines
Also, remove "sync" and "async" from the names of the members of struct
rtl_ioto avoid confusion:write{8,16,32}_async -> write{8,16,32}
read{8,16,32}_sync -> read{8,16,32}Signed-off-by Bitterblue Smith <[email protected]>Acked-by Ping-Ke Shih <[email protected]>Quoted 9 lines
---
v2:
- Rename the members of structrtl_io.--- drivers/net/wireless/realtek/rtlwifi/pci.c | 12 +- drivers/net/wireless/realtek/rtlwifi/usb.c | 163 ++++++-------------- drivers/net/wireless/realtek/rtlwifi/wifi.h | 30 ++-- 3 files changed, 66 insertions(+), 139 deletions(-)[...]
Quoted 3 lines
drivers/net/wireless/realtek/rtlwifi/usb.c +0
-0@@ -114,18 +51,15 @@ static int _usbctrl_vendorreq_sync_read(struct usb_device *udev, u8 request, }while (++vendorreq_times <MAX_USBCTRL_VENDORREQ_TIMES );
Quoted 8 lines
drivers/net/wireless/realtek/rtlwifi/usb.c static int _usbctrl_vendorreq_sync_read(struct usb_device *udev, u8 request, · line 54
Quoted 5 lines
drivers/net/wireless/realtek/rtlwifi/usb.c +1
-3if (status <0 && count++ <4 ) -pr_err ("reg 0x%x, usbctrl_vendorreq TimeOut! status:0x%x value=0x%x\n" , - value, status, *(u32 *)pdata); -return status; + pr_err("reg 0x%x, usbctrl_vendorreq TimeOut! status:0x%x value=0x%x reqtype=0x%x\n",nit: Since you touch this, would you like to use
dev_err()instead?
Sure, I can do that.
Quoted 6 lines
Quoted 3 lines
drivers/net/wireless/realtek/rtlwifi/usb.c +1
-0+ value, status, *(u32 *)pdata, reqtype); }[...]