@@ -525,12 +525,15 @@ dtb_check_done:
/* cache_clean_flush may use the stack, so relocate it */
add sp, sp, r6
#endif
-
+ mov r0, r9
+ ldr r1, 0f
+ add r1, r1, r0
bl cache_clean_flush
badr r0, restart
add r0, r0, r6
mov pc, r0
+0: .long _edata - restart
wont_overwrite:
/*
@@ -622,6 +625,21 @@ not_relocated: mov r0, #0
add r2, sp, #0x10000 @ 64k max
mov r3, r7
bl decompress_kernel
+
+ mov r0, r4 @ base of inflated image
+ adr r1, LC0 @ actual LC0
+ ldr r2, [r1] @ linktime LC0
+ sub r2, r1, r2 @ LC0 delta
+ ldr r1, [r1, #16] @ link time inflated size offset
+ ldr r1, [r1, r2] @ actual inflated size (LE)
+#ifdef __ARMEB__
+ /* convert to big endian */
+ eor r2, r1, r1, ror #16
+ bic r2, r2, #0x00ff0000
+ mov r1, r1, ror #8
+ eor r1, r1, r2, lsr #8
+#endif
+ add r1, r1, r0 @ end of inflated image
bl cache_clean_flush
bl cache_off
@@ -1439,6 +1457,7 @@ reloc_code_end:
#ifdef CONFIG_EFI_STUB
.align 2
_start: .long start - .
+__edata: .long _edata - .
ENTRY(efi_stub_entry)
@ allocate space on stack for passing current zImage address
@@ -1470,8 +1489,11 @@ ENTRY(efi_stub_entry)
.align 2
0: .long start - (. + 4)
- @ Preserve return value of efi_entry() in r4
- mov r4, r0
+ mov r4, r0 @ preserve DTB pointer
+ mov r0, r1 @ start of image
+ adr r2, __edata
+ ldr r1, [r2]
+ add r1, r1, r2 @ end of image
bl cache_clean_flush
bl cache_off
In preparation of turning the decompressor's cache clean/flush operations into proper by-VA maintenance for v7 cores, pass the start and end addresses of the regions that need cache maintenance into cache_clean_flush in registers r0 and r1. Currently, all implementations of cache_clean_flush ignore these values, so no functional change is expected as a result of this patch. Signed-off-by: Ard Biesheuvel <ardb@kernel.org> --- arch/arm/boot/compressed/head.S | 28 +++++++++++++++++--- 1 file changed, 25 insertions(+), 3 deletions(-)