On Mon, Jul 12, 2021 at 2:31 AM Greg Kroah-Hartman gregkh@linuxfoundation.org wrote:
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
After sending out 5.12.17 for testing, we had a user complain that all of their USB devices disappeared with the error:
Jul 15 23:18:53 kernel: xhci_hcd 0000:04:00.0: Direct firmware load for renesas_usb_fw.mem failed with error -2 Jul 15 23:18:53 kernel: xhci_hcd 0000:04:00.0: request_firmware failed: -2 Jul 15 23:18:53 kernel: xhci_hcd: probe of 0000:04:00.0 failed with error -2
After first assuming that something was missing in the backport to 5.12, I had the user try 5.13.2, and then 5.14-rc1. Both of those failed in the same way, so it is not working in the current Linus tree either. Reverting this patch fixed the issue.
Justin
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