| Message ID | 20200407073331.397-1-kai.heng.feng@canonical.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 6343a6d4b2130be9323f347d60af8a7ba8f7242c |
| Delegated to: | Kalle Valo |
| Headers | show |
| Series | [v2] rtw88: Add delay on polling h2c command status bit | expand |
Kai-Heng Feng <kai.heng.feng@canonical.com> wrote: > On some systems we can constanly see rtw88 complains: > [39584.721375] rtw_pci 0000:03:00.0: failed to send h2c command > > Increase interval of each check to wait the status bit really changed. > > Use read_poll_timeout() macro which fits anything we need here. > > Suggested-by: Kalle Valo <kvalo@codeaurora.org> > Signed-off-by: Kai-Heng Feng <kai.heng.feng@canonical.com> Patch applied to wireless-drivers-next.git, thanks. 6343a6d4b213 rtw88: Add delay on polling h2c command status bit
diff --git a/drivers/net/wireless/realtek/rtw88/fw.c b/drivers/net/wireless/realtek/rtw88/fw.c index 05c430b3489c..8508b83d98ed 100644 --- a/drivers/net/wireless/realtek/rtw88/fw.c +++ b/drivers/net/wireless/realtek/rtw88/fw.c @@ -2,6 +2,8 @@ /* Copyright(c) 2018-2019 Realtek Corporation */ +#include <linux/iopoll.h> + #include "main.h" #include "coex.h" #include "fw.h" @@ -193,8 +195,8 @@ static void rtw_fw_send_h2c_command(struct rtw_dev *rtwdev, u8 box; u8 box_state; u32 box_reg, box_ex_reg; - u32 h2c_wait; int idx; + int ret; rtw_dbg(rtwdev, RTW_DBG_FW, "send H2C content %02x%02x%02x%02x %02x%02x%02x%02x\n", @@ -226,12 +228,11 @@ static void rtw_fw_send_h2c_command(struct rtw_dev *rtwdev, goto out; } - h2c_wait = 20; - do { - box_state = rtw_read8(rtwdev, REG_HMETFR); - } while ((box_state >> box) & 0x1 && --h2c_wait > 0); + ret = read_poll_timeout(rtw_read8, box_state, + !((box_state >> box) & 0x1), 100, 3000, false, + rtwdev, REG_HMETFR); - if (!h2c_wait) { + if (ret) { rtw_err(rtwdev, "failed to send h2c command\n"); goto out; }
On some systems we can constanly see rtw88 complains: [39584.721375] rtw_pci 0000:03:00.0: failed to send h2c command Increase interval of each check to wait the status bit really changed. Use read_poll_timeout() macro which fits anything we need here. Suggested-by: Kalle Valo <kvalo@codeaurora.org> Signed-off-by: Kai-Heng Feng <kai.heng.feng@canonical.com> --- v2: - Use read_poll_timeout macro. drivers/net/wireless/realtek/rtw88/fw.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-)