mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

hw/arm/raspi: Move arm_boot_info structure to RaspiMachineState

Browse Source 
The arm_boot_info structure belong to the machine,
move it to RaspiMachineState.

Reviewed-by: Luc Michel <luc.michel@greensocs.com>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-id: 20200924111808.77168-4-f4bug@amsat.org
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Philippe Mathieu-Daudé 2020-09-24 13:18:03 +02:00 committed by Peter Maydell
parent 02058e4b40
commit 0f15c6e338
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
hw/arm/raspi.c
View File

@ -41,6 +41,7 @@ struct RaspiMachineState {
MachineState parent_obj; MachineState parent_obj;
/*< public >*/ /*< public >*/
BCM283XState soc; BCM283XState soc;
struct arm_boot_info binfo;
}; };
typedef struct RaspiMachineState RaspiMachineState; typedef struct RaspiMachineState RaspiMachineState;
@ -206,12 +207,11 @@ static void reset_secondary(ARMCPU *cpu, const struct arm_boot_info *info)
static void setup_boot(MachineState *machine, int version, size_t ram_size) static void setup_boot(MachineState *machine, int version, size_t ram_size)
{ {
RaspiMachineState *s = RASPI_MACHINE(machine); RaspiMachineState *s = RASPI_MACHINE(machine);
static struct arm_boot_info binfo;
int r; int r;
binfo.board_id = MACH_TYPE_BCM2708; s->binfo.board_id = MACH_TYPE_BCM2708;
binfo.ram_size = ram_size; s->binfo.ram_size = ram_size;
binfo.nb_cpus = machine->smp.cpus; s->binfo.nb_cpus = machine->smp.cpus;
if (version <= 2) { if (version <= 2) {
/* The rpi1 and 2 require some custom setup code to run in Secure /* The rpi1 and 2 require some custom setup code to run in Secure
@ -220,21 +220,21 @@ static void setup_boot(MachineState *machine, int version, size_t ram_size)
* firmware for some cache maintenance operations. * firmware for some cache maintenance operations.
* The rpi3 doesn't need this. * The rpi3 doesn't need this.
*/ */
binfo.board_setup_addr = BOARDSETUP_ADDR; s->binfo.board_setup_addr = BOARDSETUP_ADDR;
binfo.write_board_setup = write_board_setup; s->binfo.write_board_setup = write_board_setup;
binfo.secure_board_setup = true; s->binfo.secure_board_setup = true;
binfo.secure_boot = true; s->binfo.secure_boot = true;
} }
/* Pi2 and Pi3 requires SMP setup */ /* Pi2 and Pi3 requires SMP setup */
if (version >= 2) { if (version >= 2) {
binfo.smp_loader_start = SMPBOOT_ADDR; s->binfo.smp_loader_start = SMPBOOT_ADDR;
if (version == 2) { if (version == 2) {
binfo.write_secondary_boot = write_smpboot; s->binfo.write_secondary_boot = write_smpboot;
} else { } else {
binfo.write_secondary_boot = write_smpboot64; s->binfo.write_secondary_boot = write_smpboot64;
} }
binfo.secondary_cpu_reset_hook = reset_secondary; s->binfo.secondary_cpu_reset_hook = reset_secondary;
} }
/* If the user specified a "firmware" image (e.g. UEFI), we bypass /* If the user specified a "firmware" image (e.g. UEFI), we bypass
@ -250,11 +250,11 @@ static void setup_boot(MachineState *machine, int version, size_t ram_size)
exit(1); exit(1);
} }
binfo.entry = firmware_addr; s->binfo.entry = firmware_addr;
binfo.firmware_loaded = true; s->binfo.firmware_loaded = true;
} }
arm_load_kernel(&s->soc.cpu[0].core, machine, &binfo); arm_load_kernel(&s->soc.cpu[0].core, machine, &s->binfo);
} }
static void raspi_machine_init(MachineState *machine) static void raspi_machine_init(MachineState *machine)