2016-01-29 23:50:44 +01:00
|
|
|
/*
|
|
|
|
* Raspberry Pi emulation (c) 2012 Gregory Estrade
|
|
|
|
* Upstreaming code cleanup [including bcm2835_*] (c) 2013 Jan Petrous
|
|
|
|
*
|
|
|
|
* Rasperry Pi 2 emulation Copyright (c) 2015, Microsoft
|
|
|
|
* Written by Andrew Baumann
|
|
|
|
*
|
2018-02-15 19:29:36 +01:00
|
|
|
* Raspberry Pi 3 emulation Copyright (c) 2018 Zoltán Baldaszti
|
|
|
|
* Upstream code cleanup (c) 2018 Pekka Enberg
|
|
|
|
*
|
2020-03-23 18:22:30 +01:00
|
|
|
* This work is licensed under the terms of the GNU GPL, version 2 or later.
|
|
|
|
* See the COPYING file in the top-level directory.
|
2016-01-29 23:50:44 +01:00
|
|
|
*/
|
|
|
|
|
2016-02-08 20:01:23 +01:00
|
|
|
#include "qemu/osdep.h"
|
2019-05-07 13:55:02 +02:00
|
|
|
#include "qemu/units.h"
|
2020-02-08 17:56:36 +01:00
|
|
|
#include "qemu/cutils.h"
|
include/qemu/osdep.h: Don't include qapi/error.h
Commit 57cb38b included qapi/error.h into qemu/osdep.h to get the
Error typedef. Since then, we've moved to include qemu/osdep.h
everywhere. Its file comment explains: "To avoid getting into
possible circular include dependencies, this file should not include
any other QEMU headers, with the exceptions of config-host.h,
compiler.h, os-posix.h and os-win32.h, all of which are doing a
similar job to this file and are under similar constraints."
qapi/error.h doesn't do a similar job, and it doesn't adhere to
similar constraints: it includes qapi-types.h. That's in excess of
100KiB of crap most .c files don't actually need.
Add the typedef to qemu/typedefs.h, and include that instead of
qapi/error.h. Include qapi/error.h in .c files that need it and don't
get it now. Include qapi-types.h in qom/object.h for uint16List.
Update scripts/clean-includes accordingly. Update it further to match
reality: replace config.h by config-target.h, add sysemu/os-posix.h,
sysemu/os-win32.h. Update the list of includes in the qemu/osdep.h
comment quoted above similarly.
This reduces the number of objects depending on qapi/error.h from "all
of them" to less than a third. Unfortunately, the number depending on
qapi-types.h shrinks only a little. More work is needed for that one.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
[Fix compilation without the spice devel packages. - Paolo]
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
2016-03-14 09:01:28 +01:00
|
|
|
#include "qapi/error.h"
|
2016-01-19 21:51:44 +01:00
|
|
|
#include "cpu.h"
|
2016-01-29 23:50:44 +01:00
|
|
|
#include "hw/arm/bcm2836.h"
|
2020-02-08 17:56:35 +01:00
|
|
|
#include "hw/registerfields.h"
|
2016-01-29 23:50:44 +01:00
|
|
|
#include "qemu/error-report.h"
|
|
|
|
#include "hw/boards.h"
|
|
|
|
#include "hw/loader.h"
|
2019-05-23 15:47:43 +02:00
|
|
|
#include "hw/arm/boot.h"
|
2016-01-29 23:50:44 +01:00
|
|
|
#include "sysemu/sysemu.h"
|
2020-09-03 22:43:22 +02:00
|
|
|
#include "qom/object.h"
|
2016-01-29 23:50:44 +01:00
|
|
|
|
|
|
|
#define SMPBOOT_ADDR 0x300 /* this should leave enough space for ATAGS */
|
|
|
|
#define MVBAR_ADDR 0x400 /* secure vectors */
|
|
|
|
#define BOARDSETUP_ADDR (MVBAR_ADDR + 0x20) /* board setup code */
|
2018-02-15 19:29:36 +01:00
|
|
|
#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 */
|
2018-03-13 16:34:58 +01:00
|
|
|
#define SPINTABLE_ADDR 0xd8 /* Pi 3 bootloader spintable */
|
2016-01-29 23:50:44 +01:00
|
|
|
|
hw/arm/raspi: Use BCM2708 machine type with pre Device Tree kernels
When booting without device tree, the Linux kernels uses the $R1
register to determine the machine type. The list of values is
registered at [1].
There are two entries for the Raspberry Pi:
- https://www.arm.linux.org.uk/developer/machines/list.php?mid=3138
name: MACH_TYPE_BCM2708
value: 0xc42 (3138)
status: Active, not mainlined
date: 15 Oct 2010
- https://www.arm.linux.org.uk/developer/machines/list.php?mid=4828
name: MACH_TYPE_BCM2835
value: 4828
status: Active, mainlined
date: 6 Dec 2013
QEMU always used the non-mainlined type MACH_TYPE_BCM2708.
The value 0xc43 is registered to 'MX51_GGC' (processor i.MX51), and
0xc44 to 'Western Digital Sharespace NAS' (processor Marvell 88F5182).
The Raspberry Pi foundation bootloader only sets the BCM2708 machine
type, see [2] or [3]:
133 9:
134 mov r0, #0
135 ldr r1, =3138 @ BCM2708 machine id
136 ldr r2, atags @ ATAGS
137 bx r4
U-Boot only uses MACH_TYPE_BCM2708 (see [4]):
25 /*
26 * 2835 is a SKU in a series for which the 2708 is the first or primary SoC,
27 * so 2708 has historically been used rather than a dedicated 2835 ID.
28 *
29 * We don't define a machine type for bcm2709/bcm2836 since the RPi Foundation
30 * chose to use someone else's previously registered machine ID (3139, MX51_GGC)
31 * rather than obtaining a valid ID:-/
32 *
33 * For the bcm2837, hopefully a machine type is not needed, since everything
34 * is DT.
35 */
While the definition MACH_BCM2709 with value 0xc43 was introduced in
a commit described "Add 2709 platform for Raspberry Pi 2" out of the
mainline Linux kernel, it does not seem used, and the platform is
introduced with Device Tree support anyway (see [5] and [6]).
Remove the unused values (0xc43 introduced in commit 1df7d1f9303aef
"raspi: add raspberry pi 2 machine" and 0xc44 in commit bade58166f4
"raspi: Raspberry Pi 3 support"), keeping only MACH_TYPE_BCM2708.
[1] https://www.arm.linux.org.uk/developer/machines/
[2] https://github.com/raspberrypi/tools/blob/920c7ed2e/armstubs/armstub7.S#L135
[3] https://github.com/raspberrypi/tools/blob/49719d554/armstubs/armstub7.S#L64
[4] https://gitlab.denx.de/u-boot/u-boot/blob/v2015.04/include/configs/rpi-common.h#L18
[5] https://github.com/raspberrypi/linux/commit/d9fac63adac#diff-6722037d79570df5b392a49e0e006573R526
[6] http://lists.infradead.org/pipermail/linux-rpi-kernel/2015-February/001268.html
Cc: Zoltán Baldaszti <bztemail@gmail.com>
Cc: Pekka Enberg <penberg@iki.fi>
Cc: Stephen Warren <swarren@nvidia.com>
Cc: Kshitij Soni <kshitij.soni@broadcom.com>
Cc: Michael Chan <michael.chan@broadcom.com>
Cc: Andrew Baumann <Andrew.Baumann@microsoft.com>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Niek Linnenbank <nieklinnenbank@gmail.com>
Message-id: 20200208165645.15657-2-f4bug@amsat.org
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
2020-02-08 17:56:33 +01:00
|
|
|
/* Registered machine type (matches RPi Foundation bootloader and U-Boot) */
|
|
|
|
#define MACH_TYPE_BCM2708 3138
|
2016-01-29 23:50:44 +01:00
|
|
|
|
2020-09-03 22:43:22 +02:00
|
|
|
struct RaspiMachineState {
|
2020-02-08 17:56:39 +01:00
|
|
|
/*< private >*/
|
|
|
|
MachineState parent_obj;
|
|
|
|
/*< public >*/
|
2018-03-13 16:34:54 +01:00
|
|
|
BCM283XState soc;
|
2020-09-24 13:18:03 +02:00
|
|
|
struct arm_boot_info binfo;
|
2020-09-03 22:43:22 +02:00
|
|
|
};
|
|
|
|
typedef struct RaspiMachineState RaspiMachineState;
|
2020-02-08 17:56:39 +01:00
|
|
|
|
2020-09-03 22:43:22 +02:00
|
|
|
struct RaspiMachineClass {
|
2020-02-08 17:56:39 +01:00
|
|
|
/*< private >*/
|
|
|
|
MachineClass parent_obj;
|
|
|
|
/*< public >*/
|
2020-02-08 17:56:40 +01:00
|
|
|
uint32_t board_rev;
|
2020-09-03 22:43:22 +02:00
|
|
|
};
|
|
|
|
typedef struct RaspiMachineClass RaspiMachineClass;
|
2020-02-08 17:56:39 +01:00
|
|
|
|
|
|
|
#define TYPE_RASPI_MACHINE MACHINE_TYPE_NAME("raspi-common")
|
2020-08-31 23:07:33 +02:00
|
|
|
DECLARE_OBJ_CHECKERS(RaspiMachineState, RaspiMachineClass,
|
|
|
|
RASPI_MACHINE, TYPE_RASPI_MACHINE)
|
2020-02-08 17:56:39 +01:00
|
|
|
|
2016-01-29 23:50:44 +01:00
|
|
|
|
2020-02-08 17:56:35 +01:00
|
|
|
/*
|
|
|
|
* Board revision codes:
|
|
|
|
* www.raspberrypi.org/documentation/hardware/raspberrypi/revision-codes/
|
|
|
|
*/
|
|
|
|
FIELD(REV_CODE, REVISION, 0, 4);
|
|
|
|
FIELD(REV_CODE, TYPE, 4, 8);
|
|
|
|
FIELD(REV_CODE, PROCESSOR, 12, 4);
|
|
|
|
FIELD(REV_CODE, MANUFACTURER, 16, 4);
|
|
|
|
FIELD(REV_CODE, MEMORY_SIZE, 20, 3);
|
|
|
|
FIELD(REV_CODE, STYLE, 23, 1);
|
|
|
|
|
2020-09-24 13:18:06 +02:00
|
|
|
typedef enum RaspiProcessorId {
|
2020-10-24 19:01:24 +02:00
|
|
|
PROCESSOR_ID_BCM2835 = 0,
|
2020-09-24 13:18:06 +02:00
|
|
|
PROCESSOR_ID_BCM2836 = 1,
|
|
|
|
PROCESSOR_ID_BCM2837 = 2,
|
|
|
|
} RaspiProcessorId;
|
|
|
|
|
|
|
|
static const struct {
|
|
|
|
const char *type;
|
|
|
|
int cores_count;
|
|
|
|
} soc_property[] = {
|
2020-10-24 19:01:24 +02:00
|
|
|
[PROCESSOR_ID_BCM2835] = {TYPE_BCM2835, 1},
|
2020-09-24 13:18:06 +02:00
|
|
|
[PROCESSOR_ID_BCM2836] = {TYPE_BCM2836, BCM283X_NCPUS},
|
|
|
|
[PROCESSOR_ID_BCM2837] = {TYPE_BCM2837, BCM283X_NCPUS},
|
|
|
|
};
|
|
|
|
|
2020-02-08 17:56:36 +01:00
|
|
|
static uint64_t board_ram_size(uint32_t board_rev)
|
|
|
|
{
|
|
|
|
assert(FIELD_EX32(board_rev, REV_CODE, STYLE)); /* Only new style */
|
|
|
|
return 256 * MiB << FIELD_EX32(board_rev, REV_CODE, MEMORY_SIZE);
|
|
|
|
}
|
|
|
|
|
2020-09-24 13:18:06 +02:00
|
|
|
static RaspiProcessorId board_processor_id(uint32_t board_rev)
|
2020-02-08 17:56:35 +01:00
|
|
|
{
|
2020-09-24 13:18:06 +02:00
|
|
|
int proc_id = FIELD_EX32(board_rev, REV_CODE, PROCESSOR);
|
|
|
|
|
2020-02-08 17:56:35 +01:00
|
|
|
assert(FIELD_EX32(board_rev, REV_CODE, STYLE)); /* Only new style */
|
2020-09-24 13:18:06 +02:00
|
|
|
assert(proc_id < ARRAY_SIZE(soc_property) && soc_property[proc_id].type);
|
|
|
|
|
|
|
|
return proc_id;
|
2020-02-08 17:56:35 +01:00
|
|
|
}
|
|
|
|
|
2020-02-08 17:56:37 +01:00
|
|
|
static const char *board_soc_type(uint32_t board_rev)
|
|
|
|
{
|
2020-09-24 13:18:06 +02:00
|
|
|
return soc_property[board_processor_id(board_rev)].type;
|
2020-02-08 17:56:37 +01:00
|
|
|
}
|
|
|
|
|
2020-02-08 17:56:45 +01:00
|
|
|
static int cores_count(uint32_t board_rev)
|
|
|
|
{
|
2020-09-24 13:18:06 +02:00
|
|
|
return soc_property[board_processor_id(board_rev)].cores_count;
|
2020-02-08 17:56:45 +01:00
|
|
|
}
|
|
|
|
|
2020-02-08 17:56:43 +01:00
|
|
|
static const char *board_type(uint32_t board_rev)
|
|
|
|
{
|
|
|
|
static const char *types[] = {
|
|
|
|
"A", "B", "A+", "B+", "2B", "Alpha", "CM1", NULL, "3B", "Zero",
|
|
|
|
"CM3", NULL, "Zero W", "3B+", "3A+", NULL, "CM3+", "4B",
|
|
|
|
};
|
|
|
|
assert(FIELD_EX32(board_rev, REV_CODE, STYLE)); /* Only new style */
|
|
|
|
int bt = FIELD_EX32(board_rev, REV_CODE, TYPE);
|
|
|
|
if (bt >= ARRAY_SIZE(types) || !types[bt]) {
|
|
|
|
return "Unknown";
|
|
|
|
}
|
|
|
|
return types[bt];
|
|
|
|
}
|
|
|
|
|
2016-01-29 23:50:44 +01:00
|
|
|
static void write_smpboot(ARMCPU *cpu, const struct arm_boot_info *info)
|
|
|
|
{
|
|
|
|
static const uint32_t smpboot[] = {
|
|
|
|
0xe1a0e00f, /* mov lr, pc */
|
|
|
|
0xe3a0fe00 + (BOARDSETUP_ADDR >> 4), /* mov pc, BOARDSETUP_ADDR */
|
|
|
|
0xee100fb0, /* mrc p15, 0, r0, c0, c0, 5;get core ID */
|
|
|
|
0xe7e10050, /* ubfx r0, r0, #0, #2 ;extract LSB */
|
|
|
|
0xe59f5014, /* ldr r5, =0x400000CC ;load mbox base */
|
|
|
|
0xe320f001, /* 1: yield */
|
|
|
|
0xe7953200, /* ldr r3, [r5, r0, lsl #4] ;read mbox for our core*/
|
|
|
|
0xe3530000, /* cmp r3, #0 ;spin while zero */
|
|
|
|
0x0afffffb, /* beq 1b */
|
|
|
|
0xe7853200, /* str r3, [r5, r0, lsl #4] ;clear mbox */
|
|
|
|
0xe12fff13, /* bx r3 ;jump to target */
|
|
|
|
0x400000cc, /* (constant: mailbox 3 read/clear base) */
|
|
|
|
};
|
|
|
|
|
|
|
|
/* check that we don't overrun board setup vectors */
|
|
|
|
QEMU_BUILD_BUG_ON(SMPBOOT_ADDR + sizeof(smpboot) > MVBAR_ADDR);
|
|
|
|
/* check that board setup address is correctly relocated */
|
|
|
|
QEMU_BUILD_BUG_ON((BOARDSETUP_ADDR & 0xf) != 0
|
|
|
|
|| (BOARDSETUP_ADDR >> 4) >= 0x100);
|
|
|
|
|
2019-10-20 01:47:09 +02:00
|
|
|
rom_add_blob_fixed_as("raspi_smpboot", smpboot, sizeof(smpboot),
|
|
|
|
info->smp_loader_start,
|
|
|
|
arm_boot_address_space(cpu, info));
|
2016-01-29 23:50:44 +01:00
|
|
|
}
|
|
|
|
|
2018-03-13 16:34:58 +01:00
|
|
|
static void write_smpboot64(ARMCPU *cpu, const struct arm_boot_info *info)
|
|
|
|
{
|
2019-10-20 01:47:09 +02:00
|
|
|
AddressSpace *as = arm_boot_address_space(cpu, info);
|
2018-03-13 16:34:58 +01:00
|
|
|
/* Unlike the AArch32 version we don't need to call the board setup hook.
|
|
|
|
* The mechanism for doing the spin-table is also entirely different.
|
|
|
|
* We must have four 64-bit fields at absolute addresses
|
|
|
|
* 0xd8, 0xe0, 0xe8, 0xf0 in RAM, which are the flag variables for
|
|
|
|
* our CPUs, and which we must ensure are zero initialized before
|
|
|
|
* the primary CPU goes into the kernel. We put these variables inside
|
|
|
|
* a rom blob, so that the reset for ROM contents zeroes them for us.
|
|
|
|
*/
|
|
|
|
static const uint32_t smpboot[] = {
|
|
|
|
0xd2801b05, /* mov x5, 0xd8 */
|
|
|
|
0xd53800a6, /* mrs x6, mpidr_el1 */
|
|
|
|
0x924004c6, /* and x6, x6, #0x3 */
|
|
|
|
0xd503205f, /* spin: wfe */
|
|
|
|
0xf86678a4, /* ldr x4, [x5,x6,lsl #3] */
|
|
|
|
0xb4ffffc4, /* cbz x4, spin */
|
|
|
|
0xd2800000, /* mov x0, #0x0 */
|
|
|
|
0xd2800001, /* mov x1, #0x0 */
|
|
|
|
0xd2800002, /* mov x2, #0x0 */
|
|
|
|
0xd2800003, /* mov x3, #0x0 */
|
|
|
|
0xd61f0080, /* br x4 */
|
|
|
|
};
|
|
|
|
|
|
|
|
static const uint64_t spintables[] = {
|
|
|
|
0, 0, 0, 0
|
|
|
|
};
|
|
|
|
|
2019-10-20 01:47:09 +02:00
|
|
|
rom_add_blob_fixed_as("raspi_smpboot", smpboot, sizeof(smpboot),
|
|
|
|
info->smp_loader_start, as);
|
|
|
|
rom_add_blob_fixed_as("raspi_spintables", spintables, sizeof(spintables),
|
|
|
|
SPINTABLE_ADDR, as);
|
2018-03-13 16:34:58 +01:00
|
|
|
}
|
|
|
|
|
2016-01-29 23:50:44 +01:00
|
|
|
static void write_board_setup(ARMCPU *cpu, const struct arm_boot_info *info)
|
|
|
|
{
|
|
|
|
arm_write_secure_board_setup_dummy_smc(cpu, info, MVBAR_ADDR);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void reset_secondary(ARMCPU *cpu, const struct arm_boot_info *info)
|
|
|
|
{
|
|
|
|
CPUState *cs = CPU(cpu);
|
|
|
|
cpu_set_pc(cs, info->smp_loader_start);
|
|
|
|
}
|
|
|
|
|
2020-09-24 13:18:08 +02:00
|
|
|
static void setup_boot(MachineState *machine, RaspiProcessorId processor_id,
|
|
|
|
size_t ram_size)
|
2016-01-29 23:50:44 +01:00
|
|
|
{
|
2020-09-24 13:18:02 +02:00
|
|
|
RaspiMachineState *s = RASPI_MACHINE(machine);
|
2016-01-29 23:50:44 +01:00
|
|
|
int r;
|
|
|
|
|
2020-09-24 13:18:03 +02:00
|
|
|
s->binfo.board_id = MACH_TYPE_BCM2708;
|
|
|
|
s->binfo.ram_size = ram_size;
|
|
|
|
s->binfo.nb_cpus = machine->smp.cpus;
|
2018-03-13 16:34:50 +01:00
|
|
|
|
2020-09-24 13:18:08 +02:00
|
|
|
if (processor_id <= PROCESSOR_ID_BCM2836) {
|
|
|
|
/*
|
|
|
|
* The BCM2835 and BCM2836 require some custom setup code to run
|
|
|
|
* in Secure mode before booting a kernel (to set up the SMC vectors
|
|
|
|
* so that we get a no-op SMC; this is used by Linux to call the
|
2018-03-13 16:34:50 +01:00
|
|
|
* firmware for some cache maintenance operations.
|
2020-09-24 13:18:08 +02:00
|
|
|
* The BCM2837 doesn't need this.
|
2018-03-13 16:34:50 +01:00
|
|
|
*/
|
2020-09-24 13:18:03 +02:00
|
|
|
s->binfo.board_setup_addr = BOARDSETUP_ADDR;
|
|
|
|
s->binfo.write_board_setup = write_board_setup;
|
|
|
|
s->binfo.secure_board_setup = true;
|
|
|
|
s->binfo.secure_boot = true;
|
2018-03-13 16:34:50 +01:00
|
|
|
}
|
2016-01-29 23:50:44 +01:00
|
|
|
|
2020-09-24 13:18:08 +02:00
|
|
|
/* BCM2836 and BCM2837 requires SMP setup */
|
|
|
|
if (processor_id >= PROCESSOR_ID_BCM2836) {
|
2020-09-24 13:18:03 +02:00
|
|
|
s->binfo.smp_loader_start = SMPBOOT_ADDR;
|
2020-09-24 13:18:08 +02:00
|
|
|
if (processor_id == PROCESSOR_ID_BCM2836) {
|
2020-09-24 13:18:03 +02:00
|
|
|
s->binfo.write_secondary_boot = write_smpboot;
|
2018-03-13 16:34:58 +01:00
|
|
|
} else {
|
2020-09-24 13:18:03 +02:00
|
|
|
s->binfo.write_secondary_boot = write_smpboot64;
|
2018-03-13 16:34:58 +01:00
|
|
|
}
|
2020-09-24 13:18:03 +02:00
|
|
|
s->binfo.secondary_cpu_reset_hook = reset_secondary;
|
2016-01-29 23:50:44 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
/* If the user specified a "firmware" image (e.g. UEFI), we bypass
|
|
|
|
* the normal Linux boot process
|
|
|
|
*/
|
|
|
|
if (machine->firmware) {
|
2020-09-24 13:18:07 +02:00
|
|
|
hwaddr firmware_addr = processor_id <= PROCESSOR_ID_BCM2836
|
|
|
|
? FIRMWARE_ADDR_2 : FIRMWARE_ADDR_3;
|
2016-01-29 23:50:44 +01:00
|
|
|
/* load the firmware image (typically kernel.img) */
|
2018-02-15 19:29:36 +01:00
|
|
|
r = load_image_targphys(machine->firmware, firmware_addr,
|
|
|
|
ram_size - firmware_addr);
|
2016-01-29 23:50:44 +01:00
|
|
|
if (r < 0) {
|
|
|
|
error_report("Failed to load firmware from %s", machine->firmware);
|
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
|
2020-09-24 13:18:03 +02:00
|
|
|
s->binfo.entry = firmware_addr;
|
|
|
|
s->binfo.firmware_loaded = true;
|
2016-01-29 23:50:44 +01:00
|
|
|
}
|
|
|
|
|
2020-09-24 13:18:03 +02:00
|
|
|
arm_load_kernel(&s->soc.cpu[0].core, machine, &s->binfo);
|
2016-01-29 23:50:44 +01:00
|
|
|
}
|
|
|
|
|
2020-02-08 17:56:41 +01:00
|
|
|
static void raspi_machine_init(MachineState *machine)
|
2016-01-29 23:50:44 +01:00
|
|
|
{
|
2020-02-08 17:56:40 +01:00
|
|
|
RaspiMachineClass *mc = RASPI_MACHINE_GET_CLASS(machine);
|
2020-02-08 17:56:39 +01:00
|
|
|
RaspiMachineState *s = RASPI_MACHINE(machine);
|
2020-02-08 17:56:40 +01:00
|
|
|
uint32_t board_rev = mc->board_rev;
|
2020-02-08 17:56:36 +01:00
|
|
|
uint64_t ram_size = board_ram_size(board_rev);
|
2016-03-16 18:06:01 +01:00
|
|
|
uint32_t vcram_size;
|
2016-02-24 22:58:48 +01:00
|
|
|
DriveInfo *di;
|
|
|
|
BlockBackend *blk;
|
|
|
|
BusState *bus;
|
|
|
|
DeviceState *carddev;
|
2016-01-29 23:50:44 +01:00
|
|
|
|
2020-02-08 17:56:36 +01:00
|
|
|
if (machine->ram_size != ram_size) {
|
|
|
|
char *size_str = size_to_str(ram_size);
|
|
|
|
error_report("Invalid RAM size, should be %s", size_str);
|
|
|
|
g_free(size_str);
|
2019-05-07 13:55:02 +02:00
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
|
2016-01-29 23:50:44 +01:00
|
|
|
/* FIXME: Remove when we have custom CPU address space support */
|
2020-02-19 17:09:03 +01:00
|
|
|
memory_region_add_subregion_overlap(get_system_memory(), 0,
|
|
|
|
machine->ram, 0);
|
2016-01-29 23:50:44 +01:00
|
|
|
|
|
|
|
/* Setup the SOC */
|
qom: Less verbose object_initialize_child()
All users of object_initialize_child() pass the obvious child size
argument. Almost all pass &error_abort and no properties. Tiresome.
Rename object_initialize_child() to
object_initialize_child_with_props() to free the name. New
convenience wrapper object_initialize_child() automates the size
argument, and passes &error_abort and no properties.
Rename object_initialize_childv() to
object_initialize_child_with_propsv() for consistency.
Convert callers with this Coccinelle script:
@@
expression parent, propname, type;
expression child, size;
symbol error_abort;
@@
- object_initialize_child(parent, propname, OBJECT(child), size, type, &error_abort, NULL)
+ object_initialize_child(parent, propname, child, size, type, &error_abort, NULL)
@@
expression parent, propname, type;
expression child;
symbol error_abort;
@@
- object_initialize_child(parent, propname, child, sizeof(*child), type, &error_abort, NULL)
+ object_initialize_child(parent, propname, child, type)
@@
expression parent, propname, type;
expression child;
symbol error_abort;
@@
- object_initialize_child(parent, propname, &child, sizeof(child), type, &error_abort, NULL)
+ object_initialize_child(parent, propname, &child, type)
@@
expression parent, propname, type;
expression child, size, err;
expression list props;
@@
- object_initialize_child(parent, propname, child, size, type, err, props)
+ object_initialize_child_with_props(parent, propname, child, size, type, err, props)
Note that Coccinelle chokes on ARMSSE typedef vs. macro in
hw/arm/armsse.c. Worked around by temporarily renaming the macro for
the spatch run.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Acked-by: Alistair Francis <alistair.francis@wdc.com>
[Rebased: machine opentitan is new (commit fe0fe4735e7)]
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20200610053247.1583243-37-armbru@redhat.com>
2020-06-10 07:32:25 +02:00
|
|
|
object_initialize_child(OBJECT(machine), "soc", &s->soc,
|
|
|
|
board_soc_type(board_rev));
|
qom: Drop parameter @errp of object_property_add() & friends
The only way object_property_add() can fail is when a property with
the same name already exists. Since our property names are all
hardcoded, failure is a programming error, and the appropriate way to
handle it is passing &error_abort.
Same for its variants, except for object_property_add_child(), which
additionally fails when the child already has a parent. Parentage is
also under program control, so this is a programming error, too.
We have a bit over 500 callers. Almost half of them pass
&error_abort, slightly fewer ignore errors, one test case handles
errors, and the remaining few callers pass them to their own callers.
The previous few commits demonstrated once again that ignoring
programming errors is a bad idea.
Of the few ones that pass on errors, several violate the Error API.
The Error ** argument must be NULL, &error_abort, &error_fatal, or a
pointer to a variable containing NULL. Passing an argument of the
latter kind twice without clearing it in between is wrong: if the
first call sets an error, it no longer points to NULL for the second
call. ich9_pm_add_properties(), sparc32_ledma_realize(),
sparc32_dma_realize(), xilinx_axidma_realize(), xilinx_enet_realize()
are wrong that way.
When the one appropriate choice of argument is &error_abort, letting
users pick the argument is a bad idea.
Drop parameter @errp and assert the preconditions instead.
There's one exception to "duplicate property name is a programming
error": the way object_property_add() implements the magic (and
undocumented) "automatic arrayification". Don't drop @errp there.
Instead, rename object_property_add() to object_property_try_add(),
and add the obvious wrapper object_property_add().
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20200505152926.18877-15-armbru@redhat.com>
[Two semantic rebase conflicts resolved]
2020-05-05 17:29:22 +02:00
|
|
|
object_property_add_const_link(OBJECT(&s->soc), "ram", OBJECT(machine->ram));
|
qom: Put name parameter before value / visitor parameter
The object_property_set_FOO() setters take property name and value in
an unusual order:
void object_property_set_FOO(Object *obj, FOO_TYPE value,
const char *name, Error **errp)
Having to pass value before name feels grating. Swap them.
Same for object_property_set(), object_property_get(), and
object_property_parse().
Convert callers with this Coccinelle script:
@@
identifier fun = {
object_property_get, object_property_parse, object_property_set_str,
object_property_set_link, object_property_set_bool,
object_property_set_int, object_property_set_uint, object_property_set,
object_property_set_qobject
};
expression obj, v, name, errp;
@@
- fun(obj, v, name, errp)
+ fun(obj, name, v, errp)
Chokes on hw/arm/musicpal.c's lcd_refresh() with the unhelpful error
message "no position information". Convert that one manually.
Fails to convert hw/arm/armsse.c, because Coccinelle gets confused by
ARMSSE being used both as typedef and function-like macro there.
Convert manually.
Fails to convert hw/rx/rx-gdbsim.c, because Coccinelle gets confused
by RXCPU being used both as typedef and function-like macro there.
Convert manually. The other files using RXCPU that way don't need
conversion.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Message-Id: <20200707160613.848843-27-armbru@redhat.com>
[Straightforwad conflict with commit 2336172d9b "audio: set default
value for pcspk.iobase property" resolved]
2020-07-07 18:05:54 +02:00
|
|
|
object_property_set_int(OBJECT(&s->soc), "board-rev", board_rev,
|
2016-02-11 12:17:32 +01:00
|
|
|
&error_abort);
|
qdev: Convert bus-less devices to qdev_realize() with Coccinelle
All remaining conversions to qdev_realize() are for bus-less devices.
Coccinelle script:
// only correct for bus-less @dev!
@@
expression errp;
expression dev;
@@
- qdev_init_nofail(dev);
+ qdev_realize(dev, NULL, &error_fatal);
@ depends on !(file in "hw/core/qdev.c") && !(file in "hw/core/bus.c")@
expression errp;
expression dev;
symbol true;
@@
- object_property_set_bool(OBJECT(dev), true, "realized", errp);
+ qdev_realize(DEVICE(dev), NULL, errp);
@ depends on !(file in "hw/core/qdev.c") && !(file in "hw/core/bus.c")@
expression errp;
expression dev;
symbol true;
@@
- object_property_set_bool(dev, true, "realized", errp);
+ qdev_realize(DEVICE(dev), NULL, errp);
Note that Coccinelle chokes on ARMSSE typedef vs. macro in
hw/arm/armsse.c. Worked around by temporarily renaming the macro for
the spatch run.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Acked-by: Alistair Francis <alistair.francis@wdc.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20200610053247.1583243-57-armbru@redhat.com>
2020-06-10 07:32:45 +02:00
|
|
|
qdev_realize(DEVICE(&s->soc), NULL, &error_abort);
|
2016-01-29 23:50:44 +01:00
|
|
|
|
2016-02-24 22:58:48 +01:00
|
|
|
/* Create and plug in the SD cards */
|
|
|
|
di = drive_get_next(IF_SD);
|
|
|
|
blk = di ? blk_by_legacy_dinfo(di) : NULL;
|
|
|
|
bus = qdev_get_child_bus(DEVICE(&s->soc), "sd-bus");
|
|
|
|
if (bus == NULL) {
|
|
|
|
error_report("No SD bus found in SOC object");
|
|
|
|
exit(1);
|
|
|
|
}
|
qdev: Convert uses of qdev_create() with Coccinelle
This is the transformation explained in the commit before previous.
Takes care of just one pattern that needs conversion. More to come in
this series.
Coccinelle script:
@ depends on !(file in "hw/arm/highbank.c")@
expression bus, type_name, dev, expr;
@@
- dev = qdev_create(bus, type_name);
+ dev = qdev_new(type_name);
... when != dev = expr
- qdev_init_nofail(dev);
+ qdev_realize_and_unref(dev, bus, &error_fatal);
@@
expression bus, type_name, dev, expr;
identifier DOWN;
@@
- dev = DOWN(qdev_create(bus, type_name));
+ dev = DOWN(qdev_new(type_name));
... when != dev = expr
- qdev_init_nofail(DEVICE(dev));
+ qdev_realize_and_unref(DEVICE(dev), bus, &error_fatal);
@@
expression bus, type_name, expr;
identifier dev;
@@
- DeviceState *dev = qdev_create(bus, type_name);
+ DeviceState *dev = qdev_new(type_name);
... when != dev = expr
- qdev_init_nofail(dev);
+ qdev_realize_and_unref(dev, bus, &error_fatal);
@@
expression bus, type_name, dev, expr, errp;
symbol true;
@@
- dev = qdev_create(bus, type_name);
+ dev = qdev_new(type_name);
... when != dev = expr
- object_property_set_bool(OBJECT(dev), true, "realized", errp);
+ qdev_realize_and_unref(dev, bus, errp);
@@
expression bus, type_name, expr, errp;
identifier dev;
symbol true;
@@
- DeviceState *dev = qdev_create(bus, type_name);
+ DeviceState *dev = qdev_new(type_name);
... when != dev = expr
- object_property_set_bool(OBJECT(dev), true, "realized", errp);
+ qdev_realize_and_unref(dev, bus, errp);
The first rule exempts hw/arm/highbank.c, because it matches along two
control flow paths there, with different @type_name. Covered by the
next commit's manual conversions.
Missing #include "qapi/error.h" added manually.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20200610053247.1583243-10-armbru@redhat.com>
[Conflicts in hw/misc/empty_slot.c and hw/sparc/leon3.c resolved]
2020-06-10 07:31:58 +02:00
|
|
|
carddev = qdev_new(TYPE_SD_CARD);
|
qdev: Make qdev_prop_set_drive() match the other helpers
qdev_prop_set_drive() can fail. None of the other qdev_prop_set_FOO()
can; they abort on error.
To clean up this inconsistency, rename qdev_prop_set_drive() to
qdev_prop_set_drive_err(), and create a qdev_prop_set_drive() that
aborts on error.
Coccinelle script to update callers:
@ depends on !(file in "hw/core/qdev-properties-system.c")@
expression dev, name, value;
symbol error_abort;
@@
- qdev_prop_set_drive(dev, name, value, &error_abort);
+ qdev_prop_set_drive(dev, name, value);
@@
expression dev, name, value, errp;
@@
- qdev_prop_set_drive(dev, name, value, errp);
+ qdev_prop_set_drive_err(dev, name, value, errp);
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20200622094227.1271650-14-armbru@redhat.com>
2020-06-22 11:42:24 +02:00
|
|
|
qdev_prop_set_drive_err(carddev, "drive", blk, &error_fatal);
|
qdev: Convert uses of qdev_create() with Coccinelle
This is the transformation explained in the commit before previous.
Takes care of just one pattern that needs conversion. More to come in
this series.
Coccinelle script:
@ depends on !(file in "hw/arm/highbank.c")@
expression bus, type_name, dev, expr;
@@
- dev = qdev_create(bus, type_name);
+ dev = qdev_new(type_name);
... when != dev = expr
- qdev_init_nofail(dev);
+ qdev_realize_and_unref(dev, bus, &error_fatal);
@@
expression bus, type_name, dev, expr;
identifier DOWN;
@@
- dev = DOWN(qdev_create(bus, type_name));
+ dev = DOWN(qdev_new(type_name));
... when != dev = expr
- qdev_init_nofail(DEVICE(dev));
+ qdev_realize_and_unref(DEVICE(dev), bus, &error_fatal);
@@
expression bus, type_name, expr;
identifier dev;
@@
- DeviceState *dev = qdev_create(bus, type_name);
+ DeviceState *dev = qdev_new(type_name);
... when != dev = expr
- qdev_init_nofail(dev);
+ qdev_realize_and_unref(dev, bus, &error_fatal);
@@
expression bus, type_name, dev, expr, errp;
symbol true;
@@
- dev = qdev_create(bus, type_name);
+ dev = qdev_new(type_name);
... when != dev = expr
- object_property_set_bool(OBJECT(dev), true, "realized", errp);
+ qdev_realize_and_unref(dev, bus, errp);
@@
expression bus, type_name, expr, errp;
identifier dev;
symbol true;
@@
- DeviceState *dev = qdev_create(bus, type_name);
+ DeviceState *dev = qdev_new(type_name);
... when != dev = expr
- object_property_set_bool(OBJECT(dev), true, "realized", errp);
+ qdev_realize_and_unref(dev, bus, errp);
The first rule exempts hw/arm/highbank.c, because it matches along two
control flow paths there, with different @type_name. Covered by the
next commit's manual conversions.
Missing #include "qapi/error.h" added manually.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20200610053247.1583243-10-armbru@redhat.com>
[Conflicts in hw/misc/empty_slot.c and hw/sparc/leon3.c resolved]
2020-06-10 07:31:58 +02:00
|
|
|
qdev_realize_and_unref(carddev, bus, &error_fatal);
|
2016-02-24 22:58:48 +01:00
|
|
|
|
2017-06-07 18:36:17 +02:00
|
|
|
vcram_size = object_property_get_uint(OBJECT(&s->soc), "vcram-size",
|
|
|
|
&error_abort);
|
2020-09-24 13:18:08 +02:00
|
|
|
setup_boot(machine, board_processor_id(mc->board_rev),
|
|
|
|
machine->ram_size - vcram_size);
|
2018-02-15 19:29:36 +01:00
|
|
|
}
|
|
|
|
|
2020-09-24 13:18:04 +02:00
|
|
|
static void raspi_machine_class_common_init(MachineClass *mc,
|
|
|
|
uint32_t board_rev)
|
2016-01-29 23:50:44 +01:00
|
|
|
{
|
2020-09-24 13:18:01 +02:00
|
|
|
mc->desc = g_strdup_printf("Raspberry Pi %s (revision 1.%u)",
|
|
|
|
board_type(board_rev),
|
|
|
|
FIELD_EX32(board_rev, REV_CODE, REVISION));
|
2020-02-08 17:56:41 +01:00
|
|
|
mc->init = raspi_machine_init;
|
2016-01-29 23:50:44 +01:00
|
|
|
mc->block_default_type = IF_SD;
|
|
|
|
mc->no_parallel = 1;
|
|
|
|
mc->no_floppy = 1;
|
|
|
|
mc->no_cdrom = 1;
|
2020-02-08 17:56:45 +01:00
|
|
|
mc->default_cpus = mc->min_cpus = mc->max_cpus = cores_count(board_rev);
|
2020-02-08 17:56:42 +01:00
|
|
|
mc->default_ram_size = board_ram_size(board_rev);
|
2020-02-19 17:09:03 +01:00
|
|
|
mc->default_ram_id = "ram";
|
2016-01-29 23:50:44 +01:00
|
|
|
};
|
2018-02-22 16:12:51 +01:00
|
|
|
|
2020-10-24 19:01:26 +02:00
|
|
|
static void raspi0_machine_class_init(ObjectClass *oc, void *data)
|
|
|
|
{
|
|
|
|
MachineClass *mc = MACHINE_CLASS(oc);
|
|
|
|
RaspiMachineClass *rmc = RASPI_MACHINE_CLASS(oc);
|
|
|
|
|
|
|
|
rmc->board_rev = 0x920092; /* Revision 1.2 */
|
|
|
|
raspi_machine_class_common_init(mc, rmc->board_rev);
|
|
|
|
};
|
|
|
|
|
2020-10-24 19:01:25 +02:00
|
|
|
static void raspi1ap_machine_class_init(ObjectClass *oc, void *data)
|
|
|
|
{
|
|
|
|
MachineClass *mc = MACHINE_CLASS(oc);
|
|
|
|
RaspiMachineClass *rmc = RASPI_MACHINE_CLASS(oc);
|
|
|
|
|
|
|
|
rmc->board_rev = 0x900021; /* Revision 1.1 */
|
|
|
|
raspi_machine_class_common_init(mc, rmc->board_rev);
|
|
|
|
};
|
|
|
|
|
2020-09-24 13:18:04 +02:00
|
|
|
static void raspi2b_machine_class_init(ObjectClass *oc, void *data)
|
|
|
|
{
|
|
|
|
MachineClass *mc = MACHINE_CLASS(oc);
|
|
|
|
RaspiMachineClass *rmc = RASPI_MACHINE_CLASS(oc);
|
|
|
|
|
2020-09-24 13:18:05 +02:00
|
|
|
mc->alias = "raspi2";
|
2020-09-24 13:18:04 +02:00
|
|
|
rmc->board_rev = 0xa21041;
|
|
|
|
raspi_machine_class_common_init(mc, rmc->board_rev);
|
|
|
|
};
|
|
|
|
|
|
|
|
#ifdef TARGET_AARCH64
|
2020-10-24 19:01:27 +02:00
|
|
|
static void raspi3ap_machine_class_init(ObjectClass *oc, void *data)
|
|
|
|
{
|
|
|
|
MachineClass *mc = MACHINE_CLASS(oc);
|
|
|
|
RaspiMachineClass *rmc = RASPI_MACHINE_CLASS(oc);
|
|
|
|
|
|
|
|
rmc->board_rev = 0x9020e0; /* Revision 1.0 */
|
|
|
|
raspi_machine_class_common_init(mc, rmc->board_rev);
|
|
|
|
};
|
|
|
|
|
2020-09-24 13:18:04 +02:00
|
|
|
static void raspi3b_machine_class_init(ObjectClass *oc, void *data)
|
|
|
|
{
|
|
|
|
MachineClass *mc = MACHINE_CLASS(oc);
|
|
|
|
RaspiMachineClass *rmc = RASPI_MACHINE_CLASS(oc);
|
|
|
|
|
2020-09-24 13:18:05 +02:00
|
|
|
mc->alias = "raspi3";
|
2020-09-24 13:18:04 +02:00
|
|
|
rmc->board_rev = 0xa02082;
|
|
|
|
raspi_machine_class_common_init(mc, rmc->board_rev);
|
|
|
|
};
|
|
|
|
#endif /* TARGET_AARCH64 */
|
|
|
|
|
2020-02-08 17:56:39 +01:00
|
|
|
static const TypeInfo raspi_machine_types[] = {
|
|
|
|
{
|
2020-10-24 19:01:26 +02:00
|
|
|
.name = MACHINE_TYPE_NAME("raspi0"),
|
|
|
|
.parent = TYPE_RASPI_MACHINE,
|
|
|
|
.class_init = raspi0_machine_class_init,
|
|
|
|
}, {
|
2020-10-24 19:01:25 +02:00
|
|
|
.name = MACHINE_TYPE_NAME("raspi1ap"),
|
|
|
|
.parent = TYPE_RASPI_MACHINE,
|
|
|
|
.class_init = raspi1ap_machine_class_init,
|
|
|
|
}, {
|
2020-09-24 13:18:05 +02:00
|
|
|
.name = MACHINE_TYPE_NAME("raspi2b"),
|
2020-02-08 17:56:39 +01:00
|
|
|
.parent = TYPE_RASPI_MACHINE,
|
2020-09-24 13:18:04 +02:00
|
|
|
.class_init = raspi2b_machine_class_init,
|
2020-02-08 17:56:39 +01:00
|
|
|
#ifdef TARGET_AARCH64
|
2020-10-24 19:01:27 +02:00
|
|
|
}, {
|
|
|
|
.name = MACHINE_TYPE_NAME("raspi3ap"),
|
|
|
|
.parent = TYPE_RASPI_MACHINE,
|
|
|
|
.class_init = raspi3ap_machine_class_init,
|
2020-02-08 17:56:39 +01:00
|
|
|
}, {
|
2020-09-24 13:18:05 +02:00
|
|
|
.name = MACHINE_TYPE_NAME("raspi3b"),
|
2020-02-08 17:56:39 +01:00
|
|
|
.parent = TYPE_RASPI_MACHINE,
|
2020-09-24 13:18:04 +02:00
|
|
|
.class_init = raspi3b_machine_class_init,
|
2020-02-08 17:56:39 +01:00
|
|
|
#endif
|
|
|
|
}, {
|
|
|
|
.name = TYPE_RASPI_MACHINE,
|
|
|
|
.parent = TYPE_MACHINE,
|
|
|
|
.instance_size = sizeof(RaspiMachineState),
|
|
|
|
.class_size = sizeof(RaspiMachineClass),
|
|
|
|
.abstract = true,
|
|
|
|
}
|
|
|
|
};
|
|
|
|
|
|
|
|
DEFINE_TYPES(raspi_machine_types)
|