Skip to content

Commit

Permalink
usb: renesas-xhci: remove version check
Browse files Browse the repository at this point in the history
commit d66a57b upstream.

Some devices in wild are reporting bunch of firmware versions, so remove
the check for versions in driver

Reported by: Anastasios Vacharakis <vacharakis@gmail.com>
Reported by: Glen Journeay <journeay@gmail.com>
Fixes: 2478be8 ("usb: renesas-xhci: Add ROM loader for uPD720201")
Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=208911
Signed-off-by: Vinod Koul <vkoul@kernel.org>
Cc: stable <stable@vger.kernel.org>
Link: https://lore.kernel.org/r/20200818071739.789720-1-vkoul@kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
vinodkoul authored and gregkh committed Sep 3, 2020
1 parent 2b32323 commit 68adec4
Showing 1 changed file with 1 addition and 18 deletions.
19 changes: 1 addition & 18 deletions drivers/usb/host/xhci-pci-renesas.c
Expand Up @@ -50,20 +50,6 @@
#define RENESAS_RETRY 10000
#define RENESAS_DELAY 10

#define ROM_VALID_01 0x2013
#define ROM_VALID_02 0x2026

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

static int renesas_fw_download_image(struct pci_dev *dev,
const u32 *fw, size_t step, bool rom)
{
Expand Down Expand Up @@ -202,10 +188,7 @@ static int renesas_check_rom_state(struct pci_dev *pdev)

version &= RENESAS_FW_VERSION_FIELD;
version = version >> RENESAS_FW_VERSION_OFFSET;

err = renesas_verify_fw_version(pdev, version);
if (err)
return err;
dev_dbg(&pdev->dev, "Found ROM version: %x\n", version);

/*
* Test if ROM is present and loaded, if so we can skip everything
Expand Down

0 comments on commit 68adec4

Please sign in to comment.