thunderbolt: Poll 10ms for REG_FW_STS_NVM_AUTH_DONE to be set

In Intel Tiger Lake and beyond it takes some time after the force power
is set until the firmware connection manager is ready. So instead of
reading it once we poll it for 10ms before giving up.

Signed-off-by: Gil Fine <gil.fine@intel.com>
Reviewed-by: Yehezkel Bernat <YehezkelShB@gmail.com>
Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com>

diff --git a/drivers/thunderbolt/icm.c b/drivers/thunderbolt/icm.c
index 2f30b816705a28ba1ab2853ca04ffd6a711ae8a7..0f25cf9fe519af430da793e32f1222a2d282e2c8 100644 (file)
--- a/drivers/thunderbolt/icm.c
+++ b/drivers/thunderbolt/icm.c
@@ -1677,14 +1677,18 @@ static void icm_icl_rtd3_veto(struct tb *tb, const struct icm_pkg_header *hdr)
 
 static bool icm_tgl_is_supported(struct tb *tb)
 {
-       u32 val;
+       unsigned long end = jiffies + msecs_to_jiffies(10);
 
-       /*
-        * If the firmware is not running use software CM. This platform
-        * should fully support both.
-        */
-       val = ioread32(tb->nhi->iobase + REG_FW_STS);
-       return !!(val & REG_FW_STS_NVM_AUTH_DONE);
+       do {
+               u32 val;
+
+               val = ioread32(tb->nhi->iobase + REG_FW_STS);
+               if (val & REG_FW_STS_NVM_AUTH_DONE)
+                       return true;
+               usleep_range(100, 500);
+       } while (time_before(jiffies, end));
+
+       return false;
 }
 
 static void icm_handle_notification(struct work_struct *work)