| Message ID | 1e35dd26-3f10-40b1-b2b4-f72184a26611@gmail.com |
|---|---|
| State | New |
| Headers | show |
| Series | [rtw-next,v2,1/2] wifi: rtw88: usb: Reduce control message timeout to 500 ms | expand |
Bitterblue Smith <rtl8821cerfe2@gmail.com> wrote: > RTL8811AU stops responding during the firmware download on some systems: > > [ 809.256440] rtw_8821au 5-2.1:1.0: Firmware version 42.4.0, H2C version 0 > [ 812.759142] rtw_8821au 5-2.1:1.0 wlp48s0f4u2u1: renamed from wlan0 > [ 837.315388] rtw_8821au 1-4:1.0: write register 0x1ef4 failed with -110 > [ 867.524259] rtw_8821au 1-4:1.0: write register 0x1ef8 failed with -110 > [ 868.930976] rtw_8821au 5-2.1:1.0 wlp48s0f4u2u1: entered promiscuous mode > [ 897.730952] rtw_8821au 1-4:1.0: write register 0x1efc failed with -110 > > Each write takes 30 seconds to fail because that's the timeout currently > used for control messages in rtw_usb_write(). > > In this scenario the firmware download takes at least 2000 seconds. > Because this is done from the USB probe function, the long delay makes > other things in the system hang. > > Reduce the timeout to 500 ms. This is the value used by the official USB > wifi drivers from Realtek. > > Of course this only makes things hang for ~30 seconds instead of ~30 > minutes. It doesn't fix the firmware download. > > Tested with RTL8822CU, RTL8812BU, RTL8811CU, RTL8814AU, RTL8811AU, > RTL8812AU, RTL8821AU, RTL8723DU. > > Cc: stable@vger.kernel.org > Fixes: a82dfd33d123 ("wifi: rtw88: Add common USB chip support") > Link: https://github.com/lwfinger/rtw88/issues/344 > Signed-off-by: Bitterblue Smith <rtl8821cerfe2@gmail.com> > Acked-by: Ping-Ke Shih <pkshih@realtek.com> 2 patch(es) applied to rtw-next branch of rtw.git, thanks. 490340faddea wifi: rtw88: usb: Reduce control message timeout to 500 ms 80fe0bc1659c wifi: rtw88: usb: Upload the firmware in bigger chunks --- https://github.com/pkshih/rtw.git
diff --git a/drivers/net/wireless/realtek/rtw88/usb.c b/drivers/net/wireless/realtek/rtw88/usb.c index 204343ac2558..b16db579fdce 100644 --- a/drivers/net/wireless/realtek/rtw88/usb.c +++ b/drivers/net/wireless/realtek/rtw88/usb.c @@ -139,7 +139,7 @@ static void rtw_usb_write(struct rtw_dev *rtwdev, u32 addr, u32 val, int len) ret = usb_control_msg(udev, usb_sndctrlpipe(udev, 0), RTW_USB_CMD_REQ, RTW_USB_CMD_WRITE, - addr, 0, data, len, 30000); + addr, 0, data, len, 500); if (ret < 0 && ret != -ENODEV && count++ < 4) rtw_err(rtwdev, "write register 0x%x failed with %d\n", addr, ret);
RTL8811AU stops responding during the firmware download on some systems: [ 809.256440] rtw_8821au 5-2.1:1.0: Firmware version 42.4.0, H2C version 0 [ 812.759142] rtw_8821au 5-2.1:1.0 wlp48s0f4u2u1: renamed from wlan0 [ 837.315388] rtw_8821au 1-4:1.0: write register 0x1ef4 failed with -110 [ 867.524259] rtw_8821au 1-4:1.0: write register 0x1ef8 failed with -110 [ 868.930976] rtw_8821au 5-2.1:1.0 wlp48s0f4u2u1: entered promiscuous mode [ 897.730952] rtw_8821au 1-4:1.0: write register 0x1efc failed with -110 Each write takes 30 seconds to fail because that's the timeout currently used for control messages in rtw_usb_write(). In this scenario the firmware download takes at least 2000 seconds. Because this is done from the USB probe function, the long delay makes other things in the system hang. Reduce the timeout to 500 ms. This is the value used by the official USB wifi drivers from Realtek. Of course this only makes things hang for ~30 seconds instead of ~30 minutes. It doesn't fix the firmware download. Tested with RTL8822CU, RTL8812BU, RTL8811CU, RTL8814AU, RTL8811AU, RTL8812AU, RTL8821AU, RTL8723DU. Cc: stable@vger.kernel.org Fixes: a82dfd33d123 ("wifi: rtw88: Add common USB chip support") Link: https://github.com/lwfinger/rtw88/issues/344 Signed-off-by: Bitterblue Smith <rtl8821cerfe2@gmail.com> Acked-by: Ping-Ke Shih <pkshih@realtek.com> --- v2: - Add Acked-by. --- drivers/net/wireless/realtek/rtw88/usb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)