diff mbox series

external/mambo: Print more info when the kernel is too big

Message ID 20210831230617.1012662-1-mpe@ellerman.id.au
State Accepted
Headers show
Series external/mambo: Print more info when the kernel is too big | expand

Commit Message

Michael Ellerman Aug. 31, 2021, 11:06 p.m. UTC 
Make it a bit easier to boot large kernels by printing more info when
the kernel is too big, so the user has some idea how much they need to
adjust PAYLOAD_ADDR by.

Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
---
 external/mambo/skiboot.tcl | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)


base-commit: 6352fa85e23f3c620544edcb3feb971d3babd746
prerequisite-patch-id: 37a0365ad7264def9b2fefa613d086b4600f092d
prerequisite-patch-id: 8f3d1073410ed87a3e3b5c959026438326e82cac

Comments

Vasant Hegde Sept. 9, 2021, 8:03 a.m. UTC | #1 
On 9/1/21 4:36 AM, Michael Ellerman wrote:
> Make it a bit easier to boot large kernels by printing more info when
> the kernel is too big, so the user has some idea how much they need to
> adjust PAYLOAD_ADDR by.
> 

Thanks! Merged to master as 0b3276fe.

-Vasant
diff mbox series

Patch

diff --git a/external/mambo/skiboot.tcl b/external/mambo/skiboot.tcl
index 841b67b0f..05db430c6 100644
--- a/external/mambo/skiboot.tcl
+++ b/external/mambo/skiboot.tcl
@@ -705,8 +705,10 @@  mysim memory fread $mconf(boot_load) $boot_size $mconf(boot_image)
 set payload_size [file size $mconf(payload)]
 mysim memory fread $mconf(payload_addr) $payload_size $mconf(payload)
 
-if { $payload_size > [expr $mconf(boot_load) - $mconf(payload_addr)] } {
-	error "vmlinux is too large, consider adjusting PAYLOAD_ADDR"
+set available_space [expr $mconf(boot_load) - $mconf(payload_addr)]
+if { $payload_size > $available_space } {
+    set overflow [expr $payload_size - $available_space]
+    error "vmlinux is too large by $overflow bytes ($payload_size > $available_space), consider adjusting PAYLOAD_ADDR"
 }
 
 # Flatten it