]> xenbits.xensource.com Git - people/royger/xen.git/commitdiff
xen/arm: domain_build: Add PSCI 1.0 compatibility
authorDirk Behme <dirk.behme@de.bosch.com>
Thu, 21 Apr 2016 05:33:50 +0000 (07:33 +0200)
committerStefano Stabellini <sstabellini@kernel.org>
Fri, 22 Apr 2016 17:16:51 +0000 (18:16 +0100)
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>
Acked-by: Stefano Stabellini <sstabellini@kernel.org>
Release-acked-by: Wei Liu <wei.liu2@citrix.com>
xen/arch/arm/domain_build.c

index aba714ca6bb8cbe7c341b17d79be87f63500b212..00dc07af637b67153d33408f34331700dff84f93 100644 (file)
@@ -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"),