2011-03-07 12:10:32 +01:00
|
|
|
/*
|
|
|
|
* ARM Versatile Express emulation.
|
|
|
|
*
|
|
|
|
* Copyright (c) 2010 - 2011 B Labs Ltd.
|
|
|
|
* Copyright (c) 2011 Linaro Limited
|
|
|
|
* Written by Bahadir Balban, Amit Mahajan, Peter Maydell
|
|
|
|
*
|
|
|
|
* This program is free software; you can redistribute it and/or modify
|
|
|
|
* it under the terms of the GNU General Public License version 2 as
|
|
|
|
* published by the Free Software Foundation.
|
|
|
|
*
|
|
|
|
* This program is distributed in the hope that it will be useful,
|
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
* GNU General Public License for more details.
|
|
|
|
*
|
|
|
|
* You should have received a copy of the GNU General Public License along
|
|
|
|
* with this program; if not, see <http://www.gnu.org/licenses/>.
|
2012-01-13 17:44:23 +01:00
|
|
|
*
|
|
|
|
* Contributions after 2012-01-13 are licensed under the terms of the
|
|
|
|
* GNU GPL, version 2 or (at your option) any later version.
|
2011-03-07 12:10:32 +01:00
|
|
|
*/
|
|
|
|
|
2015-12-07 17:23:45 +01:00
|
|
|
#include "qemu/osdep.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 "qemu-common.h"
|
|
|
|
#include "cpu.h"
|
2013-02-04 15:40:22 +01:00
|
|
|
#include "hw/sysbus.h"
|
2019-05-23 15:47:43 +02:00
|
|
|
#include "hw/arm/boot.h"
|
2013-02-05 17:06:20 +01:00
|
|
|
#include "hw/arm/primecell.h"
|
2019-04-12 18:54:13 +02:00
|
|
|
#include "hw/net/lan9118.h"
|
2018-03-01 12:05:46 +01:00
|
|
|
#include "hw/i2c/i2c.h"
|
2012-10-24 08:43:34 +02:00
|
|
|
#include "net/net.h"
|
2012-12-17 18:20:04 +01:00
|
|
|
#include "sysemu/sysemu.h"
|
2013-02-04 15:40:22 +01:00
|
|
|
#include "hw/boards.h"
|
2014-06-09 16:43:22 +02:00
|
|
|
#include "hw/loader.h"
|
2012-12-17 18:19:49 +01:00
|
|
|
#include "exec/address-spaces.h"
|
2013-02-05 17:06:20 +01:00
|
|
|
#include "hw/block/flash.h"
|
2013-07-16 14:25:12 +02:00
|
|
|
#include "sysemu/device_tree.h"
|
2014-03-17 17:31:45 +01:00
|
|
|
#include "qemu/error-report.h"
|
2013-07-16 14:25:12 +02:00
|
|
|
#include <libfdt.h>
|
2016-06-06 17:59:31 +02:00
|
|
|
#include "hw/char/pl011.h"
|
2017-09-04 16:21:53 +02:00
|
|
|
#include "hw/cpu/a9mpcore.h"
|
|
|
|
#include "hw/cpu/a15mpcore.h"
|
2020-06-17 09:25:30 +02:00
|
|
|
#include "hw/i2c/arm_sbcon_i2c.h"
|
2011-03-07 12:10:32 +01:00
|
|
|
|
|
|
|
#define VEXPRESS_BOARD_ID 0x8e0
|
2012-09-19 07:57:21 +02:00
|
|
|
#define VEXPRESS_FLASH_SIZE (64 * 1024 * 1024)
|
|
|
|
#define VEXPRESS_FLASH_SECT_SIZE (256 * 1024)
|
2011-03-07 12:10:32 +01:00
|
|
|
|
2013-07-16 14:25:12 +02:00
|
|
|
/* Number of virtio transports to create (0..8; limited by
|
|
|
|
* number of available IRQ lines).
|
|
|
|
*/
|
|
|
|
#define NUM_VIRTIO_TRANSPORTS 4
|
|
|
|
|
2012-02-16 10:56:08 +01:00
|
|
|
/* Address maps for peripherals:
|
|
|
|
* the Versatile Express motherboard has two possible maps,
|
|
|
|
* the "legacy" one (used for A9) and the "Cortex-A Series"
|
|
|
|
* map (used for newer cores).
|
|
|
|
* Individual daughterboards can also have different maps for
|
|
|
|
* their peripherals.
|
|
|
|
*/
|
|
|
|
|
|
|
|
enum {
|
|
|
|
VE_SYSREGS,
|
|
|
|
VE_SP810,
|
|
|
|
VE_SERIALPCI,
|
|
|
|
VE_PL041,
|
|
|
|
VE_MMCI,
|
|
|
|
VE_KMI0,
|
|
|
|
VE_KMI1,
|
|
|
|
VE_UART0,
|
|
|
|
VE_UART1,
|
|
|
|
VE_UART2,
|
|
|
|
VE_UART3,
|
|
|
|
VE_WDT,
|
|
|
|
VE_TIMER01,
|
|
|
|
VE_TIMER23,
|
|
|
|
VE_SERIALDVI,
|
|
|
|
VE_RTC,
|
|
|
|
VE_COMPACTFLASH,
|
|
|
|
VE_CLCD,
|
|
|
|
VE_NORFLASH0,
|
|
|
|
VE_NORFLASH1,
|
2013-07-09 14:49:40 +02:00
|
|
|
VE_NORFLASHALIAS,
|
2012-02-16 10:56:08 +01:00
|
|
|
VE_SRAM,
|
|
|
|
VE_VIDEORAM,
|
|
|
|
VE_ETHERNET,
|
|
|
|
VE_USB,
|
|
|
|
VE_DAPROM,
|
2013-07-16 14:25:12 +02:00
|
|
|
VE_VIRTIO,
|
2012-02-16 10:56:08 +01:00
|
|
|
};
|
|
|
|
|
2012-10-23 12:30:10 +02:00
|
|
|
static hwaddr motherboard_legacy_map[] = {
|
2014-07-02 16:07:50 +02:00
|
|
|
[VE_NORFLASHALIAS] = 0,
|
2012-02-16 10:56:08 +01:00
|
|
|
/* CS7: 0x10000000 .. 0x10020000 */
|
|
|
|
[VE_SYSREGS] = 0x10000000,
|
|
|
|
[VE_SP810] = 0x10001000,
|
|
|
|
[VE_SERIALPCI] = 0x10002000,
|
|
|
|
[VE_PL041] = 0x10004000,
|
|
|
|
[VE_MMCI] = 0x10005000,
|
|
|
|
[VE_KMI0] = 0x10006000,
|
|
|
|
[VE_KMI1] = 0x10007000,
|
|
|
|
[VE_UART0] = 0x10009000,
|
|
|
|
[VE_UART1] = 0x1000a000,
|
|
|
|
[VE_UART2] = 0x1000b000,
|
|
|
|
[VE_UART3] = 0x1000c000,
|
|
|
|
[VE_WDT] = 0x1000f000,
|
|
|
|
[VE_TIMER01] = 0x10011000,
|
|
|
|
[VE_TIMER23] = 0x10012000,
|
2013-07-16 14:25:12 +02:00
|
|
|
[VE_VIRTIO] = 0x10013000,
|
2012-02-16 10:56:08 +01:00
|
|
|
[VE_SERIALDVI] = 0x10016000,
|
|
|
|
[VE_RTC] = 0x10017000,
|
|
|
|
[VE_COMPACTFLASH] = 0x1001a000,
|
|
|
|
[VE_CLCD] = 0x1001f000,
|
|
|
|
/* CS0: 0x40000000 .. 0x44000000 */
|
|
|
|
[VE_NORFLASH0] = 0x40000000,
|
|
|
|
/* CS1: 0x44000000 .. 0x48000000 */
|
|
|
|
[VE_NORFLASH1] = 0x44000000,
|
|
|
|
/* CS2: 0x48000000 .. 0x4a000000 */
|
|
|
|
[VE_SRAM] = 0x48000000,
|
|
|
|
/* CS3: 0x4c000000 .. 0x50000000 */
|
|
|
|
[VE_VIDEORAM] = 0x4c000000,
|
|
|
|
[VE_ETHERNET] = 0x4e000000,
|
|
|
|
[VE_USB] = 0x4f000000,
|
2011-03-07 12:10:32 +01:00
|
|
|
};
|
|
|
|
|
2012-10-23 12:30:10 +02:00
|
|
|
static hwaddr motherboard_aseries_map[] = {
|
2013-07-09 14:49:40 +02:00
|
|
|
[VE_NORFLASHALIAS] = 0,
|
2012-09-19 07:51:58 +02:00
|
|
|
/* CS0: 0x08000000 .. 0x0c000000 */
|
|
|
|
[VE_NORFLASH0] = 0x08000000,
|
2012-02-16 10:56:09 +01:00
|
|
|
/* CS4: 0x0c000000 .. 0x10000000 */
|
|
|
|
[VE_NORFLASH1] = 0x0c000000,
|
|
|
|
/* CS5: 0x10000000 .. 0x14000000 */
|
|
|
|
/* CS1: 0x14000000 .. 0x18000000 */
|
|
|
|
[VE_SRAM] = 0x14000000,
|
|
|
|
/* CS2: 0x18000000 .. 0x1c000000 */
|
|
|
|
[VE_VIDEORAM] = 0x18000000,
|
|
|
|
[VE_ETHERNET] = 0x1a000000,
|
|
|
|
[VE_USB] = 0x1b000000,
|
|
|
|
/* CS3: 0x1c000000 .. 0x20000000 */
|
|
|
|
[VE_DAPROM] = 0x1c000000,
|
|
|
|
[VE_SYSREGS] = 0x1c010000,
|
|
|
|
[VE_SP810] = 0x1c020000,
|
|
|
|
[VE_SERIALPCI] = 0x1c030000,
|
|
|
|
[VE_PL041] = 0x1c040000,
|
|
|
|
[VE_MMCI] = 0x1c050000,
|
|
|
|
[VE_KMI0] = 0x1c060000,
|
|
|
|
[VE_KMI1] = 0x1c070000,
|
|
|
|
[VE_UART0] = 0x1c090000,
|
|
|
|
[VE_UART1] = 0x1c0a0000,
|
|
|
|
[VE_UART2] = 0x1c0b0000,
|
|
|
|
[VE_UART3] = 0x1c0c0000,
|
|
|
|
[VE_WDT] = 0x1c0f0000,
|
|
|
|
[VE_TIMER01] = 0x1c110000,
|
|
|
|
[VE_TIMER23] = 0x1c120000,
|
2013-07-16 14:25:12 +02:00
|
|
|
[VE_VIRTIO] = 0x1c130000,
|
2012-02-16 10:56:09 +01:00
|
|
|
[VE_SERIALDVI] = 0x1c160000,
|
|
|
|
[VE_RTC] = 0x1c170000,
|
|
|
|
[VE_COMPACTFLASH] = 0x1c1a0000,
|
|
|
|
[VE_CLCD] = 0x1c1f0000,
|
|
|
|
};
|
|
|
|
|
2012-02-16 10:56:09 +01:00
|
|
|
/* Structure defining the peculiarities of a specific daughterboard */
|
|
|
|
|
|
|
|
typedef struct VEDBoardInfo VEDBoardInfo;
|
|
|
|
|
2014-12-16 00:09:38 +01:00
|
|
|
typedef struct {
|
|
|
|
MachineClass parent;
|
|
|
|
VEDBoardInfo *daughterboard;
|
|
|
|
} VexpressMachineClass;
|
|
|
|
|
|
|
|
typedef struct {
|
|
|
|
MachineState parent;
|
2014-12-16 00:09:41 +01:00
|
|
|
bool secure;
|
2018-08-24 14:17:35 +02:00
|
|
|
bool virt;
|
2014-12-16 00:09:38 +01:00
|
|
|
} VexpressMachineState;
|
|
|
|
|
|
|
|
#define TYPE_VEXPRESS_MACHINE "vexpress"
|
2015-08-20 23:54:36 +02:00
|
|
|
#define TYPE_VEXPRESS_A9_MACHINE MACHINE_TYPE_NAME("vexpress-a9")
|
|
|
|
#define TYPE_VEXPRESS_A15_MACHINE MACHINE_TYPE_NAME("vexpress-a15")
|
2014-12-16 00:09:38 +01:00
|
|
|
#define VEXPRESS_MACHINE(obj) \
|
|
|
|
OBJECT_CHECK(VexpressMachineState, (obj), TYPE_VEXPRESS_MACHINE)
|
|
|
|
#define VEXPRESS_MACHINE_GET_CLASS(obj) \
|
|
|
|
OBJECT_GET_CLASS(VexpressMachineClass, obj, TYPE_VEXPRESS_MACHINE)
|
|
|
|
#define VEXPRESS_MACHINE_CLASS(klass) \
|
|
|
|
OBJECT_CLASS_CHECK(VexpressMachineClass, klass, TYPE_VEXPRESS_MACHINE)
|
|
|
|
|
2014-12-16 00:09:42 +01:00
|
|
|
typedef void DBoardInitFn(const VexpressMachineState *machine,
|
2012-02-16 10:56:09 +01:00
|
|
|
ram_addr_t ram_size,
|
2017-09-13 18:04:57 +02:00
|
|
|
const char *cpu_type,
|
2013-03-15 17:41:56 +01:00
|
|
|
qemu_irq *pic);
|
2012-02-16 10:56:09 +01:00
|
|
|
|
|
|
|
struct VEDBoardInfo {
|
2013-07-16 14:25:11 +02:00
|
|
|
struct arm_boot_info bootinfo;
|
2012-10-23 12:30:10 +02:00
|
|
|
const hwaddr *motherboard_map;
|
|
|
|
hwaddr loader_start;
|
|
|
|
const hwaddr gic_cpu_if_addr;
|
2013-03-15 17:41:56 +01:00
|
|
|
uint32_t proc_id;
|
2013-03-15 17:41:57 +01:00
|
|
|
uint32_t num_voltage_sensors;
|
|
|
|
const uint32_t *voltages;
|
2013-03-15 17:41:58 +01:00
|
|
|
uint32_t num_clocks;
|
|
|
|
const uint32_t *clocks;
|
2012-02-16 10:56:09 +01:00
|
|
|
DBoardInitFn *init;
|
|
|
|
};
|
|
|
|
|
2019-05-18 22:54:26 +02:00
|
|
|
static void init_cpus(MachineState *ms, const char *cpu_type,
|
|
|
|
const char *privdev, hwaddr periphbase,
|
|
|
|
qemu_irq *pic, bool secure, bool virt)
|
2014-03-17 17:31:45 +01:00
|
|
|
{
|
|
|
|
DeviceState *dev;
|
|
|
|
SysBusDevice *busdev;
|
|
|
|
int n;
|
2019-05-18 22:54:26 +02:00
|
|
|
unsigned int smp_cpus = ms->smp.cpus;
|
2014-03-17 17:31:45 +01:00
|
|
|
|
|
|
|
/* Create the actual CPUs */
|
|
|
|
for (n = 0; n < smp_cpus; n++) {
|
2017-09-13 18:04:57 +02:00
|
|
|
Object *cpuobj = object_new(cpu_type);
|
2014-03-17 17:31:45 +01:00
|
|
|
|
2014-12-16 00:09:48 +01:00
|
|
|
if (!secure) {
|
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_bool(cpuobj, "has_el3", false, NULL);
|
2014-12-16 00:09:48 +01:00
|
|
|
}
|
2018-08-24 14:17:35 +02:00
|
|
|
if (!virt) {
|
|
|
|
if (object_property_find(cpuobj, "has_el2", NULL)) {
|
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_bool(cpuobj, "has_el2", false, NULL);
|
2018-08-24 14:17:35 +02:00
|
|
|
}
|
|
|
|
}
|
2014-12-16 00:09:48 +01:00
|
|
|
|
2014-04-04 18:42:34 +02:00
|
|
|
if (object_property_find(cpuobj, "reset-cbar", NULL)) {
|
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(cpuobj, "reset-cbar", periphbase,
|
|
|
|
&error_abort);
|
2014-03-17 17:31:45 +01:00
|
|
|
}
|
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(cpuobj), NULL, &error_fatal);
|
2014-03-17 17:31:45 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Create the private peripheral devices (including the GIC);
|
|
|
|
* this must happen after the CPUs are created because a15mpcore_priv
|
|
|
|
* wires itself up to the CPU's generic_timer gpio out lines.
|
|
|
|
*/
|
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
|
|
|
dev = qdev_new(privdev);
|
2014-03-17 17:31:45 +01:00
|
|
|
qdev_prop_set_uint32(dev, "num-cpu", smp_cpus);
|
|
|
|
busdev = SYS_BUS_DEVICE(dev);
|
sysbus: Convert to sysbus_realize() etc. with Coccinelle
Convert from qdev_realize(), qdev_realize_and_unref() with null @bus
argument to sysbus_realize(), sysbus_realize_and_unref().
Coccinelle script:
@@
expression dev, errp;
@@
- qdev_realize(DEVICE(dev), NULL, errp);
+ sysbus_realize(SYS_BUS_DEVICE(dev), errp);
@@
expression sysbus_dev, dev, errp;
@@
+ sysbus_dev = SYS_BUS_DEVICE(dev);
- qdev_realize_and_unref(dev, NULL, errp);
+ sysbus_realize_and_unref(sysbus_dev, errp);
- sysbus_dev = SYS_BUS_DEVICE(dev);
@@
expression sysbus_dev, dev, errp;
expression expr;
@@
sysbus_dev = SYS_BUS_DEVICE(dev);
... when != dev = expr;
- qdev_realize_and_unref(dev, NULL, errp);
+ sysbus_realize_and_unref(sysbus_dev, errp);
@@
expression dev, errp;
@@
- qdev_realize_and_unref(DEVICE(dev), NULL, errp);
+ sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), errp);
@@
expression dev, errp;
@@
- qdev_realize_and_unref(dev, NULL, errp);
+ sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), errp);
Whitespace changes minimized manually.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Acked-by: Alistair Francis <alistair.francis@wdc.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20200610053247.1583243-46-armbru@redhat.com>
[Conflicts in hw/misc/empty_slot.c and hw/sparc/leon3.c resolved]
2020-06-10 07:32:34 +02:00
|
|
|
sysbus_realize_and_unref(busdev, &error_fatal);
|
2014-03-17 17:31:45 +01:00
|
|
|
sysbus_mmio_map(busdev, 0, periphbase);
|
|
|
|
|
|
|
|
/* Interrupts [42:0] are from the motherboard;
|
|
|
|
* [47:43] are reserved; [63:48] are daughterboard
|
|
|
|
* peripherals. Note that some documentation numbers
|
|
|
|
* external interrupts starting from 32 (because there
|
|
|
|
* are internal interrupts 0..31).
|
|
|
|
*/
|
|
|
|
for (n = 0; n < 64; n++) {
|
|
|
|
pic[n] = qdev_get_gpio_in(dev, n);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Connect the CPUs to the GIC */
|
|
|
|
for (n = 0; n < smp_cpus; n++) {
|
|
|
|
DeviceState *cpudev = DEVICE(qemu_get_cpu(n));
|
|
|
|
|
|
|
|
sysbus_connect_irq(busdev, n, qdev_get_gpio_in(cpudev, ARM_CPU_IRQ));
|
2015-05-12 12:57:18 +02:00
|
|
|
sysbus_connect_irq(busdev, n + smp_cpus,
|
|
|
|
qdev_get_gpio_in(cpudev, ARM_CPU_FIQ));
|
2018-08-24 14:17:32 +02:00
|
|
|
sysbus_connect_irq(busdev, n + 2 * smp_cpus,
|
|
|
|
qdev_get_gpio_in(cpudev, ARM_CPU_VIRQ));
|
|
|
|
sysbus_connect_irq(busdev, n + 3 * smp_cpus,
|
|
|
|
qdev_get_gpio_in(cpudev, ARM_CPU_VFIQ));
|
2014-03-17 17:31:45 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-12-16 00:09:42 +01:00
|
|
|
static void a9_daughterboard_init(const VexpressMachineState *vms,
|
2012-02-16 10:56:09 +01:00
|
|
|
ram_addr_t ram_size,
|
2017-09-13 18:04:57 +02:00
|
|
|
const char *cpu_type,
|
2013-03-15 17:41:56 +01:00
|
|
|
qemu_irq *pic)
|
2011-03-07 12:10:32 +01:00
|
|
|
{
|
2019-05-18 22:54:26 +02:00
|
|
|
MachineState *machine = MACHINE(vms);
|
2011-10-05 18:49:54 +02:00
|
|
|
MemoryRegion *sysmem = get_system_memory();
|
|
|
|
MemoryRegion *lowram = g_new(MemoryRegion, 1);
|
2012-02-16 10:56:09 +01:00
|
|
|
ram_addr_t low_ram_size;
|
2011-03-07 12:10:32 +01:00
|
|
|
|
|
|
|
if (ram_size > 0x40000000) {
|
|
|
|
/* 1GB is the maximum the address space permits */
|
hw/arm: Replace fprintf(stderr, "*\n" with error_report()
Replace a large number of the fprintf(stderr, "*\n" calls with
error_report(). The functions were renamed with these commands and then
compiler issues where manually fixed.
find ./* -type f -exec sed -i \
'N;N;N;N;N;N;N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N;N;N;N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N;N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
Some lines where then manually tweaked to pass checkpatch.
The 'qemu: ' prefix was manually removed from the hw/arm/boot.c file.
Signed-off-by: Alistair Francis <alistair.francis@xilinx.com>
Cc: qemu-arm@nongnu.org
Conversions that aren't followed by exit() dropped, because they might
be inappropriate.
Also trim trailing punctuation from error messages.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20180203084315.20497-3-armbru@redhat.com>
2018-02-03 09:43:03 +01:00
|
|
|
error_report("vexpress-a9: cannot model more than 1GB RAM");
|
2011-03-07 12:10:32 +01:00
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
|
|
|
|
low_ram_size = ram_size;
|
|
|
|
if (low_ram_size > 0x4000000) {
|
|
|
|
low_ram_size = 0x4000000;
|
|
|
|
}
|
|
|
|
/* RAM is from 0x60000000 upwards. The bottom 64MB of the
|
|
|
|
* address space should in theory be remappable to various
|
|
|
|
* things including ROM or RAM; we always map the RAM there.
|
|
|
|
*/
|
2020-02-19 17:09:06 +01:00
|
|
|
memory_region_init_alias(lowram, NULL, "vexpress.lowmem", machine->ram,
|
|
|
|
0, low_ram_size);
|
2011-10-05 18:49:54 +02:00
|
|
|
memory_region_add_subregion(sysmem, 0x0, lowram);
|
2020-02-19 17:09:06 +01:00
|
|
|
memory_region_add_subregion(sysmem, 0x60000000, machine->ram);
|
2011-03-07 12:10:32 +01:00
|
|
|
|
|
|
|
/* 0x1e000000 A9MPCore (SCU) private memory region */
|
2019-05-18 22:54:26 +02:00
|
|
|
init_cpus(machine, cpu_type, TYPE_A9MPCORE_PRIV, 0x1e000000, pic,
|
2018-08-24 14:17:35 +02:00
|
|
|
vms->secure, vms->virt);
|
2011-03-07 12:10:32 +01:00
|
|
|
|
2012-02-16 10:56:09 +01:00
|
|
|
/* Daughterboard peripherals : 0x10020000 .. 0x20000000 */
|
|
|
|
|
|
|
|
/* 0x10020000 PL111 CLCD (daughterboard) */
|
|
|
|
sysbus_create_simple("pl111", 0x10020000, pic[44]);
|
|
|
|
|
|
|
|
/* 0x10060000 AXI RAM */
|
|
|
|
/* 0x100e0000 PL341 Dynamic Memory Controller */
|
|
|
|
/* 0x100e1000 PL354 Static Memory Controller */
|
|
|
|
/* 0x100e2000 System Configuration Controller */
|
|
|
|
|
|
|
|
sysbus_create_simple("sp804", 0x100e4000, pic[48]);
|
|
|
|
/* 0x100e5000 SP805 Watchdog module */
|
|
|
|
/* 0x100e6000 BP147 TrustZone Protection Controller */
|
|
|
|
/* 0x100e9000 PL301 'Fast' AXI matrix */
|
|
|
|
/* 0x100ea000 PL301 'Slow' AXI matrix */
|
|
|
|
/* 0x100ec000 TrustZone Address Space Controller */
|
|
|
|
/* 0x10200000 CoreSight debug APB */
|
|
|
|
/* 0x1e00a000 PL310 L2 Cache Controller */
|
|
|
|
sysbus_create_varargs("l2x0", 0x1e00a000, NULL);
|
|
|
|
}
|
|
|
|
|
2013-03-15 17:41:57 +01:00
|
|
|
/* Voltage values for SYS_CFG_VOLT daughterboard registers;
|
|
|
|
* values are in microvolts.
|
|
|
|
*/
|
|
|
|
static const uint32_t a9_voltages[] = {
|
|
|
|
1000000, /* VD10 : 1.0V : SoC internal logic voltage */
|
|
|
|
1000000, /* VD10_S2 : 1.0V : PL310, L2 cache, RAM, non-PL310 logic */
|
|
|
|
1000000, /* VD10_S3 : 1.0V : Cortex-A9, cores, MPEs, SCU, PL310 logic */
|
|
|
|
1800000, /* VCC1V8 : 1.8V : DDR2 SDRAM, test chip DDR2 I/O supply */
|
|
|
|
900000, /* DDR2VTT : 0.9V : DDR2 SDRAM VTT termination voltage */
|
|
|
|
3300000, /* VCC3V3 : 3.3V : local board supply for misc external logic */
|
|
|
|
};
|
|
|
|
|
2013-03-15 17:41:58 +01:00
|
|
|
/* Reset values for daughterboard oscillators (in Hz) */
|
|
|
|
static const uint32_t a9_clocks[] = {
|
|
|
|
45000000, /* AMBA AXI ACLK: 45MHz */
|
|
|
|
23750000, /* daughterboard CLCD clock: 23.75MHz */
|
|
|
|
66670000, /* Test chip reference clock: 66.67MHz */
|
|
|
|
};
|
|
|
|
|
2013-07-16 14:25:11 +02:00
|
|
|
static VEDBoardInfo a9_daughterboard = {
|
2012-02-16 10:56:09 +01:00
|
|
|
.motherboard_map = motherboard_legacy_map,
|
|
|
|
.loader_start = 0x60000000,
|
2012-02-16 10:56:09 +01:00
|
|
|
.gic_cpu_if_addr = 0x1e000100,
|
2013-03-15 17:41:56 +01:00
|
|
|
.proc_id = 0x0c000191,
|
2013-03-15 17:41:57 +01:00
|
|
|
.num_voltage_sensors = ARRAY_SIZE(a9_voltages),
|
|
|
|
.voltages = a9_voltages,
|
2013-03-15 17:41:58 +01:00
|
|
|
.num_clocks = ARRAY_SIZE(a9_clocks),
|
|
|
|
.clocks = a9_clocks,
|
2012-02-16 10:56:09 +01:00
|
|
|
.init = a9_daughterboard_init,
|
|
|
|
};
|
|
|
|
|
2014-12-16 00:09:42 +01:00
|
|
|
static void a15_daughterboard_init(const VexpressMachineState *vms,
|
2012-02-16 10:56:09 +01:00
|
|
|
ram_addr_t ram_size,
|
2017-09-13 18:04:57 +02:00
|
|
|
const char *cpu_type,
|
2013-03-15 17:41:56 +01:00
|
|
|
qemu_irq *pic)
|
2012-02-16 10:56:09 +01:00
|
|
|
{
|
2019-05-18 22:54:26 +02:00
|
|
|
MachineState *machine = MACHINE(vms);
|
2012-02-16 10:56:09 +01:00
|
|
|
MemoryRegion *sysmem = get_system_memory();
|
|
|
|
MemoryRegion *sram = g_new(MemoryRegion, 1);
|
|
|
|
|
2012-07-20 14:34:50 +02:00
|
|
|
{
|
|
|
|
/* We have to use a separate 64 bit variable here to avoid the gcc
|
|
|
|
* "comparison is always false due to limited range of data type"
|
|
|
|
* warning if we are on a host where ram_addr_t is 32 bits.
|
|
|
|
*/
|
|
|
|
uint64_t rsz = ram_size;
|
|
|
|
if (rsz > (30ULL * 1024 * 1024 * 1024)) {
|
hw/arm: Replace fprintf(stderr, "*\n" with error_report()
Replace a large number of the fprintf(stderr, "*\n" calls with
error_report(). The functions were renamed with these commands and then
compiler issues where manually fixed.
find ./* -type f -exec sed -i \
'N;N;N;N;N;N;N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N;N;N;N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N;N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
Some lines where then manually tweaked to pass checkpatch.
The 'qemu: ' prefix was manually removed from the hw/arm/boot.c file.
Signed-off-by: Alistair Francis <alistair.francis@xilinx.com>
Cc: qemu-arm@nongnu.org
Conversions that aren't followed by exit() dropped, because they might
be inappropriate.
Also trim trailing punctuation from error messages.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20180203084315.20497-3-armbru@redhat.com>
2018-02-03 09:43:03 +01:00
|
|
|
error_report("vexpress-a15: cannot model more than 30GB RAM");
|
2012-07-20 14:34:50 +02:00
|
|
|
exit(1);
|
|
|
|
}
|
2012-02-16 10:56:09 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
/* RAM is from 0x80000000 upwards; there is no low-memory alias for it. */
|
2020-02-19 17:09:06 +01:00
|
|
|
memory_region_add_subregion(sysmem, 0x80000000, machine->ram);
|
2012-02-16 10:56:09 +01:00
|
|
|
|
|
|
|
/* 0x2c000000 A15MPCore private memory region (GIC) */
|
2019-05-18 22:54:26 +02:00
|
|
|
init_cpus(machine, cpu_type, TYPE_A15MPCORE_PRIV,
|
|
|
|
0x2c000000, pic, vms->secure, vms->virt);
|
2012-02-16 10:56:09 +01:00
|
|
|
|
|
|
|
/* A15 daughterboard peripherals: */
|
|
|
|
|
|
|
|
/* 0x20000000: CoreSight interfaces: not modelled */
|
|
|
|
/* 0x2a000000: PL301 AXI interconnect: not modelled */
|
|
|
|
/* 0x2a420000: SCC: not modelled */
|
|
|
|
/* 0x2a430000: system counter: not modelled */
|
|
|
|
/* 0x2b000000: HDLCD controller: not modelled */
|
|
|
|
/* 0x2b060000: SP805 watchdog: not modelled */
|
|
|
|
/* 0x2b0a0000: PL341 dynamic memory controller: not modelled */
|
|
|
|
/* 0x2e000000: system SRAM */
|
2017-07-07 16:42:53 +02:00
|
|
|
memory_region_init_ram(sram, NULL, "vexpress.a15sram", 0x10000,
|
Fix bad error handling after memory_region_init_ram()
Symptom:
$ qemu-system-x86_64 -m 10000000
Unexpected error in ram_block_add() at /work/armbru/qemu/exec.c:1456:
upstream-qemu: cannot set up guest memory 'pc.ram': Cannot allocate memory
Aborted (core dumped)
Root cause: commit ef701d7 screwed up handling of out-of-memory
conditions. Before the commit, we report the error and exit(1), in
one place, ram_block_add(). The commit lifts the error handling up
the call chain some, to three places. Fine. Except it uses
&error_abort in these places, changing the behavior from exit(1) to
abort(), and thus undoing the work of commit 3922825 "exec: Don't
abort when we can't allocate guest memory".
The three places are:
* memory_region_init_ram()
Commit 4994653 (right after commit ef701d7) lifted the error
handling further, through memory_region_init_ram(), multiplying the
incorrect use of &error_abort. Later on, imitation of existing
(bad) code may have created more.
* memory_region_init_ram_ptr()
The &error_abort is still there.
* memory_region_init_rom_device()
Doesn't need fixing, because commit 33e0eb5 (soon after commit
ef701d7) lifted the error handling further, and in the process
changed it from &error_abort to passing it up the call chain.
Correct, because the callers are realize() methods.
Fix the error handling after memory_region_init_ram() with a
Coccinelle semantic patch:
@r@
expression mr, owner, name, size, err;
position p;
@@
memory_region_init_ram(mr, owner, name, size,
(
- &error_abort
+ &error_fatal
|
err@p
)
);
@script:python@
p << r.p;
@@
print "%s:%s:%s" % (p[0].file, p[0].line, p[0].column)
When the last argument is &error_abort, it gets replaced by
&error_fatal. This is the fix.
If the last argument is anything else, its position is reported. This
lets us check the fix is complete. Four positions get reported:
* ram_backend_memory_alloc()
Error is passed up the call chain, ultimately through
user_creatable_complete(). As far as I can tell, it's callers all
handle the error sanely.
* fsl_imx25_realize(), fsl_imx31_realize(), dp8393x_realize()
DeviceClass.realize() methods, errors handled sanely further up the
call chain.
We're good. Test case again behaves:
$ qemu-system-x86_64 -m 10000000
qemu-system-x86_64: cannot set up guest memory 'pc.ram': Cannot allocate memory
[Exit 1 ]
The next commits will repair the rest of commit ef701d7's damage.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <1441983105-26376-3-git-send-email-armbru@redhat.com>
Reviewed-by: Peter Crosthwaite <crosthwaite.peter@gmail.com>
2015-09-11 16:51:43 +02:00
|
|
|
&error_fatal);
|
2012-02-16 10:56:09 +01:00
|
|
|
memory_region_add_subregion(sysmem, 0x2e000000, sram);
|
|
|
|
|
|
|
|
/* 0x7ffb0000: DMA330 DMA controller: not modelled */
|
|
|
|
/* 0x7ffd0000: PL354 static memory controller: not modelled */
|
|
|
|
}
|
|
|
|
|
2013-03-15 17:41:57 +01:00
|
|
|
static const uint32_t a15_voltages[] = {
|
|
|
|
900000, /* Vcore: 0.9V : CPU core voltage */
|
|
|
|
};
|
|
|
|
|
2013-03-15 17:41:58 +01:00
|
|
|
static const uint32_t a15_clocks[] = {
|
|
|
|
60000000, /* OSCCLK0: 60MHz : CPU_CLK reference */
|
|
|
|
0, /* OSCCLK1: reserved */
|
|
|
|
0, /* OSCCLK2: reserved */
|
|
|
|
0, /* OSCCLK3: reserved */
|
|
|
|
40000000, /* OSCCLK4: 40MHz : external AXI master clock */
|
|
|
|
23750000, /* OSCCLK5: 23.75MHz : HDLCD PLL reference */
|
|
|
|
50000000, /* OSCCLK6: 50MHz : static memory controller clock */
|
|
|
|
60000000, /* OSCCLK7: 60MHz : SYSCLK reference */
|
|
|
|
40000000, /* OSCCLK8: 40MHz : DDR2 PLL reference */
|
|
|
|
};
|
|
|
|
|
2013-07-16 14:25:11 +02:00
|
|
|
static VEDBoardInfo a15_daughterboard = {
|
2012-02-16 10:56:09 +01:00
|
|
|
.motherboard_map = motherboard_aseries_map,
|
|
|
|
.loader_start = 0x80000000,
|
|
|
|
.gic_cpu_if_addr = 0x2c002000,
|
2013-03-15 17:41:56 +01:00
|
|
|
.proc_id = 0x14000237,
|
2013-03-15 17:41:57 +01:00
|
|
|
.num_voltage_sensors = ARRAY_SIZE(a15_voltages),
|
|
|
|
.voltages = a15_voltages,
|
2013-03-15 17:41:58 +01:00
|
|
|
.num_clocks = ARRAY_SIZE(a15_clocks),
|
|
|
|
.clocks = a15_clocks,
|
2012-02-16 10:56:09 +01:00
|
|
|
.init = a15_daughterboard_init,
|
|
|
|
};
|
|
|
|
|
2013-07-16 14:25:12 +02:00
|
|
|
static int add_virtio_mmio_node(void *fdt, uint32_t acells, uint32_t scells,
|
|
|
|
hwaddr addr, hwaddr size, uint32_t intc,
|
|
|
|
int irq)
|
|
|
|
{
|
|
|
|
/* Add a virtio_mmio node to the device tree blob:
|
|
|
|
* virtio_mmio@ADDRESS {
|
|
|
|
* compatible = "virtio,mmio";
|
|
|
|
* reg = <ADDRESS, SIZE>;
|
|
|
|
* interrupt-parent = <&intc>;
|
|
|
|
* interrupts = <0, irq, 1>;
|
|
|
|
* }
|
|
|
|
* (Note that the format of the interrupts property is dependent on the
|
|
|
|
* interrupt controller that interrupt-parent points to; these are for
|
|
|
|
* the ARM GIC and indicate an SPI interrupt, rising-edge-triggered.)
|
|
|
|
*/
|
|
|
|
int rc;
|
|
|
|
char *nodename = g_strdup_printf("/virtio_mmio@%" PRIx64, addr);
|
|
|
|
|
2013-11-11 09:14:41 +01:00
|
|
|
rc = qemu_fdt_add_subnode(fdt, nodename);
|
|
|
|
rc |= qemu_fdt_setprop_string(fdt, nodename,
|
|
|
|
"compatible", "virtio,mmio");
|
|
|
|
rc |= qemu_fdt_setprop_sized_cells(fdt, nodename, "reg",
|
|
|
|
acells, addr, scells, size);
|
|
|
|
qemu_fdt_setprop_cells(fdt, nodename, "interrupt-parent", intc);
|
|
|
|
qemu_fdt_setprop_cells(fdt, nodename, "interrupts", 0, irq, 1);
|
2017-02-10 18:40:29 +01:00
|
|
|
qemu_fdt_setprop(fdt, nodename, "dma-coherent", NULL, 0);
|
2013-07-16 14:25:12 +02:00
|
|
|
g_free(nodename);
|
|
|
|
if (rc) {
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static uint32_t find_int_controller(void *fdt)
|
|
|
|
{
|
|
|
|
/* Find the FDT node corresponding to the interrupt controller
|
|
|
|
* for virtio-mmio devices. We do this by scanning the fdt for
|
|
|
|
* a node with the right compatibility, since we know there is
|
|
|
|
* only one GIC on a vexpress board.
|
|
|
|
* We return the phandle of the node, or 0 if none was found.
|
|
|
|
*/
|
|
|
|
const char *compat = "arm,cortex-a9-gic";
|
|
|
|
int offset;
|
|
|
|
|
|
|
|
offset = fdt_node_offset_by_compatible(fdt, -1, compat);
|
|
|
|
if (offset >= 0) {
|
|
|
|
return fdt_get_phandle(fdt, offset);
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void vexpress_modify_dtb(const struct arm_boot_info *info, void *fdt)
|
|
|
|
{
|
|
|
|
uint32_t acells, scells, intc;
|
|
|
|
const VEDBoardInfo *daughterboard = (const VEDBoardInfo *)info;
|
|
|
|
|
2016-02-19 17:42:30 +01:00
|
|
|
acells = qemu_fdt_getprop_cell(fdt, "/", "#address-cells",
|
|
|
|
NULL, &error_fatal);
|
|
|
|
scells = qemu_fdt_getprop_cell(fdt, "/", "#size-cells",
|
|
|
|
NULL, &error_fatal);
|
2013-07-16 14:25:12 +02:00
|
|
|
intc = find_int_controller(fdt);
|
|
|
|
if (!intc) {
|
|
|
|
/* Not fatal, we just won't provide virtio. This will
|
|
|
|
* happen with older device tree blobs.
|
|
|
|
*/
|
2017-09-11 21:52:53 +02:00
|
|
|
warn_report("couldn't find interrupt controller in "
|
2017-09-11 21:52:56 +02:00
|
|
|
"dtb; will not include virtio-mmio devices in the dtb");
|
2013-07-16 14:25:12 +02:00
|
|
|
} else {
|
|
|
|
int i;
|
|
|
|
const hwaddr *map = daughterboard->motherboard_map;
|
|
|
|
|
|
|
|
/* We iterate backwards here because adding nodes
|
|
|
|
* to the dtb puts them in last-first.
|
|
|
|
*/
|
|
|
|
for (i = NUM_VIRTIO_TRANSPORTS - 1; i >= 0; i--) {
|
|
|
|
add_virtio_mmio_node(fdt, acells, scells,
|
|
|
|
map[VE_VIRTIO] + 0x200 * i,
|
|
|
|
0x200, intc, 40 + i);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-12-17 20:42:26 +01:00
|
|
|
|
|
|
|
/* Open code a private version of pflash registration since we
|
|
|
|
* need to set non-default device width for VExpress platform.
|
|
|
|
*/
|
2019-03-08 10:45:56 +01:00
|
|
|
static PFlashCFI01 *ve_pflash_cfi01_register(hwaddr base, const char *name,
|
|
|
|
DriveInfo *di)
|
2013-12-17 20:42:26 +01:00
|
|
|
{
|
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
|
|
|
DeviceState *dev = qdev_new(TYPE_PFLASH_CFI01);
|
2013-12-17 20:42:26 +01:00
|
|
|
|
2015-03-09 19:17:26 +01:00
|
|
|
if (di) {
|
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(dev, "drive", blk_by_legacy_dinfo(di));
|
2013-12-17 20:42:26 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
qdev_prop_set_uint32(dev, "num-blocks",
|
|
|
|
VEXPRESS_FLASH_SIZE / VEXPRESS_FLASH_SECT_SIZE);
|
|
|
|
qdev_prop_set_uint64(dev, "sector-length", VEXPRESS_FLASH_SECT_SIZE);
|
|
|
|
qdev_prop_set_uint8(dev, "width", 4);
|
|
|
|
qdev_prop_set_uint8(dev, "device-width", 2);
|
2015-04-08 13:53:29 +02:00
|
|
|
qdev_prop_set_bit(dev, "big-endian", false);
|
2013-12-17 20:42:27 +01:00
|
|
|
qdev_prop_set_uint16(dev, "id0", 0x89);
|
|
|
|
qdev_prop_set_uint16(dev, "id1", 0x18);
|
2013-12-17 20:42:26 +01:00
|
|
|
qdev_prop_set_uint16(dev, "id2", 0x00);
|
2013-12-17 20:42:27 +01:00
|
|
|
qdev_prop_set_uint16(dev, "id3", 0x00);
|
2013-12-17 20:42:26 +01:00
|
|
|
qdev_prop_set_string(dev, "name", name);
|
sysbus: Convert to sysbus_realize() etc. with Coccinelle
Convert from qdev_realize(), qdev_realize_and_unref() with null @bus
argument to sysbus_realize(), sysbus_realize_and_unref().
Coccinelle script:
@@
expression dev, errp;
@@
- qdev_realize(DEVICE(dev), NULL, errp);
+ sysbus_realize(SYS_BUS_DEVICE(dev), errp);
@@
expression sysbus_dev, dev, errp;
@@
+ sysbus_dev = SYS_BUS_DEVICE(dev);
- qdev_realize_and_unref(dev, NULL, errp);
+ sysbus_realize_and_unref(sysbus_dev, errp);
- sysbus_dev = SYS_BUS_DEVICE(dev);
@@
expression sysbus_dev, dev, errp;
expression expr;
@@
sysbus_dev = SYS_BUS_DEVICE(dev);
... when != dev = expr;
- qdev_realize_and_unref(dev, NULL, errp);
+ sysbus_realize_and_unref(sysbus_dev, errp);
@@
expression dev, errp;
@@
- qdev_realize_and_unref(DEVICE(dev), NULL, errp);
+ sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), errp);
@@
expression dev, errp;
@@
- qdev_realize_and_unref(dev, NULL, errp);
+ sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), errp);
Whitespace changes minimized manually.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Acked-by: Alistair Francis <alistair.francis@wdc.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20200610053247.1583243-46-armbru@redhat.com>
[Conflicts in hw/misc/empty_slot.c and hw/sparc/leon3.c resolved]
2020-06-10 07:32:34 +02:00
|
|
|
sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal);
|
2013-12-17 20:42:26 +01:00
|
|
|
|
|
|
|
sysbus_mmio_map(SYS_BUS_DEVICE(dev), 0, base);
|
2019-03-08 10:46:00 +01:00
|
|
|
return PFLASH_CFI01(dev);
|
2013-12-17 20:42:26 +01:00
|
|
|
}
|
|
|
|
|
2014-12-16 00:09:40 +01:00
|
|
|
static void vexpress_common_init(MachineState *machine)
|
2012-02-16 10:56:09 +01:00
|
|
|
{
|
2014-12-16 00:09:42 +01:00
|
|
|
VexpressMachineState *vms = VEXPRESS_MACHINE(machine);
|
2014-12-16 00:09:40 +01:00
|
|
|
VexpressMachineClass *vmc = VEXPRESS_MACHINE_GET_CLASS(machine);
|
2015-08-26 13:17:12 +02:00
|
|
|
VEDBoardInfo *daughterboard = vmc->daughterboard;
|
2012-02-16 10:56:09 +01:00
|
|
|
DeviceState *dev, *sysctl, *pl041;
|
|
|
|
qemu_irq pic[64];
|
|
|
|
uint32_t sys_id;
|
2012-09-19 07:57:21 +02:00
|
|
|
DriveInfo *dinfo;
|
2019-03-08 10:45:56 +01:00
|
|
|
PFlashCFI01 *pflash0;
|
2018-03-01 12:05:46 +01:00
|
|
|
I2CBus *i2c;
|
2012-02-16 10:56:09 +01:00
|
|
|
ram_addr_t vram_size, sram_size;
|
|
|
|
MemoryRegion *sysmem = get_system_memory();
|
|
|
|
MemoryRegion *vram = g_new(MemoryRegion, 1);
|
|
|
|
MemoryRegion *sram = g_new(MemoryRegion, 1);
|
2013-07-09 14:49:40 +02:00
|
|
|
MemoryRegion *flashalias = g_new(MemoryRegion, 1);
|
|
|
|
MemoryRegion *flash0mem;
|
2012-10-23 12:30:10 +02:00
|
|
|
const hwaddr *map = daughterboard->motherboard_map;
|
2013-03-15 17:41:57 +01:00
|
|
|
int i;
|
2012-02-16 10:56:09 +01:00
|
|
|
|
2017-09-13 18:04:57 +02:00
|
|
|
daughterboard->init(vms, machine->ram_size, machine->cpu_type, pic);
|
2012-02-16 10:56:09 +01:00
|
|
|
|
2014-06-09 16:43:22 +02:00
|
|
|
/*
|
|
|
|
* If a bios file was provided, attempt to map it into memory
|
|
|
|
*/
|
|
|
|
if (bios_name) {
|
2015-03-05 03:58:32 +01:00
|
|
|
char *fn;
|
2015-04-01 18:57:29 +02:00
|
|
|
int image_size;
|
2014-06-19 19:06:25 +02:00
|
|
|
|
|
|
|
if (drive_get(IF_PFLASH, 0, 0)) {
|
|
|
|
error_report("The contents of the first flash device may be "
|
|
|
|
"specified with -bios or with -drive if=pflash... "
|
|
|
|
"but you cannot use both options at once");
|
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
fn = qemu_find_file(QEMU_FILE_TYPE_BIOS, bios_name);
|
2015-04-01 18:57:29 +02:00
|
|
|
if (!fn) {
|
|
|
|
error_report("Could not find ROM image '%s'", bios_name);
|
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
image_size = load_image_targphys(fn, map[VE_NORFLASH0],
|
|
|
|
VEXPRESS_FLASH_SIZE);
|
|
|
|
g_free(fn);
|
|
|
|
if (image_size < 0) {
|
2014-06-09 16:43:22 +02:00
|
|
|
error_report("Could not load ROM image '%s'", bios_name);
|
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2012-02-16 10:56:08 +01:00
|
|
|
/* Motherboard peripherals: the wiring is the same but the
|
|
|
|
* addresses vary between the legacy and A-Series memory maps.
|
|
|
|
*/
|
|
|
|
|
2011-03-07 12:10:32 +01:00
|
|
|
sys_id = 0x1190f500;
|
|
|
|
|
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
|
|
|
sysctl = qdev_new("realview_sysctl");
|
2011-03-07 12:10:32 +01:00
|
|
|
qdev_prop_set_uint32(sysctl, "sys_id", sys_id);
|
2013-03-15 17:41:56 +01:00
|
|
|
qdev_prop_set_uint32(sysctl, "proc_id", daughterboard->proc_id);
|
2013-03-15 17:41:57 +01:00
|
|
|
qdev_prop_set_uint32(sysctl, "len-db-voltage",
|
|
|
|
daughterboard->num_voltage_sensors);
|
|
|
|
for (i = 0; i < daughterboard->num_voltage_sensors; i++) {
|
|
|
|
char *propname = g_strdup_printf("db-voltage[%d]", i);
|
|
|
|
qdev_prop_set_uint32(sysctl, propname, daughterboard->voltages[i]);
|
|
|
|
g_free(propname);
|
|
|
|
}
|
2013-03-15 17:41:58 +01:00
|
|
|
qdev_prop_set_uint32(sysctl, "len-db-clock",
|
|
|
|
daughterboard->num_clocks);
|
|
|
|
for (i = 0; i < daughterboard->num_clocks; i++) {
|
|
|
|
char *propname = g_strdup_printf("db-clock[%d]", i);
|
|
|
|
qdev_prop_set_uint32(sysctl, propname, daughterboard->clocks[i]);
|
|
|
|
g_free(propname);
|
|
|
|
}
|
sysbus: Convert to sysbus_realize() etc. with Coccinelle
Convert from qdev_realize(), qdev_realize_and_unref() with null @bus
argument to sysbus_realize(), sysbus_realize_and_unref().
Coccinelle script:
@@
expression dev, errp;
@@
- qdev_realize(DEVICE(dev), NULL, errp);
+ sysbus_realize(SYS_BUS_DEVICE(dev), errp);
@@
expression sysbus_dev, dev, errp;
@@
+ sysbus_dev = SYS_BUS_DEVICE(dev);
- qdev_realize_and_unref(dev, NULL, errp);
+ sysbus_realize_and_unref(sysbus_dev, errp);
- sysbus_dev = SYS_BUS_DEVICE(dev);
@@
expression sysbus_dev, dev, errp;
expression expr;
@@
sysbus_dev = SYS_BUS_DEVICE(dev);
... when != dev = expr;
- qdev_realize_and_unref(dev, NULL, errp);
+ sysbus_realize_and_unref(sysbus_dev, errp);
@@
expression dev, errp;
@@
- qdev_realize_and_unref(DEVICE(dev), NULL, errp);
+ sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), errp);
@@
expression dev, errp;
@@
- qdev_realize_and_unref(dev, NULL, errp);
+ sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), errp);
Whitespace changes minimized manually.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Acked-by: Alistair Francis <alistair.francis@wdc.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20200610053247.1583243-46-armbru@redhat.com>
[Conflicts in hw/misc/empty_slot.c and hw/sparc/leon3.c resolved]
2020-06-10 07:32:34 +02:00
|
|
|
sysbus_realize_and_unref(SYS_BUS_DEVICE(sysctl), &error_fatal);
|
2013-01-20 02:47:33 +01:00
|
|
|
sysbus_mmio_map(SYS_BUS_DEVICE(sysctl), 0, map[VE_SYSREGS]);
|
2012-02-16 10:56:08 +01:00
|
|
|
|
|
|
|
/* VE_SP810: not modelled */
|
|
|
|
/* VE_SERIALPCI: not modelled */
|
2011-03-07 12:10:32 +01:00
|
|
|
|
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
|
|
|
pl041 = qdev_new("pl041");
|
2011-10-28 11:55:38 +02:00
|
|
|
qdev_prop_set_uint32(pl041, "nc_fifo_depth", 512);
|
sysbus: Convert to sysbus_realize() etc. with Coccinelle
Convert from qdev_realize(), qdev_realize_and_unref() with null @bus
argument to sysbus_realize(), sysbus_realize_and_unref().
Coccinelle script:
@@
expression dev, errp;
@@
- qdev_realize(DEVICE(dev), NULL, errp);
+ sysbus_realize(SYS_BUS_DEVICE(dev), errp);
@@
expression sysbus_dev, dev, errp;
@@
+ sysbus_dev = SYS_BUS_DEVICE(dev);
- qdev_realize_and_unref(dev, NULL, errp);
+ sysbus_realize_and_unref(sysbus_dev, errp);
- sysbus_dev = SYS_BUS_DEVICE(dev);
@@
expression sysbus_dev, dev, errp;
expression expr;
@@
sysbus_dev = SYS_BUS_DEVICE(dev);
... when != dev = expr;
- qdev_realize_and_unref(dev, NULL, errp);
+ sysbus_realize_and_unref(sysbus_dev, errp);
@@
expression dev, errp;
@@
- qdev_realize_and_unref(DEVICE(dev), NULL, errp);
+ sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), errp);
@@
expression dev, errp;
@@
- qdev_realize_and_unref(dev, NULL, errp);
+ sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), errp);
Whitespace changes minimized manually.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Acked-by: Alistair Francis <alistair.francis@wdc.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20200610053247.1583243-46-armbru@redhat.com>
[Conflicts in hw/misc/empty_slot.c and hw/sparc/leon3.c resolved]
2020-06-10 07:32:34 +02:00
|
|
|
sysbus_realize_and_unref(SYS_BUS_DEVICE(pl041), &error_fatal);
|
2013-01-20 02:47:33 +01:00
|
|
|
sysbus_mmio_map(SYS_BUS_DEVICE(pl041), 0, map[VE_PL041]);
|
|
|
|
sysbus_connect_irq(SYS_BUS_DEVICE(pl041), 0, pic[11]);
|
2011-03-07 12:10:32 +01:00
|
|
|
|
2012-02-16 10:56:08 +01:00
|
|
|
dev = sysbus_create_varargs("pl181", map[VE_MMCI], pic[9], pic[10], NULL);
|
2011-03-07 12:10:32 +01:00
|
|
|
/* Wire up MMC card detect and read-only signals */
|
2020-07-05 13:39:53 +02:00
|
|
|
qdev_connect_gpio_out_named(dev, "card-read-only", 0,
|
2011-03-07 12:10:32 +01:00
|
|
|
qdev_get_gpio_in(sysctl, ARM_SYSCTL_GPIO_MMC_WPROT));
|
2020-07-05 13:39:53 +02:00
|
|
|
qdev_connect_gpio_out_named(dev, "card-inserted", 0,
|
2011-03-07 12:10:32 +01:00
|
|
|
qdev_get_gpio_in(sysctl, ARM_SYSCTL_GPIO_MMC_CARDIN));
|
|
|
|
|
2012-02-16 10:56:08 +01:00
|
|
|
sysbus_create_simple("pl050_keyboard", map[VE_KMI0], pic[12]);
|
|
|
|
sysbus_create_simple("pl050_mouse", map[VE_KMI1], pic[13]);
|
2011-03-07 12:10:32 +01:00
|
|
|
|
2018-04-20 16:52:43 +02:00
|
|
|
pl011_create(map[VE_UART0], pic[5], serial_hd(0));
|
|
|
|
pl011_create(map[VE_UART1], pic[6], serial_hd(1));
|
|
|
|
pl011_create(map[VE_UART2], pic[7], serial_hd(2));
|
|
|
|
pl011_create(map[VE_UART3], pic[8], serial_hd(3));
|
2011-03-07 12:10:32 +01:00
|
|
|
|
2012-02-16 10:56:08 +01:00
|
|
|
sysbus_create_simple("sp804", map[VE_TIMER01], pic[2]);
|
|
|
|
sysbus_create_simple("sp804", map[VE_TIMER23], pic[3]);
|
2011-03-07 12:10:32 +01:00
|
|
|
|
2020-06-17 09:25:30 +02:00
|
|
|
dev = sysbus_create_simple(TYPE_VERSATILE_I2C, map[VE_SERIALDVI], NULL);
|
2018-03-01 12:05:46 +01:00
|
|
|
i2c = (I2CBus *)qdev_get_child_bus(dev, "i2c");
|
2020-07-06 00:41:53 +02:00
|
|
|
i2c_slave_create_simple(i2c, "sii9022", 0x39);
|
2011-03-07 12:10:32 +01:00
|
|
|
|
2012-02-16 10:56:08 +01:00
|
|
|
sysbus_create_simple("pl031", map[VE_RTC], pic[4]); /* RTC */
|
2011-03-07 12:10:32 +01:00
|
|
|
|
2012-02-16 10:56:08 +01:00
|
|
|
/* VE_COMPACTFLASH: not modelled */
|
2011-03-07 12:10:32 +01:00
|
|
|
|
2012-02-16 10:56:09 +01:00
|
|
|
sysbus_create_simple("pl111", map[VE_CLCD], pic[14]);
|
2011-03-07 12:10:32 +01:00
|
|
|
|
2012-09-19 07:57:21 +02:00
|
|
|
dinfo = drive_get_next(IF_PFLASH);
|
2013-12-17 20:42:26 +01:00
|
|
|
pflash0 = ve_pflash_cfi01_register(map[VE_NORFLASH0], "vexpress.flash0",
|
|
|
|
dinfo);
|
2013-07-09 14:49:40 +02:00
|
|
|
if (!pflash0) {
|
hw/arm: Replace fprintf(stderr, "*\n" with error_report()
Replace a large number of the fprintf(stderr, "*\n" calls with
error_report(). The functions were renamed with these commands and then
compiler issues where manually fixed.
find ./* -type f -exec sed -i \
'N;N;N;N;N;N;N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N;N;N;N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N;N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
Some lines where then manually tweaked to pass checkpatch.
The 'qemu: ' prefix was manually removed from the hw/arm/boot.c file.
Signed-off-by: Alistair Francis <alistair.francis@xilinx.com>
Cc: qemu-arm@nongnu.org
Conversions that aren't followed by exit() dropped, because they might
be inappropriate.
Also trim trailing punctuation from error messages.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20180203084315.20497-3-armbru@redhat.com>
2018-02-03 09:43:03 +01:00
|
|
|
error_report("vexpress: error registering flash 0");
|
2012-09-19 07:57:21 +02:00
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
|
2013-07-09 14:49:40 +02:00
|
|
|
if (map[VE_NORFLASHALIAS] != -1) {
|
|
|
|
/* Map flash 0 as an alias into low memory */
|
|
|
|
flash0mem = sysbus_mmio_get_region(SYS_BUS_DEVICE(pflash0), 0);
|
|
|
|
memory_region_init_alias(flashalias, NULL, "vexpress.flashalias",
|
|
|
|
flash0mem, 0, VEXPRESS_FLASH_SIZE);
|
|
|
|
memory_region_add_subregion(sysmem, map[VE_NORFLASHALIAS], flashalias);
|
|
|
|
}
|
|
|
|
|
2012-09-19 07:57:21 +02:00
|
|
|
dinfo = drive_get_next(IF_PFLASH);
|
2013-12-17 20:42:26 +01:00
|
|
|
if (!ve_pflash_cfi01_register(map[VE_NORFLASH1], "vexpress.flash1",
|
|
|
|
dinfo)) {
|
hw/arm: Replace fprintf(stderr, "*\n" with error_report()
Replace a large number of the fprintf(stderr, "*\n" calls with
error_report(). The functions were renamed with these commands and then
compiler issues where manually fixed.
find ./* -type f -exec sed -i \
'N;N;N;N;N;N;N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N;N;N;N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N;N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
Some lines where then manually tweaked to pass checkpatch.
The 'qemu: ' prefix was manually removed from the hw/arm/boot.c file.
Signed-off-by: Alistair Francis <alistair.francis@xilinx.com>
Cc: qemu-arm@nongnu.org
Conversions that aren't followed by exit() dropped, because they might
be inappropriate.
Also trim trailing punctuation from error messages.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20180203084315.20497-3-armbru@redhat.com>
2018-02-03 09:43:03 +01:00
|
|
|
error_report("vexpress: error registering flash 1");
|
2012-09-19 07:57:21 +02:00
|
|
|
exit(1);
|
|
|
|
}
|
2012-02-16 10:56:08 +01:00
|
|
|
|
2011-03-07 12:10:32 +01:00
|
|
|
sram_size = 0x2000000;
|
2017-07-07 16:42:53 +02:00
|
|
|
memory_region_init_ram(sram, NULL, "vexpress.sram", sram_size,
|
Fix bad error handling after memory_region_init_ram()
Symptom:
$ qemu-system-x86_64 -m 10000000
Unexpected error in ram_block_add() at /work/armbru/qemu/exec.c:1456:
upstream-qemu: cannot set up guest memory 'pc.ram': Cannot allocate memory
Aborted (core dumped)
Root cause: commit ef701d7 screwed up handling of out-of-memory
conditions. Before the commit, we report the error and exit(1), in
one place, ram_block_add(). The commit lifts the error handling up
the call chain some, to three places. Fine. Except it uses
&error_abort in these places, changing the behavior from exit(1) to
abort(), and thus undoing the work of commit 3922825 "exec: Don't
abort when we can't allocate guest memory".
The three places are:
* memory_region_init_ram()
Commit 4994653 (right after commit ef701d7) lifted the error
handling further, through memory_region_init_ram(), multiplying the
incorrect use of &error_abort. Later on, imitation of existing
(bad) code may have created more.
* memory_region_init_ram_ptr()
The &error_abort is still there.
* memory_region_init_rom_device()
Doesn't need fixing, because commit 33e0eb5 (soon after commit
ef701d7) lifted the error handling further, and in the process
changed it from &error_abort to passing it up the call chain.
Correct, because the callers are realize() methods.
Fix the error handling after memory_region_init_ram() with a
Coccinelle semantic patch:
@r@
expression mr, owner, name, size, err;
position p;
@@
memory_region_init_ram(mr, owner, name, size,
(
- &error_abort
+ &error_fatal
|
err@p
)
);
@script:python@
p << r.p;
@@
print "%s:%s:%s" % (p[0].file, p[0].line, p[0].column)
When the last argument is &error_abort, it gets replaced by
&error_fatal. This is the fix.
If the last argument is anything else, its position is reported. This
lets us check the fix is complete. Four positions get reported:
* ram_backend_memory_alloc()
Error is passed up the call chain, ultimately through
user_creatable_complete(). As far as I can tell, it's callers all
handle the error sanely.
* fsl_imx25_realize(), fsl_imx31_realize(), dp8393x_realize()
DeviceClass.realize() methods, errors handled sanely further up the
call chain.
We're good. Test case again behaves:
$ qemu-system-x86_64 -m 10000000
qemu-system-x86_64: cannot set up guest memory 'pc.ram': Cannot allocate memory
[Exit 1 ]
The next commits will repair the rest of commit ef701d7's damage.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <1441983105-26376-3-git-send-email-armbru@redhat.com>
Reviewed-by: Peter Crosthwaite <crosthwaite.peter@gmail.com>
2015-09-11 16:51:43 +02:00
|
|
|
&error_fatal);
|
2012-02-16 10:56:08 +01:00
|
|
|
memory_region_add_subregion(sysmem, map[VE_SRAM], sram);
|
2011-03-07 12:10:32 +01:00
|
|
|
|
|
|
|
vram_size = 0x800000;
|
2017-07-07 16:42:53 +02:00
|
|
|
memory_region_init_ram(vram, NULL, "vexpress.vram", vram_size,
|
Fix bad error handling after memory_region_init_ram()
Symptom:
$ qemu-system-x86_64 -m 10000000
Unexpected error in ram_block_add() at /work/armbru/qemu/exec.c:1456:
upstream-qemu: cannot set up guest memory 'pc.ram': Cannot allocate memory
Aborted (core dumped)
Root cause: commit ef701d7 screwed up handling of out-of-memory
conditions. Before the commit, we report the error and exit(1), in
one place, ram_block_add(). The commit lifts the error handling up
the call chain some, to three places. Fine. Except it uses
&error_abort in these places, changing the behavior from exit(1) to
abort(), and thus undoing the work of commit 3922825 "exec: Don't
abort when we can't allocate guest memory".
The three places are:
* memory_region_init_ram()
Commit 4994653 (right after commit ef701d7) lifted the error
handling further, through memory_region_init_ram(), multiplying the
incorrect use of &error_abort. Later on, imitation of existing
(bad) code may have created more.
* memory_region_init_ram_ptr()
The &error_abort is still there.
* memory_region_init_rom_device()
Doesn't need fixing, because commit 33e0eb5 (soon after commit
ef701d7) lifted the error handling further, and in the process
changed it from &error_abort to passing it up the call chain.
Correct, because the callers are realize() methods.
Fix the error handling after memory_region_init_ram() with a
Coccinelle semantic patch:
@r@
expression mr, owner, name, size, err;
position p;
@@
memory_region_init_ram(mr, owner, name, size,
(
- &error_abort
+ &error_fatal
|
err@p
)
);
@script:python@
p << r.p;
@@
print "%s:%s:%s" % (p[0].file, p[0].line, p[0].column)
When the last argument is &error_abort, it gets replaced by
&error_fatal. This is the fix.
If the last argument is anything else, its position is reported. This
lets us check the fix is complete. Four positions get reported:
* ram_backend_memory_alloc()
Error is passed up the call chain, ultimately through
user_creatable_complete(). As far as I can tell, it's callers all
handle the error sanely.
* fsl_imx25_realize(), fsl_imx31_realize(), dp8393x_realize()
DeviceClass.realize() methods, errors handled sanely further up the
call chain.
We're good. Test case again behaves:
$ qemu-system-x86_64 -m 10000000
qemu-system-x86_64: cannot set up guest memory 'pc.ram': Cannot allocate memory
[Exit 1 ]
The next commits will repair the rest of commit ef701d7's damage.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <1441983105-26376-3-git-send-email-armbru@redhat.com>
Reviewed-by: Peter Crosthwaite <crosthwaite.peter@gmail.com>
2015-09-11 16:51:43 +02:00
|
|
|
&error_fatal);
|
2012-02-16 10:56:08 +01:00
|
|
|
memory_region_add_subregion(sysmem, map[VE_VIDEORAM], vram);
|
2011-03-07 12:10:32 +01:00
|
|
|
|
|
|
|
/* 0x4e000000 LAN9118 Ethernet */
|
2012-07-24 17:35:11 +02:00
|
|
|
if (nd_table[0].used) {
|
2012-02-16 10:56:08 +01:00
|
|
|
lan9118_init(&nd_table[0], map[VE_ETHERNET], pic[15]);
|
2011-03-07 12:10:32 +01:00
|
|
|
}
|
|
|
|
|
2012-02-16 10:56:08 +01:00
|
|
|
/* VE_USB: not modelled */
|
|
|
|
|
|
|
|
/* VE_DAPROM: not modelled */
|
2011-03-07 12:10:32 +01:00
|
|
|
|
2013-07-16 14:25:12 +02:00
|
|
|
/* Create mmio transports, so the user can create virtio backends
|
|
|
|
* (which will be automatically plugged in to the transports). If
|
|
|
|
* no backend is created the transport will just sit harmlessly idle.
|
|
|
|
*/
|
|
|
|
for (i = 0; i < NUM_VIRTIO_TRANSPORTS; i++) {
|
|
|
|
sysbus_create_simple("virtio-mmio", map[VE_VIRTIO] + 0x200 * i,
|
|
|
|
pic[40 + i]);
|
|
|
|
}
|
|
|
|
|
2014-05-07 16:42:57 +02:00
|
|
|
daughterboard->bootinfo.ram_size = machine->ram_size;
|
2019-05-18 22:54:26 +02:00
|
|
|
daughterboard->bootinfo.nb_cpus = machine->smp.cpus;
|
2013-07-16 14:25:11 +02:00
|
|
|
daughterboard->bootinfo.board_id = VEXPRESS_BOARD_ID;
|
|
|
|
daughterboard->bootinfo.loader_start = daughterboard->loader_start;
|
|
|
|
daughterboard->bootinfo.smp_loader_start = map[VE_SRAM];
|
|
|
|
daughterboard->bootinfo.smp_bootreg_addr = map[VE_SYSREGS] + 0x30;
|
|
|
|
daughterboard->bootinfo.gic_cpu_if_addr = daughterboard->gic_cpu_if_addr;
|
2013-07-16 14:25:12 +02:00
|
|
|
daughterboard->bootinfo.modify_dtb = vexpress_modify_dtb;
|
2018-08-24 14:17:35 +02:00
|
|
|
/* When booting Linux we should be in secure state if the CPU has one. */
|
|
|
|
daughterboard->bootinfo.secure_boot = vms->secure;
|
2019-08-09 08:57:21 +02:00
|
|
|
arm_load_kernel(ARM_CPU(first_cpu), machine, &daughterboard->bootinfo);
|
2011-03-07 12:10:32 +01:00
|
|
|
}
|
|
|
|
|
2014-12-16 00:09:41 +01:00
|
|
|
static bool vexpress_get_secure(Object *obj, Error **errp)
|
|
|
|
{
|
|
|
|
VexpressMachineState *vms = VEXPRESS_MACHINE(obj);
|
|
|
|
|
|
|
|
return vms->secure;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void vexpress_set_secure(Object *obj, bool value, Error **errp)
|
|
|
|
{
|
|
|
|
VexpressMachineState *vms = VEXPRESS_MACHINE(obj);
|
|
|
|
|
|
|
|
vms->secure = value;
|
|
|
|
}
|
|
|
|
|
2018-08-24 14:17:35 +02:00
|
|
|
static bool vexpress_get_virt(Object *obj, Error **errp)
|
|
|
|
{
|
|
|
|
VexpressMachineState *vms = VEXPRESS_MACHINE(obj);
|
|
|
|
|
|
|
|
return vms->virt;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void vexpress_set_virt(Object *obj, bool value, Error **errp)
|
|
|
|
{
|
|
|
|
VexpressMachineState *vms = VEXPRESS_MACHINE(obj);
|
|
|
|
|
|
|
|
vms->virt = value;
|
|
|
|
}
|
|
|
|
|
2014-12-16 00:09:41 +01:00
|
|
|
static void vexpress_instance_init(Object *obj)
|
|
|
|
{
|
|
|
|
VexpressMachineState *vms = VEXPRESS_MACHINE(obj);
|
|
|
|
|
|
|
|
/* EL3 is enabled by default on vexpress */
|
|
|
|
vms->secure = true;
|
|
|
|
object_property_add_bool(obj, "secure", vexpress_get_secure,
|
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
|
|
|
vexpress_set_secure);
|
2014-12-16 00:09:41 +01:00
|
|
|
object_property_set_description(obj, "secure",
|
|
|
|
"Set on/off to enable/disable the ARM "
|
2020-05-05 17:29:15 +02:00
|
|
|
"Security Extensions (TrustZone)");
|
2014-12-16 00:09:41 +01:00
|
|
|
}
|
|
|
|
|
2018-08-24 14:17:35 +02:00
|
|
|
static void vexpress_a15_instance_init(Object *obj)
|
|
|
|
{
|
|
|
|
VexpressMachineState *vms = VEXPRESS_MACHINE(obj);
|
|
|
|
|
|
|
|
/*
|
|
|
|
* For the vexpress-a15, EL2 is by default enabled if EL3 is,
|
|
|
|
* but can also be specifically set to on or off.
|
|
|
|
*/
|
|
|
|
vms->virt = true;
|
|
|
|
object_property_add_bool(obj, "virtualization", vexpress_get_virt,
|
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
|
|
|
vexpress_set_virt);
|
2018-08-24 14:17:35 +02:00
|
|
|
object_property_set_description(obj, "virtualization",
|
|
|
|
"Set on/off to enable/disable the ARM "
|
|
|
|
"Virtualization Extensions "
|
2020-05-05 17:29:15 +02:00
|
|
|
"(defaults to same as 'secure')");
|
2018-08-24 14:17:35 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
static void vexpress_a9_instance_init(Object *obj)
|
|
|
|
{
|
|
|
|
VexpressMachineState *vms = VEXPRESS_MACHINE(obj);
|
|
|
|
|
|
|
|
/* The A9 doesn't have the virt extensions */
|
|
|
|
vms->virt = false;
|
|
|
|
}
|
|
|
|
|
2014-12-16 00:09:38 +01:00
|
|
|
static void vexpress_class_init(ObjectClass *oc, void *data)
|
|
|
|
{
|
|
|
|
MachineClass *mc = MACHINE_CLASS(oc);
|
|
|
|
|
|
|
|
mc->desc = "ARM Versatile Express";
|
2014-12-16 00:09:40 +01:00
|
|
|
mc->init = vexpress_common_init;
|
2014-12-16 00:09:38 +01:00
|
|
|
mc->max_cpus = 4;
|
2017-09-07 14:54:54 +02:00
|
|
|
mc->ignore_memory_transaction_failures = true;
|
2020-02-19 17:09:06 +01:00
|
|
|
mc->default_ram_id = "vexpress.highmem";
|
2014-12-16 00:09:38 +01:00
|
|
|
}
|
|
|
|
|
2014-12-16 00:09:39 +01:00
|
|
|
static void vexpress_a9_class_init(ObjectClass *oc, void *data)
|
|
|
|
{
|
|
|
|
MachineClass *mc = MACHINE_CLASS(oc);
|
|
|
|
VexpressMachineClass *vmc = VEXPRESS_MACHINE_CLASS(oc);
|
|
|
|
|
|
|
|
mc->desc = "ARM Versatile Express for Cortex-A9";
|
2017-09-13 18:04:57 +02:00
|
|
|
mc->default_cpu_type = ARM_CPU_TYPE_NAME("cortex-a9");
|
2014-12-16 00:09:39 +01:00
|
|
|
|
2015-08-26 13:17:12 +02:00
|
|
|
vmc->daughterboard = &a9_daughterboard;
|
2014-12-16 00:09:39 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
static void vexpress_a15_class_init(ObjectClass *oc, void *data)
|
|
|
|
{
|
|
|
|
MachineClass *mc = MACHINE_CLASS(oc);
|
|
|
|
VexpressMachineClass *vmc = VEXPRESS_MACHINE_CLASS(oc);
|
|
|
|
|
|
|
|
mc->desc = "ARM Versatile Express for Cortex-A15";
|
2017-09-13 18:04:57 +02:00
|
|
|
mc->default_cpu_type = ARM_CPU_TYPE_NAME("cortex-a15");
|
2014-12-16 00:09:39 +01:00
|
|
|
|
|
|
|
vmc->daughterboard = &a15_daughterboard;
|
|
|
|
}
|
|
|
|
|
2014-12-16 00:09:38 +01:00
|
|
|
static const TypeInfo vexpress_info = {
|
|
|
|
.name = TYPE_VEXPRESS_MACHINE,
|
|
|
|
.parent = TYPE_MACHINE,
|
|
|
|
.abstract = true,
|
|
|
|
.instance_size = sizeof(VexpressMachineState),
|
2014-12-16 00:09:41 +01:00
|
|
|
.instance_init = vexpress_instance_init,
|
2014-12-16 00:09:38 +01:00
|
|
|
.class_size = sizeof(VexpressMachineClass),
|
|
|
|
.class_init = vexpress_class_init,
|
|
|
|
};
|
|
|
|
|
2014-12-16 00:09:39 +01:00
|
|
|
static const TypeInfo vexpress_a9_info = {
|
|
|
|
.name = TYPE_VEXPRESS_A9_MACHINE,
|
|
|
|
.parent = TYPE_VEXPRESS_MACHINE,
|
|
|
|
.class_init = vexpress_a9_class_init,
|
2018-08-24 14:17:35 +02:00
|
|
|
.instance_init = vexpress_a9_instance_init,
|
2011-03-07 12:10:32 +01:00
|
|
|
};
|
|
|
|
|
2014-12-16 00:09:39 +01:00
|
|
|
static const TypeInfo vexpress_a15_info = {
|
|
|
|
.name = TYPE_VEXPRESS_A15_MACHINE,
|
|
|
|
.parent = TYPE_VEXPRESS_MACHINE,
|
|
|
|
.class_init = vexpress_a15_class_init,
|
2018-08-24 14:17:35 +02:00
|
|
|
.instance_init = vexpress_a15_instance_init,
|
2012-02-16 10:56:09 +01:00
|
|
|
};
|
|
|
|
|
2011-03-07 12:10:32 +01:00
|
|
|
static void vexpress_machine_init(void)
|
|
|
|
{
|
2014-12-16 00:09:38 +01:00
|
|
|
type_register_static(&vexpress_info);
|
2014-12-16 00:09:39 +01:00
|
|
|
type_register_static(&vexpress_a9_info);
|
|
|
|
type_register_static(&vexpress_a15_info);
|
2011-03-07 12:10:32 +01:00
|
|
|
}
|
|
|
|
|
2016-02-16 21:59:04 +01:00
|
|
|
type_init(vexpress_machine_init);
|