diff mbox

[v2] xen/arm: domain_build: Add PSCI 1.0 compatibility

Message ID 1461216830-13779-1-git-send-email-dirk.behme@de.bosch.com (mailing list archive)
State New, archived
Headers show

Commit Message

Dirk Behme April 21, 2016, 5:33 a.m. UTC
Xen needs to blacklist any PSCI node as it will be recreated for DOM0.
Up to now, this was done only for arm,psci and arm,psci-0.2 compatible
nodes. Add PSCI 1.0 compatibility to make device tree nodes with

compatible = "arm,psci-1.0";

blacklisted, too

Signed-off-by: Dirk Behme <dirk.behme@de.bosch.com>
---
 xen/arch/arm/domain_build.c | 1 +
 1 file changed, 1 insertion(+)

Comments

Julien Grall April 22, 2016, 3:42 p.m. UTC | #1
(CC Wei for release-ack)

Hello Dirk,

On 21/04/16 06:33, Dirk Behme wrote:
> Xen needs to blacklist any PSCI node as it will be recreated for DOM0.
> Up to now, this was done only for arm,psci and arm,psci-0.2 compatible
> nodes. Add PSCI 1.0 compatibility to make device tree nodes with
>
> compatible = "arm,psci-1.0";
>
> blacklisted, too
>
> Signed-off-by: Dirk Behme <dirk.behme@de.bosch.com>

Acked-by: Julien Grall <julien.grall@arm.com>

I think this is a bug fix for Xen 4.7. The impact is very limited and 
will help to boot Xen on platform when only PSCI 1.0 is supported.

The patch should also be backported to Xen 4.6 where the support of PSCI 
1.0 has been added for the first time.

Regards,

