Commit 435cc113 authored by Yoshihiro Shimoda's avatar Yoshihiro Shimoda Committed by Greg Kroah-Hartman
Browse files

usb: host: xhci-plat: set resume_quirk() for R-Car controllers 



This patch sets resume_quirk() for R-Car controllers to re-download
the firmware in resume timing. Otherwise, if the controller's power
is down in suspend timing, the firmware in the controller goes away,
and then the controller doesn't work after resume.

Signed-off-by: default avatarYoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Signed-off-by: default avatarMathias Nyman <mathias.nyman@linux.intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 98c0a3ff

drivers/usb/host/xhci-plat.c

+3 −0
Original line number Diff line number Diff line
@@ -103,18 +103,21 @@ static const struct xhci_plat_priv xhci_plat_renesas_rcar_gen2 = { 
	.firmware_name = XHCI_RCAR_FIRMWARE_NAME_V1,

	.init_quirk = xhci_rcar_init_quirk,

	.plat_start = xhci_rcar_start,

	.resume_quirk = xhci_rcar_resume_quirk,

};



static const struct xhci_plat_priv xhci_plat_renesas_rcar_gen3 = {

	.firmware_name = XHCI_RCAR_FIRMWARE_NAME_V2,

	.init_quirk = xhci_rcar_init_quirk,

	.plat_start = xhci_rcar_start,

	.resume_quirk = xhci_rcar_resume_quirk,

};



static const struct xhci_plat_priv xhci_plat_renesas_rcar_r8a7796 = {

	.firmware_name = XHCI_RCAR_FIRMWARE_NAME_V3,

	.init_quirk = xhci_rcar_init_quirk,

	.plat_start = xhci_rcar_start,

	.resume_quirk = xhci_rcar_resume_quirk,

};



static const struct of_device_id usb_xhci_of_match[] = {

drivers/usb/host/xhci-rcar.c

+11 −0
Original line number Diff line number Diff line
@@ -198,3 +198,14 @@ int xhci_rcar_init_quirk(struct usb_hcd *hcd) 


	return xhci_rcar_download_firmware(hcd);

}



int xhci_rcar_resume_quirk(struct usb_hcd *hcd)

{

	int ret;



	ret = xhci_rcar_download_firmware(hcd);

	if (!ret)

		xhci_rcar_start(hcd);



	return ret;

}

drivers/usb/host/xhci-rcar.h

+6 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
#if IS_ENABLED(CONFIG_USB_XHCI_RCAR)

void xhci_rcar_start(struct usb_hcd *hcd);

int xhci_rcar_init_quirk(struct usb_hcd *hcd);

int xhci_rcar_resume_quirk(struct usb_hcd *hcd);

#else

static inline void xhci_rcar_start(struct usb_hcd *hcd)

{
@@ -27,5 +28,10 @@ static inline int xhci_rcar_init_quirk(struct usb_hcd *hcd) 
{

	return 0;

}



static inline int xhci_rcar_resume_quirk(struct usb_hcd *hcd)

{

	return 0;

}

#endif

#endif /* _XHCI_RCAR_H */

CRA Git | Maintained and supported by SUSTech CRA and CCSE