Xen devel - Sep 2013 - [PATCH] xen: arm: use new 64-bit zImage magic numbers for Xen binary

Upstream commit 4370eec05a88 "arm64: Expand arm64 image header" ended
up
changing the zImage magic (which was actually the initial branch instructio
encoding!). The new header has a proper magic number at a fixed location.

Switch Xen itself to using this format. Neither the bootwrapper nor the models
care about this header themselves and real bootloaders are not widely used, so
now is as good a time as any to switch (as upstream have proven)

Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
---
 xen/arch/arm/arm64/head.S |    8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/xen/arch/arm/arm64/head.S b/xen/arch/arm/arm64/head.S
index 1d04efc..5ffe4f4 100644
--- a/xen/arch/arm/arm64/head.S
+++ b/xen/arch/arm/arm64/head.S
@@ -108,6 +108,14 @@ start:
         .quad   0                    /* Image load offset from start of RAM */
         .quad   0                    /* reserved */
         .quad   0                    /* reserved */
+        .quad   0                    /* reserved */
+        .quad   0                    /* reserved */
+        .quad   0                    /* reserved */
+        .byte   0x41                 /* Magic number, "ARM\x64" */
+        .byte   0x52
+        .byte   0x4d
+        .byte   0x64
+        .word   0                    /* reserved */
 
 real_start:
         msr   DAIFSet, 0xf           /* Disable all interrupts */
-- 
1.7.10.4

At 12:21 +0100 on 25 Sep (1380111711), Ian Campbell
wrote:
> Upstream commit 4370eec05a88 "arm64: Expand arm64 image header"
ended up
> changing the zImage magic (which was actually the initial branch instructio
> encoding!). The new header has a proper magic number at a fixed location.
> 
> Switch Xen itself to using this format. Neither the bootwrapper nor the
models
> care about this header themselves and real bootloaders are not widely used,
so
> now is as good a time as any to switch (as upstream have proven)
By ''upstream'' here, you mean Linux?
> Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Acked-by: Tim Deegan <tim@xen.org>

On Thu, 2013-09-26 at 14:11 +0100, Tim Deegan wrote:
> At 12:21 +0100 on 25 Sep (1380111711), Ian Campbell wrote:
> > Upstream commit 4370eec05a88 "arm64: Expand arm64 image
header" ended up
> > changing the zImage magic (which was actually the initial branch
instructio
> > encoding!). The new header has a proper magic number at a fixed
location.
> > 
> > Switch Xen itself to using this format. Neither the bootwrapper nor
the models
> > care about this header themselves and real bootloaders are not widely
used, so
> > now is as good a time as any to switch (as upstream have proven)
> 
> By ''upstream'' here, you mean Linux?
Yes.
> > Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
> 
> Acked-by: Tim Deegan <tim@xen.org>
Thanks.

On Thu, 2013-09-26 at 14:11 +0100, Tim Deegan wrote:
> At 12:21 +0100 on 25 Sep (1380111711), Ian Campbell wrote:
> > Upstream commit 4370eec05a88 "arm64: Expand arm64 image
header" ended up
> > changing the zImage magic (which was actually the initial branch
instructio
> > encoding!). The new header has a proper magic number at a fixed
location.
> > 
> > Switch Xen itself to using this format. Neither the bootwrapper nor
the models
> > care about this header themselves and real bootloaders are not widely
used, so
> > now is as good a time as any to switch (as upstream have proven)
> 
> By ''upstream'' here, you mean Linux?
> 
> > Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
> 
> Acked-by: Tim Deegan <tim@xen.org>
Applied, thanks.