ARM: tegra: Reserve 32MB for the Linux kernel
Jon Hunter
maintainerPATCH 1/1 ARM: tegra: Reserve 32MB for the Linux kernel
From: Jonathan Hunter <[email protected]>
Booting recently Linux -next kernels on 32-bit Tegra devices has been failing when using the 'multi_v7_defconfig' kenrel configuration because the size of has grown such that it is overwriting the FDT blob.
Current Linux -next kernels built with the 'multi_v7_defconfig' have a total size of ~19.5MB (where .text is ~12.5MB, .data is ~6.5MB and .bss is ~0.5MB). Therefore, increase the memory location reserved for the Linux kernel to 32MB from 16MB for 32-bit Tegra devices.
This change has been boot tested on Tegra20 Ventana, Tegra30 Cardhu and Tegra124 Jetson TK1 with the Linux next tree (20190212).
--- include/configs/tegra114-common.h | 14 +++++++------- include/configs/tegra124-common.h | 14 +++++++------- include/configs/tegra20-common.h | 14 +++++++------- include/configs/tegra30-common.h | 14 +++++++------- 4 files changed, 28 insertions(+), 28 deletions(-)
include/configs/tegra114-common.h +7 -7
@@ -15,7 +15,7 @@/* * Miscellaneous configurable options */ -#define CONFIG_STACKBASE 0x82800000/* 40MB */ +#define CONFIG_STACKBASE 0x83800000/* 56MB */ /*----------------------------------------------------------------------- * Physical Memory Map
@@ -36,13 +36,13 @@* should not overlap that area, or the kernel will have to copy itself * somewhere else before decompression. Similarly, the address of any other * data passed to the kernel shouldn't overlap the start of RAM. Pushing -* this up to 16M allows for a sizable kernel to be decompressed below the +* this up to 32M allows for a sizable kernel to be decompressed below the * compressed load address. * -* fdt_addr_r simply shouldn't overlap anything else. Choosing 32M allows for -* the compressed kernel to be up to 16M too. +* fdt_addr_r simply shouldn't overlap anything else. Choosing 48M allows for +* the compressed kernel to be up to 32M too. * -* ramdisk_addr_r simply shouldn't overlap anything else. Choosing 33M allows +* ramdisk_addr_r simply shouldn't overlap anything else. Choosing 49M allows * for the FDT/DTB to be up to 1M, which is hopefully plenty. */ #define CONFIG_LOADADDR 0x81000000
@@ -50,8 +50,8 @@"scriptaddr=0x90000000\0" \"pxefile_addr_r=0x90100000\0" \ "kernel_addr_r=" __stringify(CONFIG_LOADADDR) "\0" \ -"fdt_addr_r=0x82000000\0" \ -"ramdisk_addr_r=0x82100000\0" +"fdt_addr_r=0x83000000\0" \ +"ramdisk_addr_r=0x83100000\0" /* Defines for SPL */#define CONFIG_SPL_TEXT_BASE 0x80108000
include/configs/tegra124-common.h +7 -7
@@ -17,7 +17,7 @@/* * Miscellaneous configurable options */ -#define CONFIG_STACKBASE 0x82800000/* 40MB */ +#define CONFIG_STACKBASE 0x83800000/* 56MB */ /*----------------------------------------------------------------------- * Physical Memory Map
@@ -38,13 +38,13 @@* should not overlap that area, or the kernel will have to copy itself * somewhere else before decompression. Similarly, the address of any other * data passed to the kernel shouldn't overlap the start of RAM. Pushing -* this up to 16M allows for a sizable kernel to be decompressed below the +* this up to 32M allows for a sizable kernel to be decompressed below the * compressed load address. * -* fdt_addr_r simply shouldn't overlap anything else. Choosing 32M allows for -* the compressed kernel to be up to 16M too. +* fdt_addr_r simply shouldn't overlap anything else. Choosing 48M allows for +* the compressed kernel to be up to 32M too. * -* ramdisk_addr_r simply shouldn't overlap anything else. Choosing 33M allows +* ramdisk_addr_r simply shouldn't overlap anything else. Choosing 49M allows * for the FDT/DTB to be up to 1M, which is hopefully plenty. */ #define CONFIG_LOADADDR 0x81000000
@@ -52,8 +52,8 @@"scriptaddr=0x90000000\0" \"pxefile_addr_r=0x90100000\0" \ "kernel_addr_r=" __stringify(CONFIG_LOADADDR) "\0" \ -"fdt_addr_r=0x82000000\0" \ -"ramdisk_addr_r=0x82100000\0" +"fdt_addr_r=0x83000000\0" \ +"ramdisk_addr_r=0x83100000\0" /* Defines for SPL */#define CONFIG_SPL_TEXT_BASE 0x80108000
include/configs/tegra20-common.h +7 -7
@@ -16,7 +16,7 @@/* * Miscellaneous configurable options */ -#define CONFIG_STACKBASE 0x02800000/* 40MB */ +#define CONFIG_STACKBASE 0x03800000/* 56MB */ /*----------------------------------------------------------------------- * Physical Memory Map
@@ -37,13 +37,13 @@* should not overlap that area, or the kernel will have to copy itself * somewhere else before decompression. Similarly, the address of any other * data passed to the kernel shouldn't overlap the start of RAM. Pushing -* this up to 16M allows for a sizable kernel to be decompressed below the +* this up to 32M allows for a sizable kernel to be decompressed below the * compressed load address. * -* fdt_addr_r simply shouldn't overlap anything else. Choosing 32M allows for -* the compressed kernel to be up to 16M too. +* fdt_addr_r simply shouldn't overlap anything else. Choosing 48M allows for +* the compressed kernel to be up to 32M too. * -* ramdisk_addr_r simply shouldn't overlap anything else. Choosing 33M allows +* ramdisk_addr_r simply shouldn't overlap anything else. Choosing 49M allows * for the FDT/DTB to be up to 1M, which is hopefully plenty. */ #define CONFIG_LOADADDR 0x01000000
@@ -51,8 +51,8 @@"scriptaddr=0x10000000\0" \"pxefile_addr_r=0x10100000\0" \ "kernel_addr_r=" __stringify(CONFIG_LOADADDR) "\0" \ -"fdt_addr_r=0x02000000\0" \ -"ramdisk_addr_r=0x02100000\0" +"fdt_addr_r=0x03000000\0" \ +"ramdisk_addr_r=0x03100000\0" /* Defines for SPL */#define CONFIG_SPL_TEXT_BASE 0x00108000
include/configs/tegra30-common.h +7 -7
@@ -16,7 +16,7 @@/* * Miscellaneous configurable options */ -#define CONFIG_STACKBASE 0x82800000/* 40MB */ +#define CONFIG_STACKBASE 0x83800000/* 56MB */ /*----------------------------------------------------------------------- * Physical Memory Map
@@ -37,13 +37,13 @@* should not overlap that area, or the kernel will have to copy itself * somewhere else before decompression. Similarly, the address of any other * data passed to the kernel shouldn't overlap the start of RAM. Pushing -* this up to 16M allows for a sizable kernel to be decompressed below the +* this up to 32M allows for a sizable kernel to be decompressed below the * compressed load address. * -* fdt_addr_r simply shouldn't overlap anything else. Choosing 32M allows for -* the compressed kernel to be up to 16M too. +* fdt_addr_r simply shouldn't overlap anything else. Choosing 48M allows for +* the compressed kernel to be up to 32M too. * -* ramdisk_addr_r simply shouldn't overlap anything else. Choosing 33M allows +* ramdisk_addr_r simply shouldn't overlap anything else. Choosing 49M allows * for the FDT/DTB to be up to 1M, which is hopefully plenty. */ #define CONFIG_LOADADDR 0x81000000
@@ -51,8 +51,8 @@"scriptaddr=0x90000000\0" \"pxefile_addr_r=0x90100000\0" \ "kernel_addr_r=" __stringify(CONFIG_LOADADDR) "\0" \ -"fdt_addr_r=0x82000000\0" \ -"ramdisk_addr_r=0x82100000\0" +"fdt_addr_r=0x83000000\0" \ +"ramdisk_addr_r=0x83100000\0" /* Defines for SPL */#define CONFIG_SPL_TEXT_BASE 0x80108000
Signature · 1 line
2.7.4
PATCH 1/1 ARM: tegra: Reserve 32MB for the Linux kernel
Quoted 6 lines · Jon Hunter
From: Jonathan Hunter <[email protected]>
Booting recently Linux -next kernels on 32-bit Tegra devices has been failing when using the '
multi_v7_defconfig' kenrel configuration because the size of has grown such that it is overwriting the FDT blob.
Quoted 7 lines
Current Linux -next kernels built with the '
multi_v7_defconfig' have a total size of ~19.5MB (where .text is ~12.5MB, .data is ~6.5MB and .bss is ~0.5MB). Therefore, increase the memory location reserved for the Linux kernel to 32MB from 16MB for 32-bit Tegra devices.This change has been boot tested on Tegra20 Ventana, Tegra30 Cardhu and Tegra124 Jetson TK1 with the Linux next tree (20190212).
Just in case anyone else puzzles over this:
It took me too long to realize/remember why the following wasn't a problem since the stack will overlap the initrd location:
-#define CONFIG_STACKBASE 0x82800000 /* 40MB */
+#define CONFIG_STACKBASE 0x83800000 /* 56MB */
...
+ "ramdisk_addr_r=0x83100000\0"
... which of course is because the stackbase variable is only used during early boot, which is long before that location is used to store the initrd the U-Boot loads.