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 351925b5d2c8304815b9608af21c76fdb313b6ae..c782e2522d38624673063a879cfaec0b948f7ac6 100644 (file)
--- a/drivers/net/wireless/ath/wil6210/main.c
+++ b/drivers/net/wireless/ath/wil6210/main.c
@@ -269,7 +269,7 @@ void wil_priv_deinit(struct wil6210_priv *wil)
 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 @@ static void wil_target_reset(struct wil6210_priv *wil)
        }
        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 80573f786df6c0ff3836292f04ae6b5fe6294bb3..fb1006b2a4e22582feeb54ca91edb1134efaf3c8 100644 (file)
--- a/drivers/net/wireless/ath/wil6210/wil6210.h
+++ b/drivers/net/wireless/ath/wil6210/wil6210.h
@@ -74,7 +74,8 @@ struct RGF_ICR {
 } __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)