Skip to content

Commit

Permalink
rtw88: Add delay on polling h2c command status bit
Browse files Browse the repository at this point in the history
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>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
Link: https://lore.kernel.org/r/20200407073331.397-1-kai.heng.feng@canonical.com
  • Loading branch information
Kai-Heng Feng authored and Kalle Valo committed Apr 14, 2020
1 parent 63e49a9 commit 6343a6d
Showing 1 changed file with 7 additions and 6 deletions.
13 changes: 7 additions & 6 deletions drivers/net/wireless/realtek/rtw88/fw.c
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
/* Copyright(c) 2018-2019 Realtek Corporation
*/

#include <linux/iopoll.h>

#include "main.h"
#include "coex.h"
#include "fw.h"
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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;
}
Expand Down

0 comments on commit 6343a6d

Please sign in to comment.