rockchip: rk35xx: expand space for decompressed kernel
PATCH 1/1 rockchip: rk35xx: expand space for decompressed kernel
An uncompressed 6.7.0-rc1 Linux kernel Image built with the arm64 defconfig is about 40MB. This does not fit in to the space between kernel_comp_addr_r and fdt_addr_r, so when uncompressing an Image.gz to this size, the FDT will be overwritten. Move fdt_addr_r and ramdisk_addr_r higher in memory to allow 96MB for uncompressing kernels.
--- include/configs/rk3568_common.h | 4 ++-- include/configs/rk3588_common.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)
include/configs/rk3568_common.h +2 -2
@@ -20,10 +20,10 @@"script_offset_f=0xffe000\0" \"script_size_f=0x2000\0" \"pxefile_addr_r=0x00e00000\0" \ -"fdt_addr_r=0x0a100000\0" \ +"fdt_addr_r=0x0e000000\0" \"fdtoverlay_addr_r=0x02000000\0" \"kernel_addr_r=0x02080000\0" \ -"ramdisk_addr_r=0x0a200000\0" \ +"ramdisk_addr_r=0x0e100000\0" \"kernel_comp_addr_r=0x08000000\0" \"kernel_comp_size=0x2000000\0"
include/configs/rk3588_common.h +2 -2
@@ -19,10 +19,10 @@"script_offset_f=0xffe000\0" \"script_size_f=0x2000\0" \"pxefile_addr_r=0x00e00000\0" \ -"fdt_addr_r=0x0a100000\0" \ +"fdt_addr_r=0x0e000000\0" \"fdtoverlay_addr_r=0x02000000\0" \"kernel_addr_r=0x02080000\0" \ -"ramdisk_addr_r=0x0a200000\0" \ +"ramdisk_addr_r=0x0e100000\0" \"kernel_comp_addr_r=0x08000000\0" \"kernel_comp_size=0x2000000\0"
Signature · 1 line
2.39.3 (Apple Git-145)
Quoted 22 lines · Hugh Cole-Baker
An uncompressed 6.7.0-rc1 Linux kernel Image built with the arm64 defconfig is about 40MB. This does not fit in to the space between
kernel_comp_addr_randfdt_addr_r, so when uncompressing an Image.gz to this size, the FDT will be overwritten. Movefdt_addr_randramdisk_addr_rhigher in memory to allow 96MB for uncompressing kernels.Signed-off-by Hugh Cole-Baker <[email protected]>Cc Simon Glass <[email protected]>Cc Philipp Tomsich <[email protected]>Cc Kever Yang <[email protected]>Cc Jonas Karlman <[email protected]>--- include/configs/rk3568_common.h | 4 ++-- include/configs/rk3588_common.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)include/configs/rk3568_common.h +0
-0@@ -20,10 +20,10 @@"script_offset_f=0xffe000\0" \
include/configs/rk3568_common.h line 28
Quoted 10 lines
include/configs/rk3568_common.h +2
-2"script_size_f=0x2000\0" \"pxefile_addr_r=0x00e00000\0" \ -"fdt_addr_r=0x0a100000\0" \ +"fdt_addr_r=0x0e000000\0" \"fdtoverlay_addr_r=0x02000000\0" \"kernel_addr_r=0x02080000\0" \ -"ramdisk_addr_r=0x0a200000\0" \ +"ramdisk_addr_r=0x0e100000\0" \"kernel_comp_addr_r=0x08000000\0" \"kernel_comp_size=0x2000000\0"
I think this shows the real problem is that the defaults here need to be re-thought with functional maximums in mind. There's a practical limit of 128MB for the kernel so we should have the kernel, then the kernel decompression buffer, then device tree and overlays space, then ramdisk at the end.
Signature · 1 line
Tom
Quoted 30 lines · Tom Rini
Quoted 29 lines · Hugh Cole-Baker
An uncompressed 6.7.0-rc1 Linux kernel Image built with the arm64 defconfig is about 40MB. This does not fit in to the space between
kernel_comp_addr_randfdt_addr_r, so when uncompressing an Image.gz to this size, the FDT will be overwritten. Movefdt_addr_randramdisk_addr_rhigher in memory to allow 96MB for uncompressing kernels.Signed-off-by Hugh Cole-Baker <[email protected]>Cc Simon Glass <[email protected]>Cc Philipp Tomsich <[email protected]>Cc Kever Yang <[email protected]>Cc Jonas Karlman <[email protected]>--- include/configs/rk3568_common.h | 4 ++-- include/configs/rk3588_common.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)include/configs/rk3568_common.h +1
-2@@ -20,10 +20,10 @@"script_offset_f=0xffe000\0" \"script_size_f=0x2000\0" \"pxefile_addr_r=0x00e00000\0" \ -"fdt_addr_r=0x0a100000\0" \ +"fdt_addr_r=0x0e000000\0" \"fdtoverlay_addr_r=0x02000000\0" \"kernel_addr_r=0x02080000\0" \ -"ramdisk_addr_r=0x0a200000\0" \
Quoted 9 lines
include/configs/rk3568_common.h line 28
Quoted 3 lines
include/configs/rk3568_common.h +1
-0+"ramdisk_addr_r=0x0e100000\0" \"kernel_comp_addr_r=0x08000000\0" \"kernel_comp_size=0x2000000\0" I think this shows the real problem is that the defaults here need to be re-thought with functional maximums in mind. There's a practical limit of 128MB for the kernel so we should have the kernel, then the kernel decompression buffer, then device tree and overlays space, then ramdisk at the end.
kernel_comp_size needs to be adjusted with this change