wil6210: target reset flow update
Use 'real' indication for hardware state.
Signed-off-by: Vladimir Kondratiev <qca_vkondrat@qca.qualcomm.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
diff --git a/drivers/net/wireless/ath/wil6210/main.c b/drivers/net/wireless/ath/wil6210/main.c
index 351925b..c782e25 100644
--- a/drivers/net/wireless/ath/wil6210/main.c
+++ b/drivers/net/wireless/ath/wil6210/main.c
@@ -269,7 +269,7 @@
static void wil_target_reset(struct wil6210_priv *wil)
{
int delay = 0;
- u32 baud_rate;
+ u32 hw_state;
u32 rev_id;
wil_dbg_misc(wil, "Resetting...\n");
@@ -312,15 +312,16 @@
}
W(RGF_USER_CLKS_CTL_SW_RST_VEC_0, 0);
- /* wait until device ready. Use baud rate */
+ /* wait until device ready */
do {
msleep(1);
- baud_rate = R(RGF_USER_SERIAL_BAUD_RATE);
+ hw_state = R(RGF_USER_HW_MACHINE_STATE);
if (delay++ > 100) {
- wil_err(wil, "Reset not completed\n");
+ wil_err(wil, "Reset not completed, hw_state 0x%08x\n",
+ hw_state);
return;
}
- } while (baud_rate != 0x15e);
+ } while (hw_state != HW_MACHINE_BOOT_DONE);
if (rev_id == 2)
W(RGF_PCIE_LOS_COUNTER_CTL, BIT(8));
diff --git a/drivers/net/wireless/ath/wil6210/wil6210.h b/drivers/net/wireless/ath/wil6210/wil6210.h
index 80573f7..fb1006b 100644
--- a/drivers/net/wireless/ath/wil6210/wil6210.h
+++ b/drivers/net/wireless/ath/wil6210/wil6210.h
@@ -74,7 +74,8 @@
} __packed;
/* registers - FW addresses */
-#define RGF_USER_SERIAL_BAUD_RATE (0x880050)
+#define RGF_USER_HW_MACHINE_STATE (0x8801dc)
+ #define HW_MACHINE_BOOT_DONE (0x3fffffd)
#define RGF_USER_USER_CPU_0 (0x8801e0)
#define RGF_USER_MAC_CPU_0 (0x8801fc)
#define RGF_USER_USER_SCRATCH_PAD (0x8802bc)