If CONFIG_FW_LOADER_USER_HELPER_FALLBACK=y and CONFIG_USB_XHCI_RCAR=y,
request_firmware() in xhci_rcar_download_firmware() waits for 60s to
sysfs fallback for the firmware like below.
[ 1.599701] xhci-hcd ee000000.usb: xHCI Host Controller
[ 1.604948] xhci-hcd ee000000.usb: new USB bus registered, assigned bus
number 3
[ 1.612403] xhci-hcd ee000000.usb: Direct firmware load for
r8a779x_usb3_v3.dlmem failed with error -2
[ 1.621726] xhci-hcd ee000000.usb: Falling back to sysfs fallback for:
r8a779x_usb3_v3.dlmem
[ 1.707953] ata1: link resume succeeded after 1 retries
[ 1.819379] ata1: SATA link down (SStatus 0 SControl 300)
[ 62.436012] xhci-hcd ee000000.usb: can't setup: -11
[ 62.440901] xhci-hcd ee000000.usb: USB bus 3 deregistered
[ 62.446361] xhci-hcd: probe of ee000000.usb failed with error -11
To avoid this 60s wait, this patch adds to check the system_state
condition and if the system is not running,
xhci_rcar_download_firmware() calls request_firmware_direct()
instead of request_firmware() as a workaround.
Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda...@renesas.com>
---
drivers/usb/host/xhci-rcar.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/drivers/usb/host/xhci-rcar.c b/drivers/usb/host/xhci-rcar.c
index 34761be..c90cf46 100644
--- a/drivers/usb/host/xhci-rcar.c
+++ b/drivers/usb/host/xhci-rcar.c
@@ -6,6 +6,7 @@
*/
#include <linux/firmware.h>
+#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/platform_device.h>
#include <linux/of.h>
@@ -146,7 +147,10 @@ static int xhci_rcar_download_firmware(struct usb_hcd *hcd)
firmware_name = priv->firmware_name;
/* request R-Car USB3.0 firmware */
- retval = request_firmware(&fw, firmware_name, dev);
+ if (system_state < SYSTEM_RUNNING)
+ retval = request_firmware_direct(&fw, firmware_name, dev);
+ else
+ retval = request_firmware(&fw, firmware_name, dev);
if (retval)
return retval;
--
2.7.4
