| Message ID | 20201026105812.38418-5-tony@atomide.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Few ti-sysc related fixes | expand |
Hi Tony, On 26/10/2020 12:58, Tony Lindgren wrote: > The cpsw SOFT_RESET register is cleard when out of reset so let's > add SYSS_QUIRK_RESETDONE_INVERTED flag for cpsw. Otherwise we will > get bogus "OCP softreset timed out" warnings on boot. Not sure if this quirk based approach is right way to move forward here. The cpsw/cpgmac is "ti,sysc-omap4-simple" which means sysc_omap4_simple, which, in turn, has .srst_shift = -ENODEV. And above should be enough to avoid both sysc_reset() and sysc_wait_softreset() for such modules. > > Fixes: d46f9fbec719 ("bus: ti-sysc: Use optional clocks on for enable and wait for softreset bit") > Signed-off-by: Tony Lindgren <tony@atomide.com> > --- > drivers/bus/ti-sysc.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/bus/ti-sysc.c b/drivers/bus/ti-sysc.c > --- a/drivers/bus/ti-sysc.c > +++ b/drivers/bus/ti-sysc.c > @@ -1364,6 +1364,8 @@ static const struct sysc_revision_quirk sysc_revision_quirks[] = { > /* Quirks that need to be set based on detected module */ > SYSC_QUIRK("aess", 0, 0, 0x10, -ENODEV, 0x40000000, 0xffffffff, > SYSC_MODULE_QUIRK_AESS), > + SYSC_QUIRK("cpgmac", 0, 0x1200, 0x1208, 0x1204, 0x4edb1902, > + 0xffff00f0, SYSS_QUIRK_RESETDONE_INVERTED), > SYSC_QUIRK("dcan", 0x48480000, 0x20, -ENODEV, -ENODEV, 0xa3170504, 0xffffffff, > SYSC_QUIRK_CLKDM_NOAUTO), > SYSC_QUIRK("dss", 0x4832a000, 0, 0x10, 0x14, 0x00000020, 0xffffffff, > @@ -1423,8 +1425,6 @@ static const struct sysc_revision_quirk sysc_revision_quirks[] = { > SYSC_QUIRK("atl", 0, 0, -ENODEV, -ENODEV, 0x0a070100, 0xffffffff, 0), > SYSC_QUIRK("cm", 0, 0, -ENODEV, -ENODEV, 0x40000301, 0xffffffff, 0), > SYSC_QUIRK("control", 0, 0, 0x10, -ENODEV, 0x40000900, 0xffffffff, 0), > - SYSC_QUIRK("cpgmac", 0, 0x1200, 0x1208, 0x1204, 0x4edb1902, > - 0xffff00f0, 0), > SYSC_QUIRK("dcan", 0, 0x20, -ENODEV, -ENODEV, 0xa3170504, 0xffffffff, 0), > SYSC_QUIRK("dcan", 0, 0x20, -ENODEV, -ENODEV, 0x4edb1902, 0xffffffff, 0), > SYSC_QUIRK("dispc", 0x4832a400, 0, 0x10, 0x14, 0x00000030, 0xffffffff, 0), >
* Grygorii Strashko <grygorii.strashko@ti.com> [201030 18:15]: > Hi Tony, > > On 26/10/2020 12:58, Tony Lindgren wrote: > > The cpsw SOFT_RESET register is cleard when out of reset so let's > > add SYSS_QUIRK_RESETDONE_INVERTED flag for cpsw. Otherwise we will > > get bogus "OCP softreset timed out" warnings on boot. > > Not sure if this quirk based approach is right way to move forward here. > > The cpsw/cpgmac is "ti,sysc-omap4-simple" which means sysc_omap4_simple, which, > in turn, has .srst_shift = -ENODEV. > > And above should be enough to avoid both sysc_reset() and sysc_wait_softreset() for such modules. That sounds like a much better fix indeed, I'll take a look. Thanks, Tony
diff --git a/drivers/bus/ti-sysc.c b/drivers/bus/ti-sysc.c --- a/drivers/bus/ti-sysc.c +++ b/drivers/bus/ti-sysc.c @@ -1364,6 +1364,8 @@ static const struct sysc_revision_quirk sysc_revision_quirks[] = { /* Quirks that need to be set based on detected module */ SYSC_QUIRK("aess", 0, 0, 0x10, -ENODEV, 0x40000000, 0xffffffff, SYSC_MODULE_QUIRK_AESS), + SYSC_QUIRK("cpgmac", 0, 0x1200, 0x1208, 0x1204, 0x4edb1902, + 0xffff00f0, SYSS_QUIRK_RESETDONE_INVERTED), SYSC_QUIRK("dcan", 0x48480000, 0x20, -ENODEV, -ENODEV, 0xa3170504, 0xffffffff, SYSC_QUIRK_CLKDM_NOAUTO), SYSC_QUIRK("dss", 0x4832a000, 0, 0x10, 0x14, 0x00000020, 0xffffffff, @@ -1423,8 +1425,6 @@ static const struct sysc_revision_quirk sysc_revision_quirks[] = { SYSC_QUIRK("atl", 0, 0, -ENODEV, -ENODEV, 0x0a070100, 0xffffffff, 0), SYSC_QUIRK("cm", 0, 0, -ENODEV, -ENODEV, 0x40000301, 0xffffffff, 0), SYSC_QUIRK("control", 0, 0, 0x10, -ENODEV, 0x40000900, 0xffffffff, 0), - SYSC_QUIRK("cpgmac", 0, 0x1200, 0x1208, 0x1204, 0x4edb1902, - 0xffff00f0, 0), SYSC_QUIRK("dcan", 0, 0x20, -ENODEV, -ENODEV, 0xa3170504, 0xffffffff, 0), SYSC_QUIRK("dcan", 0, 0x20, -ENODEV, -ENODEV, 0x4edb1902, 0xffffffff, 0), SYSC_QUIRK("dispc", 0x4832a400, 0, 0x10, 0x14, 0x00000030, 0xffffffff, 0),
The cpsw SOFT_RESET register is cleard when out of reset so let's add SYSS_QUIRK_RESETDONE_INVERTED flag for cpsw. Otherwise we will get bogus "OCP softreset timed out" warnings on boot. Fixes: d46f9fbec719 ("bus: ti-sysc: Use optional clocks on for enable and wait for softreset bit") Signed-off-by: Tony Lindgren <tony@atomide.com> --- drivers/bus/ti-sysc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)