ae2474f118
Change the iMX-SoC based boards to use the new boot.c functionality to allow us to enable psci-conduit only if the guest is being booted in EL1 or EL2, so that if the user runs guest EL3 firmware code our PSCI emulation doesn't get in its way. To do this we stop setting the psci-conduit property on the CPU objects in the SoC code, and instead set the psci_conduit field in the arm_boot_info struct to tell the common boot loader code that we'd like PSCI if the guest is starting at an EL that it makes sense with. This affects the mcimx6ul-evk and mcimx7d-sabre boards. Note that for the mcimx7d board, this means that when running guest code at EL3 there is currently no way to power on the secondary CPUs, because we do not currently have a model of the system reset controller module which should be used to do that for the imx7 SoC, only for the imx6 SoC. (Previously EL3 code which knew it was running on QEMU could use a PSCI call to do this.) This doesn't affect the imx6ul-evk board because it is uniprocessor. Signed-off-by: Peter Maydell <peter.maydell@linaro.org> Reviewed-by: Richard Henderson <richard.henderson@linaro.org> Tested-by: Edgar E. Iglesias <edgar.iglesias@xilinx.com> Tested-by: Cédric Le Goater <clg@kaod.org> Acked-by: Richard Henderson <richard.henderson@linaro.org> Message-id: 20220127154639.2090164-5-peter.maydell@linaro.org
77 lines
2.4 KiB
C
77 lines
2.4 KiB
C
/*
|
|
* Copyright (c) 2018 Jean-Christophe Dubois <jcd@tribudubois.net>
|
|
*
|
|
* MCIMX6UL_EVK Board System emulation.
|
|
*
|
|
* This code is licensed under the GPL, version 2 or later.
|
|
* See the file `COPYING' in the top level directory.
|
|
*
|
|
* It (partially) emulates a mcimx6ul_evk board, with a Freescale
|
|
* i.MX6ul SoC
|
|
*/
|
|
|
|
#include "qemu/osdep.h"
|
|
#include "qapi/error.h"
|
|
#include "hw/arm/fsl-imx6ul.h"
|
|
#include "hw/boards.h"
|
|
#include "hw/qdev-properties.h"
|
|
#include "qemu/error-report.h"
|
|
#include "sysemu/qtest.h"
|
|
|
|
static void mcimx6ul_evk_init(MachineState *machine)
|
|
{
|
|
static struct arm_boot_info boot_info;
|
|
FslIMX6ULState *s;
|
|
int i;
|
|
|
|
if (machine->ram_size > FSL_IMX6UL_MMDC_SIZE) {
|
|
error_report("RAM size " RAM_ADDR_FMT " above max supported (%08x)",
|
|
machine->ram_size, FSL_IMX6UL_MMDC_SIZE);
|
|
exit(1);
|
|
}
|
|
|
|
boot_info = (struct arm_boot_info) {
|
|
.loader_start = FSL_IMX6UL_MMDC_ADDR,
|
|
.board_id = -1,
|
|
.ram_size = machine->ram_size,
|
|
.nb_cpus = machine->smp.cpus,
|
|
.psci_conduit = QEMU_PSCI_CONDUIT_SMC,
|
|
};
|
|
|
|
s = FSL_IMX6UL(object_new(TYPE_FSL_IMX6UL));
|
|
object_property_add_child(OBJECT(machine), "soc", OBJECT(s));
|
|
object_property_set_uint(OBJECT(s), "fec1-phy-num", 2, &error_fatal);
|
|
object_property_set_uint(OBJECT(s), "fec2-phy-num", 1, &error_fatal);
|
|
qdev_realize(DEVICE(s), NULL, &error_fatal);
|
|
|
|
memory_region_add_subregion(get_system_memory(), FSL_IMX6UL_MMDC_ADDR,
|
|
machine->ram);
|
|
|
|
for (i = 0; i < FSL_IMX6UL_NUM_USDHCS; i++) {
|
|
BusState *bus;
|
|
DeviceState *carddev;
|
|
DriveInfo *di;
|
|
BlockBackend *blk;
|
|
|
|
di = drive_get(IF_SD, 0, i);
|
|
blk = di ? blk_by_legacy_dinfo(di) : NULL;
|
|
bus = qdev_get_child_bus(DEVICE(&s->usdhc[i]), "sd-bus");
|
|
carddev = qdev_new(TYPE_SD_CARD);
|
|
qdev_prop_set_drive_err(carddev, "drive", blk, &error_fatal);
|
|
qdev_realize_and_unref(carddev, bus, &error_fatal);
|
|
}
|
|
|
|
if (!qtest_enabled()) {
|
|
arm_load_kernel(&s->cpu, machine, &boot_info);
|
|
}
|
|
}
|
|
|
|
static void mcimx6ul_evk_machine_init(MachineClass *mc)
|
|
{
|
|
mc->desc = "Freescale i.MX6UL Evaluation Kit (Cortex-A7)";
|
|
mc->init = mcimx6ul_evk_init;
|
|
mc->max_cpus = FSL_IMX6UL_NUM_CPUS;
|
|
mc->default_ram_id = "mcimx6ul-evk.ram";
|
|
}
|
|
DEFINE_MACHINE("mcimx6ul-evk", mcimx6ul_evk_machine_init)
|