wifi: rtw89: Increase polling delay in rtw89_fw_read_c2h_reg() for USB
PATCH 1/2 wifi: rtw89: Increase polling delay in rtw89_fw_read_c2h_reg() for USB
This read_poll_timeout_atomic() with a delay of 1 µs and a timeout of 1000000 µs can take ~250 seconds in the worst case because sending a USB control message takes ~250 µs.
Increase the delay to 250 µs in order to reduce the maximum polling time to ~2 seconds.
This problem was observed with RTL8851BU while suspending to RAM with WOWLAN enabled. The computer sat for 4 minutes with a black screen before suspending.
--- drivers/net/wireless/realtek/rtw89/fw.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/realtek/rtw89/fw.c +1 -1
@@ -6665,7 +6665,7 @@ static int rtw89_fw_read_c2h_reg(struct rtw89_dev *rtwdev, info->id =RTW89_FWCMD_C2HREG_FUNC_NULL ; - ret =read_poll_timeout_atomic (rtw89_read8, val, val,1 , + ret =read_poll_timeout_atomic (rtw89_read8, val, val,250 ,RTW89_C2H_TIMEOUT , false, rtwdev, chip->c2h_ctrl_reg);if (ret) {
Signature · 1 line
2.50.0
PATCH 2/2 wifi: rtw89: Increase polling delay in rtw89_fwdl_check_path_ready_* for USB
When the chip is not powered on correctly (like during driver development) rtw89_fwdl_check_path_ready_ax() can fail. read_poll_timeout_atomic() with a delay of 1 µs and a timeout of 400000 µs can take 50 seconds with USB because of the time it takes to send a USB control message. The firmware upload is tried 5 times, so in total it takes 250 seconds.
Increase the delay to 250 µs in order to reduce the time rtw89_fwdl_check_path_ready_ax() takes from 50 seconds to less than 1 second.
Make the same change in rtw89_fwdl_check_path_ready_be() as well.
--- drivers/net/wireless/realtek/rtw89/mac.c | 2 +- drivers/net/wireless/realtek/rtw89/mac_be.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/net/wireless/realtek/rtw89/mac.c +1 -1
@@ -6928,7 +6928,7 @@ int rtw89_fwdl_check_path_ready_ax(struct rtw89_dev *rtwdev,u8 val;return read_poll_timeout_atomic (rtw89_read8, val, val & check, -1 ,FWDL_WAIT_CNT , false, +250 ,FWDL_WAIT_CNT , false, rtwdev,R_AX_WCPU_FW_CTRL ); }
drivers/net/wireless/realtek/rtw89/mac_be.c +1 -1
@@ -571,7 +571,7 @@ static int rtw89_fwdl_check_path_ready_be(struct rtw89_dev *rtwdev,u32 val;return read_poll_timeout_atomic (rtw89_read32, val, val & check, -1 ,1000000 , false, +250 ,1000000 , false, rtwdev,R_BE_WCPU_FW_CTRL ); }
Signature · 1 line
2.50.0
Ping-Ke Shih
maintainerQuoted 3 lines · Bitterblue Smith
This
read_poll_timeout_atomic()with a delay of 1 µs and a timeout of 1000000 µs can take ~250 seconds in the worst case because sending a USB control message takes ~250 µs.
I was not aware of the change of [1]. The behavior of atomic version becomes different from non-atomic version.
For this patch, I feel we can keep delay_us to 1 and treat timeout_us as 'count', which USB devices do smaller retries. The smaller delay_us can reduce total polling time, especially for PCIE devices (see my comments below)
Though I don't measure total polling time of patch 2/2, I feel we can apply similar idea.
[1] 7349a69cf312 ("iopoll: Do not use timekeeping in read_poll_timeout_atomic()")
Quoted 18 lines
Increase the delay to 250 µs in order to reduce the maximum polling time to ~2 seconds.
This problem was observed with RTL8851BU while suspending to RAM with WOWLAN enabled. The computer sat for 4 minutes with a black screen before suspending.
Signed-off-by Bitterblue Smith <[email protected]>--- drivers/net/wireless/realtek/rtw89/fw.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/net/wireless/realtek/rtw89/fw.c +0
-0
drivers/net/wireless/realtek/rtw89/fw.c static int rtw89_fw_read_c2h_reg(struct rtw89_dev *rtwdev, · line 6668
Quoted 5 lines
drivers/net/wireless/realtek/rtw89/fw.c +1
-1@@ -6665,7 +6665,7 @@ static int rtw89_fw_read_c2h_reg(struct rtw89_dev *rtwdev, info->id =RTW89_FWCMD_C2HREG_FUNC_NULL ; - ret = read_poll_timeout_atomic(rtw89_read8, val, val, 1, + ret = read_poll_timeout_atomic(rtw89_read8, val, val, 250,
As my experiments, PCIE devices take about 30us for this polling, when setting delay 1. But it will take 256us, if delay is changed to 250. I feel we need to set this value by HCI type if needed.
Quoted 5 lines
drivers/net/wireless/realtek/rtw89/fw.c +0
-1RTW89_C2H_TIMEOUT , false, rtwdev, chip->c2h_ctrl_reg);if (ret) { --2.50.0
Quoted 8 lines · Ping-Ke Shih
Quoted 3 lines · Bitterblue Smith
This
read_poll_timeout_atomic()with a delay of 1 µs and a timeout of 1000000 µs can take ~250 seconds in the worst case because sending a USB control message takes ~250 µs.I was not aware of the change of [1]. The behavior of atomic version becomes different from non-atomic version.
Quoted 7 lines
For this patch, I feel we can keep
delay_usto 1 and treattimeout_usas 'count', which USB devices do smaller retries. The smallerdelay_uscan reduce total polling time, especially for PCIE devices (see my comments below)Though I don't measure total polling time of patch 2/2, I feel we can apply similar idea.
Yes, a smaller timeout also works. I tested 4000 for this patch and 3200 for patch 2. (4000 * 250 = 1000000 and 3200 * 125 = 400000. I don't know why rtw89_read8() in the second patch takes only 125 µs.)
Quoted 36 lines
[1]
7349a69cf312("iopoll: Do not use timekeeping inread_poll_timeout_atomic()")Quoted 18 lines
Increase the delay to 250 µs in order to reduce the maximum polling time to ~2 seconds.
This problem was observed with RTL8851BU while suspending to RAM with WOWLAN enabled. The computer sat for 4 minutes with a black screen before suspending.
Signed-off-by Bitterblue Smith <[email protected]>--- drivers/net/wireless/realtek/rtw89/fw.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/net/wireless/realtek/rtw89/fw.c +0
-0drivers/net/wireless/realtek/rtw89/fw.c static int rtw89_fw_read_c2h_reg(struct rtw89_dev *rtwdev, · line 6668
Quoted 5 lines
drivers/net/wireless/realtek/rtw89/fw.c +1
-1@@ -6665,7 +6665,7 @@ static int rtw89_fw_read_c2h_reg(struct rtw89_dev *rtwdev, info->id =RTW89_FWCMD_C2HREG_FUNC_NULL ; - ret = read_poll_timeout_atomic(rtw89_read8, val, val, 1, + ret = read_poll_timeout_atomic(rtw89_read8, val, val, 250,As my experiments, PCIE devices take about 30us for this polling, when setting delay 1. But it will take 256us, if delay is changed to 250. I feel we need to set this value by HCI type if needed.
Quoted 5 lines
drivers/net/wireless/realtek/rtw89/fw.c +0
-1RTW89_C2H_TIMEOUT , false, rtwdev, chip->c2h_ctrl_reg);if (ret) { --2.50.0
Ping-Ke Shih
maintainerQuoted 13 lines · Bitterblue Smith
Quoted 12 lines · Ping-Ke Shih
Quoted 3 lines · Bitterblue Smith
This
read_poll_timeout_atomic()with a delay of 1 µs and a timeout of 1000000 µs can take ~250 seconds in the worst case because sending a USB control message takes ~250 µs.I was not aware of the change of [1]. The behavior of atomic version becomes different from non-atomic version.
For this patch, I feel we can keep
delay_usto 1 and treattimeout_usas 'count', which USB devices do smaller retries. The smallerdelay_uscan reduce total polling time, especially for PCIE devices (see my comments below)
Quoted 6 lines
Quoted 3 lines
Though I don't measure total polling time of patch 2/2, I feel we can apply similar idea.
Yes, a smaller timeout also works. I tested 4000 for this patch and 3200 for patch 2.
Forgot to say, for PCIE devices please keep the timeout as was.
Quoted 2 lines
(4000 * 250 = 1000000 and 3200 * 125 = 400000. I don't know why
rtw89_read8()in the second patch takes only 125 µs.)
Quoted 14 lines · Ping-Ke Shih
Quoted 13 lines · Bitterblue Smith
Quoted 12 lines · Ping-Ke Shih
Quoted 3 lines · Bitterblue Smith
This
read_poll_timeout_atomic()with a delay of 1 µs and a timeout of 1000000 µs can take ~250 seconds in the worst case because sending a USB control message takes ~250 µs.I was not aware of the change of [1]. The behavior of atomic version becomes different from non-atomic version.
For this patch, I feel we can keep
delay_usto 1 and treattimeout_usas 'count', which USB devices do smaller retries. The smallerdelay_uscan reduce total polling time, especially for PCIE devices (see my comments below)
Quoted 9 lines
Quoted 6 lines
Quoted 3 lines
Though I don't measure total polling time of patch 2/2, I feel we can apply similar idea.
Yes, a smaller timeout also works. I tested 4000 for this patch and 3200 for patch 2.
Forgot to say, for PCIE devices please keep the timeout as was.
Yes, of course.
Quoted 4 lines
Quoted 2 lines
(4000 * 250 = 1000000 and 3200 * 125 = 400000. I don't know why
rtw89_read8()in the second patch takes only 125 µs.)