thunderbolt: Wait a bit longer for ICM to authenticate the active NVM
commitpull/10/heade4be8c9b6a
upstream. Sometimes during cold boot ICM has not yet authenticated the active NVM image leading to timeout and failing the driver probe. Allow ICM to take some more time and increase the timeout to 3 seconds before we give up. While there fix icm_firmware_init() to return the real error code without overwriting it with -ENODEV. Fixes:f67cf49117
("thunderbolt: Add support for Internal Connection Manager (ICM)") Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com> Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com> Cc: stable@vger.kernel.org Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
parent
73b969f6a9
commit
6f40f6ee22
|
@ -539,14 +539,14 @@ static bool icm_ar_is_supported(struct tb *tb)
|
|||
static int icm_ar_get_mode(struct tb *tb)
|
||||
{
|
||||
struct tb_nhi *nhi = tb->nhi;
|
||||
int retries = 5;
|
||||
int retries = 60;
|
||||
u32 val;
|
||||
|
||||
do {
|
||||
val = ioread32(nhi->iobase + REG_FW_STS);
|
||||
if (val & REG_FW_STS_NVM_AUTH_DONE)
|
||||
break;
|
||||
msleep(30);
|
||||
msleep(50);
|
||||
} while (--retries);
|
||||
|
||||
if (!retries) {
|
||||
|
@ -859,6 +859,9 @@ static int icm_firmware_init(struct tb *tb)
|
|||
break;
|
||||
|
||||
default:
|
||||
if (ret < 0)
|
||||
return ret;
|
||||
|
||||
tb_err(tb, "ICM firmware is in wrong mode: %u\n", ret);
|
||||
return -ENODEV;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue