From: Pawel Laszczak <pawell@cadence.com>
To: Peter Chen <peter.chen@nxp.com>,
"balbi@kernel.org" <balbi@kernel.org>,
"mathias.nyman@intel.com" <mathias.nyman@intel.com>,
"gregkh@linuxfoundation.org" <gregkh@linuxfoundation.org>
Cc: "linux-usb@vger.kernel.org" <linux-usb@vger.kernel.org>,
"linux-imx@nxp.com" <linux-imx@nxp.com>,
"rogerq@ti.com" <rogerq@ti.com>,
"jun.li@nxp.com" <jun.li@nxp.com>
Subject: RE: [PATCH v5 3/9] usb: cdns3: imx: add glue layer runtime pm implementation
Date: Thu, 13 Aug 2020 13:20:44 +0000 [thread overview]
Message-ID: <DM6PR07MB5529C3F25DC7498D2AF850D9DD430@DM6PR07MB5529.namprd07.prod.outlook.com> (raw)
In-Reply-To: <20200707074941.28078-4-peter.chen@nxp.com>
>
>Add imx glue layer runtime pm implementation, and the runtime
>pm is default off.
>
>Signed-off-by: Peter Chen <peter.chen@nxp.com>
Reviewed-by: Pawel Laszczak <pawell@cadence.com>
>---
> drivers/usb/cdns3/cdns3-imx.c | 203 ++++++++++++++++++++++++++++++++--
> 1 file changed, 192 insertions(+), 11 deletions(-)
>
>diff --git a/drivers/usb/cdns3/cdns3-imx.c b/drivers/usb/cdns3/cdns3-imx.c
>index aba988e71958..5d2a4e19fa83 100644
>--- a/drivers/usb/cdns3/cdns3-imx.c
>+++ b/drivers/usb/cdns3/cdns3-imx.c
>@@ -15,6 +15,8 @@
> #include <linux/io.h>
> #include <linux/of_platform.h>
> #include <linux/iopoll.h>
>+#include <linux/pm_runtime.h>
>+#include "core.h"
>
> #define USB3_CORE_CTRL1 0x00
> #define USB3_CORE_CTRL2 0x04
>@@ -32,7 +34,7 @@
> /* Register bits definition */
>
> /* USB3_CORE_CTRL1 */
>-#define SW_RESET_MASK (0x3f << 26)
>+#define SW_RESET_MASK GENMASK(31, 26)
> #define PWR_SW_RESET BIT(31)
> #define APB_SW_RESET BIT(30)
> #define AXI_SW_RESET BIT(29)
>@@ -44,17 +46,17 @@
> #define OC_DISABLE BIT(9)
> #define MDCTRL_CLK_SEL BIT(7)
> #define MODE_STRAP_MASK (0x7)
>-#define DEV_MODE (1 << 2)
>-#define HOST_MODE (1 << 1)
>-#define OTG_MODE (1 << 0)
>+#define DEV_MODE BIT(2)
>+#define HOST_MODE BIT(1)
>+#define OTG_MODE BIT(0)
>
> /* USB3_INT_REG */
> #define CLK_125_REQ BIT(29)
> #define LPM_CLK_REQ BIT(28)
> #define DEVU3_WAEKUP_EN BIT(14)
> #define OTG_WAKEUP_EN BIT(12)
>-#define DEV_INT_EN (3 << 8) /* DEV INT b9:8 */
>-#define HOST_INT1_EN (1 << 0) /* HOST INT b7:0 */
>+#define DEV_INT_EN GENMASK(9, 8) /* DEV INT b9:8 */
>+#define HOST_INT1_EN BIT(0) /* HOST INT b7:0 */
>
> /* USB3_CORE_STATUS */
> #define MDCTRL_CLK_STATUS BIT(15)
>@@ -62,15 +64,34 @@
> #define HOST_POWER_ON_READY BIT(12)
>
> /* USB3_SSPHY_STATUS */
>-#define CLK_VALID_MASK (0x3f << 26)
>-#define CLK_VALID_COMPARE_BITS (0xf << 28)
>-#define PHY_REFCLK_REQ (1 << 0)
>+#define CLK_VALID_MASK GENMASK(31, 26)
>+#define CLK_VALID_COMPARE_BITS GENMASK(31, 28)
>+#define PHY_REFCLK_REQ BIT(0)
>+
>+/* OTG registers definition */
>+#define OTGSTS 0x4
>+/* OTGSTS */
>+#define OTG_NRDY BIT(11)
>+
>+/* xHCI registers definition */
>+#define XECP_PM_PMCSR 0x8018
>+#define XECP_AUX_CTRL_REG1 0x8120
>+
>+/* Register bits definition */
>+/* XECP_AUX_CTRL_REG1 */
>+#define CFG_RXDET_P3_EN BIT(15)
>+
>+/* XECP_PM_PMCSR */
>+#define PS_MASK GENMASK(1, 0)
>+#define PS_D0 0
>+#define PS_D1 1
>
> struct cdns_imx {
> struct device *dev;
> void __iomem *noncore;
> struct clk_bulk_data *clks;
> int num_clks;
>+ struct platform_device *cdns3_pdev;
> };
>
> static inline u32 cdns_imx_readl(struct cdns_imx *data, u32 offset)
>@@ -126,6 +147,20 @@ static int cdns_imx_noncore_init(struct cdns_imx *data)
> return ret;
> }
>
>+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,
>+};
>+
>+static struct of_dev_auxdata cdns_imx_auxdata[] = {
>+ {
>+ .compatible = "cdns,usb3",
>+ .platform_data = &cdns_imx_pdata,
>+ },
>+ {},
>+};
>+
> static int cdns_imx_probe(struct platform_device *pdev)
> {
> struct device *dev = &pdev->dev;
>@@ -162,14 +197,18 @@ static int cdns_imx_probe(struct platform_device *pdev)
> if (ret)
> goto err;
>
>- ret = of_platform_populate(node, NULL, NULL, dev);
>+ ret = of_platform_populate(node, NULL, cdns_imx_auxdata, dev);
> if (ret) {
> dev_err(dev, "failed to create children: %d\n", ret);
> goto err;
> }
>
>- return ret;
>+ device_set_wakeup_capable(dev, true);
>+ pm_runtime_set_active(dev);
>+ pm_runtime_enable(dev);
>+ pm_runtime_forbid(dev);
>
>+ return ret;
> err:
> clk_bulk_disable_unprepare(data->num_clks, data->clks);
> return ret;
>@@ -194,6 +233,147 @@ static int cdns_imx_remove(struct platform_device *pdev)
> return 0;
> }
>
>+#ifdef CONFIG_PM
>+static void cdns3_set_wakeup(struct cdns_imx *data, bool enable)
>+{
>+ u32 value;
>+
>+ value = cdns_imx_readl(data, USB3_INT_REG);
>+ if (enable)
>+ value |= OTG_WAKEUP_EN | DEVU3_WAEKUP_EN;
>+ else
>+ value &= ~(OTG_WAKEUP_EN | DEVU3_WAEKUP_EN);
>+
>+ cdns_imx_writel(data, USB3_INT_REG, value);
>+}
>+
>+static int cdns_imx_platform_suspend(struct device *dev,
>+ bool suspend, bool wakeup)
>+{
>+ struct cdns3 *cdns = dev_get_drvdata(dev);
>+ struct device *parent = dev->parent;
>+ struct cdns_imx *data = dev_get_drvdata(parent);
>+ void __iomem *otg_regs = (void *)(cdns->otg_regs);
>+ void __iomem *xhci_regs = cdns->xhci_regs;
>+ u32 value;
>+ int ret = 0;
>+
>+ if (cdns->role != USB_ROLE_HOST)
>+ return 0;
>+
>+ if (suspend) {
>+ /* SW request low power when all usb ports allow to it ??? */
>+ value = readl(xhci_regs + XECP_PM_PMCSR);
>+ value &= ~PS_MASK;
>+ value |= PS_D1;
>+ writel(value, xhci_regs + XECP_PM_PMCSR);
>+
>+ /* mdctrl_clk_sel */
>+ value = cdns_imx_readl(data, USB3_CORE_CTRL1);
>+ value |= MDCTRL_CLK_SEL;
>+ cdns_imx_writel(data, USB3_CORE_CTRL1, value);
>+
>+ /* wait for mdctrl_clk_status */
>+ value = cdns_imx_readl(data, USB3_CORE_STATUS);
>+ ret = readl_poll_timeout(data->noncore + USB3_CORE_STATUS, value,
>+ (value & MDCTRL_CLK_STATUS) == MDCTRL_CLK_STATUS,
>+ 10, 100000);
>+ if (ret)
>+ dev_warn(parent, "wait mdctrl_clk_status timeout\n");
>+
>+ /* wait lpm_clk_req to be 0 */
>+ value = cdns_imx_readl(data, USB3_INT_REG);
>+ ret = readl_poll_timeout(data->noncore + USB3_INT_REG, value,
>+ (value & LPM_CLK_REQ) != LPM_CLK_REQ,
>+ 10, 100000);
>+ if (ret)
>+ dev_warn(parent, "wait lpm_clk_req timeout\n");
>+
>+ /* wait phy_refclk_req to be 0 */
>+ value = cdns_imx_readl(data, USB3_SSPHY_STATUS);
>+ ret = readl_poll_timeout(data->noncore + USB3_SSPHY_STATUS, value,
>+ (value & PHY_REFCLK_REQ) != PHY_REFCLK_REQ,
>+ 10, 100000);
>+ if (ret)
>+ dev_warn(parent, "wait phy_refclk_req timeout\n");
>+
>+ cdns3_set_wakeup(data, wakeup);
>+ } else {
>+ cdns3_set_wakeup(data, false);
>+
>+ /* SW request D0 */
>+ value = readl(xhci_regs + XECP_PM_PMCSR);
>+ value &= ~PS_MASK;
>+ value |= PS_D0;
>+ writel(value, xhci_regs + XECP_PM_PMCSR);
>+
>+ /* clr CFG_RXDET_P3_EN */
>+ value = readl(xhci_regs + XECP_AUX_CTRL_REG1);
>+ value &= ~CFG_RXDET_P3_EN;
>+ writel(value, xhci_regs + XECP_AUX_CTRL_REG1);
>+
>+ /* clear mdctrl_clk_sel */
>+ value = cdns_imx_readl(data, USB3_CORE_CTRL1);
>+ value &= ~MDCTRL_CLK_SEL;
>+ cdns_imx_writel(data, USB3_CORE_CTRL1, value);
>+
>+ /* wait CLK_125_REQ to be 1 */
>+ value = cdns_imx_readl(data, USB3_INT_REG);
>+ ret = readl_poll_timeout(data->noncore + USB3_INT_REG, value,
>+ (value & CLK_125_REQ) == CLK_125_REQ,
>+ 10, 100000);
>+ if (ret)
>+ dev_warn(parent, "wait CLK_125_REQ timeout\n");
>+
>+ /* wait for mdctrl_clk_status is cleared */
>+ value = cdns_imx_readl(data, USB3_CORE_STATUS);
>+ ret = readl_poll_timeout(data->noncore + USB3_CORE_STATUS, value,
>+ (value & MDCTRL_CLK_STATUS) != MDCTRL_CLK_STATUS,
>+ 10, 100000);
>+ if (ret)
>+ dev_warn(parent, "wait mdctrl_clk_status cleared timeout\n");
>+
>+ /* Wait until OTG_NRDY is 0 */
>+ value = readl(otg_regs + OTGSTS);
>+ ret = readl_poll_timeout(otg_regs + OTGSTS, value,
>+ (value & OTG_NRDY) != OTG_NRDY,
>+ 10, 100000);
>+ if (ret)
>+ dev_warn(parent, "wait OTG ready timeout\n");
>+ }
>+
>+ return ret;
>+
>+}
>+
>+static int cdns_imx_resume(struct device *dev)
>+{
>+ struct cdns_imx *data = dev_get_drvdata(dev);
>+
>+ return clk_bulk_prepare_enable(data->num_clks, data->clks);
>+}
>+
>+static int cdns_imx_suspend(struct device *dev)
>+{
>+ struct cdns_imx *data = dev_get_drvdata(dev);
>+
>+ clk_bulk_disable_unprepare(data->num_clks, data->clks);
>+
>+ return 0;
>+}
>+#else
>+static int cdns_imx_platform_suspend(struct device *dev,
>+ bool suspend, bool wakeup)
>+{
>+ return 0;
>+}
>+
>+#endif /* CONFIG_PM */
>+
>+static const struct dev_pm_ops cdns_imx_pm_ops = {
>+ SET_RUNTIME_PM_OPS(cdns_imx_suspend, cdns_imx_resume, NULL)
>+};
>+
> static const struct of_device_id cdns_imx_of_match[] = {
> { .compatible = "fsl,imx8qm-usb3", },
> {},
>@@ -206,6 +386,7 @@ static struct platform_driver cdns_imx_driver = {
> .driver = {
> .name = "cdns3-imx",
> .of_match_table = cdns_imx_of_match,
>+ .pm = &cdns_imx_pm_ops,
> },
> };
> module_platform_driver(cdns_imx_driver);
>--
>2.17.1
next prev parent reply other threads:[~2020-08-13 13:21 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-07 7:49 [PATCH v5 0/9] usb: some PM changes for cdns3 and xhci-plat Peter Chen
2020-07-07 7:49 ` [PATCH v5 1/9] usb: cdns3: introduce set_phy_power_on{off} APIs Peter Chen
2020-08-13 12:09 ` Pawel Laszczak
2020-08-14 5:29 ` Peter Chen
2020-07-07 7:49 ` [PATCH v5 2/9] usb: cdns3: add runtime PM support Peter Chen
2020-08-13 13:10 ` Pawel Laszczak
2020-07-07 7:49 ` [PATCH v5 3/9] usb: cdns3: imx: add glue layer runtime pm implementation Peter Chen
2020-08-13 13:20 ` Pawel Laszczak [this message]
2020-07-07 7:49 ` [PATCH v5 4/9] usb: host: xhci-plat: add platform data support Peter Chen
2020-07-07 7:49 ` [PATCH v5 5/9] usb: host: xhci-plat: add .suspend_quirk for struct xhci_plat_priv Peter Chen
2020-07-07 7:49 ` [PATCH v5 6/9] usb: host: xhci-plat: delete the unnecessary code Peter Chen
2020-07-07 7:49 ` [PATCH v5 7/9] usb: host: xhci-plat: add priv quirk for skip PHY initialization Peter Chen
2020-07-24 6:24 ` Peter Chen
2020-07-07 7:49 ` [PATCH v5 8/9] usb: cdns3: host: add .suspend_quirk for xhci-plat.c Peter Chen
2020-08-17 4:39 ` Pawel Laszczak
2020-07-07 7:49 ` [PATCH v5 9/9] usb: cdns3: host: add xhci_plat_priv quirk XHCI_SKIP_PHY_INIT Peter Chen
2020-08-17 4:37 ` Pawel Laszczak
2020-07-17 6:13 ` [PATCH v5 0/9] usb: some PM changes for cdns3 and xhci-plat Peter Chen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=DM6PR07MB5529C3F25DC7498D2AF850D9DD430@DM6PR07MB5529.namprd07.prod.outlook.com \
--to=pawell@cadence.com \
--cc=balbi@kernel.org \
--cc=gregkh@linuxfoundation.org \
--cc=jun.li@nxp.com \
--cc=linux-imx@nxp.com \
--cc=linux-usb@vger.kernel.org \
--cc=mathias.nyman@intel.com \
--cc=peter.chen@nxp.com \
--cc=rogerq@ti.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.