* [PATCH v1 0/1] hw/arm: versal-virt: Always call arm_load_kernel()
@ 2022-01-30 11:03 Edgar E. Iglesias
2022-01-30 11:03 ` [PATCH v1 1/1] " Edgar E. Iglesias
2022-02-07 17:09 ` [PATCH v1 0/1] " Peter Maydell
0 siblings, 2 replies; 3+ messages in thread
From: Edgar E. Iglesias @ 2022-01-30 11:03 UTC (permalink / raw)
To: qemu-devel
Cc: edgar.iglesias, peter.maydell, sstabellini, luc, sai.pavan.boddu,
frasse.iglesias, alistair, richard.henderson, francisco.iglesias,
frederic.konrad, qemu-arm, philmd
From: "Edgar E. Iglesias" <edgar.iglesias@xilinx.com>
This should be applied on top of Peter Maydell's
"arm: Fix handling of unrecognized functions in PSCI emulation"
patch series.
This fixes an issue reported by Peter Maydell. We should
always call arm_load_kernel() regardless of kernel_filename being
set. This is needed because arm_load_kernel() sets up reset for
the CPUs.
Cheers,
Edgar
Edgar E. Iglesias (1):
hw/arm: versal-virt: Always call arm_load_kernel()
hw/arm/xlnx-versal-virt.c | 11 ++---------
1 file changed, 2 insertions(+), 9 deletions(-)
--
2.25.1
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH v1 1/1] hw/arm: versal-virt: Always call arm_load_kernel()
2022-01-30 11:03 [PATCH v1 0/1] hw/arm: versal-virt: Always call arm_load_kernel() Edgar E. Iglesias
@ 2022-01-30 11:03 ` Edgar E. Iglesias
2022-02-07 17:09 ` [PATCH v1 0/1] " Peter Maydell
1 sibling, 0 replies; 3+ messages in thread
From: Edgar E. Iglesias @ 2022-01-30 11:03 UTC (permalink / raw)
To: qemu-devel
Cc: edgar.iglesias, peter.maydell, sstabellini, luc, sai.pavan.boddu,
frasse.iglesias, alistair, richard.henderson, francisco.iglesias,
frederic.konrad, qemu-arm, philmd
From: "Edgar E. Iglesias" <edgar.iglesias@xilinx.com>
Always call arm_load_kernel() regardless of kernel_filename being
set. This is needed because arm_load_kernel() sets up reset for
the CPUs.
Fixes: 6f16da53ff (hw/arm: versal: Add a virtual Xilinx Versal board)
Reported-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Edgar E. Iglesias <edgar.iglesias@xilinx.com>
---
hw/arm/xlnx-versal-virt.c | 11 ++---------
1 file changed, 2 insertions(+), 9 deletions(-)
diff --git a/hw/arm/xlnx-versal-virt.c b/hw/arm/xlnx-versal-virt.c
index ef3231cdbb..7c7baff8b7 100644
--- a/hw/arm/xlnx-versal-virt.c
+++ b/hw/arm/xlnx-versal-virt.c
@@ -681,20 +681,13 @@ static void versal_virt_init(MachineState *machine)
s->binfo.get_dtb = versal_virt_get_dtb;
s->binfo.modify_dtb = versal_virt_modify_dtb;
s->binfo.psci_conduit = psci_conduit;
- if (machine->kernel_filename) {
- arm_load_kernel(&s->soc.fpd.apu.cpu[0], machine, &s->binfo);
- } else {
- AddressSpace *as = arm_boot_address_space(&s->soc.fpd.apu.cpu[0],
- &s->binfo);
+ if (!machine->kernel_filename) {
/* Some boot-loaders (e.g u-boot) don't like blobs at address 0 (NULL).
* Offset things by 4K. */
s->binfo.loader_start = 0x1000;
s->binfo.dtb_limit = 0x1000000;
- if (arm_load_dtb(s->binfo.loader_start,
- &s->binfo, s->binfo.dtb_limit, as, machine) < 0) {
- exit(EXIT_FAILURE);
- }
}
+ arm_load_kernel(&s->soc.fpd.apu.cpu[0], machine, &s->binfo);
for (i = 0; i < XLNX_VERSAL_NUM_OSPI_FLASH; i++) {
BusState *spi_bus;
--
2.25.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH v1 0/1] hw/arm: versal-virt: Always call arm_load_kernel()
2022-01-30 11:03 [PATCH v1 0/1] hw/arm: versal-virt: Always call arm_load_kernel() Edgar E. Iglesias
2022-01-30 11:03 ` [PATCH v1 1/1] " Edgar E. Iglesias
@ 2022-02-07 17:09 ` Peter Maydell
1 sibling, 0 replies; 3+ messages in thread
From: Peter Maydell @ 2022-02-07 17:09 UTC (permalink / raw)
To: Edgar E. Iglesias
Cc: edgar.iglesias, sstabellini, luc, sai.pavan.boddu,
frasse.iglesias, alistair, richard.henderson, qemu-devel,
francisco.iglesias, frederic.konrad, qemu-arm, philmd
On Sun, 30 Jan 2022 at 11:03, Edgar E. Iglesias
<edgar.iglesias@gmail.com> wrote:
>
> From: "Edgar E. Iglesias" <edgar.iglesias@xilinx.com>
>
> This should be applied on top of Peter Maydell's
> "arm: Fix handling of unrecognized functions in PSCI emulation"
> patch series.
>
> This fixes an issue reported by Peter Maydell. We should
> always call arm_load_kernel() regardless of kernel_filename being
> set. This is needed because arm_load_kernel() sets up reset for
> the CPUs.
Applied to target-arm.next, thanks.
-- PMM
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-02-07 17:13 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-01-30 11:03 [PATCH v1 0/1] hw/arm: versal-virt: Always call arm_load_kernel() Edgar E. Iglesias
2022-01-30 11:03 ` [PATCH v1 1/1] " Edgar E. Iglesias
2022-02-07 17:09 ` [PATCH v1 0/1] " Peter Maydell
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.