| Message ID | 20200818071739.789720-1-vkoul@kernel.org (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | d66a57be2f9a315fc10d0f524f670fec903e0fb4 |
| Headers | show |
| Series | [v3] usb: renesas-xhci: remove version check | expand |
On Tue, Aug 18, 2020 at 12:47:39PM +0530, Vinod Koul wrote: > 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: 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@kernel.org> > --- > Changes in v3: > - drop additional firmware versions and remove the check > > Greg, this fixes regression for folks with preprogrammed controllers > please mark as stable material You could have done so by putting "Cc: stable..." in the s-o-b of the kernel, why force me to do that by hand? thanks, greg k-h
On 18-08-20, 09:31, Greg Kroah-Hartman wrote: > On Tue, Aug 18, 2020 at 12:47:39PM +0530, Vinod Koul wrote: > > 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: 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@kernel.org> > > --- > > Changes in v3: > > - drop additional firmware versions and remove the check > > > > Greg, this fixes regression for folks with preprogrammed controllers > > please mark as stable material > > You could have done so by putting "Cc: stable..." in the s-o-b of the > kernel, why force me to do that by hand? Oops, wasnt sure of your preference. Btw am sure you would have scripted it :-) Would you like me to send an update with stable tagged or this is fine for now?
On Tue, Aug 18, 2020 at 02:09:19PM +0530, Vinod Koul wrote: > On 18-08-20, 09:31, Greg Kroah-Hartman wrote: > > On Tue, Aug 18, 2020 at 12:47:39PM +0530, Vinod Koul wrote: > > > 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: 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@kernel.org> > > > --- > > > Changes in v3: > > > - drop additional firmware versions and remove the check > > > > > > Greg, this fixes regression for folks with preprogrammed controllers > > > please mark as stable material > > > > You could have done so by putting "Cc: stable..." in the s-o-b of the > > kernel, why force me to do that by hand? > > Oops, wasnt sure of your preference. Btw am sure you would have scripted > it :-) > > Would you like me to send an update with stable tagged or this is fine > for now? I can do it now, but in the future please be nice to maintainers, we are overworked as you well know :) thanks, greg k-h
On 18-08-20, 10:46, Greg Kroah-Hartman wrote: > On Tue, Aug 18, 2020 at 02:09:19PM +0530, Vinod Koul wrote: > > On 18-08-20, 09:31, Greg Kroah-Hartman wrote: > > > On Tue, Aug 18, 2020 at 12:47:39PM +0530, Vinod Koul wrote: > > > > 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: 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@kernel.org> > > > > --- > > > > Changes in v3: > > > > - drop additional firmware versions and remove the check > > > > > > > > Greg, this fixes regression for folks with preprogrammed controllers > > > > please mark as stable material > > > > > > You could have done so by putting "Cc: stable..." in the s-o-b of the > > > kernel, why force me to do that by hand? > > > > Oops, wasnt sure of your preference. Btw am sure you would have scripted > > it :-) > > > > Would you like me to send an update with stable tagged or this is fine > > for now? > > I can do it now, but in the future please be nice to maintainers, we are > overworked as you well know :) Thanks.
diff --git a/drivers/usb/host/xhci-pci-renesas.c b/drivers/usb/host/xhci-pci-renesas.c index 59b1965ad0a3..f97ac9f52bf4 100644 --- a/drivers/usb/host/xhci-pci-renesas.c +++ b/drivers/usb/host/xhci-pci-renesas.c @@ -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) { @@ -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
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: 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@kernel.org> --- Changes in v3: - drop additional firmware versions and remove the check Greg, this fixes regression for folks with preprogrammed controllers please mark as stable material drivers/usb/host/xhci-pci-renesas.c | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-)