diff options
| author | Andreas Fenkart <afenkart@gmail.com> | 2015-11-20 10:47:47 +0100 |
|---|---|---|
| committer | Simon Horman <horms@verge.net.au> | 2015-11-24 15:59:09 +0900 |
| commit | e0e7a11783c1b780d90d4b8b02f2dedcc1f6c8e1 (patch) | |
| tree | 4613b6c401ae493ad4814b994752c8d079c6a05a | |
| parent | 084ed28061e1f7b9cfff4ae623430da72c31faff (diff) | |
kexex: arm: create ATAGS_MEM tag from devicetree memory node
booting a non-devicetree kernel from a devicetree kernel failed,
since the memory layout wasn't passed.
Signed-off-by: Andreas Fenkart <andreas.fenkart@dev.digitalstrom.org>
Signed-off-by: Simon Horman <horms@verge.net.au>
| -rw-r--r-- | kexec/arch/arm/kexec-zImage-arm.c | 38 |
1 files changed, 38 insertions, 0 deletions
diff --git a/kexec/arch/arm/kexec-zImage-arm.c b/kexec/arch/arm/kexec-zImage-arm.c index ff4e38d..d5b8ab4 100644 --- a/kexec/arch/arm/kexec-zImage-arm.c +++ b/kexec/arch/arm/kexec-zImage-arm.c @@ -139,6 +139,38 @@ struct tag * atag_read_tags(void) return (struct tag *) buf; } +static +int create_mem32_tag(struct tag_mem32 *tag_mem32) +{ + const char fn[]= "/proc/device-tree/memory/reg"; + uint32_t tmp[2]; + FILE *fp; + + fp = fopen(fn, "r"); + if (!fp) { + fprintf(stderr, "Cannot open %s: %m\n", fn); + return -1; + } + + if (fread(tmp, sizeof(tmp[0]), 2, fp) != 2) { + fprintf(stderr, "Short read %s\n", fn); + fclose(fp); + return -1; + } + + if (ferror(fp)) { + fprintf(stderr, "Cannot read %s: %m\n", fn); + fclose(fp); + return -1; + } + + /* atags_mem32 has base/size fields reversed! */ + tag_mem32->size = be32_to_cpu(tmp[1]); + tag_mem32->start = be32_to_cpu(tmp[0]); + + fclose(fp); + return 0; +} static int atag_arm_load(struct kexec_info *info, unsigned long base, @@ -182,6 +214,12 @@ int atag_arm_load(struct kexec_info *info, unsigned long base, params->hdr.size = 2; params->hdr.tag = ATAG_CORE; params = tag_next(params); + + if (!create_mem32_tag(¶ms->u.mem)) { + params->hdr.size = 4; + params->hdr.tag = ATAG_MEM; + params = tag_next(params); + } } if (initrd) { |