2016-01-30 01:50:44 +03: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 21:29:36 +03:00
|
|
|
* Raspberry Pi 3 emulation Copyright (c) 2018 Zoltán Baldaszti
|
|
|
|
* Upstream code cleanup (c) 2018 Pekka Enberg
|
|
|
|
*
|
2020-03-23 20:22:30 +03: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-30 01:50:44 +03:00
|
|
|
*/
|
|
|
|
|
2016-02-08 22:01:23 +03:00
|
|
|
#include "qemu/osdep.h"
|
2019-05-07 14:55:02 +03:00
|
|
|
#include "qemu/units.h"
|
2020-02-08 19:56:36 +03: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 11:01:28 +03:00
|
|
|
#include "qapi/error.h"
|
2023-04-24 18:27:17 +03:00
|
|
|
#include "hw/arm/boot.h"
|
2016-01-30 01:50:44 +03:00
|
|
|
#include "hw/arm/bcm2836.h"
|
2024-02-26 03:02:28 +03:00
|
|
|
#include "hw/arm/bcm2838.h"
|
2024-02-26 03:02:21 +03:00
|
|
|
#include "hw/arm/raspi_platform.h"
|
2020-02-08 19:56:35 +03:00
|
|
|
#include "hw/registerfields.h"
|
2016-01-30 01:50:44 +03:00
|
|
|
#include "qemu/error-report.h"
|
|
|
|
#include "hw/boards.h"
|
|
|
|
#include "hw/loader.h"
|
2019-05-23 16:47:43 +03:00
|
|
|
#include "hw/arm/boot.h"
|
2020-09-03 23:43:22 +03:00
|
|
|
#include "qom/object.h"
|
2016-01-30 01:50:44 +03:00
|
|
|
|
2024-02-26 03:02:21 +03:00
|
|
|
#define TYPE_RASPI_MACHINE MACHINE_TYPE_NAME("raspi-common")
|
|
|
|
OBJECT_DECLARE_SIMPLE_TYPE(RaspiMachineState, RASPI_MACHINE)
|
|
|
|
|
2016-01-30 01:50:44 +03: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 21:29:36 +03: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 18:34:58 +03:00
|
|
|
#define SPINTABLE_ADDR 0xd8 /* Pi 3 bootloader spintable */
|
2016-01-30 01:50:44 +03:00
|
|
|
|
2020-09-03 23:43:22 +03:00
|
|
|
struct RaspiMachineState {
|
2020-02-08 19:56:39 +03:00
|
|
|
/*< private >*/
|
2024-02-26 03:02:21 +03:00
|
|
|
RaspiBaseMachineState parent_obj;
|
2020-02-08 19:56:39 +03:00
|
|
|
/*< public >*/
|
2018-03-13 18:34:54 +03:00
|
|
|
BCM283XState soc;
|
2020-09-03 23:43:22 +03:00
|
|
|
};
|
2016-01-30 01:50:44 +03:00
|
|
|
|
2020-02-08 19:56:35 +03: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 14:18:06 +03:00
|
|
|
typedef enum RaspiProcessorId {
|
2020-10-24 20:01:24 +03:00
|
|
|
PROCESSOR_ID_BCM2835 = 0,
|
2020-09-24 14:18:06 +03:00
|
|
|
PROCESSOR_ID_BCM2836 = 1,
|
|
|
|
PROCESSOR_ID_BCM2837 = 2,
|
2024-02-26 03:02:28 +03:00
|
|
|
PROCESSOR_ID_BCM2838 = 3,
|
2020-09-24 14:18:06 +03:00
|
|
|
} RaspiProcessorId;
|
|
|
|
|
|
|
|
static const struct {
|
|
|
|
const char *type;
|
|
|
|
int cores_count;
|
|
|
|
} soc_property[] = {
|
2020-10-24 20:01:24 +03:00
|
|
|
[PROCESSOR_ID_BCM2835] = {TYPE_BCM2835, 1},
|
2020-09-24 14:18:06 +03:00
|
|
|
[PROCESSOR_ID_BCM2836] = {TYPE_BCM2836, BCM283X_NCPUS},
|
|
|
|
[PROCESSOR_ID_BCM2837] = {TYPE_BCM2837, BCM283X_NCPUS},
|
2024-02-26 03:02:28 +03:00
|
|
|
[PROCESSOR_ID_BCM2838] = {TYPE_BCM2838, BCM283X_NCPUS},
|
2020-09-24 14:18:06 +03:00
|
|
|
};
|
|
|
|
|
2024-02-26 03:02:29 +03:00
|
|
|
uint64_t board_ram_size(uint32_t board_rev)
|
2020-02-08 19:56:36 +03:00
|
|
|
{
|
|
|
|
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 14:18:06 +03:00
|
|
|
static RaspiProcessorId board_processor_id(uint32_t board_rev)
|
2020-02-08 19:56:35 +03:00
|
|
|
{
|
2020-09-24 14:18:06 +03:00
|
|
|
int proc_id = FIELD_EX32(board_rev, REV_CODE, PROCESSOR);
|
|
|
|
|
2020-02-08 19:56:35 +03:00
|
|
|
assert(FIELD_EX32(board_rev, REV_CODE, STYLE)); /* Only new style */
|
2020-09-24 14:18:06 +03:00
|
|
|
assert(proc_id < ARRAY_SIZE(soc_property) && soc_property[proc_id].type);
|
|
|
|
|
|
|
|
return proc_id;
|
2020-02-08 19:56:35 +03:00
|
|
|
}
|
|
|
|
|
2024-02-26 03:02:28 +03:00
|
|
|
const char *board_soc_type(uint32_t board_rev)
|
2020-02-08 19:56:37 +03:00
|
|
|
{
|
2020-09-24 14:18:06 +03:00
|
|
|
return soc_property[board_processor_id(board_rev)].type;
|
2020-02-08 19:56:37 +03:00
|
|
|
}
|
|
|
|
|
2020-02-08 19:56:45 +03:00
|
|
|
static int cores_count(uint32_t board_rev)
|
|
|
|
{
|
2020-09-24 14:18:06 +03:00
|
|
|
return soc_property[board_processor_id(board_rev)].cores_count;
|
2020-02-08 19:56:45 +03:00
|
|
|
}
|
|
|
|
|
2020-02-08 19:56:43 +03: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-30 01:50:44 +03:00
|
|
|
static void write_smpboot(ARMCPU *cpu, const struct arm_boot_info *info)
|
|
|
|
{
|
2023-04-24 18:27:17 +03:00
|
|
|
static const ARMInsnFixup 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) */
|
|
|
|
{ 0, FIXUP_TERMINATOR }
|
2016-01-30 01:50:44 +03:00
|
|
|
};
|
2023-04-24 18:27:17 +03:00
|
|
|
static const uint32_t fixupcontext[FIXUP_MAX] = { 0 };
|
2016-01-30 01:50:44 +03:00
|
|
|
|
|
|
|
/* 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);
|
|
|
|
|
2023-04-24 18:27:17 +03:00
|
|
|
arm_write_bootloader("raspi_smpboot", arm_boot_address_space(cpu, info),
|
|
|
|
info->smp_loader_start, smpboot, fixupcontext);
|
2016-01-30 01:50:44 +03:00
|
|
|
}
|
|
|
|
|
2018-03-13 18:34:58 +03:00
|
|
|
static void write_smpboot64(ARMCPU *cpu, const struct arm_boot_info *info)
|
|
|
|
{
|
2019-10-20 02:47:09 +03:00
|
|
|
AddressSpace *as = arm_boot_address_space(cpu, info);
|
2018-03-13 18:34:58 +03: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.
|
|
|
|
*/
|
2023-04-24 18:27:17 +03:00
|
|
|
static const ARMInsnFixup 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 */
|
|
|
|
{ 0, FIXUP_TERMINATOR }
|
2018-03-13 18:34:58 +03:00
|
|
|
};
|
2023-04-24 18:27:17 +03:00
|
|
|
static const uint32_t fixupcontext[FIXUP_MAX] = { 0 };
|
2018-03-13 18:34:58 +03:00
|
|
|
|
|
|
|
static const uint64_t spintables[] = {
|
|
|
|
0, 0, 0, 0
|
|
|
|
};
|
|
|
|
|
2023-04-24 18:27:17 +03:00
|
|
|
arm_write_bootloader("raspi_smpboot", as, info->smp_loader_start,
|
|
|
|
smpboot, fixupcontext);
|
2019-10-20 02:47:09 +03:00
|
|
|
rom_add_blob_fixed_as("raspi_spintables", spintables, sizeof(spintables),
|
|
|
|
SPINTABLE_ADDR, as);
|
2018-03-13 18:34:58 +03:00
|
|
|
}
|
|
|
|
|
2016-01-30 01:50:44 +03: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);
|
|
|
|
}
|
|
|
|
|
2024-02-26 03:02:21 +03:00
|
|
|
static void setup_boot(MachineState *machine, ARMCPU *cpu,
|
|
|
|
RaspiProcessorId processor_id, size_t ram_size)
|
2016-01-30 01:50:44 +03:00
|
|
|
{
|
2024-02-26 03:02:21 +03:00
|
|
|
RaspiBaseMachineState *s = RASPI_BASE_MACHINE(machine);
|
2016-01-30 01:50:44 +03:00
|
|
|
int r;
|
|
|
|
|
2020-09-24 14:18:03 +03:00
|
|
|
s->binfo.ram_size = ram_size;
|
2018-03-13 18:34:50 +03:00
|
|
|
|
2020-09-24 14:18:08 +03: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 18:34:50 +03:00
|
|
|
* firmware for some cache maintenance operations.
|
2020-09-24 14:18:08 +03:00
|
|
|
* The BCM2837 doesn't need this.
|
2018-03-13 18:34:50 +03:00
|
|
|
*/
|
2020-09-24 14:18:03 +03: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 18:34:50 +03:00
|
|
|
}
|
2016-01-30 01:50:44 +03:00
|
|
|
|
2020-09-24 14:18:08 +03:00
|
|
|
/* BCM2836 and BCM2837 requires SMP setup */
|
|
|
|
if (processor_id >= PROCESSOR_ID_BCM2836) {
|
2020-09-24 14:18:03 +03:00
|
|
|
s->binfo.smp_loader_start = SMPBOOT_ADDR;
|
2020-09-24 14:18:08 +03:00
|
|
|
if (processor_id == PROCESSOR_ID_BCM2836) {
|
2020-09-24 14:18:03 +03:00
|
|
|
s->binfo.write_secondary_boot = write_smpboot;
|
2018-03-13 18:34:58 +03:00
|
|
|
} else {
|
2020-09-24 14:18:03 +03:00
|
|
|
s->binfo.write_secondary_boot = write_smpboot64;
|
2018-03-13 18:34:58 +03:00
|
|
|
}
|
2020-09-24 14:18:03 +03:00
|
|
|
s->binfo.secondary_cpu_reset_hook = reset_secondary;
|
2016-01-30 01:50:44 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
/* If the user specified a "firmware" image (e.g. UEFI), we bypass
|
|
|
|
* the normal Linux boot process
|
|
|
|
*/
|
|
|
|
if (machine->firmware) {
|
2020-09-24 14:18:07 +03:00
|
|
|
hwaddr firmware_addr = processor_id <= PROCESSOR_ID_BCM2836
|
|
|
|
? FIRMWARE_ADDR_2 : FIRMWARE_ADDR_3;
|
2016-01-30 01:50:44 +03:00
|
|
|
/* load the firmware image (typically kernel.img) */
|
2018-02-15 21:29:36 +03:00
|
|
|
r = load_image_targphys(machine->firmware, firmware_addr,
|
|
|
|
ram_size - firmware_addr);
|
2016-01-30 01:50:44 +03:00
|
|
|
if (r < 0) {
|
|
|
|
error_report("Failed to load firmware from %s", machine->firmware);
|
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
|
2020-09-24 14:18:03 +03:00
|
|
|
s->binfo.entry = firmware_addr;
|
|
|
|
s->binfo.firmware_loaded = true;
|
2016-01-30 01:50:44 +03:00
|
|
|
}
|
|
|
|
|
2024-02-26 03:02:21 +03:00
|
|
|
arm_load_kernel(cpu, machine, &s->binfo);
|
2016-01-30 01:50:44 +03:00
|
|
|
}
|
|
|
|
|
2024-02-26 03:02:28 +03:00
|
|
|
void raspi_base_machine_init(MachineState *machine,
|
2024-02-26 03:02:21 +03:00
|
|
|
BCM283XBaseState *soc)
|
2016-01-30 01:50:44 +03:00
|
|
|
{
|
2024-02-26 03:02:21 +03:00
|
|
|
RaspiBaseMachineClass *mc = RASPI_BASE_MACHINE_GET_CLASS(machine);
|
2020-02-08 19:56:40 +03:00
|
|
|
uint32_t board_rev = mc->board_rev;
|
2020-02-08 19:56:36 +03:00
|
|
|
uint64_t ram_size = board_ram_size(board_rev);
|
2024-02-26 03:02:28 +03:00
|
|
|
uint32_t vcram_base, vcram_size;
|
|
|
|
size_t boot_ram_size;
|
2016-02-25 00:58:48 +03:00
|
|
|
DriveInfo *di;
|
|
|
|
BlockBackend *blk;
|
|
|
|
BusState *bus;
|
|
|
|
DeviceState *carddev;
|
2016-01-30 01:50:44 +03:00
|
|
|
|
2020-02-08 19:56:36 +03: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 14:55:02 +03:00
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
|
2016-01-30 01:50:44 +03:00
|
|
|
/* FIXME: Remove when we have custom CPU address space support */
|
2020-02-19 19:09:03 +03:00
|
|
|
memory_region_add_subregion_overlap(get_system_memory(), 0,
|
|
|
|
machine->ram, 0);
|
2016-01-30 01:50:44 +03:00
|
|
|
|
|
|
|
/* Setup the SOC */
|
2024-02-26 03:02:21 +03:00
|
|
|
object_property_add_const_link(OBJECT(soc), "ram", OBJECT(machine->ram));
|
|
|
|
object_property_set_int(OBJECT(soc), "board-rev", board_rev,
|
2016-02-11 14:17:32 +03:00
|
|
|
&error_abort);
|
2024-02-26 03:02:21 +03:00
|
|
|
object_property_set_str(OBJECT(soc), "command-line",
|
2023-04-25 13:34:31 +03:00
|
|
|
machine->kernel_cmdline, &error_abort);
|
2024-02-26 03:02:21 +03:00
|
|
|
qdev_realize(DEVICE(soc), NULL, &error_fatal);
|
2016-01-30 01:50:44 +03:00
|
|
|
|
2016-02-25 00:58:48 +03:00
|
|
|
/* Create and plug in the SD cards */
|
2021-11-17 19:33:58 +03:00
|
|
|
di = drive_get(IF_SD, 0, 0);
|
2016-02-25 00:58:48 +03:00
|
|
|
blk = di ? blk_by_legacy_dinfo(di) : NULL;
|
2024-02-26 03:02:21 +03:00
|
|
|
bus = qdev_get_child_bus(DEVICE(soc), "sd-bus");
|
2016-02-25 00:58:48 +03:00
|
|
|
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 08:31:58 +03: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 12:42:24 +03: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 08:31:58 +03:00
|
|
|
qdev_realize_and_unref(carddev, bus, &error_fatal);
|
2016-02-25 00:58:48 +03:00
|
|
|
|
2024-02-26 03:02:21 +03:00
|
|
|
vcram_size = object_property_get_uint(OBJECT(soc), "vcram-size",
|
2017-06-07 19:36:17 +03:00
|
|
|
&error_abort);
|
2024-02-26 03:02:28 +03:00
|
|
|
vcram_base = object_property_get_uint(OBJECT(soc), "vcram-base",
|
|
|
|
&error_abort);
|
|
|
|
|
|
|
|
if (vcram_base == 0) {
|
|
|
|
vcram_base = ram_size - vcram_size;
|
|
|
|
}
|
|
|
|
boot_ram_size = MIN(vcram_base, UPPER_RAM_BASE - vcram_size);
|
|
|
|
|
2024-02-26 03:02:21 +03:00
|
|
|
setup_boot(machine, &soc->cpu[0].core, board_processor_id(board_rev),
|
2024-02-26 03:02:28 +03:00
|
|
|
boot_ram_size);
|
2018-02-15 21:29:36 +03:00
|
|
|
}
|
|
|
|
|
2024-02-26 03:02:28 +03:00
|
|
|
void raspi_machine_init(MachineState *machine)
|
2024-02-26 03:02:21 +03:00
|
|
|
{
|
|
|
|
RaspiMachineState *s = RASPI_MACHINE(machine);
|
|
|
|
RaspiBaseMachineState *s_base = RASPI_BASE_MACHINE(machine);
|
|
|
|
RaspiBaseMachineClass *mc = RASPI_BASE_MACHINE_GET_CLASS(machine);
|
|
|
|
BCM283XState *soc = &s->soc;
|
|
|
|
|
|
|
|
s_base->binfo.board_id = MACH_TYPE_BCM2708;
|
|
|
|
|
|
|
|
object_initialize_child(OBJECT(machine), "soc", soc,
|
|
|
|
board_soc_type(mc->board_rev));
|
|
|
|
raspi_base_machine_init(machine, &soc->parent_obj);
|
|
|
|
}
|
|
|
|
|
|
|
|
void raspi_machine_class_common_init(MachineClass *mc,
|
|
|
|
uint32_t board_rev)
|
2016-01-30 01:50:44 +03:00
|
|
|
{
|
2020-09-24 14:18:01 +03:00
|
|
|
mc->desc = g_strdup_printf("Raspberry Pi %s (revision 1.%u)",
|
|
|
|
board_type(board_rev),
|
|
|
|
FIELD_EX32(board_rev, REV_CODE, REVISION));
|
2016-01-30 01:50:44 +03:00
|
|
|
mc->block_default_type = IF_SD;
|
|
|
|
mc->no_parallel = 1;
|
|
|
|
mc->no_floppy = 1;
|
|
|
|
mc->no_cdrom = 1;
|
2020-02-08 19:56:45 +03:00
|
|
|
mc->default_cpus = mc->min_cpus = mc->max_cpus = cores_count(board_rev);
|
2020-02-08 19:56:42 +03:00
|
|
|
mc->default_ram_size = board_ram_size(board_rev);
|
2020-02-19 19:09:03 +03:00
|
|
|
mc->default_ram_id = "ram";
|
2016-01-30 01:50:44 +03:00
|
|
|
};
|
2018-02-22 18:12:51 +03:00
|
|
|
|
2024-02-26 03:02:21 +03:00
|
|
|
static void raspi_machine_class_init(MachineClass *mc,
|
|
|
|
uint32_t board_rev)
|
|
|
|
{
|
|
|
|
raspi_machine_class_common_init(mc, board_rev);
|
|
|
|
mc->init = raspi_machine_init;
|
|
|
|
};
|
|
|
|
|
2020-10-24 20:01:26 +03:00
|
|
|
static void raspi0_machine_class_init(ObjectClass *oc, void *data)
|
|
|
|
{
|
|
|
|
MachineClass *mc = MACHINE_CLASS(oc);
|
2024-02-26 03:02:21 +03:00
|
|
|
RaspiBaseMachineClass *rmc = RASPI_BASE_MACHINE_CLASS(oc);
|
2020-10-24 20:01:26 +03:00
|
|
|
|
|
|
|
rmc->board_rev = 0x920092; /* Revision 1.2 */
|
2024-02-26 03:02:21 +03:00
|
|
|
raspi_machine_class_init(mc, rmc->board_rev);
|
2020-10-24 20:01:26 +03:00
|
|
|
};
|
|
|
|
|
2020-10-24 20:01:25 +03:00
|
|
|
static void raspi1ap_machine_class_init(ObjectClass *oc, void *data)
|
|
|
|
{
|
|
|
|
MachineClass *mc = MACHINE_CLASS(oc);
|
2024-02-26 03:02:21 +03:00
|
|
|
RaspiBaseMachineClass *rmc = RASPI_BASE_MACHINE_CLASS(oc);
|
2020-10-24 20:01:25 +03:00
|
|
|
|
|
|
|
rmc->board_rev = 0x900021; /* Revision 1.1 */
|
2024-02-26 03:02:21 +03:00
|
|
|
raspi_machine_class_init(mc, rmc->board_rev);
|
2020-10-24 20:01:25 +03:00
|
|
|
};
|
|
|
|
|
2020-09-24 14:18:04 +03:00
|
|
|
static void raspi2b_machine_class_init(ObjectClass *oc, void *data)
|
|
|
|
{
|
|
|
|
MachineClass *mc = MACHINE_CLASS(oc);
|
2024-02-26 03:02:21 +03:00
|
|
|
RaspiBaseMachineClass *rmc = RASPI_BASE_MACHINE_CLASS(oc);
|
2020-09-24 14:18:04 +03:00
|
|
|
|
|
|
|
rmc->board_rev = 0xa21041;
|
2024-02-26 03:02:21 +03:00
|
|
|
raspi_machine_class_init(mc, rmc->board_rev);
|
2020-09-24 14:18:04 +03:00
|
|
|
};
|
|
|
|
|
|
|
|
#ifdef TARGET_AARCH64
|
2020-10-24 20:01:27 +03:00
|
|
|
static void raspi3ap_machine_class_init(ObjectClass *oc, void *data)
|
|
|
|
{
|
|
|
|
MachineClass *mc = MACHINE_CLASS(oc);
|
2024-02-26 03:02:21 +03:00
|
|
|
RaspiBaseMachineClass *rmc = RASPI_BASE_MACHINE_CLASS(oc);
|
2020-10-24 20:01:27 +03:00
|
|
|
|
|
|
|
rmc->board_rev = 0x9020e0; /* Revision 1.0 */
|
2024-02-26 03:02:21 +03:00
|
|
|
raspi_machine_class_init(mc, rmc->board_rev);
|
2020-10-24 20:01:27 +03:00
|
|
|
};
|
|
|
|
|
2020-09-24 14:18:04 +03:00
|
|
|
static void raspi3b_machine_class_init(ObjectClass *oc, void *data)
|
|
|
|
{
|
|
|
|
MachineClass *mc = MACHINE_CLASS(oc);
|
2024-02-26 03:02:21 +03:00
|
|
|
RaspiBaseMachineClass *rmc = RASPI_BASE_MACHINE_CLASS(oc);
|
2020-09-24 14:18:04 +03:00
|
|
|
|
|
|
|
rmc->board_rev = 0xa02082;
|
2024-02-26 03:02:21 +03:00
|
|
|
raspi_machine_class_init(mc, rmc->board_rev);
|
2020-09-24 14:18:04 +03:00
|
|
|
};
|
|
|
|
#endif /* TARGET_AARCH64 */
|
|
|
|
|
2020-02-08 19:56:39 +03:00
|
|
|
static const TypeInfo raspi_machine_types[] = {
|
|
|
|
{
|
2020-10-24 20:01:26 +03:00
|
|
|
.name = MACHINE_TYPE_NAME("raspi0"),
|
|
|
|
.parent = TYPE_RASPI_MACHINE,
|
|
|
|
.class_init = raspi0_machine_class_init,
|
|
|
|
}, {
|
2020-10-24 20:01:25 +03:00
|
|
|
.name = MACHINE_TYPE_NAME("raspi1ap"),
|
|
|
|
.parent = TYPE_RASPI_MACHINE,
|
|
|
|
.class_init = raspi1ap_machine_class_init,
|
|
|
|
}, {
|
2020-09-24 14:18:05 +03:00
|
|
|
.name = MACHINE_TYPE_NAME("raspi2b"),
|
2020-02-08 19:56:39 +03:00
|
|
|
.parent = TYPE_RASPI_MACHINE,
|
2020-09-24 14:18:04 +03:00
|
|
|
.class_init = raspi2b_machine_class_init,
|
2020-02-08 19:56:39 +03:00
|
|
|
#ifdef TARGET_AARCH64
|
2020-10-24 20:01:27 +03:00
|
|
|
}, {
|
|
|
|
.name = MACHINE_TYPE_NAME("raspi3ap"),
|
|
|
|
.parent = TYPE_RASPI_MACHINE,
|
|
|
|
.class_init = raspi3ap_machine_class_init,
|
2020-02-08 19:56:39 +03:00
|
|
|
}, {
|
2020-09-24 14:18:05 +03:00
|
|
|
.name = MACHINE_TYPE_NAME("raspi3b"),
|
2020-02-08 19:56:39 +03:00
|
|
|
.parent = TYPE_RASPI_MACHINE,
|
2020-09-24 14:18:04 +03:00
|
|
|
.class_init = raspi3b_machine_class_init,
|
2020-02-08 19:56:39 +03:00
|
|
|
#endif
|
|
|
|
}, {
|
|
|
|
.name = TYPE_RASPI_MACHINE,
|
2024-02-26 03:02:21 +03:00
|
|
|
.parent = TYPE_RASPI_BASE_MACHINE,
|
2020-02-08 19:56:39 +03:00
|
|
|
.instance_size = sizeof(RaspiMachineState),
|
2024-02-26 03:02:21 +03:00
|
|
|
.abstract = true,
|
|
|
|
}, {
|
|
|
|
.name = TYPE_RASPI_BASE_MACHINE,
|
|
|
|
.parent = TYPE_MACHINE,
|
|
|
|
.instance_size = sizeof(RaspiBaseMachineState),
|
|
|
|
.class_size = sizeof(RaspiBaseMachineClass),
|
2020-02-08 19:56:39 +03:00
|
|
|
.abstract = true,
|
|
|
|
}
|
|
|
|
};
|
|
|
|
|
|
|
|
DEFINE_TYPES(raspi_machine_types)
|