Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 75226086 authored by Vladimir Kondratiev's avatar Vladimir Kondratiev Committed by Ian Maund
Browse files

wil6210: wait longer for hardware reset completion 



Typical time for hardware reset, as measured, is about 200..250 msec.
Adjust sleeping to use more relaxed msleep, increase sleep interval
and increase total sleep time to be about 1sec

Change-Id: I7e54587ab6026ddba7cfb0154c2a4309a73925a0
Signed-off-by: default avatarVladimir Kondratiev <qca_vkondrat@qca.qualcomm.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
Git-commit: 520d68e7cf6c72687698c4584e8f1f8fab4dfc4e
Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-testing.git


Signed-off-by: default avatarHamad Kadmany <hkadmany@codeaurora.org>
parent 599d7381

drivers/net/wireless/ath/wil6210/main.c

+7 −4
Original line number Diff line number Diff line
@@ -25,6 +25,9 @@ static bool no_fw_recovery; 
module_param(no_fw_recovery, bool, S_IRUGO | S_IWUSR);

MODULE_PARM_DESC(no_fw_recovery, " disable FW error recovery");



#define RST_DELAY (20) /* msec, for loop in @wil_target_reset */

#define RST_COUNT (1 + 1000/RST_DELAY) /* round up to be above 1 sec total */



/*

 * Due to a hardware issue,

 * one has to read/write to/from NIC in 32-bit chunks;
@@ -388,11 +391,11 @@ static int wil_target_reset(struct wil6210_priv *wil) 
	W(RGF_USER_CLKS_CTL_SW_RST_VEC_0, 0);

	wmb(); /* order is important here */



	/* wait until device ready */

	/* wait until device ready. typical time is 200..250 msec */

	do {

		msleep(1);

		msleep(RST_DELAY);

		hw_state = R(RGF_USER_HW_MACHINE_STATE);

		if (delay++ > 100) {

		if (delay++ > RST_COUNT) {

			wil_err(wil, "Reset not completed, hw_state 0x%08x\n",

				hw_state);

			return -ETIME;
@@ -406,7 +409,7 @@ static int wil_target_reset(struct wil6210_priv *wil) 
	C(RGF_USER_CLKS_CTL_0, BIT_USER_CLKS_RST_PWGD);

	wmb(); /* order is important here */



	wil_dbg_misc(wil, "Reset completed in %d ms\n", delay);

	wil_dbg_misc(wil, "Reset completed in %d ms\n", delay * RST_DELAY);

	return 0;



#undef R