lkml.org 
[lkml]   [2021]   [Jul]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.13 024/800] usb: renesas-xhci: Fix handling of unknown ROM state
    Date
    From: Moritz Fischer <mdf@kernel.org>

    commit d143825baf15f204dac60acdf95e428182aa3374 upstream.

    The ROM load sometimes seems to return an unknown status
    (RENESAS_ROM_STATUS_NO_RESULT) instead of success / fail.

    If the ROM load indeed failed this leads to failures when trying to
    communicate with the controller later on.

    Attempt to load firmware using RAM load in those cases.

    Fixes: 2478be82de44 ("usb: renesas-xhci: Add ROM loader for uPD720201")
    Cc: stable@vger.kernel.org
    Cc: Mathias Nyman <mathias.nyman@intel.com>
    Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    Cc: Vinod Koul <vkoul@kernel.org>
    Tested-by: Vinod Koul <vkoul@kernel.org>
    Reviewed-by: Vinod Koul <vkoul@kernel.org>
    Signed-off-by: Moritz Fischer <mdf@kernel.org>
    Link: https://lore.kernel.org/r/20210615153758.253572-1-mdf@kernel.org
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/usb/host/xhci-pci-renesas.c | 16 ++++++++--------
    1 file changed, 8 insertions(+), 8 deletions(-)

    --- a/drivers/usb/host/xhci-pci-renesas.c
    +++ b/drivers/usb/host/xhci-pci-renesas.c
    @@ -207,7 +207,8 @@ static int renesas_check_rom_state(struc
    return 0;

    case RENESAS_ROM_STATUS_NO_RESULT: /* No result yet */
    - return 0;
    + dev_dbg(&pdev->dev, "Unknown ROM status ...\n");
    + break;

    case RENESAS_ROM_STATUS_ERROR: /* Error State */
    default: /* All other states are marked as "Reserved states" */
    @@ -224,13 +225,12 @@ static int renesas_fw_check_running(stru
    u8 fw_state;
    int err;

    - /* Check if device has ROM and loaded, if so skip everything */
    - err = renesas_check_rom(pdev);
    - if (err) { /* we have rom */
    - err = renesas_check_rom_state(pdev);
    - if (!err)
    - return err;
    - }
    + /*
    + * Only if device has ROM and loaded FW we can skip loading and
    + * return success. Otherwise (even unknown state), attempt to load FW.
    + */
    + if (renesas_check_rom(pdev) && !renesas_check_rom_state(pdev))
    + return 0;

    /*
    * Test if the device is actually needing the firmware. As most

    \
     
     \ /
      Last update: 2021-07-12 10:09    [W:2.950 / U:0.420 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site