image: Don't relocate ramdisk to highmem
PATCH 1/2 image: Don't relocate ramdisk to highmem
The Linux kernel cannot unpack a ramdisk that's stored in high memory. Unless the initrd_high environment variable is explicitly set, abide by that restriction using the getenv_bootm_low() and getenv_bootm_mapsize() helpers.
Signed-off-by Thierry Reding <[email protected]>
---
Changes in v2:
- update function header comment
common/image.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
common/image.c +4 -3
@@ -966,7 +966,8 @@ int boot_get_ramdisk(int argc, char * const argv[], bootm_headers_t *images,* end address (after possible relocation) * * boot_ramdisk_high() takes a relocation hint from "initrd_high" environement -* variable and if requested ramdisk data is moved to a specified location. +* variable and if requested ramdisk data is moved to a specified location. If +* no such hint is given, the default is to relocate the initrd to low memory. * * Initrd_start and initrd_end are set to final (after relocation) ramdisk * start/end addresses if ramdisk image start and len were provided,
@@ -991,8 +992,8 @@ int boot_ramdisk_high(struct lmb *lmb, ulong rd_data, ulong rd_len,if (initrd_high == ~0 ) initrd_copy_to_ram =0 ; }else { -/* not set, no restrictions to load high */ - initrd_high = ~0 ; +/* make sure to put ramdisk in low memory */ + initrd_high =getenv_bootm_low () +getenv_bootm_mapsize (); }
Signature · 1 line
1.8.4
PATCH 2/2 image: Only relocate ramdisk when necessary
If a ramdisk has been loaded to low memory to begin with, there's no need to relocate it.
Signed-off-by Thierry Reding <[email protected]>
--- common/image.c | 12 ++++++++++++ 1 file changed, 12 insertions(+)
common/image.c +12 -0
@@ -968,6 +968,8 @@ int boot_get_ramdisk(int argc, char * const argv[], bootm_headers_t *images,* boot_ramdisk_high() takes a relocation hint from "initrd_high" environement * variable and if requested ramdisk data is moved to a specified location. If * no such hint is given, the default is to relocate the initrd to low memory. +* If the ramdisk is already in a proper location, skip relocation and use it +* in-place. * * Initrd_start and initrd_end are set to final (after relocation) ramdisk * start/end addresses if ramdisk image start and len were provided,
@@ -1006,6 +1008,16 @@ int boot_ramdisk_high(struct lmb *lmb, ulong rd_data, ulong rd_len, initrd_high, initrd_copy_to_ram);if (rd_data) { +/* +* Only copy initrd if necessary. If it has been loaded to +* low memory, just skip relocation and use it in-place. +*/ +ulong bootm_start =getenv_bootm_low (); +ulong rd_end = rd_data + rd_len; + +if (rd_data >= bootm_start && rd_end <= initrd_high) + initrd_copy_to_ram =0 ; +if (!initrd_copy_to_ram) {/* zero-copy ramdisk support */ debug (" in-place initrd\n" ); *initrd_start = rd_data;
Signature · 1 line
1.8.4