* [PATCH 0/2] TI AM64/J7: USB Errata i2409 workaround @ 2024-05-14 9:24 Ravi Gunasekaran 2024-05-14 9:24 ` [PATCH 1/2] usb: cdns3: Add quirk flag to enable suspend residency Ravi Gunasekaran 2024-05-14 9:24 ` [PATCH 2/2] usb: cdns3-ti: Add workaround for Errata i2409 Ravi Gunasekaran 0 siblings, 2 replies; 6+ messages in thread From: Ravi Gunasekaran @ 2024-05-14 9:24 UTC (permalink / raw) To: peter.chen, pawell, rogerq, r-gunasekaran; +Cc: gregkh, linux-usb, linux-kernel This series adds workaround for all TI platforms using cdns3,usb IP. i.e. AM64/J7x Roger Quadros (2): usb: cdns3: Add quirk flag to enable suspend residency usb: cdns3-ti: Add workaround for Errata i2409 drivers/usb/cdns3/cdns3-ti.c | 15 ++++++++++++++- drivers/usb/cdns3/core.h | 1 + drivers/usb/cdns3/drd.c | 9 ++++++++- drivers/usb/cdns3/drd.h | 3 +++ 4 files changed, 26 insertions(+), 2 deletions(-) base-commit: 6ba6c795dc73c22ce2c86006f17c4aa802db2a60 -- 2.17.1 ^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 1/2] usb: cdns3: Add quirk flag to enable suspend residency 2024-05-14 9:24 [PATCH 0/2] TI AM64/J7: USB Errata i2409 workaround Ravi Gunasekaran @ 2024-05-14 9:24 ` Ravi Gunasekaran 2024-05-15 1:38 ` Peter Chen 2024-05-14 9:24 ` [PATCH 2/2] usb: cdns3-ti: Add workaround for Errata i2409 Ravi Gunasekaran 1 sibling, 1 reply; 6+ messages in thread From: Ravi Gunasekaran @ 2024-05-14 9:24 UTC (permalink / raw) To: peter.chen, pawell, rogerq, r-gunasekaran; +Cc: gregkh, linux-usb, linux-kernel From: Roger Quadros <rogerq@kernel.org> Some platforms (e.g. ti,j721e-usb, ti,am64-usb) require this bit to be set to workaround a lockup issue with PHY short suspend intervals [1]. Add a platform quirk flag to indicate if Suspend Residency should be enabled. [1] - https://www.ti.com/lit/er/sprz457h/sprz457h.pdf i2409 - USB: USB2 PHY locks up due to short suspend Signed-off-by: Roger Quadros <rogerq@kernel.org> Signed-off-by: Ravi Gunasekaran <r-gunasekaran@ti.com> --- drivers/usb/cdns3/core.h | 1 + drivers/usb/cdns3/drd.c | 9 ++++++++- drivers/usb/cdns3/drd.h | 3 +++ 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/drivers/usb/cdns3/core.h b/drivers/usb/cdns3/core.h index 81a9c9d6be08..57d47348dc19 100644 --- a/drivers/usb/cdns3/core.h +++ b/drivers/usb/cdns3/core.h @@ -44,6 +44,7 @@ struct cdns3_platform_data { bool suspend, bool wakeup); unsigned long quirks; #define CDNS3_DEFAULT_PM_RUNTIME_ALLOW BIT(0) +#define CDNS3_DRD_SUSPEND_RESIDENCY_ENABLE BIT(1) }; /** diff --git a/drivers/usb/cdns3/drd.c b/drivers/usb/cdns3/drd.c index 8b936a2e93a0..de0d25a072b4 100644 --- a/drivers/usb/cdns3/drd.c +++ b/drivers/usb/cdns3/drd.c @@ -389,7 +389,7 @@ static irqreturn_t cdns_drd_irq(int irq, void *data) int cdns_drd_init(struct cdns *cdns) { void __iomem *regs; - u32 state; + u32 state, reg; int ret; regs = devm_ioremap_resource(cdns->dev, &cdns->otg_res); @@ -439,6 +439,13 @@ int cdns_drd_init(struct cdns *cdns) return -EINVAL; } + if (cdns->pdata && + (cdns->pdata->quirks & CDNS3_DRD_SUSPEND_RESIDENCY_ENABLE)) { + reg = readl(&cdns->otg_v1_regs->susp_ctrl); + reg |= SUSP_CTRL_SUSPEND_RESIDENCY_ENABLE; + writel(reg, &cdns->otg_v1_regs->susp_ctrl); + } + dev_dbg(cdns->dev, "DRD version v1 (ID: %08x, rev: %08x)\n", readl(&cdns->otg_v1_regs->did), readl(&cdns->otg_v1_regs->rid)); diff --git a/drivers/usb/cdns3/drd.h b/drivers/usb/cdns3/drd.h index d72370c321d3..1e2aee14d629 100644 --- a/drivers/usb/cdns3/drd.h +++ b/drivers/usb/cdns3/drd.h @@ -193,6 +193,9 @@ struct cdns_otg_irq_regs { /* OTGREFCLK - bitmasks */ #define OTGREFCLK_STB_CLK_SWITCH_EN BIT(31) +/* SUPS_CTRL - bitmasks */ +#define SUSP_CTRL_SUSPEND_RESIDENCY_ENABLE BIT(17) + /* OVERRIDE - bitmasks */ #define OVERRIDE_IDPULLUP BIT(0) /* Only for CDNS3_CONTROLLER_V0 version */ -- 2.17.1 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH 1/2] usb: cdns3: Add quirk flag to enable suspend residency 2024-05-14 9:24 ` [PATCH 1/2] usb: cdns3: Add quirk flag to enable suspend residency Ravi Gunasekaran @ 2024-05-15 1:38 ` Peter Chen 2024-05-15 4:22 ` Ravi Gunasekaran 0 siblings, 1 reply; 6+ messages in thread From: Peter Chen @ 2024-05-15 1:38 UTC (permalink / raw) To: Ravi Gunasekaran; +Cc: pawell, rogerq, gregkh, linux-usb, linux-kernel On 24-05-14 14:54:20, Ravi Gunasekaran wrote: > From: Roger Quadros <rogerq@kernel.org> > > Some platforms (e.g. ti,j721e-usb, ti,am64-usb) require > this bit to be set to workaround a lockup issue with PHY > short suspend intervals [1]. Add a platform quirk flag > to indicate if Suspend Residency should be enabled. > > [1] - https://www.ti.com/lit/er/sprz457h/sprz457h.pdf > i2409 - USB: USB2 PHY locks up due to short suspend > > Signed-off-by: Roger Quadros <rogerq@kernel.org> > Signed-off-by: Ravi Gunasekaran <r-gunasekaran@ti.com> > --- > drivers/usb/cdns3/core.h | 1 + > drivers/usb/cdns3/drd.c | 9 ++++++++- > drivers/usb/cdns3/drd.h | 3 +++ > 3 files changed, 12 insertions(+), 1 deletion(-) > > diff --git a/drivers/usb/cdns3/core.h b/drivers/usb/cdns3/core.h > index 81a9c9d6be08..57d47348dc19 100644 > --- a/drivers/usb/cdns3/core.h > +++ b/drivers/usb/cdns3/core.h > @@ -44,6 +44,7 @@ struct cdns3_platform_data { > bool suspend, bool wakeup); > unsigned long quirks; > #define CDNS3_DEFAULT_PM_RUNTIME_ALLOW BIT(0) > +#define CDNS3_DRD_SUSPEND_RESIDENCY_ENABLE BIT(1) > }; > > /** > diff --git a/drivers/usb/cdns3/drd.c b/drivers/usb/cdns3/drd.c > index 8b936a2e93a0..de0d25a072b4 100644 > --- a/drivers/usb/cdns3/drd.c > +++ b/drivers/usb/cdns3/drd.c > @@ -389,7 +389,7 @@ static irqreturn_t cdns_drd_irq(int irq, void *data) > int cdns_drd_init(struct cdns *cdns) > { > void __iomem *regs; > - u32 state; > + u32 state, reg; > int ret; > > regs = devm_ioremap_resource(cdns->dev, &cdns->otg_res); > @@ -439,6 +439,13 @@ int cdns_drd_init(struct cdns *cdns) > return -EINVAL; > } > > + if (cdns->pdata && > + (cdns->pdata->quirks & CDNS3_DRD_SUSPEND_RESIDENCY_ENABLE)) { > + reg = readl(&cdns->otg_v1_regs->susp_ctrl); > + reg |= SUSP_CTRL_SUSPEND_RESIDENCY_ENABLE; > + writel(reg, &cdns->otg_v1_regs->susp_ctrl); > + } > + It is better put this above (just above code cdns->version = CDNS3_CONTROLLER_V1;) Peter > dev_dbg(cdns->dev, "DRD version v1 (ID: %08x, rev: %08x)\n", > readl(&cdns->otg_v1_regs->did), > readl(&cdns->otg_v1_regs->rid)); > diff --git a/drivers/usb/cdns3/drd.h b/drivers/usb/cdns3/drd.h > index d72370c321d3..1e2aee14d629 100644 > --- a/drivers/usb/cdns3/drd.h > +++ b/drivers/usb/cdns3/drd.h > @@ -193,6 +193,9 @@ struct cdns_otg_irq_regs { > /* OTGREFCLK - bitmasks */ > #define OTGREFCLK_STB_CLK_SWITCH_EN BIT(31) > > +/* SUPS_CTRL - bitmasks */ > +#define SUSP_CTRL_SUSPEND_RESIDENCY_ENABLE BIT(17) > + > /* OVERRIDE - bitmasks */ > #define OVERRIDE_IDPULLUP BIT(0) > /* Only for CDNS3_CONTROLLER_V0 version */ > -- > 2.17.1 > -- Thanks, Peter Chen ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 1/2] usb: cdns3: Add quirk flag to enable suspend residency 2024-05-15 1:38 ` Peter Chen @ 2024-05-15 4:22 ` Ravi Gunasekaran 2024-05-16 1:39 ` Peter Chen 0 siblings, 1 reply; 6+ messages in thread From: Ravi Gunasekaran @ 2024-05-15 4:22 UTC (permalink / raw) To: Peter Chen Cc: pawell, rogerq, gregkh, linux-usb, linux-kernel, Ravi Gunasekaran On 5/15/24 7:08 AM, Peter Chen wrote: > On 24-05-14 14:54:20, Ravi Gunasekaran wrote: >> From: Roger Quadros <rogerq@kernel.org> >> >> Some platforms (e.g. ti,j721e-usb, ti,am64-usb) require >> this bit to be set to workaround a lockup issue with PHY >> short suspend intervals [1]. Add a platform quirk flag >> to indicate if Suspend Residency should be enabled. >> >> [1] - https://www.ti.com/lit/er/sprz457h/sprz457h.pdf >> i2409 - USB: USB2 PHY locks up due to short suspend >> >> Signed-off-by: Roger Quadros <rogerq@kernel.org> >> Signed-off-by: Ravi Gunasekaran <r-gunasekaran@ti.com> >> --- [...] >> regs = devm_ioremap_resource(cdns->dev, &cdns->otg_res); >> @@ -439,6 +439,13 @@ int cdns_drd_init(struct cdns *cdns) >> return -EINVAL; >> } >> >> + if (cdns->pdata && >> + (cdns->pdata->quirks & CDNS3_DRD_SUSPEND_RESIDENCY_ENABLE)) { >> + reg = readl(&cdns->otg_v1_regs->susp_ctrl); >> + reg |= SUSP_CTRL_SUSPEND_RESIDENCY_ENABLE; >> + writel(reg, &cdns->otg_v1_regs->susp_ctrl); >> + } >> + > > It is better put this above (just above code cdns->version = > CDNS3_CONTROLLER_V1;) > You mean here, to group it with CDNS3 v1? else if (OTG_CDNS3_CHECK_DID(state)) { cdns->otg_irq_regs = (struct cdns_otg_irq_regs __iomem *) &cdns->otg_v1_regs->ien; writel(1, &cdns->otg_v1_regs->simulate); + if (cdns->pdata && + (cdns->pdata->quirks & CDNS3_DRD_SUSPEND_RESIDENCY_ENABLE)) { + reg = readl(&cdns->otg_v1_regs->susp_ctrl); + reg |= SUSP_CTRL_SUSPEND_RESIDENCY_ENABLE; + writel(reg, &cdns->otg_v1_regs->susp_ctrl); + } dns->version = CDNS3_CONTROLLER_V1; } else > Peter >> dev_dbg(cdns->dev, "DRD version v1 (ID: %08x, rev: %08x)\n", >> readl(&cdns->otg_v1_regs->did), >> readl(&cdns->otg_v1_regs->rid)); >> diff --git a/drivers/usb/cdns3/drd.h b/drivers/usb/cdns3/drd.h >> index d72370c321d3..1e2aee14d629 100644 >> --- a/drivers/usb/cdns3/drd.h >> +++ b/drivers/usb/cdns3/drd.h >> @@ -193,6 +193,9 @@ struct cdns_otg_irq_regs { >> /* OTGREFCLK - bitmasks */ >> #define OTGREFCLK_STB_CLK_SWITCH_EN BIT(31) >> >> +/* SUPS_CTRL - bitmasks */ >> +#define SUSP_CTRL_SUSPEND_RESIDENCY_ENABLE BIT(17) >> + >> /* OVERRIDE - bitmasks */ >> #define OVERRIDE_IDPULLUP BIT(0) >> /* Only for CDNS3_CONTROLLER_V0 version */ >> -- >> 2.17.1 >> > -- Regards, Ravi ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 1/2] usb: cdns3: Add quirk flag to enable suspend residency 2024-05-15 4:22 ` Ravi Gunasekaran @ 2024-05-16 1:39 ` Peter Chen 0 siblings, 0 replies; 6+ messages in thread From: Peter Chen @ 2024-05-16 1:39 UTC (permalink / raw) To: Ravi Gunasekaran; +Cc: pawell, rogerq, gregkh, linux-usb, linux-kernel On 24-05-15 09:52:57, Ravi Gunasekaran wrote: > > > On 5/15/24 7:08 AM, Peter Chen wrote: > > On 24-05-14 14:54:20, Ravi Gunasekaran wrote: > >> From: Roger Quadros <rogerq@kernel.org> > >> > >> Some platforms (e.g. ti,j721e-usb, ti,am64-usb) require > >> this bit to be set to workaround a lockup issue with PHY > >> short suspend intervals [1]. Add a platform quirk flag > >> to indicate if Suspend Residency should be enabled. > >> > >> [1] - https://www.ti.com/lit/er/sprz457h/sprz457h.pdf > >> i2409 - USB: USB2 PHY locks up due to short suspend > >> > >> Signed-off-by: Roger Quadros <rogerq@kernel.org> > >> Signed-off-by: Ravi Gunasekaran <r-gunasekaran@ti.com> > >> --- > > [...] > > >> regs = devm_ioremap_resource(cdns->dev, &cdns->otg_res); > >> @@ -439,6 +439,13 @@ int cdns_drd_init(struct cdns *cdns) > >> return -EINVAL; > >> } > >> > >> + if (cdns->pdata && > >> + (cdns->pdata->quirks & CDNS3_DRD_SUSPEND_RESIDENCY_ENABLE)) { > >> + reg = readl(&cdns->otg_v1_regs->susp_ctrl); > >> + reg |= SUSP_CTRL_SUSPEND_RESIDENCY_ENABLE; > >> + writel(reg, &cdns->otg_v1_regs->susp_ctrl); > >> + } > >> + > > > > It is better put this above (just above code cdns->version = > > CDNS3_CONTROLLER_V1;) > > > > You mean here, to group it with CDNS3 v1? > > else if (OTG_CDNS3_CHECK_DID(state)) { > cdns->otg_irq_regs = (struct cdns_otg_irq_regs __iomem *) > &cdns->otg_v1_regs->ien; > writel(1, &cdns->otg_v1_regs->simulate); > > + if (cdns->pdata && > + (cdns->pdata->quirks & CDNS3_DRD_SUSPEND_RESIDENCY_ENABLE)) { > + reg = readl(&cdns->otg_v1_regs->susp_ctrl); > + reg |= SUSP_CTRL_SUSPEND_RESIDENCY_ENABLE; > + writel(reg, &cdns->otg_v1_regs->susp_ctrl); > + } > dns->version = CDNS3_CONTROLLER_V1; Yes. Peter > } else > > > Peter > >> dev_dbg(cdns->dev, "DRD version v1 (ID: %08x, rev: %08x)\n", > >> readl(&cdns->otg_v1_regs->did), > >> readl(&cdns->otg_v1_regs->rid)); > >> diff --git a/drivers/usb/cdns3/drd.h b/drivers/usb/cdns3/drd.h > >> index d72370c321d3..1e2aee14d629 100644 > >> --- a/drivers/usb/cdns3/drd.h > >> +++ b/drivers/usb/cdns3/drd.h > >> @@ -193,6 +193,9 @@ struct cdns_otg_irq_regs { > >> /* OTGREFCLK - bitmasks */ > >> #define OTGREFCLK_STB_CLK_SWITCH_EN BIT(31) > >> > >> +/* SUPS_CTRL - bitmasks */ > >> +#define SUSP_CTRL_SUSPEND_RESIDENCY_ENABLE BIT(17) > >> + > >> /* OVERRIDE - bitmasks */ > >> #define OVERRIDE_IDPULLUP BIT(0) > >> /* Only for CDNS3_CONTROLLER_V0 version */ > >> -- > >> 2.17.1 > >> > > > > -- > Regards, > Ravi -- Thanks, Peter Chen ^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 2/2] usb: cdns3-ti: Add workaround for Errata i2409 2024-05-14 9:24 [PATCH 0/2] TI AM64/J7: USB Errata i2409 workaround Ravi Gunasekaran 2024-05-14 9:24 ` [PATCH 1/2] usb: cdns3: Add quirk flag to enable suspend residency Ravi Gunasekaran @ 2024-05-14 9:24 ` Ravi Gunasekaran 1 sibling, 0 replies; 6+ messages in thread From: Ravi Gunasekaran @ 2024-05-14 9:24 UTC (permalink / raw) To: peter.chen, pawell, rogerq, r-gunasekaran; +Cc: gregkh, linux-usb, linux-kernel From: Roger Quadros <rogerq@kernel.org> TI USB2 PHY is known to have a lockup issue on very short suspend intervals. Enable the Suspend Residency quirk flag to workaround this as described in Errata i2409 [1]. [1] - https://www.ti.com/lit/er/sprz457h/sprz457h.pdf Signed-off-by: Roger Quadros <rogerq@kernel.org> Signed-off-by: Ravi Gunasekaran <r-gunasekaran@ti.com> --- drivers/usb/cdns3/cdns3-ti.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/drivers/usb/cdns3/cdns3-ti.c b/drivers/usb/cdns3/cdns3-ti.c index 5945c4b1e11f..cfabc12ee0e3 100644 --- a/drivers/usb/cdns3/cdns3-ti.c +++ b/drivers/usb/cdns3/cdns3-ti.c @@ -16,6 +16,7 @@ #include <linux/of_platform.h> #include <linux/pm_runtime.h> #include <linux/property.h> +#include "core.h" /* USB Wrapper register offsets */ #define USBSS_PID 0x0 @@ -85,6 +86,18 @@ static inline void cdns_ti_writel(struct cdns_ti *data, u32 offset, u32 value) writel(value, data->usbss + offset); } +static struct cdns3_platform_data cdns_ti_pdata = { + .quirks = CDNS3_DRD_SUSPEND_RESIDENCY_ENABLE, /* Errata i2409 */ +}; + +static const struct of_dev_auxdata cdns_ti_auxdata[] = { + { + .compatible = "cdns,usb3", + .platform_data = &cdns_ti_pdata, + }, + {}, +}; + static int cdns_ti_probe(struct platform_device *pdev) { struct device *dev = &pdev->dev; @@ -176,7 +189,7 @@ static int cdns_ti_probe(struct platform_device *pdev) reg |= USBSS_W1_PWRUP_RST; cdns_ti_writel(data, USBSS_W1, reg); - error = of_platform_populate(node, NULL, NULL, dev); + error = of_platform_populate(node, NULL, cdns_ti_auxdata, dev); if (error) { dev_err(dev, "failed to create children: %d\n", error); goto err; -- 2.17.1 ^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2024-05-16 1:39 UTC | newest] Thread overview: 6+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2024-05-14 9:24 [PATCH 0/2] TI AM64/J7: USB Errata i2409 workaround Ravi Gunasekaran 2024-05-14 9:24 ` [PATCH 1/2] usb: cdns3: Add quirk flag to enable suspend residency Ravi Gunasekaran 2024-05-15 1:38 ` Peter Chen 2024-05-15 4:22 ` Ravi Gunasekaran 2024-05-16 1:39 ` Peter Chen 2024-05-14 9:24 ` [PATCH 2/2] usb: cdns3-ti: Add workaround for Errata i2409 Ravi Gunasekaran
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox