Commit 44cf5360 authored by Moritz Fischer's avatar Moritz Fischer Committed by Greg Kroah-Hartman
Browse files

Revert "usb: renesas-xhci: Fix handling of unknown ROM state" 



This reverts commit d143825b.

Justin reports some of his systems now fail as result of this commit:

 xhci_hcd 0000:04:00.0: Direct firmware load for renesas_usb_fw.mem failed with error -2
 xhci_hcd 0000:04:00.0: request_firmware failed: -2
 xhci_hcd: probe of 0000:04:00.0 failed with error -2

The revert brings back the original issue the commit tried to solve but
at least unbreaks existing systems relying on previous behavior.

Cc: stable@vger.kernel.org
Cc: Mathias Nyman <mathias.nyman@intel.com>
Cc: Vinod Koul <vkoul@kernel.org>
Cc: Justin Forbes <jmforbes@linuxtx.org>
Reported-by: default avatarJustin Forbes <jmforbes@linuxtx.org>
Signed-off-by: default avatarMoritz Fischer <mdf@kernel.org>
Fixes: d143825b ("usb: renesas-xhci: Fix handling of unknown ROM state")
Link: https://lore.kernel.org/r/20210719070519.41114-1-mdf@kernel.org


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent b0863f19

drivers/usb/host/xhci-pci-renesas.c

+8 −8
Original line number Diff line number Diff line
@@ -207,8 +207,7 @@ static int renesas_check_rom_state(struct pci_dev *pdev) 
			return 0;



		case RENESAS_ROM_STATUS_NO_RESULT: /* No result yet */

			dev_dbg(&pdev->dev, "Unknown ROM status ...\n");

			break;

			return 0;



		case RENESAS_ROM_STATUS_ERROR: /* Error State */

		default: /* All other states are marked as "Reserved states" */
@@ -225,12 +224,13 @@ static int renesas_fw_check_running(struct pci_dev *pdev) 
	u8 fw_state;

	int 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;

	/* 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;

	}



	/*

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