Support u-boot noload images for arm as used by NetBSD/evbarm GENERIC kernel.
PATCH 1/1 Support u-boot noload images for arm as used by NetBSD/evbarm GENERIC kernel.
noload kernels are loaded with the u-boot image header and as a result the header size needs adding to the entry point. Fake up a hdr so the kernel image is loaded at the right address and the entry point is adjusted appropriately
---
hw/arm/boot.c | 8 +++++---
hw/core/loader.c | 12 +++++++++---
hw/core/uboot_image.h | 1 +
3 files changed, 15 insertions(+), 6 deletions(-)
hw/arm/boot.c +0 -0
@@ -30,8 +30,9 @@
* Documentation/arm/Booting and Documentation/arm64/booting.txt
* They have different preferred image load offsets from system RAM base. */
-#define KERNEL_ARGS_ADDR 0x100
-#define KERNEL_LOAD_ADDR 0x00010000
+#define KERNEL_ARGS_ADDR 0x100
+#define KERNEL_NOLOAD_ADDR 0x00000000
+#define KERNEL_LOAD_ADDR 0x00010000
#define KERNEL64_LOAD_ADDR 0x00080000
#define ARM64_TEXT_OFFSET_OFFSET 8
@@ -1078,7 +1079,8 @@ void arm_load_kernel(ARMCPU *cpu, struct arm_boot_info *info) }
entry = elf_entry;
if (kernel_size < 0) {
- kernel_size = load_uimage_as(info->kernel_filename, &entry, NULL, + uint64_t loadaddr = info->loader_start + KERNEL_NOLOAD_ADDR; + kernel_size = load_uimage_as(info->kernel_filename, &entry, &loadaddr, &is_linux, NULL, NULL, as);
}
if (arm_feature(&cpu->env, ARM_FEATURE_AARCH64) && kernel_size < 0) {
hw/core/loader.c +0 -0
@@ -638,13 +638,19 @@ static int load_uboot_image(const char *filename, hwaddr *ep, hwaddr *loadaddr,
goto out;
if (hdr->ih_type != image_type) {
- fprintf(stderr, "Wrong image type %d, expected %d\n", hdr->ih_type, - image_type);
- goto out;
+ if (image_type != IH_TYPE_KERNEL && hdr->ih_type != IH_TYPE_KERNEL_NOLOAD) { + fprintf(stderr, "Wrong image type %d, expected %d\n", hdr->ih_type, + image_type);
+ goto out;
+ }
}
/* TODO: Implement other image types. */
switch (hdr->ih_type) {
+ case IH_TYPE_KERNEL_NOLOAD:
+ hdr->ih_load = *loadaddr + sizeof(*hdr);
+ hdr->ih_ep += hdr->ih_load;
+
case IH_TYPE_KERNEL:
address = hdr->ih_load;
if (translate_fn) {
hw/core/uboot_image.h +0 -0
@@ -124,6 +124,7 @@
#define IH_TYPE_SCRIPT 6 /* Script file */ #define IH_TYPE_FILESYSTEM 7 /* Filesystem Image (any type) */ #define IH_TYPE_FLATDT 8 /* Binary Flat Device Tree Blob */ +#define IH_TYPE_KERNEL_NOLOAD 14 /* OS Kernel Image (noload) */
/*
* Compression Types
Signature · 1 line
2.17.1
I saw this thread, but from a NetBSD maintainer point of view, I will defer review to ARM people.
Quoted 83 lines · Nick Hudson
noload kernels are loaded with the u-boot image header and as a result the header size needs adding to the entry point. Fake up a hdr so the kernel image is loaded at the right address and the entry point is adjusted appropriately
Signed-off-by Nick Hudson <[email protected]>---
hw/arm/boot.c | 8 +++++---
hw/core/loader.c | 12 +++++++++---
hw/core/uboot_image.h | 1 +3 files changed, 15 insertions(+), 6 deletions(-)hw/arm/boot.c +5
-3@@ -30,8 +30,9 @@* Documentation/arm/Booting and Documentation/arm64/booting.txt * They have different preferred image load offsets from system RAM base. */ -#define KERNEL_ARGS_ADDR 0x100 -#define KERNEL_LOAD_ADDR 0x00010000 +#define KERNEL_ARGS_ADDR 0x100 +#define KERNEL_NOLOAD_ADDR 0x00000000 +#define KERNEL_LOAD_ADDR 0x00010000 #define KERNEL64_LOAD_ADDR 0x00080000 #define ARM64_TEXT_OFFSET_OFFSET 8@@ -1078,7 +1079,8 @@ void arm_load_kernel(ARMCPU *cpu, struct arm_boot_info *info) } entry = elf_entry; if (kernel_size < 0) { - kernel_size = load_uimage_as(info->kernel_filename, &entry, NULL, + uint64_t loadaddr = info->loader_start + KERNEL_NOLOAD_ADDR; + kernel_size = load_uimage_as(info->kernel_filename, &entry, &loadaddr, &is_linux, NULL, NULL, as);}
if (arm_feature(&cpu->env, ARM_FEATURE_AARCH64)&&kernel_size< 0) {hw/core/loader.c +5
-3@@ -638,13 +638,19 @@ static int load_uboot_image(const char *filename, hwaddr *ep, hwaddr *loadaddr, goto out; if (hdr->ih_type != image_type) { - fprintf(stderr, "Wrong image type %d, expected %d\n", hdr->ih_type, - image_type); - goto out; + if (image_type != IH_TYPE_KERNEL && hdr->ih_type != IH_TYPE_KERNEL_NOLOAD) { + fprintf(stderr, "Wrong image type %d, expected %d\n", hdr->ih_type, + image_type); + goto out; + } } /* TODO: Implement other image types. */switch (
hdr->ih_type) {
+ caseIH_TYPE_KERNEL_NOLOAD:
+hdr->ih_load= *loadaddr +sizeof(*hdr);
+hdr->ih_ep+=hdr->ih_load;
+
caseIH_TYPE_KERNEL:
address =hdr->ih_load;
if (translate_fn) {hw/core/uboot_image.h +1
-0@@ -124,6 +124,7 @@ #define IH_TYPE_SCRIPT 6 /* Script file */ #define IH_TYPE_FILESYSTEM 7 /* Filesystem Image (any type) */ #define IH_TYPE_FLATDT 8 /* Binary Flat Device Tree Blob */ +#define IH_TYPE_KERNEL_NOLOAD 14/* OS Kernel Image (noload) */ /** Compression Types
ping
Quoted 84 lines · Nick Hudson
noload kernels are loaded with the u-boot image header and as a result the header size needs adding to the entry point. Fake up a hdr so the kernel image is loaded at the right address and the entry point is adjusted appropriately
Signed-off-by Nick Hudson <[email protected]>---
hw/arm/boot.c | 8 +++++---
hw/core/loader.c | 12 +++++++++---
hw/core/uboot_image.h | 1 +3 files changed, 15 insertions(+), 6 deletions(-)hw/arm/boot.c +5
-3@@ -30,8 +30,9 @@* Documentation/arm/Booting and Documentation/arm64/booting.txt * They have different preferred image load offsets from system RAM base. */ -#define KERNEL_ARGS_ADDR 0x100 -#define KERNEL_LOAD_ADDR 0x00010000 +#define KERNEL_ARGS_ADDR 0x100 +#define KERNEL_NOLOAD_ADDR 0x00000000 +#define KERNEL_LOAD_ADDR 0x00010000 #define KERNEL64_LOAD_ADDR 0x00080000 #define ARM64_TEXT_OFFSET_OFFSET 8@@ -1078,7 +1079,8 @@ void arm_load_kernel(ARMCPU *cpu, struct arm_boot_info *info) } entry = elf_entry; if (kernel_size < 0) { - kernel_size = load_uimage_as(info->kernel_filename, &entry,NULL , + uint64_t loadaddr = info->loader_start + KERNEL_NOLOAD_ADDR; + kernel_size = load_uimage_as(info->kernel_filename, &entry, &loadaddr,
&is_linux, NULL, NULL, as); }
if (arm_feature(&cpu->env, ARM_FEATURE_AARCH64)&&kernel_size< 0) {hw/core/loader.c +5
-3@@ -638,13 +638,19 @@ static int load_uboot_image(const char *filename, hwaddr *ep, hwaddr *loadaddr, goto out; if (hdr->ih_type != image_type) { - fprintf(stderr, "Wrong image type %d, expected %d\n", hdr->ih_type, - image_type); - goto out; + if (image_type != IH_TYPE_KERNEL && hdr->ih_type != IH_TYPE_KERNEL_NOLOAD) { + fprintf(stderr, "Wrong image type %d, expected %d\n", hdr->ih_type, + image_type); + goto out; + } } /* TODO: Implement other image types. */switch (
hdr->ih_type) {
+ caseIH_TYPE_KERNEL_NOLOAD:
+hdr->ih_load= *loadaddr +sizeof(*hdr);
+hdr->ih_ep+=hdr->ih_load;
+
caseIH_TYPE_KERNEL:
address =hdr->ih_load;
if (translate_fn) {hw/core/uboot_image.h +1
-0@@ -124,6 +124,7 @@ #define IH_TYPE_SCRIPT 6 /* Script file */ #define IH_TYPE_FILESYSTEM 7 /* Filesystem Image (any type) */ #define IH_TYPE_FLATDT 8 /* Binary Flat Device Tree Blob */ +#define IH_TYPE_KERNEL_NOLOAD 14/* OS Kernel Image (noload) */ /** Compression Types
Quoted 1 line · Nick Hudson
ping
Hi; thanks for the ping. This patch is in my to-review queue but it may be a little while til I get to it, as I'm currently prioritising work for the 3.1 release, and this will be a new feature for 4.0.
thanks
-- PMM
Quoted 6 lines · Nick Hudson
noload kernels are loaded with the u-boot image header and as a result the header size needs adding to the entry point. Fake up a hdr so the kernel image is loaded at the right address and the entry point is adjusted appropriately
Signed-off-by Nick Hudson <[email protected]>
Hi; thanks for this patch.
Quoted 23 lines
--- hw/arm/boot.c | 8 +++++--- hw/core/loader.c | 12 +++++++++--- hw/core/uboot_image.h | 1 + 3 files changed, 15 insertions(+), 6 deletions(-)hw/arm/boot.c +3
-2@@ -30,8 +30,9 @@* Documentation/arm/Booting and Documentation/arm64/booting.txt * They have different preferred image load offsets from system RAM base. */ -#define KERNEL_ARGS_ADDR 0x100 -#define KERNEL_LOAD_ADDR 0x00010000 +#define KERNEL_ARGS_ADDR 0x100 +#define KERNEL_NOLOAD_ADDR 0x00000000 +#define KERNEL_LOAD_ADDR 0x00010000#define KERNEL64_LOAD_ADDR 0x00080000#define ARM64_TEXT_OFFSET_OFFSET 8
hw/arm/boot.c void arm_load_kernel(ARMCPU *cpu, struct arm_boot_info · line 1086
Quoted 9 lines
hw/arm/boot.c +2
-1@@ -1078,7 +1079,8 @@ void arm_load_kernel(ARMCPU *cpu, struct arm_boot_info *info) } entry = elf_entry;if (kernel_size <0 ) { - kernel_size =load_uimage_as (info->kernel_filename, &entry,NULL , +uint64_t loadaddr = info->loader_start +KERNEL_NOLOAD_ADDR ; + kernel_size =load_uimage_as (info->kernel_filename, &entry, &loadaddr, &is_linux,NULL ,NULL , as);
I don't really understand this change. The API for load_uimage_as() says that the loadaddr argument is an output, not an input, and that it is ignored if it is NULL. If we're changing the API here then we need to (a) document that change and (b) check all the callers can handle it. It would be better if we can avoid having to do that.
Quoted 17 lines
} if (arm_feature(&cpu->env, ARM_FEATURE_AARCH64) && kernel_size < 0) {hw/core/loader.c +2
-3@@ -638,13 +638,19 @@ static int load_uboot_image(const char *filename, hwaddr *ep, hwaddr *loadaddr, goto out;if (hdr->ih_type != image_type) { -fprintf (stderr,"Wrong image type %d, expected %d\n" , hdr->ih_type, - image_type); - goto out; +if (image_type !=IH_TYPE_KERNEL && hdr->ih_type !=IH_TYPE_KERNEL_NOLOAD ) { + fprintf(stderr, "Wrong image type %d, expected %d\n",
hw/core/loader.c static int load_uboot_image(const char *filename, · line 654
Quoted 10 lines
hw/core/loader.c +5
-0hdr->ih_type, + image_type); + goto out; + } }/* TODO: Implement other image types. */ switch (hdr->ih_type) { +case IH_TYPE_KERNEL_NOLOAD : + hdr->ih_load = *loadaddr +sizeof (*hdr);
This will segfault if the user passed in NULL for loadaddr, as they are allowed to do by the API.
hw/core/loader.c static int load_uboot_image(const char *filename, · line 656
Quoted 2 lines
hw/core/loader.c +2
-0+ hdr->ih_ep += hdr->ih_load; +
Cases which fall through need a specific
/* fall through */
comment. This tells human readers and static analysis tools that it was intentional.
hw/core/uboot_image.h line 127
Quoted 12 lines
case IH_TYPE_KERNEL: address = hdr->ih_load; if (translate_fn) {hw/core/uboot_image.h +1
-0@@ -124,6 +124,7 @@#define IH_TYPE_SCRIPT 6/* Script file */ #define IH_TYPE_FILESYSTEM 7/* Filesystem Image (any type) */ #define IH_TYPE_FLATDT 8/* Binary Flat Device Tree Blob */ +#define IH_TYPE_KERNEL_NOLOAD 14/* OS Kernel Image (noload) */
thanks
-- PMM
Quoted 8 lines · Peter Maydell
Quoted 6 lines · Nick Hudson
noload kernels are loaded with the u-boot image header and as a result the header size needs adding to the entry point. Fake up a hdr so the kernel image is loaded at the right address and the entry point is adjusted appropriately
Signed-off-by Nick Hudson <[email protected]>Hi; thanks for this patch.
Thanks for reviewing.
Quoted 22 lines
Quoted 22 lines
--- hw/arm/boot.c | 8 +++++--- hw/core/loader.c | 12 +++++++++--- hw/core/uboot_image.h | 1 + 3 files changed, 15 insertions(+), 6 deletions(-)hw/arm/boot.c +3
-2@@ -30,8 +30,9 @@* Documentation/arm/Booting and Documentation/arm64/booting.txt * They have different preferred image load offsets from system RAM base. */ -#define KERNEL_ARGS_ADDR 0x100 -#define KERNEL_LOAD_ADDR 0x00010000 +#define KERNEL_ARGS_ADDR 0x100 +#define KERNEL_NOLOAD_ADDR 0x00000000 +#define KERNEL_LOAD_ADDR 0x00010000#define KERNEL64_LOAD_ADDR 0x00080000
Quoted 16 lines
hw/arm/boot.c void arm_load_kernel(ARMCPU *cpu, struct arm_boot_info · line 1086
Quoted 11 lines
hw/arm/boot.c +2
-1#define ARM64_TEXT_OFFSET_OFFSET 8@@ -1078,7 +1079,8 @@ void arm_load_kernel(ARMCPU *cpu, struct arm_boot_info *info) } entry = elf_entry;if (kernel_size <0 ) { - kernel_size =load_uimage_as (info->kernel_filename, &entry,NULL , +uint64_t loadaddr = info->loader_start +KERNEL_NOLOAD_ADDR ; + kernel_size =load_uimage_as (info->kernel_filename, &entry, &loadaddr, &is_linux,NULL ,NULL , as);I don't really understand this change. The API for
load_uimage_as()says that the loadaddr argument is an output, not an input, and that it is ignored if it is NULL. If we're changing the API here then we need to (a) document that change and (b) check all the callers can handle it. It would be better if we can avoid having to do that.
I chose to pass where the noload kernel should be loaded via loadaddr as arm_load_kernel knows where RAM is. Perhaps there's a better way?
BTW, I should have mentioned that I pass the same address that is used for the bootloader. This address is adjusted in load_uboot_image by the size of the uboot header. As the bootloader is smaller than the uboot header it all works. uboot loads the whole image including header and adjusts the entry point by the header size.
Quoted 24 lines
Quoted 24 lines
} if (arm_feature(&cpu->env, ARM_FEATURE_AARCH64) && kernel_size < 0) {hw/core/loader.c +5
-3@@ -638,13 +638,19 @@ static int load_uboot_image(const char *filename, hwaddr *ep, hwaddr *loadaddr, goto out;if (hdr->ih_type != image_type) { -fprintf (stderr,"Wrong image type %d, expected %d\n" , hdr->ih_type, - image_type); - goto out; +if (image_type !=IH_TYPE_KERNEL && hdr->ih_type !=IH_TYPE_KERNEL_NOLOAD ) { +fprintf (stderr,"Wrong image type %d, expected %d\n" , hdr->ih_type, + image_type); + goto out; + } }
Quoted 6 lines
hw/core/loader.c static int load_uboot_image(const char *filename, · line 654
Quoted 4 lines
hw/core/loader.c +2
-0/* TODO: Implement other image types. */ switch (hdr->ih_type) { +case IH_TYPE_KERNEL_NOLOAD : + hdr->ih_load = *loadaddr +sizeof (*hdr);This will segfault if the user passed in NULL for loadaddr, as they are allowed to do by the API.
I can update the header with this API change and update callers if that's ok?
Quoted 8 lines
hw/core/loader.c static int load_uboot_image(const char *filename, · line 656
Quoted 3 lines
hw/core/loader.c +2
-0+ hdr->ih_ep += hdr->ih_load; +Cases which fall through need a specific
/* fall through */comment. This tells human readers and static analysis tools that it was intentional.
Sure, I did wonder if this was expected.
Thanks,
Nick