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

raspi: Raspberry Pi 3 support

Browse Source 
This patch adds Raspberry Pi 3 support to hw/arm/raspi.c. The
differences to Pi 2 are:

 - Firmware address
 - Board ID
 - Board revision

The CPU is different too, but that's going to be configured as part of
the machine default CPU when we introduce a new machine type.

The patch was written from scratch by me but the logic is similar to
Zoltán Baldaszti's previous work, which I used as a reference (with
permission from the author):

  https://github.com/bztsrc/qemu-raspi3

Signed-off-by: Pekka Enberg <penberg@iki.fi>
[PMM: fixed trailing whitespace on one line]
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Pekka Enberg 2018-02-15 18:29:36 +00:00 committed by Peter Maydell
parent d9f8bbd8eb
commit bade58166f
1 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
hw/arm/raspi.c
View File

@ -5,6 +5,9 @@
* Rasperry Pi 2 emulation Copyright (c) 2015, Microsoft * Rasperry Pi 2 emulation Copyright (c) 2015, Microsoft
* Written by Andrew Baumann * Written by Andrew Baumann
* *
* Raspberry Pi 3 emulation Copyright (c) 2018 Zoltán Baldaszti
* Upstream code cleanup (c) 2018 Pekka Enberg
*
* This code is licensed under the GNU GPLv2 and later. * This code is licensed under the GNU GPLv2 and later.
*/ */
@ -22,10 +25,11 @@
#define SMPBOOT_ADDR 0x300 /* this should leave enough space for ATAGS */ #define SMPBOOT_ADDR 0x300 /* this should leave enough space for ATAGS */
#define MVBAR_ADDR 0x400 /* secure vectors */ #define MVBAR_ADDR 0x400 /* secure vectors */
#define BOARDSETUP_ADDR (MVBAR_ADDR + 0x20) /* board setup code */ #define BOARDSETUP_ADDR (MVBAR_ADDR + 0x20) /* board setup code */
#define FIRMWARE_ADDR 0x8000 /* Pi loads kernel.img here by default */ #define FIRMWARE_ADDR_2 0x8000 /* Pi 2 loads kernel.img here by default */
#define FIRMWARE_ADDR_3 0x80000 /* Pi 3 loads kernel.img here by default */
/* Table of Linux board IDs for different Pi versions */ /* Table of Linux board IDs for different Pi versions */
static const int raspi_boardid[] = {[1] = 0xc42, [2] = 0xc43}; static const int raspi_boardid[] = {[1] = 0xc42, [2] = 0xc43, [3] = 0xc44};
typedef struct RasPiState { typedef struct RasPiState {
BCM2836State soc; BCM2836State soc;
@ -83,8 +87,8 @@ static void setup_boot(MachineState *machine, int version, size_t ram_size)
binfo.secure_board_setup = true; binfo.secure_board_setup = true;
binfo.secure_boot = true; binfo.secure_boot = true;
/* Pi2 requires SMP setup */ /* Pi2 and Pi3 requires SMP setup */
if (version == 2) { if (version >= 2) {
binfo.smp_loader_start = SMPBOOT_ADDR; binfo.smp_loader_start = SMPBOOT_ADDR;
binfo.write_secondary_boot = write_smpboot; binfo.write_secondary_boot = write_smpboot;
binfo.secondary_cpu_reset_hook = reset_secondary; binfo.secondary_cpu_reset_hook = reset_secondary;
@ -94,15 +98,16 @@ static void setup_boot(MachineState *machine, int version, size_t ram_size)
* the normal Linux boot process * the normal Linux boot process
*/ */
if (machine->firmware) { if (machine->firmware) {
hwaddr firmware_addr = version == 3 ? FIRMWARE_ADDR_3 : FIRMWARE_ADDR_2;
/* load the firmware image (typically kernel.img) */ /* load the firmware image (typically kernel.img) */
r = load_image_targphys(machine->firmware, FIRMWARE_ADDR, r = load_image_targphys(machine->firmware, firmware_addr,
ram_size - FIRMWARE_ADDR); ram_size - firmware_addr);
if (r < 0) { if (r < 0) {
error_report("Failed to load firmware from %s", machine->firmware); error_report("Failed to load firmware from %s", machine->firmware);
exit(1); exit(1);
} }
binfo.entry = FIRMWARE_ADDR; binfo.entry = firmware_addr;
binfo.firmware_loaded = true; binfo.firmware_loaded = true;
} else { } else {
binfo.kernel_filename = machine->kernel_filename; binfo.kernel_filename = machine->kernel_filename;
@ -113,7 +118,7 @@ static void setup_boot(MachineState *machine, int version, size_t ram_size)
arm_load_kernel(ARM_CPU(first_cpu), &binfo); arm_load_kernel(ARM_CPU(first_cpu), &binfo);
} }
static void raspi2_init(MachineState *machine) static void raspi_init(MachineState *machine, int version)
{ {
RasPiState *s = g_new0(RasPiState, 1); RasPiState *s = g_new0(RasPiState, 1);
uint32_t vcram_size; uint32_t vcram_size;
@ -139,7 +144,8 @@ static void raspi2_init(MachineState *machine)
&error_abort); &error_abort);
object_property_set_int(OBJECT(&s->soc), smp_cpus, "enabled-cpus", object_property_set_int(OBJECT(&s->soc), smp_cpus, "enabled-cpus",
&error_abort); &error_abort);
object_property_set_int(OBJECT(&s->soc), 0xa21041, "board-rev", int board_rev = version == 3 ? 0xa02082 : 0xa21041;
object_property_set_int(OBJECT(&s->soc), board_rev, "board-rev",
&error_abort); &error_abort);
object_property_set_bool(OBJECT(&s->soc), true, "realized", &error_abort); object_property_set_bool(OBJECT(&s->soc), true, "realized", &error_abort);
@ -157,7 +163,12 @@ static void raspi2_init(MachineState *machine)
vcram_size = object_property_get_uint(OBJECT(&s->soc), "vcram-size", vcram_size = object_property_get_uint(OBJECT(&s->soc), "vcram-size",
&error_abort); &error_abort);
setup_boot(machine, 2, machine->ram_size - vcram_size); setup_boot(machine, version, machine->ram_size - vcram_size);
}
static void raspi2_init(MachineState *machine)
{
raspi_init(machine, 2);
} }
static void raspi2_machine_init(MachineClass *mc) static void raspi2_machine_init(MachineClass *mc)