Commit 5e0e54ff authored by Peter Chen's avatar Peter Chen Committed by Greg Kroah-Hartman
Browse files

usb: host: xhci-plat: add .suspend_quirk for struct xhci_plat_priv 



Some platforms (eg cdns3) may have special sequences between
xhci_bus_suspend and xhci_suspend, add .suspend_quick for it.

Reviewed-by: default avatarJun Li <jun.li@nxp.com>
Signed-off-by: default avatarPeter Chen <peter.chen@nxp.com>
Signed-off-by: default avatarMathias Nyman <mathias.nyman@linux.intel.com>
Link: https://lore.kernel.org/r/20200918131752.16488-3-mathias.nyman@linux.intel.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 46034a99

drivers/usb/host/xhci-plat.c

+19 −0
Original line number Diff line number Diff line
@@ -54,6 +54,16 @@ static int xhci_priv_init_quirk(struct usb_hcd *hcd) 
	return priv->init_quirk(hcd);

}



static int xhci_priv_suspend_quirk(struct usb_hcd *hcd)

{

	struct xhci_plat_priv *priv = hcd_to_xhci_priv(hcd);



	if (!priv->suspend_quirk)

		return 0;



	return priv->suspend_quirk(hcd);

}



static int xhci_priv_resume_quirk(struct usb_hcd *hcd)

{

	struct xhci_plat_priv *priv = hcd_to_xhci_priv(hcd);
@@ -401,7 +411,11 @@ static int __maybe_unused xhci_plat_suspend(struct device *dev) 
{

	struct usb_hcd	*hcd = dev_get_drvdata(dev);

	struct xhci_hcd	*xhci = hcd_to_xhci(hcd);

	int ret;



	ret = xhci_priv_suspend_quirk(hcd);

	if (ret)

		return ret;

	/*

	 * xhci_suspend() needs `do_wakeup` to know whether host is allowed

	 * to do wakeup during suspend. Since xhci_plat_suspend is currently
@@ -438,6 +452,11 @@ static int __maybe_unused xhci_plat_runtime_suspend(struct device *dev) 
{

	struct usb_hcd  *hcd = dev_get_drvdata(dev);

	struct xhci_hcd *xhci = hcd_to_xhci(hcd);

	int ret;



	ret = xhci_priv_suspend_quirk(hcd);

	if (ret)

		return ret;



	return xhci_suspend(xhci, true);

}

drivers/usb/host/xhci-plat.h

+1 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ struct xhci_plat_priv { 
	unsigned long long quirks;

	void (*plat_start)(struct usb_hcd *);

	int (*init_quirk)(struct usb_hcd *);

	int (*suspend_quirk)(struct usb_hcd *);

	int (*resume_quirk)(struct usb_hcd *);

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE