usb: cdns3: host: add .suspend_quirk for xhci-plat.c
PATCH 1/6 usb: cdns3: host: add .suspend_quirk for xhci-plat.c
cdns3 has some special PM sequence between xhci_bus_suspend and xhci_suspend, add quirk to implement it.
--- drivers/usb/cdns3/host-export.h | 6 +++++ drivers/usb/cdns3/host.c | 43 +++++++++++++++++++++++++++++++++ 2 files changed, 49 insertions(+)
drivers/usb/cdns3/host-export.h +6 -0
@@ -9,9 +9,11 @@#ifndef __LINUX_CDNS3_HOST_EXPORT#define __LINUX_CDNS3_HOST_EXPORT +struct usb_hcd ;#ifdef CONFIG_USB_CDNS3_HOST int cdns3_host_init (struct cdns3 *cdns); +int xhci_cdns3_suspend_quirk (struct usb_hcd *hcd);#else
@@ -21,6 +23,10 @@ static inline int cdns3_host_init(struct cdns3 *cdns) }static inline void cdns3_host_exit (struct cdns3 *cdns) { } +static inline int xhci_cdns3_suspend_quirk (struct usb_hcd *hcd) +{ +return 0 ; +}#endif /* CONFIG_USB_CDNS3_HOST */
drivers/usb/cdns3/host.c +43 -0
61 lines not on this page · raw message
Signature · 1 line
2.17.1
PATCH 2/6 usb: cdns3: host: add xhci_plat_priv quirk XHCI_SKIP_PHY_INIT
cdns3 manages PHY by own DRD driver, so skip the management by HCD core.
--- drivers/usb/cdns3/host.c | 1 + 1 file changed, 1 insertion(+)
drivers/usb/cdns3/host.c +1 -0
@@ -24,6 +24,7 @@#define LPM_2_STB_SWITCH_EN BIT(25)static const struct xhci_plat_priv xhci_plat_cdns3_xhci = { + .quirks =XHCI_SKIP_PHY_INIT , .suspend_quirk = xhci_cdns3_suspend_quirk, };
Signature · 1 line
2.17.1
PATCH 3/6 usb: cdns3: host: disable BEI support
In reply to Peter ChenThe Cadence xHCI doesn't support BEI well, it causes the disconnection of ISOC devices can't be detected, so we disable it.
--- drivers/usb/cdns3/host.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/usb/cdns3/host.c +1 -1
@@ -24,7 +24,7 @@#define LPM_2_STB_SWITCH_EN BIT(25)static const struct xhci_plat_priv xhci_plat_cdns3_xhci = { - .quirks =XHCI_SKIP_PHY_INIT , + .quirks =XHCI_SKIP_PHY_INIT |XHCI_AVOID_BEI , .suspend_quirk = xhci_cdns3_suspend_quirk, };
Signature · 1 line
2.17.1
PATCH 4/6 usb: cdns3: add quirk for enable runtime pm by default
In reply to Peter ChenSome vendors (eg: NXP) may want to enable runtime pm by default for power saving, add one quirk for it.
--- drivers/usb/cdns3/core.c | 3 ++- drivers/usb/cdns3/core.h | 4 ++++ drivers/usb/cdns3/host.c | 20 +++++++++++++++++--- 3 files changed, 23 insertions(+), 4 deletions(-)
drivers/usb/cdns3/core.c +2 -1
@@ -559,7 +559,8 @@ static int cdns3_probe(struct platform_device *pdev)device_set_wakeup_capable (dev, true);pm_runtime_set_active (dev);pm_runtime_enable (dev); -pm_runtime_forbid (dev); +if (!(cdns->pdata->quirks &CDNS3_DEFAULT_PM_RUNTIME_ALLOW )) +pm_runtime_forbid (dev);/* * The controller needs less time between bus and controller suspend,
drivers/usb/cdns3/core.h +4 -0
@@ -42,6 +42,8 @@ struct cdns3_role_driver {struct cdns3_platform_data {int (*platform_suspend)(struct device *dev,bool suspend,bool wakeup); +unsigned long quirks; +#define CDNS3_DEFAULT_PM_RUNTIME_ALLOW BIT(0) };/**
@@ -73,6 +75,7 @@ struct cdns3_platform_data {* @wakeup_pending: wakeup interrupt pending * @pdata: platform data from glue layer * @lock: spinlock structure +* @xhci_plat_data: xhci private data structure pointer */ struct cdns3 {struct device *dev;
@@ -106,6 +109,7 @@ struct cdns3 {bool wakeup_pending;struct cdns3_platform_data *pdata;spinlock_t lock; +struct xhci_plat_priv *xhci_plat_data; };int cdns3_hw_role_switch (struct cdns3 *cdns);
drivers/usb/cdns3/host.c +17 -3
@@ -52,15 +52,25 @@ static int __cdns3_host_init(struct cdns3 *cdns) goto err1; } - ret =platform_device_add_data (xhci, &xhci_plat_cdns3_xhci, + cdns->xhci_plat_data =kmemdup (&xhci_plat_cdns3_xhci, +sizeof (struct xhci_plat_priv ),GFP_KERNEL ); +if (!cdns->xhci_plat_data) { + ret = -ENOMEM ; + goto err1; + } + +if (cdns->pdata->quirks &CDNS3_DEFAULT_PM_RUNTIME_ALLOW ) + cdns->xhci_plat_data->quirks |=XHCI_DEFAULT_PM_RUNTIME_ALLOW ; + + ret =platform_device_add_data (xhci, cdns->xhci_plat_data,sizeof (struct xhci_plat_priv ));if (ret) - goto err1; + goto free_memory; ret =platform_device_add (xhci);if (ret) {dev_err (cdns->dev,"failed to register xHCI device\n" ); - goto err1; + goto free_memory; }/* Glue needs to access xHCI region register for Power management */
@@ -69,6 +79,9 @@ static int __cdns3_host_init(struct cdns3 *cdns) cdns->xhci_regs = hcd->regs;return 0 ; + +free_memory: +kfree (cdns->xhci_plat_data); err1:platform_device_put (xhci);return ret;
@@ -102,6 +115,7 @@ int xhci_cdns3_suspend_quirk(struct usb_hcd *hcd)static void cdns3_host_exit (struct cdns3 *cdns) { +kfree (cdns->xhci_plat_data);platform_device_unregister (cdns->host_dev); cdns->host_dev =NULL ;cdns3_drd_host_off (cdns);
Signature · 1 line
2.17.1
PATCH 5/6 usb: cdns3: imx: enable runtime pm by default
In reply to Peter ChenEnable runtime pm by default
--- drivers/usb/cdns3/cdns3-imx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/usb/cdns3/cdns3-imx.c +1 -1
@@ -151,6 +151,7 @@ static int cdns_imx_platform_suspend(struct device *dev, bool suspend, bool wakeup);static struct cdns3_platform_data cdns_imx_pdata = { .platform_suspend = cdns_imx_platform_suspend, + .quirks =CDNS3_DEFAULT_PM_RUNTIME_ALLOW , };static const struct of_dev_auxdata cdns_imx_auxdata[] = {
@@ -206,7 +207,6 @@ static int cdns_imx_probe(struct platform_device *pdev)device_set_wakeup_capable (dev, true);pm_runtime_set_active (dev);pm_runtime_enable (dev); -pm_runtime_forbid (dev);return ret; err:
Signature · 1 line
2.17.1