lkml.org 
[lkml]   [2018]   [Apr]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.16 075/196] thunderbolt: Wait a bit longer for ICM to authenticate the active NVM
    Date
    4.16-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Mika Westerberg <mika.westerberg@linux.intel.com>

    commit e4be8c9b6a512e274cb6bbac4ac869d73880a8b3 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: f67cf491175a ("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>

    ---
    drivers/thunderbolt/icm.c | 7 +++++--
    1 file changed, 5 insertions(+), 2 deletions(-)

    --- a/drivers/thunderbolt/icm.c
    +++ b/drivers/thunderbolt/icm.c
    @@ -728,14 +728,14 @@ static bool icm_ar_is_supported(struct t
    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) {
    @@ -1054,6 +1054,9 @@ static int icm_firmware_init(struct tb *
    break;

    default:
    + if (ret < 0)
    + return ret;
    +
    tb_err(tb, "ICM firmware is in wrong mode: %u\n", ret);
    return -ENODEV;
    }

    \
     
     \ /
      Last update: 2018-04-22 18:04    [W:4.028 / U:0.516 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site