From: Ian Campbell <ian.campbell@citrix.com>
Date: Fri, 15 Feb 2013 13:32:08 +0000 (+0000)
Subject: xen: arm: do not pass a machine ID to dom0
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~7283
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=4308933102ae03cdc7782d8e8ed34fe455d7372d;p=xen.git

xen: arm: do not pass a machine ID to dom0

Xen relies on DTB and we pass in a suitable device-tree so we don't
need to (and shouldn't) pretend to be a Versatile Express here.

We already don't pass a machine ID to domU in the same way.

Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Acked-by: Tim Deegan <tim@xen.org>
Committed-by: Ian Campbell <ian.campbell@citrix.com>
---

diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c
index 6abbb03df4..7403f1a097 100644
--- a/xen/arch/arm/domain_build.c
+++ b/xen/arch/arm/domain_build.c
@@ -349,7 +349,7 @@ int construct_dom0(struct domain *d)
  */
 
     regs->r0 = 0; /* SBZ */
-    regs->r1 = 2272; /* Machine NR: Versatile Express */
+    regs->r1 = 0xffffffff; /* We use DTB therefore no machine id */
     regs->r2 = kinfo.dtb_paddr;
 
     WRITE_CP32(SCTLR_BASE, SCTLR);