On 14.4.2020 19.41, Vinod Koul wrote:
> Some rensas controller like uPD720201 and uPD720202 need firmware to be
> loaded. Add these devices in table and invoke renesas firmware loader
> functions to check and load the firmware into device memory when
> required.
>
> Signed-off-by: Vinod Koul <vkoul@xxxxxxxxxx>
> ---
> drivers/usb/host/xhci-pci.c | 33 +++++++++++++++++++++++++++++++++
> drivers/usb/host/xhci.h | 1 +
> 2 files changed, 34 insertions(+)
>
> diff --git a/drivers/usb/host/xhci-pci.c b/drivers/usb/host/xhci-pci.c
> index b6c2f5c530e3..11521e2e1720 100644
> --- a/drivers/usb/host/xhci-pci.c
> +++ b/drivers/usb/host/xhci-pci.c
> @@ -15,6 +15,7 @@
>
> #include "xhci.h"
> #include "xhci-trace.h"
> +#include "xhci-pci.h"
>
> #define SSIC_PORT_NUM 2
> #define SSIC_PORT_CFG2 0x880c
> @@ -328,6 +329,21 @@ static int xhci_pci_probe(struct pci_dev *dev, const struct pci_device_id *id)
> int retval;
> struct xhci_hcd *xhci;
> struct usb_hcd *hcd;
> + struct xhci_driver_data *driver_data;
> +
> + driver_data = (struct xhci_driver_data *)id->driver_data;
> +
> + if (driver_data && driver_data->quirks & XHCI_RENESAS_FW_QUIRK) {
> + retval = renesas_xhci_pci_probe(dev, id);
> + switch (retval) {
> + case 0: /* fw check success, continue */
> + break;
> + case 1: /* fw will be loaded by async load */
> + return 0;
This is no longer true, right?
To me it looks like renesas_xhci_pci_probe() returns 0 on success, both if
firmware was already running or if successfully loaded, and negative on error
While changing this the function name "renesas_xhci_pci_probe()" should be
changed as well. This isn't anymore a separate firmware loading driver, just a
a lot of renesas firmware loading code.
You could call renesas_xhci_check_request_fw() directly instead:
if (driver_data && driver_data->quirks & XHCI_RENESAS_FW_QUIRK) {
retval = renesas_xhci_check_request_fw(dev, id);
if (retval)
return retval;
}
-Mathias