> ---
>   xen/arch/arm/domain_build.c | 1 +
>   1 file changed, 1 insertion(+)
>
> diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c
> index aba714c..00dc07a 100644
> --- a/xen/arch/arm/domain_build.c
> +++ b/xen/arch/arm/domain_build.c
> @@ -1190,6 +1190,7 @@ static int handle_node(struct domain *d, struct kernel_info *kinfo,
>           DT_MATCH_COMPATIBLE("multiboot,module"),
>           DT_MATCH_COMPATIBLE("arm,psci"),
>           DT_MATCH_COMPATIBLE("arm,psci-0.2"),
> +        DT_MATCH_COMPATIBLE("arm,psci-1.0"),
>           DT_MATCH_COMPATIBLE("arm,cortex-a7-pmu"),
>           DT_MATCH_COMPATIBLE("arm,cortex-a15-pmu"),
>           DT_MATCH_COMPATIBLE("arm,armv8-pmuv3"),
>
Wei Liu April 22, 2016, 3:49 p.m. UTC | #2
On Fri, Apr 22, 2016 at 04:42:21PM +0100, Julien Grall wrote:
> (CC Wei for release-ack)
> 
> Hello Dirk,
> 
> On 21/04/16 06:33, Dirk Behme wrote:
> >Xen needs to blacklist any PSCI node as it will be recreated for DOM0.
> >Up to now, this was done only for arm,psci and arm,psci-0.2 compatible
> >nodes. Add PSCI 1.0 compatibility to make device tree nodes with
> >
> >compatible = "arm,psci-1.0";
> >
> >blacklisted, too
> >
> >Signed-off-by: Dirk Behme <dirk.behme@de.bosch.com>
> 
> Acked-by: Julien Grall <julien.grall@arm.com>
> 
> I think this is a bug fix for Xen 4.7. The impact is very limited and will
> help to boot Xen on platform when only PSCI 1.0 is supported.
> 

Release-acked-by: Wei Liu <wei.liu2@citrix.com>

> The patch should also be backported to Xen 4.6 where the support of PSCI 1.0
> has been added for the first time.
> 
> Regards,
> 
> >---
> >  xen/arch/arm/domain_build.c | 1 +
> >  1 file changed, 1 insertion(+)
> >
> >diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c
> >index aba714c..00dc07a 100644
> >--- a/xen/arch/arm/domain_build.c
> >+++ b/xen/arch/arm/domain_build.c
> >@@ -1190,6 +1190,7 @@ static int handle_node(struct domain *d, struct kernel_info *kinfo,
> >          DT_MATCH_COMPATIBLE("multiboot,module"),
> >          DT_MATCH_COMPATIBLE("arm,psci"),
> >          DT_MATCH_COMPATIBLE("arm,psci-0.2"),
> >+        DT_MATCH_COMPATIBLE("arm,psci-1.0"),
> >          DT_MATCH_COMPATIBLE("arm,cortex-a7-pmu"),
> >          DT_MATCH_COMPATIBLE("arm,cortex-a15-pmu"),
> >          DT_MATCH_COMPATIBLE("arm,armv8-pmuv3"),
> >
> 
> -- 
> Julien Grall
Julien Grall April 22, 2016, 5:21 p.m. UTC | #3
On 22/04/16 16:42, Julien Grall wrote:
> (CC Wei for release-ack)
>
> Hello Dirk,
>
> On 21/04/16 06:33, Dirk Behme wrote:
>> Xen needs to blacklist any PSCI node as it will be recreated for DOM0.
>> Up to now, this was done only for arm,psci and arm,psci-0.2 compatible
>> nodes. Add PSCI 1.0 compatibility to make device tree nodes with
>>
>> compatible = "arm,psci-1.0";
>>
>> blacklisted, too
>>
>> Signed-off-by: Dirk Behme <dirk.behme@de.bosch.com>
>
> Acked-by: Julien Grall <julien.grall@arm.com>
>
> I think this is a bug fix for Xen 4.7. The impact is very limited and
> will help to boot Xen on platform when only PSCI 1.0 is supported.
>
> The patch should also be backported to Xen 4.6 where the support of PSCI
> 1.0 has been added for the first time.

Hmmm, I messed up my tig command line. The support of PSCI v1.0 is only 
in Xen 4.7. So there is no need to backport this patch.

Regards,
Stefano Stabellini April 22, 2016, 5:28 p.m. UTC | #4
On Fri, 22 Apr 2016, Wei Liu wrote:
> On Fri, Apr 22, 2016 at 04:42:21PM +0100, Julien Grall wrote:
> > (CC Wei for release-ack)
> > 
> > Hello Dirk,
> > 
> > On 21/04/16 06:33, Dirk Behme wrote:
> > >Xen needs to blacklist any PSCI node as it will be recreated for DOM0.
> > >Up to now, this was done only for arm,psci and arm,psci-0.2 compatible
> > >nodes. Add PSCI 1.0 compatibility to make device tree nodes with
> > >
> > >compatible = "arm,psci-1.0";
> > >
> > >blacklisted, too
> > >
> > >Signed-off-by: Dirk Behme <dirk.behme@de.bosch.com>
> > 
> > Acked-by: Julien Grall <julien.grall@arm.com>
> > 
> > I think this is a bug fix for Xen 4.7. The impact is very limited and will
> > help to boot Xen on platform when only PSCI 1.0 is supported.
> > 
> 
> Release-acked-by: Wei Liu <wei.liu2@citrix.com>

committed to staging


> > The patch should also be backported to Xen 4.6 where the support of PSCI 1.0
> > has been added for the first time.
> > 
> > Regards,
> > 
> > >---
> > >  xen/arch/arm/domain_build.c | 1 +
> > >  1 file changed, 1 insertion(+)
> > >
> > >diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c
> > >index aba714c..00dc07a 100644
> > >--- a/xen/arch/arm/domain_build.c
> > >+++ b/xen/arch/arm/domain_build.c
> > >@@ -1190,6 +1190,7 @@ static int handle_node(struct domain *d, struct kernel_info *kinfo,
> > >          DT_MATCH_COMPATIBLE("multiboot,module"),
> > >          DT_MATCH_COMPATIBLE("arm,psci"),
> > >          DT_MATCH_COMPATIBLE("arm,psci-0.2"),
> > >+        DT_MATCH_COMPATIBLE("arm,psci-1.0"),
> > >          DT_MATCH_COMPATIBLE("arm,cortex-a7-pmu"),
> > >          DT_MATCH_COMPATIBLE("arm,cortex-a15-pmu"),
> > >          DT_MATCH_COMPATIBLE("arm,armv8-pmuv3"),
> > >
> > 
> > -- 
> > Julien Grall
>
diff mbox

Patch

diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c
index aba714c..00dc07a 100644
--- a/xen/arch/arm/domain_build.c
+++ b/xen/arch/arm/domain_build.c
@@ -1190,6 +1190,7 @@  static int handle_node(struct domain *d, struct kernel_info *kinfo,
         DT_MATCH_COMPATIBLE("multiboot,module"),
         DT_MATCH_COMPATIBLE("arm,psci"),
         DT_MATCH_COMPATIBLE("arm,psci-0.2"),
+        DT_MATCH_COMPATIBLE("arm,psci-1.0"),
         DT_MATCH_COMPATIBLE("arm,cortex-a7-pmu"),
         DT_MATCH_COMPATIBLE("arm,cortex-a15-pmu"),
         DT_MATCH_COMPATIBLE("arm,armv8-pmuv3"),