usb: cdns3: add quirk for enable runtime pm by default

[ Upstream commit 7cea9657756b2c83069a775c0671ff169bce456a ]

Some vendors (eg: NXP) may want to enable runtime pm by default for
power saving, add one quirk for it.

Reviewed-by: Jun Li <jun.li@nxp.com>
Signed-off-by: Peter Chen <peter.chen@nxp.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/usb/cdns3/core.c b/drivers/usb/cdns3/core.c
index 039ab5d..29affbf 100644 (file)
--- a/drivers/usb/cdns3/core.c
+++ b/drivers/usb/cdns3/core.c
@@ -569,7 +569,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,

diff --git a/drivers/usb/cdns3/core.h b/drivers/usb/cdns3/core.h
index 8a40d53..3176f92 100644 (file)
--- a/drivers/usb/cdns3/core.h
+++ b/drivers/usb/cdns3/core.h
@@ -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);

diff --git a/drivers/usb/cdns3/host.c b/drivers/usb/cdns3/host.c
index f847393..c3b29a9 100644 (file)
--- a/drivers/usb/cdns3/host.c
+++ b/drivers/usb/cdns3/host.c
@@ -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);