| Message ID | 1461335911-13233-1-git-send-email-sudeep.holla@arm.com |
|---|---|
| State | Superseded |
| Headers | show |
On Fri, Apr 22, 2016 at 03:38:31PM +0100, Sudeep Holla wrote: > Currently ARM CPUs DT bindings allows different enable-method value for > PSCI based systems. On ARM 64-bit this property is required and must be > "psci" while on ARM 32-bit systems this property is optional and must > be "arm,psci". FWIW, "arm,psci" has always been the compatible string for the PSCI node, and was never intended to be the enable-method. So as far as I can tell, this was a mistake/bug, and not a deliberate attempt at specifying 32-bit differently. > This is problematic if 32-bit OS is run on 64-bit system which has > "psci" as enable-method rather than the expected "arm,psci". > > So let's unify the value into "psci" and remove support for "arm,psci" > before it finds any users. > > Reported-by: Soby Mathew <Soby.Mathew@arm.com> > Cc: Rob Herring <robh+dt@kernel.org> > Cc: Mark Rutland <mark.rutland@arm.com> > Cc: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com> > Signed-off-by: Sudeep Holla <sudeep.holla@arm.com> This was definitely a mistake, as "arm,psci" was the compatible string for the psci node, and was never the enable-method. So: Acked-by: Mark Rutland <mark.rutland@arm.com> Hopefully no-one's begun to use this. Thanks, Mark. > --- > Documentation/devicetree/bindings/arm/cpus.txt | 1 - > drivers/firmware/psci.c | 2 +- > 2 files changed, 1 insertion(+), 2 deletions(-) > > diff --git a/Documentation/devicetree/bindings/arm/cpus.txt b/Documentation/devicetree/bindings/arm/cpus.txt > index ccc62f145306..3f0cbbb8395f 100644 > --- a/Documentation/devicetree/bindings/arm/cpus.txt > +++ b/Documentation/devicetree/bindings/arm/cpus.txt > @@ -192,7 +192,6 @@ nodes to be present and contain the properties described below. > can be one of: > "allwinner,sun6i-a31" > "allwinner,sun8i-a23" > - "arm,psci" > "arm,realview-smp" > "brcm,bcm-nsp-smp" > "brcm,brahma-b15" > diff --git a/drivers/firmware/psci.c b/drivers/firmware/psci.c > index 11bfee8b79a9..b5d05807e6ec 100644 > --- a/drivers/firmware/psci.c > +++ b/drivers/firmware/psci.c > @@ -360,7 +360,7 @@ static struct cpuidle_ops psci_cpuidle_ops __initdata = { > .init = psci_dt_cpu_init_idle, > }; > > -CPUIDLE_METHOD_OF_DECLARE(psci, "arm,psci", &psci_cpuidle_ops); > +CPUIDLE_METHOD_OF_DECLARE(psci, "psci", &psci_cpuidle_ops); > #endif > #endif > > -- > 1.9.1 > -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 22/04/16 15:44, Mark Rutland wrote: > On Fri, Apr 22, 2016 at 03:38:31PM +0100, Sudeep Holla wrote: >> Currently ARM CPUs DT bindings allows different enable-method value for >> PSCI based systems. On ARM 64-bit this property is required and must be >> "psci" while on ARM 32-bit systems this property is optional and must >> be "arm,psci". > > FWIW, "arm,psci" has always been the compatible string for the PSCI > node, and was never intended to be the enable-method. So as far as I can > tell, this was a mistake/bug, and not a deliberate attempt at specifying > 32-bit differently. > I agree. >> This is problematic if 32-bit OS is run on 64-bit system which has >> "psci" as enable-method rather than the expected "arm,psci". >> >> So let's unify the value into "psci" and remove support for "arm,psci" >> before it finds any users. >> >> Reported-by: Soby Mathew <Soby.Mathew@arm.com> >> Cc: Rob Herring <robh+dt@kernel.org> >> Cc: Mark Rutland <mark.rutland@arm.com> >> Cc: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com> >> Signed-off-by: Sudeep Holla <sudeep.holla@arm.com> > > This was definitely a mistake, as "arm,psci" was the compatible string > for the psci node, and was never the enable-method. So: > > Acked-by: Mark Rutland <mark.rutland@arm.com> > Thanks. > Hopefully no-one's begun to use this. > Seems so. Even the 32-bit kernel doesn't make use of that. The first user was for idle(see below) which was added in v4.6 just to keep it in sync with binding. It would be good to get it fixed before the final v4.6 >> diff --git a/drivers/firmware/psci.c b/drivers/firmware/psci.c >> index 11bfee8b79a9..b5d05807e6ec 100644 >> --- a/drivers/firmware/psci.c >> +++ b/drivers/firmware/psci.c >> @@ -360,7 +360,7 @@ static struct cpuidle_ops psci_cpuidle_ops __initdata = { >> .init = psci_dt_cpu_init_idle, >> }; >> >> -CPUIDLE_METHOD_OF_DECLARE(psci, "arm,psci", &psci_cpuidle_ops); >> +CPUIDLE_METHOD_OF_DECLARE(psci, "psci", &psci_cpuidle_ops); -- Regards, Sudeep -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Fri, Apr 22, 2016 at 03:57:14PM +0100, Sudeep Holla wrote: > On 22/04/16 15:44, Mark Rutland wrote: > >On Fri, Apr 22, 2016 at 03:38:31PM +0100, Sudeep Holla wrote: > >>Currently ARM CPUs DT bindings allows different enable-method value for > >>PSCI based systems. On ARM 64-bit this property is required and must be > >>"psci" while on ARM 32-bit systems this property is optional and must > >>be "arm,psci". > > > >FWIW, "arm,psci" has always been the compatible string for the PSCI > >node, and was never intended to be the enable-method. So as far as I can > >tell, this was a mistake/bug, and not a deliberate attempt at specifying > >32-bit differently. > > I agree. > > >>This is problematic if 32-bit OS is run on 64-bit system which has > >>"psci" as enable-method rather than the expected "arm,psci". > >> > >>So let's unify the value into "psci" and remove support for "arm,psci" > >>before it finds any users. > >> > >>Reported-by: Soby Mathew <Soby.Mathew@arm.com> > >>Cc: Rob Herring <robh+dt@kernel.org> > >>Cc: Mark Rutland <mark.rutland@arm.com> > >>Cc: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com> > >>Signed-off-by: Sudeep Holla <sudeep.holla@arm.com> > > > >This was definitely a mistake, as "arm,psci" was the compatible string > >for the psci node, and was never the enable-method. So: > > > >Acked-by: Mark Rutland <mark.rutland@arm.com> > > Thanks. > > >Hopefully no-one's begun to use this. > > Seems so. Even the 32-bit kernel doesn't make use of that. > > The first user was for idle(see below) which was added in v4.6 just to > keep it in sync with binding. It would be good to get it fixed before > the final v4.6 Indeed. Lorenzo, how should we forward this on? Do we have any other urgent fixes for v4.6, or should we ask arm-soc to take this alone? Thanks, Mark. > >>diff --git a/drivers/firmware/psci.c b/drivers/firmware/psci.c > >>index 11bfee8b79a9..b5d05807e6ec 100644 > >>--- a/drivers/firmware/psci.c > >>+++ b/drivers/firmware/psci.c > >>@@ -360,7 +360,7 @@ static struct cpuidle_ops psci_cpuidle_ops __initdata = { > >> .init = psci_dt_cpu_init_idle, > >> }; > >> > >>-CPUIDLE_METHOD_OF_DECLARE(psci, "arm,psci", &psci_cpuidle_ops); > >>+CPUIDLE_METHOD_OF_DECLARE(psci, "psci", &psci_cpuidle_ops); > > -- > Regards, > Sudeep > -- > To unsubscribe from this list: send the line "unsubscribe devicetree" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html > -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/Documentation/devicetree/bindings/arm/cpus.txt b/Documentation/devicetree/bindings/arm/cpus.txt index ccc62f145306..3f0cbbb8395f 100644 --- a/Documentation/devicetree/bindings/arm/cpus.txt +++ b/Documentation/devicetree/bindings/arm/cpus.txt @@ -192,7 +192,6 @@ nodes to be present and contain the properties described below. can be one of: "allwinner,sun6i-a31" "allwinner,sun8i-a23" - "arm,psci" "arm,realview-smp" "brcm,bcm-nsp-smp" "brcm,brahma-b15" diff --git a/drivers/firmware/psci.c b/drivers/firmware/psci.c index 11bfee8b79a9..b5d05807e6ec 100644 --- a/drivers/firmware/psci.c +++ b/drivers/firmware/psci.c @@ -360,7 +360,7 @@ static struct cpuidle_ops psci_cpuidle_ops __initdata = { .init = psci_dt_cpu_init_idle, }; -CPUIDLE_METHOD_OF_DECLARE(psci, "arm,psci", &psci_cpuidle_ops); +CPUIDLE_METHOD_OF_DECLARE(psci, "psci", &psci_cpuidle_ops); #endif #endif
Currently ARM CPUs DT bindings allows different enable-method value for PSCI based systems. On ARM 64-bit this property is required and must be "psci" while on ARM 32-bit systems this property is optional and must be "arm,psci". This is problematic if 32-bit OS is run on 64-bit system which has "psci" as enable-method rather than the expected "arm,psci". So let's unify the value into "psci" and remove support for "arm,psci" before it finds any users. Reported-by: Soby Mathew <Soby.Mathew@arm.com> Cc: Rob Herring <robh+dt@kernel.org> Cc: Mark Rutland <mark.rutland@arm.com> Cc: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com> Signed-off-by: Sudeep Holla <sudeep.holla@arm.com> --- Documentation/devicetree/bindings/arm/cpus.txt | 1 - drivers/firmware/psci.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) -- 1.9.1 -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html