| Message ID | 20220823160417.3858216-3-peter.maydell@linaro.org |
|---|---|
| State | Accepted |
| Headers | show |
| Series | target/arm: armv7m_load_kernel() improvements | expand |
On 8/23/22 09:04, Peter Maydell wrote: > Currently armv7m_load_kernel() takes the size of the block of memory > where it should load the initial guest image, but assumes that it > should always load it at address 0. This happens to be true of all > our M-profile boards at the moment, but it isn't guaranteed to always > be so: M-profile CPUs can be configured (via init-svtor and > init-nsvtor, which match equivalent hardware configuration signals) > to have the initial vector table at any address, not just zero. (For > instance the Teeny board has the boot ROM at address 0x0200_0000.) > > Add a base address argument to armv7m_load_kernel(), so that > callers now pass in both base address and size. All the current > callers pass 0, so this is not a behaviour change. > > Signed-off-by: Peter Maydell<peter.maydell@linaro.org> > --- Reviewed-by: Richard Henderson <richard.henderson@linaro.org> r~
On 23/8/22 18:04, Peter Maydell wrote: > Currently armv7m_load_kernel() takes the size of the block of memory > where it should load the initial guest image, but assumes that it > should always load it at address 0. This happens to be true of all > our M-profile boards at the moment, but it isn't guaranteed to always > be so: M-profile CPUs can be configured (via init-svtor and > init-nsvtor, which match equivalent hardware configuration signals) > to have the initial vector table at any address, not just zero. (For > instance the Teeny board has the boot ROM at address 0x0200_0000.) > > Add a base address argument to armv7m_load_kernel(), so that > callers now pass in both base address and size. All the current > callers pass 0, so this is not a behaviour change. > > Signed-off-by: Peter Maydell <peter.maydell@linaro.org> Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org> > --- > I thought about having armv7m_load_kernel() be "clever" and ask the > CPU what init-svtor/init-nsvtor were set to, but that seems like it > might have unanticipated consequences. "Just pass the base address" > is simpler and is how A-profile does it (though for A-profile it's > the loader_start field in struct arm_boot_info rather than an > extra argument). > --- > include/hw/arm/boot.h | 5 ++++- > hw/arm/armv7m.c | 5 +++-- > hw/arm/aspeed.c | 1 + > hw/arm/microbit.c | 2 +- > hw/arm/mps2-tz.c | 2 +- > hw/arm/mps2.c | 2 +- > hw/arm/msf2-som.c | 2 +- > hw/arm/musca.c | 3 ++- > hw/arm/netduino2.c | 2 +- > hw/arm/netduinoplus2.c | 2 +- > hw/arm/stellaris.c | 2 +- > hw/arm/stm32vldiscovery.c | 2 +- > 12 files changed, 18 insertions(+), 12 deletions(-) > > diff --git a/include/hw/arm/boot.h b/include/hw/arm/boot.h > index c7ebae156ec..f18cc3064ff 100644 > --- a/include/hw/arm/boot.h > +++ b/include/hw/arm/boot.h > @@ -25,13 +25,16 @@ typedef enum { > * armv7m_load_kernel: > * @cpu: CPU > * @kernel_filename: file to load > + * @mem_base: base address to load image at (should be where the > + * CPU expects to find its vector table on reset) > * @mem_size: mem_size: maximum image size to load > * > * Load the guest image for an ARMv7M system. This must be called by > * any ARMv7M board. (This is necessary to ensure that the CPU resets > * correctly on system reset, as well as for kernel loading.) > */ > -void armv7m_load_kernel(ARMCPU *cpu, const char *kernel_filename, int mem_size); > +void armv7m_load_kernel(ARMCPU *cpu, const char *kernel_filename, > + hwaddr mem_base, int mem_size); > > /* arm_boot.c */ > struct arm_boot_info { > diff --git a/hw/arm/armv7m.c b/hw/arm/armv7m.c > index fa4c2c735da..50a9507c0bd 100644 > --- a/hw/arm/armv7m.c > +++ b/hw/arm/armv7m.c > @@ -568,7 +568,8 @@ static void armv7m_reset(void *opaque) > cpu_reset(CPU(cpu)); > } > > -void armv7m_load_kernel(ARMCPU *cpu, const char *kernel_filename, int mem_size) > +void armv7m_load_kernel(ARMCPU *cpu, const char *kernel_filename, > + hwaddr mem_base, int mem_size) > { > ssize_t image_size; > uint64_t entry; > @@ -588,7 +589,7 @@ void armv7m_load_kernel(ARMCPU *cpu, const char *kernel_filename, int mem_size) > &entry, NULL, NULL, > NULL, 0, EM_ARM, 1, 0, as); > if (image_size < 0) { > - image_size = load_image_targphys_as(kernel_filename, 0, > + image_size = load_image_targphys_as(kernel_filename, mem_base, > mem_size, as); > } > if (image_size < 0) { > diff --git a/hw/arm/aspeed.c b/hw/arm/aspeed.c > index b3bbe06f8fa..bc3ecdb6199 100644 > --- a/hw/arm/aspeed.c > +++ b/hw/arm/aspeed.c > @@ -1430,6 +1430,7 @@ static void aspeed_minibmc_machine_init(MachineState *machine) > > armv7m_load_kernel(ARM_CPU(first_cpu), > machine->kernel_filename, > + 0, > AST1030_INTERNAL_FLASH_SIZE); > } > > diff --git a/hw/arm/microbit.c b/hw/arm/microbit.c > index e9494334ce7..50df3620882 100644 > --- a/hw/arm/microbit.c > +++ b/hw/arm/microbit.c > @@ -57,7 +57,7 @@ static void microbit_init(MachineState *machine) > mr, -1); > > armv7m_load_kernel(ARM_CPU(first_cpu), machine->kernel_filename, > - s->nrf51.flash_size); > + 0, s->nrf51.flash_size); > } > > static void microbit_machine_class_init(ObjectClass *oc, void *data) > diff --git a/hw/arm/mps2-tz.c b/hw/arm/mps2-tz.c > index 4017392bf5a..394192b9b20 100644 > --- a/hw/arm/mps2-tz.c > +++ b/hw/arm/mps2-tz.c > @@ -1197,7 +1197,7 @@ static void mps2tz_common_init(MachineState *machine) > } > > armv7m_load_kernel(ARM_CPU(first_cpu), machine->kernel_filename, > - boot_ram_size(mms)); > + 0, boot_ram_size(mms)); > } > > static void mps2_tz_idau_check(IDAUInterface *ii, uint32_t address, > diff --git a/hw/arm/mps2.c b/hw/arm/mps2.c > index bb76fa68890..a86a994dbac 100644 > --- a/hw/arm/mps2.c > +++ b/hw/arm/mps2.c > @@ -450,7 +450,7 @@ static void mps2_common_init(MachineState *machine) > mmc->fpga_type == FPGA_AN511 ? 47 : 13)); > > armv7m_load_kernel(ARM_CPU(first_cpu), machine->kernel_filename, > - 0x400000); > + 0, 0x400000); > } > > static void mps2_class_init(ObjectClass *oc, void *data) > diff --git a/hw/arm/msf2-som.c b/hw/arm/msf2-som.c > index d9f881690e0..a6df473ec90 100644 > --- a/hw/arm/msf2-som.c > +++ b/hw/arm/msf2-som.c > @@ -98,7 +98,7 @@ static void emcraft_sf2_s2s010_init(MachineState *machine) > sysbus_connect_irq(SYS_BUS_DEVICE(&soc->spi[0]), 1, cs_line); > > armv7m_load_kernel(ARM_CPU(first_cpu), machine->kernel_filename, > - soc->envm_size); > + 0, soc->envm_size); > } > > static void emcraft_sf2_machine_init(MachineClass *mc) > diff --git a/hw/arm/musca.c b/hw/arm/musca.c > index 7a83f7dda7d..6eeee57c9dd 100644 > --- a/hw/arm/musca.c > +++ b/hw/arm/musca.c > @@ -597,7 +597,8 @@ static void musca_init(MachineState *machine) > "cfg_sec_resp", 0)); > } > > - armv7m_load_kernel(ARM_CPU(first_cpu), machine->kernel_filename, 0x2000000); > + armv7m_load_kernel(ARM_CPU(first_cpu), machine->kernel_filename, > + 0, 0x2000000); > } > > static void musca_class_init(ObjectClass *oc, void *data) > diff --git a/hw/arm/netduino2.c b/hw/arm/netduino2.c > index 3365da11bf7..83753d53a3f 100644 > --- a/hw/arm/netduino2.c > +++ b/hw/arm/netduino2.c > @@ -49,7 +49,7 @@ static void netduino2_init(MachineState *machine) > sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal); > > armv7m_load_kernel(ARM_CPU(first_cpu), machine->kernel_filename, > - FLASH_SIZE); > + 0, FLASH_SIZE); > } > > static void netduino2_machine_init(MachineClass *mc) > diff --git a/hw/arm/netduinoplus2.c b/hw/arm/netduinoplus2.c > index 76cea8e4891..515c0816054 100644 > --- a/hw/arm/netduinoplus2.c > +++ b/hw/arm/netduinoplus2.c > @@ -50,7 +50,7 @@ static void netduinoplus2_init(MachineState *machine) > > armv7m_load_kernel(ARM_CPU(first_cpu), > machine->kernel_filename, > - FLASH_SIZE); > + 0, FLASH_SIZE); > } > > static void netduinoplus2_machine_init(MachineClass *mc) > diff --git a/hw/arm/stellaris.c b/hw/arm/stellaris.c > index 12c673c9172..a9e96c37f89 100644 > --- a/hw/arm/stellaris.c > +++ b/hw/arm/stellaris.c > @@ -1302,7 +1302,7 @@ static void stellaris_init(MachineState *ms, stellaris_board_info *board) > create_unimplemented_device("hibernation", 0x400fc000, 0x1000); > create_unimplemented_device("flash-control", 0x400fd000, 0x1000); > > - armv7m_load_kernel(ARM_CPU(first_cpu), ms->kernel_filename, flash_size); > + armv7m_load_kernel(ARM_CPU(first_cpu), ms->kernel_filename, 0, flash_size); > } > > /* FIXME: Figure out how to generate these from stellaris_boards. */ > diff --git a/hw/arm/stm32vldiscovery.c b/hw/arm/stm32vldiscovery.c > index 04036da3ee0..67675e952fc 100644 > --- a/hw/arm/stm32vldiscovery.c > +++ b/hw/arm/stm32vldiscovery.c > @@ -53,7 +53,7 @@ static void stm32vldiscovery_init(MachineState *machine) > > armv7m_load_kernel(ARM_CPU(first_cpu), > machine->kernel_filename, > - FLASH_SIZE); > + 0, FLASH_SIZE); > } > > static void stm32vldiscovery_machine_init(MachineClass *mc)
diff --git a/include/hw/arm/boot.h b/include/hw/arm/boot.h index c7ebae156ec..f18cc3064ff 100644 --- a/include/hw/arm/boot.h +++ b/include/hw/arm/boot.h @@ -25,13 +25,16 @@ typedef enum { * armv7m_load_kernel: * @cpu: CPU * @kernel_filename: file to load + * @mem_base: base address to load image at (should be where the + * CPU expects to find its vector table on reset) * @mem_size: mem_size: maximum image size to load * * Load the guest image for an ARMv7M system. This must be called by * any ARMv7M board. (This is necessary to ensure that the CPU resets * correctly on system reset, as well as for kernel loading.) */ -void armv7m_load_kernel(ARMCPU *cpu, const char *kernel_filename, int mem_size); +void armv7m_load_kernel(ARMCPU *cpu, const char *kernel_filename, + hwaddr mem_base, int mem_size); /* arm_boot.c */ struct arm_boot_info { diff --git a/hw/arm/armv7m.c b/hw/arm/armv7m.c index fa4c2c735da..50a9507c0bd 100644 --- a/hw/arm/armv7m.c +++ b/hw/arm/armv7m.c @@ -568,7 +568,8 @@ static void armv7m_reset(void *opaque) cpu_reset(CPU(cpu)); } -void armv7m_load_kernel(ARMCPU *cpu, const char *kernel_filename, int mem_size) +void armv7m_load_kernel(ARMCPU *cpu, const char *kernel_filename, + hwaddr mem_base, int mem_size) { ssize_t image_size; uint64_t entry; @@ -588,7 +589,7 @@ void armv7m_load_kernel(ARMCPU *cpu, const char *kernel_filename, int mem_size) &entry, NULL, NULL, NULL, 0, EM_ARM, 1, 0, as); if (image_size < 0) { - image_size = load_image_targphys_as(kernel_filename, 0, + image_size = load_image_targphys_as(kernel_filename, mem_base, mem_size, as); } if (image_size < 0) { diff --git a/hw/arm/aspeed.c b/hw/arm/aspeed.c index b3bbe06f8fa..bc3ecdb6199 100644 --- a/hw/arm/aspeed.c +++ b/hw/arm/aspeed.c @@ -1430,6 +1430,7 @@ static void aspeed_minibmc_machine_init(MachineState *machine) armv7m_load_kernel(ARM_CPU(first_cpu), machine->kernel_filename, + 0, AST1030_INTERNAL_FLASH_SIZE); } diff --git a/hw/arm/microbit.c b/hw/arm/microbit.c index e9494334ce7..50df3620882 100644 --- a/hw/arm/microbit.c +++ b/hw/arm/microbit.c @@ -57,7 +57,7 @@ static void microbit_init(MachineState *machine) mr, -1); armv7m_load_kernel(ARM_CPU(first_cpu), machine->kernel_filename, - s->nrf51.flash_size); + 0, s->nrf51.flash_size); } static void microbit_machine_class_init(ObjectClass *oc, void *data) diff --git a/hw/arm/mps2-tz.c b/hw/arm/mps2-tz.c index 4017392bf5a..394192b9b20 100644 --- a/hw/arm/mps2-tz.c +++ b/hw/arm/mps2-tz.c @@ -1197,7 +1197,7 @@ static void mps2tz_common_init(MachineState *machine) } armv7m_load_kernel(ARM_CPU(first_cpu), machine->kernel_filename, - boot_ram_size(mms)); + 0, boot_ram_size(mms)); } static void mps2_tz_idau_check(IDAUInterface *ii, uint32_t address, diff --git a/hw/arm/mps2.c b/hw/arm/mps2.c index bb76fa68890..a86a994dbac 100644 --- a/hw/arm/mps2.c +++ b/hw/arm/mps2.c @@ -450,7 +450,7 @@ static void mps2_common_init(MachineState *machine) mmc->fpga_type == FPGA_AN511 ? 47 : 13)); armv7m_load_kernel(ARM_CPU(first_cpu), machine->kernel_filename, - 0x400000); + 0, 0x400000); } static void mps2_class_init(ObjectClass *oc, void *data) diff --git a/hw/arm/msf2-som.c b/hw/arm/msf2-som.c index d9f881690e0..a6df473ec90 100644 --- a/hw/arm/msf2-som.c +++ b/hw/arm/msf2-som.c @@ -98,7 +98,7 @@ static void emcraft_sf2_s2s010_init(MachineState *machine) sysbus_connect_irq(SYS_BUS_DEVICE(&soc->spi[0]), 1, cs_line); armv7m_load_kernel(ARM_CPU(first_cpu), machine->kernel_filename, - soc->envm_size); + 0, soc->envm_size); } static void emcraft_sf2_machine_init(MachineClass *mc) diff --git a/hw/arm/musca.c b/hw/arm/musca.c index 7a83f7dda7d..6eeee57c9dd 100644 --- a/hw/arm/musca.c +++ b/hw/arm/musca.c @@ -597,7 +597,8 @@ static void musca_init(MachineState *machine) "cfg_sec_resp", 0)); } - armv7m_load_kernel(ARM_CPU(first_cpu), machine->kernel_filename, 0x2000000); + armv7m_load_kernel(ARM_CPU(first_cpu), machine->kernel_filename, + 0, 0x2000000); } static void musca_class_init(ObjectClass *oc, void *data) diff --git a/hw/arm/netduino2.c b/hw/arm/netduino2.c index 3365da11bf7..83753d53a3f 100644 --- a/hw/arm/netduino2.c +++ b/hw/arm/netduino2.c @@ -49,7 +49,7 @@ static void netduino2_init(MachineState *machine) sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal); armv7m_load_kernel(ARM_CPU(first_cpu), machine->kernel_filename, - FLASH_SIZE); + 0, FLASH_SIZE); } static void netduino2_machine_init(MachineClass *mc) diff --git a/hw/arm/netduinoplus2.c b/hw/arm/netduinoplus2.c index 76cea8e4891..515c0816054 100644 --- a/hw/arm/netduinoplus2.c +++ b/hw/arm/netduinoplus2.c @@ -50,7 +50,7 @@ static void netduinoplus2_init(MachineState *machine) armv7m_load_kernel(ARM_CPU(first_cpu), machine->kernel_filename, - FLASH_SIZE); + 0, FLASH_SIZE); } static void netduinoplus2_machine_init(MachineClass *mc) diff --git a/hw/arm/stellaris.c b/hw/arm/stellaris.c index 12c673c9172..a9e96c37f89 100644 --- a/hw/arm/stellaris.c +++ b/hw/arm/stellaris.c @@ -1302,7 +1302,7 @@ static void stellaris_init(MachineState *ms, stellaris_board_info *board) create_unimplemented_device("hibernation", 0x400fc000, 0x1000); create_unimplemented_device("flash-control", 0x400fd000, 0x1000); - armv7m_load_kernel(ARM_CPU(first_cpu), ms->kernel_filename, flash_size); + armv7m_load_kernel(ARM_CPU(first_cpu), ms->kernel_filename, 0, flash_size); } /* FIXME: Figure out how to generate these from stellaris_boards. */ diff --git a/hw/arm/stm32vldiscovery.c b/hw/arm/stm32vldiscovery.c index 04036da3ee0..67675e952fc 100644 --- a/hw/arm/stm32vldiscovery.c +++ b/hw/arm/stm32vldiscovery.c @@ -53,7 +53,7 @@ static void stm32vldiscovery_init(MachineState *machine) armv7m_load_kernel(ARM_CPU(first_cpu), machine->kernel_filename, - FLASH_SIZE); + 0, FLASH_SIZE); } static void stm32vldiscovery_machine_init(MachineClass *mc)
Currently armv7m_load_kernel() takes the size of the block of memory where it should load the initial guest image, but assumes that it should always load it at address 0. This happens to be true of all our M-profile boards at the moment, but it isn't guaranteed to always be so: M-profile CPUs can be configured (via init-svtor and init-nsvtor, which match equivalent hardware configuration signals) to have the initial vector table at any address, not just zero. (For instance the Teeny board has the boot ROM at address 0x0200_0000.) Add a base address argument to armv7m_load_kernel(), so that callers now pass in both base address and size. All the current callers pass 0, so this is not a behaviour change. Signed-off-by: Peter Maydell <peter.maydell@linaro.org> --- I thought about having armv7m_load_kernel() be "clever" and ask the CPU what init-svtor/init-nsvtor were set to, but that seems like it might have unanticipated consequences. "Just pass the base address" is simpler and is how A-profile does it (though for A-profile it's the loader_start field in struct arm_boot_info rather than an extra argument). --- include/hw/arm/boot.h | 5 ++++- hw/arm/armv7m.c | 5 +++-- hw/arm/aspeed.c | 1 + hw/arm/microbit.c | 2 +- hw/arm/mps2-tz.c | 2 +- hw/arm/mps2.c | 2 +- hw/arm/msf2-som.c | 2 +- hw/arm/musca.c | 3 ++- hw/arm/netduino2.c | 2 +- hw/arm/netduinoplus2.c | 2 +- hw/arm/stellaris.c | 2 +- hw/arm/stm32vldiscovery.c | 2 +- 12 files changed, 18 insertions(+), 12 deletions(-)