[PATCH v2] usb: renesas-xhci: add missing versions

From: Vinod Koul
Date: Sun Aug 16 2020 - 08:01:56 EST


Some devices in wild are reporting firmware version as 0x2011 and
0x2020, so add these as well

Reported by: Anastasios Vacharakis <vacharakis@xxxxxxxxx>
Reported by: Glen Journeay <journeay@xxxxxxxxx>
Fixes: 2478be82de44 ("usb: renesas-xhci: Add ROM loader for uPD720201")
Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=208911
Signed-off-by: Vinod Koul <vkoul@xxxxxxxxxx>
---
Greg, this fixes regression for folks with preprogrammed controllers with
firmware version 0x2020 and 0x2011, please mark as stable material

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

diff --git a/drivers/usb/host/xhci-pci-renesas.c b/drivers/usb/host/xhci-pci-renesas.c
index 59b1965ad0a3..f32b5a958ace 100644
--- a/drivers/usb/host/xhci-pci-renesas.c
+++ b/drivers/usb/host/xhci-pci-renesas.c
@@ -50,14 +50,19 @@
#define RENESAS_RETRY 10000
#define RENESAS_DELAY 10

-#define ROM_VALID_01 0x2013
-#define ROM_VALID_02 0x2026
+/* keep the ids sorted */
+#define ROM_VALID_01 0x2011
+#define ROM_VALID_02 0x2013
+#define ROM_VALID_03 0x2020
+#define ROM_VALID_04 0x2026

static int renesas_verify_fw_version(struct pci_dev *pdev, u32 version)
{
switch (version) {
case ROM_VALID_01:
case ROM_VALID_02:
+ case ROM_VALID_03:
+ case ROM_VALID_04:
return 0;
}
dev_err(&pdev->dev, "FW has invalid version :%d\n", version);
--
2.26.2