aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNaresh Bhat <naresh.bhat@linaro.org>2014-08-26 16:02:23 +0530
committerNaresh Bhat <naresh.bhat@linaro.org>2014-09-03 16:48:47 +0530
commitbb7ae916261ea922b219c3e9ebc0cadbc403416f (patch)
tree8087398f099f62155f656c447251236c9351eb5a
parentbfc12c2d6cfe898c39f5c20a01fe174d4e9914ae (diff)
downloadxen-bb7ae916261ea922b219c3e9ebc0cadbc403416f.tar.gz
xen/arm64: Skip the DT creation for DOM0
The DOM0 ACPI enabled Linux kernel will read all the GIC and timer related information from ACPI tables. Signed-off-by: Naresh Bhat <naresh.bhat@linaro.org> Conflicts: xen/arch/arm/domain_build.c
-rw-r--r--xen/arch/arm/domain_build.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c
index 51d793af57..49552e206f 100644
--- a/xen/arch/arm/domain_build.c
+++ b/xen/arch/arm/domain_build.c
@@ -17,6 +17,7 @@
#include <asm/platform.h>
#include <asm/psci.h>
#include <asm/setup.h>
+#include <asm-arm/acpi.h>
#include <asm/gic.h>
#include <xen/irq.h>
@@ -1085,12 +1086,18 @@ static int handle_node(struct domain *d, struct kernel_info *kinfo,
return 0;
}
+if (acpi_disabled) {
/* Replace these nodes with our own. Note that the original may be
* used_by DOMID_XEN so this check comes first. */
if ( dt_match_node(gic_matches, node) )
return make_gic_node(d, kinfo->fdt, node);
if ( dt_match_node(timer_matches, node) )
return make_timer_node(d, kinfo->fdt, node);
+}
+else {
+ printk("Skip: DOM0 kernel will read GIC and Timer node related information from ACPI tables \n");
+ return 0;
+}
/* Skip nodes used by Xen */
if ( dt_device_used_by(node) == DOMID_XEN )