2018-03-02 13:45:40 +03:00
|
|
|
/*
|
|
|
|
* ARM V2M MPS2 board emulation, trustzone aware FPGA images
|
|
|
|
*
|
|
|
|
* Copyright (c) 2017 Linaro Limited
|
|
|
|
* Written by 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 or
|
|
|
|
* (at your option) any later version.
|
|
|
|
*/
|
|
|
|
|
|
|
|
/* The MPS2 and MPS2+ dev boards are FPGA based (the 2+ has a bigger
|
|
|
|
* FPGA but is otherwise the same as the 2). Since the CPU itself
|
|
|
|
* and most of the devices are in the FPGA, the details of the board
|
|
|
|
* as seen by the guest depend significantly on the FPGA image.
|
|
|
|
* This source file covers the following FPGA images, for TrustZone cores:
|
|
|
|
* "mps2-an505" -- Cortex-M33 as documented in ARM Application Note AN505
|
2019-02-01 17:55:44 +03:00
|
|
|
* "mps2-an521" -- Dual Cortex-M33 as documented in Application Note AN521
|
2018-03-02 13:45:40 +03:00
|
|
|
*
|
|
|
|
* Links to the TRM for the board itself and to the various Application
|
|
|
|
* Notes which document the FPGA images can be found here:
|
|
|
|
* https://developer.arm.com/products/system-design/development-boards/fpga-prototyping-boards/mps2
|
|
|
|
*
|
|
|
|
* Board TRM:
|
|
|
|
* http://infocenter.arm.com/help/topic/com.arm.doc.100112_0200_06_en/versatile_express_cortex_m_prototyping_systems_v2m_mps2_and_v2m_mps2plus_technical_reference_100112_0200_06_en.pdf
|
|
|
|
* Application Note AN505:
|
|
|
|
* http://infocenter.arm.com/help/topic/com.arm.doc.dai0505b/index.html
|
2019-02-01 17:55:44 +03:00
|
|
|
* Application Note AN521:
|
|
|
|
* http://infocenter.arm.com/help/topic/com.arm.doc.dai0521c/index.html
|
2018-03-02 13:45:40 +03:00
|
|
|
*
|
|
|
|
* The AN505 defers to the Cortex-M33 processor ARMv8M IoT Kit FVP User Guide
|
|
|
|
* (ARM ECM0601256) for the details of some of the device layout:
|
|
|
|
* http://infocenter.arm.com/help/index.jsp?topic=/com.arm.doc.ecm0601256/index.html
|
2019-02-01 17:55:44 +03:00
|
|
|
* Similarly, the AN521 uses the SSE-200, and the SSE-200 TRM defines
|
|
|
|
* most of the device layout:
|
|
|
|
* http://infocenter.arm.com/help/topic/com.arm.doc.101104_0100_00_en/corelink_sse200_subsystem_for_embedded_technical_reference_manual_101104_0100_00_en.pdf
|
|
|
|
*
|
2018-03-02 13:45:40 +03:00
|
|
|
*/
|
|
|
|
|
|
|
|
#include "qemu/osdep.h"
|
2019-10-22 18:50:37 +03:00
|
|
|
#include "qemu/units.h"
|
2020-02-19 19:08:56 +03:00
|
|
|
#include "qemu/cutils.h"
|
2018-03-02 13:45:40 +03:00
|
|
|
#include "qapi/error.h"
|
|
|
|
#include "qemu/error-report.h"
|
2019-05-23 16:47:43 +03:00
|
|
|
#include "hw/arm/boot.h"
|
2018-03-02 13:45:40 +03:00
|
|
|
#include "hw/arm/armv7m.h"
|
|
|
|
#include "hw/or-irq.h"
|
|
|
|
#include "hw/boards.h"
|
|
|
|
#include "exec/address-spaces.h"
|
|
|
|
#include "sysemu/sysemu.h"
|
|
|
|
#include "hw/misc/unimp.h"
|
|
|
|
#include "hw/char/cmsdk-apb-uart.h"
|
|
|
|
#include "hw/timer/cmsdk-apb-timer.h"
|
|
|
|
#include "hw/misc/mps2-scc.h"
|
|
|
|
#include "hw/misc/mps2-fpgaio.h"
|
2018-06-22 15:28:41 +03:00
|
|
|
#include "hw/misc/tz-mpc.h"
|
2018-08-24 15:17:44 +03:00
|
|
|
#include "hw/misc/tz-msc.h"
|
2019-02-01 17:55:42 +03:00
|
|
|
#include "hw/arm/armsse.h"
|
2018-08-24 15:17:44 +03:00
|
|
|
#include "hw/dma/pl080.h"
|
2018-08-24 15:17:47 +03:00
|
|
|
#include "hw/ssi/pl022.h"
|
2020-06-17 10:25:39 +03:00
|
|
|
#include "hw/i2c/arm_sbcon_i2c.h"
|
2019-04-12 19:54:15 +03:00
|
|
|
#include "hw/net/lan9118.h"
|
2018-03-02 13:45:40 +03:00
|
|
|
#include "net/net.h"
|
|
|
|
#include "hw/core/split-irq.h"
|
2020-09-03 23:43:22 +03:00
|
|
|
#include "qom/object.h"
|
2018-03-02 13:45:40 +03:00
|
|
|
|
2019-02-01 17:55:43 +03:00
|
|
|
#define MPS2TZ_NUMIRQ 92
|
|
|
|
|
2018-03-02 13:45:40 +03:00
|
|
|
typedef enum MPS2TZFPGAType {
|
|
|
|
FPGA_AN505,
|
2019-02-01 17:55:43 +03:00
|
|
|
FPGA_AN521,
|
2018-03-02 13:45:40 +03:00
|
|
|
} MPS2TZFPGAType;
|
|
|
|
|
2020-09-03 23:43:22 +03:00
|
|
|
struct MPS2TZMachineClass {
|
2018-03-02 13:45:40 +03:00
|
|
|
MachineClass parent;
|
|
|
|
MPS2TZFPGAType fpga_type;
|
|
|
|
uint32_t scc_id;
|
2019-02-01 17:55:44 +03:00
|
|
|
const char *armsse_type;
|
2020-09-03 23:43:22 +03:00
|
|
|
};
|
2018-03-02 13:45:40 +03:00
|
|
|
|
2020-09-03 23:43:22 +03:00
|
|
|
struct MPS2TZMachineState {
|
2018-03-02 13:45:40 +03:00
|
|
|
MachineState parent;
|
|
|
|
|
2019-02-01 17:55:41 +03:00
|
|
|
ARMSSE iotkit;
|
2018-06-22 15:28:41 +03:00
|
|
|
MemoryRegion ssram[3];
|
2018-03-02 13:45:40 +03:00
|
|
|
MemoryRegion ssram1_m;
|
|
|
|
MPS2SCC scc;
|
|
|
|
MPS2FPGAIO fpgaio;
|
|
|
|
TZPPC ppc[5];
|
2018-06-22 15:28:41 +03:00
|
|
|
TZMPC ssram_mpc[3];
|
2018-08-24 15:17:47 +03:00
|
|
|
PL022State spi[5];
|
2020-06-17 10:25:39 +03:00
|
|
|
ArmSbconI2CState i2c[4];
|
2018-03-02 13:45:40 +03:00
|
|
|
UnimplementedDeviceState i2s_audio;
|
2018-06-15 16:57:13 +03:00
|
|
|
UnimplementedDeviceState gpio[4];
|
2018-03-02 13:45:40 +03:00
|
|
|
UnimplementedDeviceState gfx;
|
2018-08-24 15:17:44 +03:00
|
|
|
PL080State dma[4];
|
|
|
|
TZMSC msc[4];
|
2018-03-02 13:45:40 +03:00
|
|
|
CMSDKAPBUART uart[5];
|
|
|
|
SplitIRQ sec_resp_splitter;
|
|
|
|
qemu_or_irq uart_irq_orgate;
|
2018-06-15 16:57:13 +03:00
|
|
|
DeviceState *lan9118;
|
2019-02-01 17:55:43 +03:00
|
|
|
SplitIRQ cpu_irq_splitter[MPS2TZ_NUMIRQ];
|
2020-09-03 23:43:22 +03:00
|
|
|
};
|
2018-03-02 13:45:40 +03:00
|
|
|
|
|
|
|
#define TYPE_MPS2TZ_MACHINE "mps2tz"
|
|
|
|
#define TYPE_MPS2TZ_AN505_MACHINE MACHINE_TYPE_NAME("mps2-an505")
|
2019-02-01 17:55:44 +03:00
|
|
|
#define TYPE_MPS2TZ_AN521_MACHINE MACHINE_TYPE_NAME("mps2-an521")
|
2018-03-02 13:45:40 +03:00
|
|
|
|
2020-09-16 21:25:18 +03:00
|
|
|
OBJECT_DECLARE_TYPE(MPS2TZMachineState, MPS2TZMachineClass, MPS2TZ_MACHINE)
|
2018-03-02 13:45:40 +03:00
|
|
|
|
|
|
|
/* Main SYSCLK frequency in Hz */
|
|
|
|
#define SYSCLK_FRQ 20000000
|
|
|
|
|
|
|
|
/* Create an alias of an entire original MemoryRegion @orig
|
|
|
|
* located at @base in the memory map.
|
|
|
|
*/
|
|
|
|
static void make_ram_alias(MemoryRegion *mr, const char *name,
|
|
|
|
MemoryRegion *orig, hwaddr base)
|
|
|
|
{
|
|
|
|
memory_region_init_alias(mr, NULL, name, orig, 0,
|
|
|
|
memory_region_size(orig));
|
|
|
|
memory_region_add_subregion(get_system_memory(), base, mr);
|
|
|
|
}
|
|
|
|
|
2019-02-01 17:55:43 +03:00
|
|
|
static qemu_irq get_sse_irq_in(MPS2TZMachineState *mms, int irqno)
|
|
|
|
{
|
|
|
|
/* Return a qemu_irq which will signal IRQ n to all CPUs in the SSE. */
|
|
|
|
MPS2TZMachineClass *mmc = MPS2TZ_MACHINE_GET_CLASS(mms);
|
|
|
|
|
|
|
|
assert(irqno < MPS2TZ_NUMIRQ);
|
|
|
|
|
|
|
|
switch (mmc->fpga_type) {
|
|
|
|
case FPGA_AN505:
|
|
|
|
return qdev_get_gpio_in_named(DEVICE(&mms->iotkit), "EXP_IRQ", irqno);
|
|
|
|
case FPGA_AN521:
|
|
|
|
return qdev_get_gpio_in(DEVICE(&mms->cpu_irq_splitter[irqno]), 0);
|
|
|
|
default:
|
|
|
|
g_assert_not_reached();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2018-03-02 13:45:40 +03:00
|
|
|
/* Most of the devices in the AN505 FPGA image sit behind
|
|
|
|
* Peripheral Protection Controllers. These data structures
|
|
|
|
* define the layout of which devices sit behind which PPCs.
|
|
|
|
* The devfn for each port is a function which creates, configures
|
|
|
|
* and initializes the device, returning the MemoryRegion which
|
|
|
|
* needs to be plugged into the downstream end of the PPC port.
|
|
|
|
*/
|
|
|
|
typedef MemoryRegion *MakeDevFn(MPS2TZMachineState *mms, void *opaque,
|
|
|
|
const char *name, hwaddr size);
|
|
|
|
|
|
|
|
typedef struct PPCPortInfo {
|
|
|
|
const char *name;
|
|
|
|
MakeDevFn *devfn;
|
|
|
|
void *opaque;
|
|
|
|
hwaddr addr;
|
|
|
|
hwaddr size;
|
|
|
|
} PPCPortInfo;
|
|
|
|
|
|
|
|
typedef struct PPCInfo {
|
|
|
|
const char *name;
|
|
|
|
PPCPortInfo ports[TZ_NUM_PORTS];
|
|
|
|
} PPCInfo;
|
|
|
|
|
|
|
|
static MemoryRegion *make_unimp_dev(MPS2TZMachineState *mms,
|
|
|
|
void *opaque,
|
|
|
|
const char *name, hwaddr size)
|
|
|
|
{
|
|
|
|
/* Initialize, configure and realize a TYPE_UNIMPLEMENTED_DEVICE,
|
|
|
|
* and return a pointer to its MemoryRegion.
|
|
|
|
*/
|
|
|
|
UnimplementedDeviceState *uds = opaque;
|
|
|
|
|
sysbus: Convert qdev_set_parent_bus() use with Coccinelle, part 1
I'm converting from qdev_set_parent_bus()/realize to qdev_realize();
recent commit "qdev: Convert uses of qdev_set_parent_bus() with
Coccinelle" explains why.
sysbus_init_child_obj() is a wrapper around
object_initialize_child_with_props() and qdev_set_parent_bus(). It
passes no properties.
Convert sysbus_init_child_obj()/realize to object_initialize_child()/
qdev_realize().
Coccinelle script:
@@
expression parent, name, size, type, errp;
expression child;
symbol true;
@@
- sysbus_init_child_obj(parent, name, &child, size, type);
+ sysbus_init_child_XXX(parent, name, &child, size, type);
...
- object_property_set_bool(OBJECT(&child), true, "realized", errp);
+ sysbus_realize(SYS_BUS_DEVICE(&child), errp);
@@
expression parent, name, size, type, errp;
expression child;
symbol true;
@@
- sysbus_init_child_obj(parent, name, child, size, type);
+ sysbus_init_child_XXX(parent, name, child, size, type);
...
- object_property_set_bool(OBJECT(child), true, "realized", errp);
+ sysbus_realize(SYS_BUS_DEVICE(child), errp);
@@
expression parent, name, size, type;
expression child;
expression dev;
expression expr;
@@
- sysbus_init_child_obj(parent, name, child, size, type);
+ sysbus_init_child_XXX(parent, name, child, size, type);
...
dev = DEVICE(child);
... when != dev = expr;
- qdev_init_nofail(dev);
+ sysbus_realize(SYS_BUS_DEVICE(dev), &error_fatal);
@@
expression parent, propname, type;
expression child;
@@
- sysbus_init_child_XXX(parent, propname, child, sizeof(*child), type)
+ object_initialize_child(parent, propname, child, type)
@@
expression parent, propname, type;
expression child;
@@
- sysbus_init_child_XXX(parent, propname, &child, sizeof(child), type)
+ object_initialize_child(parent, propname, &child, type)
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-48-armbru@redhat.com>
2020-06-10 08:32:36 +03:00
|
|
|
object_initialize_child(OBJECT(mms), name, uds, TYPE_UNIMPLEMENTED_DEVICE);
|
2018-03-02 13:45:40 +03:00
|
|
|
qdev_prop_set_string(DEVICE(uds), "name", name);
|
|
|
|
qdev_prop_set_uint64(DEVICE(uds), "size", size);
|
sysbus: Convert qdev_set_parent_bus() use with Coccinelle, part 1
I'm converting from qdev_set_parent_bus()/realize to qdev_realize();
recent commit "qdev: Convert uses of qdev_set_parent_bus() with
Coccinelle" explains why.
sysbus_init_child_obj() is a wrapper around
object_initialize_child_with_props() and qdev_set_parent_bus(). It
passes no properties.
Convert sysbus_init_child_obj()/realize to object_initialize_child()/
qdev_realize().
Coccinelle script:
@@
expression parent, name, size, type, errp;
expression child;
symbol true;
@@
- sysbus_init_child_obj(parent, name, &child, size, type);
+ sysbus_init_child_XXX(parent, name, &child, size, type);
...
- object_property_set_bool(OBJECT(&child), true, "realized", errp);
+ sysbus_realize(SYS_BUS_DEVICE(&child), errp);
@@
expression parent, name, size, type, errp;
expression child;
symbol true;
@@
- sysbus_init_child_obj(parent, name, child, size, type);
+ sysbus_init_child_XXX(parent, name, child, size, type);
...
- object_property_set_bool(OBJECT(child), true, "realized", errp);
+ sysbus_realize(SYS_BUS_DEVICE(child), errp);
@@
expression parent, name, size, type;
expression child;
expression dev;
expression expr;
@@
- sysbus_init_child_obj(parent, name, child, size, type);
+ sysbus_init_child_XXX(parent, name, child, size, type);
...
dev = DEVICE(child);
... when != dev = expr;
- qdev_init_nofail(dev);
+ sysbus_realize(SYS_BUS_DEVICE(dev), &error_fatal);
@@
expression parent, propname, type;
expression child;
@@
- sysbus_init_child_XXX(parent, propname, child, sizeof(*child), type)
+ object_initialize_child(parent, propname, child, type)
@@
expression parent, propname, type;
expression child;
@@
- sysbus_init_child_XXX(parent, propname, &child, sizeof(child), type)
+ object_initialize_child(parent, propname, &child, type)
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-48-armbru@redhat.com>
2020-06-10 08:32:36 +03:00
|
|
|
sysbus_realize(SYS_BUS_DEVICE(uds), &error_fatal);
|
2018-03-02 13:45:40 +03:00
|
|
|
return sysbus_mmio_get_region(SYS_BUS_DEVICE(uds), 0);
|
|
|
|
}
|
|
|
|
|
|
|
|
static MemoryRegion *make_uart(MPS2TZMachineState *mms, void *opaque,
|
|
|
|
const char *name, hwaddr size)
|
|
|
|
{
|
|
|
|
CMSDKAPBUART *uart = opaque;
|
|
|
|
int i = uart - &mms->uart[0];
|
|
|
|
int rxirqno = i * 2;
|
|
|
|
int txirqno = i * 2 + 1;
|
|
|
|
int combirqno = i + 10;
|
|
|
|
SysBusDevice *s;
|
|
|
|
DeviceState *orgate_dev = DEVICE(&mms->uart_irq_orgate);
|
|
|
|
|
sysbus: Convert qdev_set_parent_bus() use with Coccinelle, part 1
I'm converting from qdev_set_parent_bus()/realize to qdev_realize();
recent commit "qdev: Convert uses of qdev_set_parent_bus() with
Coccinelle" explains why.
sysbus_init_child_obj() is a wrapper around
object_initialize_child_with_props() and qdev_set_parent_bus(). It
passes no properties.
Convert sysbus_init_child_obj()/realize to object_initialize_child()/
qdev_realize().
Coccinelle script:
@@
expression parent, name, size, type, errp;
expression child;
symbol true;
@@
- sysbus_init_child_obj(parent, name, &child, size, type);
+ sysbus_init_child_XXX(parent, name, &child, size, type);
...
- object_property_set_bool(OBJECT(&child), true, "realized", errp);
+ sysbus_realize(SYS_BUS_DEVICE(&child), errp);
@@
expression parent, name, size, type, errp;
expression child;
symbol true;
@@
- sysbus_init_child_obj(parent, name, child, size, type);
+ sysbus_init_child_XXX(parent, name, child, size, type);
...
- object_property_set_bool(OBJECT(child), true, "realized", errp);
+ sysbus_realize(SYS_BUS_DEVICE(child), errp);
@@
expression parent, name, size, type;
expression child;
expression dev;
expression expr;
@@
- sysbus_init_child_obj(parent, name, child, size, type);
+ sysbus_init_child_XXX(parent, name, child, size, type);
...
dev = DEVICE(child);
... when != dev = expr;
- qdev_init_nofail(dev);
+ sysbus_realize(SYS_BUS_DEVICE(dev), &error_fatal);
@@
expression parent, propname, type;
expression child;
@@
- sysbus_init_child_XXX(parent, propname, child, sizeof(*child), type)
+ object_initialize_child(parent, propname, child, type)
@@
expression parent, propname, type;
expression child;
@@
- sysbus_init_child_XXX(parent, propname, &child, sizeof(child), type)
+ object_initialize_child(parent, propname, &child, type)
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-48-armbru@redhat.com>
2020-06-10 08:32:36 +03:00
|
|
|
object_initialize_child(OBJECT(mms), name, uart, TYPE_CMSDK_APB_UART);
|
2018-04-20 17:52:44 +03:00
|
|
|
qdev_prop_set_chr(DEVICE(uart), "chardev", serial_hd(i));
|
2018-03-02 13:45:40 +03:00
|
|
|
qdev_prop_set_uint32(DEVICE(uart), "pclk-frq", SYSCLK_FRQ);
|
sysbus: Convert qdev_set_parent_bus() use with Coccinelle, part 1
I'm converting from qdev_set_parent_bus()/realize to qdev_realize();
recent commit "qdev: Convert uses of qdev_set_parent_bus() with
Coccinelle" explains why.
sysbus_init_child_obj() is a wrapper around
object_initialize_child_with_props() and qdev_set_parent_bus(). It
passes no properties.
Convert sysbus_init_child_obj()/realize to object_initialize_child()/
qdev_realize().
Coccinelle script:
@@
expression parent, name, size, type, errp;
expression child;
symbol true;
@@
- sysbus_init_child_obj(parent, name, &child, size, type);
+ sysbus_init_child_XXX(parent, name, &child, size, type);
...
- object_property_set_bool(OBJECT(&child), true, "realized", errp);
+ sysbus_realize(SYS_BUS_DEVICE(&child), errp);
@@
expression parent, name, size, type, errp;
expression child;
symbol true;
@@
- sysbus_init_child_obj(parent, name, child, size, type);
+ sysbus_init_child_XXX(parent, name, child, size, type);
...
- object_property_set_bool(OBJECT(child), true, "realized", errp);
+ sysbus_realize(SYS_BUS_DEVICE(child), errp);
@@
expression parent, name, size, type;
expression child;
expression dev;
expression expr;
@@
- sysbus_init_child_obj(parent, name, child, size, type);
+ sysbus_init_child_XXX(parent, name, child, size, type);
...
dev = DEVICE(child);
... when != dev = expr;
- qdev_init_nofail(dev);
+ sysbus_realize(SYS_BUS_DEVICE(dev), &error_fatal);
@@
expression parent, propname, type;
expression child;
@@
- sysbus_init_child_XXX(parent, propname, child, sizeof(*child), type)
+ object_initialize_child(parent, propname, child, type)
@@
expression parent, propname, type;
expression child;
@@
- sysbus_init_child_XXX(parent, propname, &child, sizeof(child), type)
+ object_initialize_child(parent, propname, &child, type)
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-48-armbru@redhat.com>
2020-06-10 08:32:36 +03:00
|
|
|
sysbus_realize(SYS_BUS_DEVICE(uart), &error_fatal);
|
2018-03-02 13:45:40 +03:00
|
|
|
s = SYS_BUS_DEVICE(uart);
|
2019-02-01 17:55:43 +03:00
|
|
|
sysbus_connect_irq(s, 0, get_sse_irq_in(mms, txirqno));
|
|
|
|
sysbus_connect_irq(s, 1, get_sse_irq_in(mms, rxirqno));
|
2018-03-02 13:45:40 +03:00
|
|
|
sysbus_connect_irq(s, 2, qdev_get_gpio_in(orgate_dev, i * 2));
|
|
|
|
sysbus_connect_irq(s, 3, qdev_get_gpio_in(orgate_dev, i * 2 + 1));
|
2019-02-01 17:55:43 +03:00
|
|
|
sysbus_connect_irq(s, 4, get_sse_irq_in(mms, combirqno));
|
2018-03-02 13:45:40 +03:00
|
|
|
return sysbus_mmio_get_region(SYS_BUS_DEVICE(uart), 0);
|
|
|
|
}
|
|
|
|
|
|
|
|
static MemoryRegion *make_scc(MPS2TZMachineState *mms, void *opaque,
|
|
|
|
const char *name, hwaddr size)
|
|
|
|
{
|
|
|
|
MPS2SCC *scc = opaque;
|
|
|
|
DeviceState *sccdev;
|
|
|
|
MPS2TZMachineClass *mmc = MPS2TZ_MACHINE_GET_CLASS(mms);
|
|
|
|
|
sysbus: Convert qdev_set_parent_bus() use with Coccinelle, part 1
I'm converting from qdev_set_parent_bus()/realize to qdev_realize();
recent commit "qdev: Convert uses of qdev_set_parent_bus() with
Coccinelle" explains why.
sysbus_init_child_obj() is a wrapper around
object_initialize_child_with_props() and qdev_set_parent_bus(). It
passes no properties.
Convert sysbus_init_child_obj()/realize to object_initialize_child()/
qdev_realize().
Coccinelle script:
@@
expression parent, name, size, type, errp;
expression child;
symbol true;
@@
- sysbus_init_child_obj(parent, name, &child, size, type);
+ sysbus_init_child_XXX(parent, name, &child, size, type);
...
- object_property_set_bool(OBJECT(&child), true, "realized", errp);
+ sysbus_realize(SYS_BUS_DEVICE(&child), errp);
@@
expression parent, name, size, type, errp;
expression child;
symbol true;
@@
- sysbus_init_child_obj(parent, name, child, size, type);
+ sysbus_init_child_XXX(parent, name, child, size, type);
...
- object_property_set_bool(OBJECT(child), true, "realized", errp);
+ sysbus_realize(SYS_BUS_DEVICE(child), errp);
@@
expression parent, name, size, type;
expression child;
expression dev;
expression expr;
@@
- sysbus_init_child_obj(parent, name, child, size, type);
+ sysbus_init_child_XXX(parent, name, child, size, type);
...
dev = DEVICE(child);
... when != dev = expr;
- qdev_init_nofail(dev);
+ sysbus_realize(SYS_BUS_DEVICE(dev), &error_fatal);
@@
expression parent, propname, type;
expression child;
@@
- sysbus_init_child_XXX(parent, propname, child, sizeof(*child), type)
+ object_initialize_child(parent, propname, child, type)
@@
expression parent, propname, type;
expression child;
@@
- sysbus_init_child_XXX(parent, propname, &child, sizeof(child), type)
+ object_initialize_child(parent, propname, &child, type)
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-48-armbru@redhat.com>
2020-06-10 08:32:36 +03:00
|
|
|
object_initialize_child(OBJECT(mms), "scc", scc, TYPE_MPS2_SCC);
|
2018-03-02 13:45:40 +03:00
|
|
|
sccdev = DEVICE(scc);
|
|
|
|
qdev_prop_set_uint32(sccdev, "scc-cfg4", 0x2);
|
2018-08-24 15:17:47 +03:00
|
|
|
qdev_prop_set_uint32(sccdev, "scc-aid", 0x00200008);
|
2018-03-02 13:45:40 +03:00
|
|
|
qdev_prop_set_uint32(sccdev, "scc-id", mmc->scc_id);
|
sysbus: Convert qdev_set_parent_bus() use with Coccinelle, part 1
I'm converting from qdev_set_parent_bus()/realize to qdev_realize();
recent commit "qdev: Convert uses of qdev_set_parent_bus() with
Coccinelle" explains why.
sysbus_init_child_obj() is a wrapper around
object_initialize_child_with_props() and qdev_set_parent_bus(). It
passes no properties.
Convert sysbus_init_child_obj()/realize to object_initialize_child()/
qdev_realize().
Coccinelle script:
@@
expression parent, name, size, type, errp;
expression child;
symbol true;
@@
- sysbus_init_child_obj(parent, name, &child, size, type);
+ sysbus_init_child_XXX(parent, name, &child, size, type);
...
- object_property_set_bool(OBJECT(&child), true, "realized", errp);
+ sysbus_realize(SYS_BUS_DEVICE(&child), errp);
@@
expression parent, name, size, type, errp;
expression child;
symbol true;
@@
- sysbus_init_child_obj(parent, name, child, size, type);
+ sysbus_init_child_XXX(parent, name, child, size, type);
...
- object_property_set_bool(OBJECT(child), true, "realized", errp);
+ sysbus_realize(SYS_BUS_DEVICE(child), errp);
@@
expression parent, name, size, type;
expression child;
expression dev;
expression expr;
@@
- sysbus_init_child_obj(parent, name, child, size, type);
+ sysbus_init_child_XXX(parent, name, child, size, type);
...
dev = DEVICE(child);
... when != dev = expr;
- qdev_init_nofail(dev);
+ sysbus_realize(SYS_BUS_DEVICE(dev), &error_fatal);
@@
expression parent, propname, type;
expression child;
@@
- sysbus_init_child_XXX(parent, propname, child, sizeof(*child), type)
+ object_initialize_child(parent, propname, child, type)
@@
expression parent, propname, type;
expression child;
@@
- sysbus_init_child_XXX(parent, propname, &child, sizeof(child), type)
+ object_initialize_child(parent, propname, &child, type)
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-48-armbru@redhat.com>
2020-06-10 08:32:36 +03:00
|
|
|
sysbus_realize(SYS_BUS_DEVICE(scc), &error_fatal);
|
2018-03-02 13:45:40 +03:00
|
|
|
return sysbus_mmio_get_region(SYS_BUS_DEVICE(sccdev), 0);
|
|
|
|
}
|
|
|
|
|
|
|
|
static MemoryRegion *make_fpgaio(MPS2TZMachineState *mms, void *opaque,
|
|
|
|
const char *name, hwaddr size)
|
|
|
|
{
|
|
|
|
MPS2FPGAIO *fpgaio = opaque;
|
|
|
|
|
sysbus: Convert qdev_set_parent_bus() use with Coccinelle, part 1
I'm converting from qdev_set_parent_bus()/realize to qdev_realize();
recent commit "qdev: Convert uses of qdev_set_parent_bus() with
Coccinelle" explains why.
sysbus_init_child_obj() is a wrapper around
object_initialize_child_with_props() and qdev_set_parent_bus(). It
passes no properties.
Convert sysbus_init_child_obj()/realize to object_initialize_child()/
qdev_realize().
Coccinelle script:
@@
expression parent, name, size, type, errp;
expression child;
symbol true;
@@
- sysbus_init_child_obj(parent, name, &child, size, type);
+ sysbus_init_child_XXX(parent, name, &child, size, type);
...
- object_property_set_bool(OBJECT(&child), true, "realized", errp);
+ sysbus_realize(SYS_BUS_DEVICE(&child), errp);
@@
expression parent, name, size, type, errp;
expression child;
symbol true;
@@
- sysbus_init_child_obj(parent, name, child, size, type);
+ sysbus_init_child_XXX(parent, name, child, size, type);
...
- object_property_set_bool(OBJECT(child), true, "realized", errp);
+ sysbus_realize(SYS_BUS_DEVICE(child), errp);
@@
expression parent, name, size, type;
expression child;
expression dev;
expression expr;
@@
- sysbus_init_child_obj(parent, name, child, size, type);
+ sysbus_init_child_XXX(parent, name, child, size, type);
...
dev = DEVICE(child);
... when != dev = expr;
- qdev_init_nofail(dev);
+ sysbus_realize(SYS_BUS_DEVICE(dev), &error_fatal);
@@
expression parent, propname, type;
expression child;
@@
- sysbus_init_child_XXX(parent, propname, child, sizeof(*child), type)
+ object_initialize_child(parent, propname, child, type)
@@
expression parent, propname, type;
expression child;
@@
- sysbus_init_child_XXX(parent, propname, &child, sizeof(child), type)
+ object_initialize_child(parent, propname, &child, type)
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-48-armbru@redhat.com>
2020-06-10 08:32:36 +03:00
|
|
|
object_initialize_child(OBJECT(mms), "fpgaio", fpgaio, TYPE_MPS2_FPGAIO);
|
|
|
|
sysbus_realize(SYS_BUS_DEVICE(fpgaio), &error_fatal);
|
2018-03-02 13:45:40 +03:00
|
|
|
return sysbus_mmio_get_region(SYS_BUS_DEVICE(fpgaio), 0);
|
|
|
|
}
|
|
|
|
|
2018-06-15 16:57:13 +03:00
|
|
|
static MemoryRegion *make_eth_dev(MPS2TZMachineState *mms, void *opaque,
|
|
|
|
const char *name, hwaddr size)
|
|
|
|
{
|
|
|
|
SysBusDevice *s;
|
|
|
|
NICInfo *nd = &nd_table[0];
|
|
|
|
|
|
|
|
/* In hardware this is a LAN9220; the LAN9118 is software compatible
|
|
|
|
* except that it doesn't support the checksum-offload feature.
|
|
|
|
*/
|
|
|
|
qemu_check_nic_model(nd, "lan9118");
|
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
|
|
|
mms->lan9118 = qdev_new(TYPE_LAN9118);
|
2018-06-15 16:57:13 +03:00
|
|
|
qdev_set_nic_properties(mms->lan9118, nd);
|
|
|
|
|
|
|
|
s = SYS_BUS_DEVICE(mms->lan9118);
|
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 08:32:34 +03:00
|
|
|
sysbus_realize_and_unref(s, &error_fatal);
|
2019-02-01 17:55:43 +03:00
|
|
|
sysbus_connect_irq(s, 0, get_sse_irq_in(mms, 16));
|
2018-06-15 16:57:13 +03:00
|
|
|
return sysbus_mmio_get_region(s, 0);
|
|
|
|
}
|
|
|
|
|
2018-06-22 15:28:41 +03:00
|
|
|
static MemoryRegion *make_mpc(MPS2TZMachineState *mms, void *opaque,
|
|
|
|
const char *name, hwaddr size)
|
|
|
|
{
|
|
|
|
TZMPC *mpc = opaque;
|
|
|
|
int i = mpc - &mms->ssram_mpc[0];
|
|
|
|
MemoryRegion *ssram = &mms->ssram[i];
|
|
|
|
MemoryRegion *upstream;
|
|
|
|
char *mpcname = g_strdup_printf("%s-mpc", name);
|
|
|
|
static uint32_t ramsize[] = { 0x00400000, 0x00200000, 0x00200000 };
|
|
|
|
static uint32_t rambase[] = { 0x00000000, 0x28000000, 0x28200000 };
|
|
|
|
|
|
|
|
memory_region_init_ram(ssram, NULL, name, ramsize[i], &error_fatal);
|
|
|
|
|
sysbus: Convert qdev_set_parent_bus() use with Coccinelle, part 1
I'm converting from qdev_set_parent_bus()/realize to qdev_realize();
recent commit "qdev: Convert uses of qdev_set_parent_bus() with
Coccinelle" explains why.
sysbus_init_child_obj() is a wrapper around
object_initialize_child_with_props() and qdev_set_parent_bus(). It
passes no properties.
Convert sysbus_init_child_obj()/realize to object_initialize_child()/
qdev_realize().
Coccinelle script:
@@
expression parent, name, size, type, errp;
expression child;
symbol true;
@@
- sysbus_init_child_obj(parent, name, &child, size, type);
+ sysbus_init_child_XXX(parent, name, &child, size, type);
...
- object_property_set_bool(OBJECT(&child), true, "realized", errp);
+ sysbus_realize(SYS_BUS_DEVICE(&child), errp);
@@
expression parent, name, size, type, errp;
expression child;
symbol true;
@@
- sysbus_init_child_obj(parent, name, child, size, type);
+ sysbus_init_child_XXX(parent, name, child, size, type);
...
- object_property_set_bool(OBJECT(child), true, "realized", errp);
+ sysbus_realize(SYS_BUS_DEVICE(child), errp);
@@
expression parent, name, size, type;
expression child;
expression dev;
expression expr;
@@
- sysbus_init_child_obj(parent, name, child, size, type);
+ sysbus_init_child_XXX(parent, name, child, size, type);
...
dev = DEVICE(child);
... when != dev = expr;
- qdev_init_nofail(dev);
+ sysbus_realize(SYS_BUS_DEVICE(dev), &error_fatal);
@@
expression parent, propname, type;
expression child;
@@
- sysbus_init_child_XXX(parent, propname, child, sizeof(*child), type)
+ object_initialize_child(parent, propname, child, type)
@@
expression parent, propname, type;
expression child;
@@
- sysbus_init_child_XXX(parent, propname, &child, sizeof(child), type)
+ object_initialize_child(parent, propname, &child, type)
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-48-armbru@redhat.com>
2020-06-10 08:32:36 +03:00
|
|
|
object_initialize_child(OBJECT(mms), mpcname, mpc, TYPE_TZ_MPC);
|
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 19:05:54 +03:00
|
|
|
object_property_set_link(OBJECT(mpc), "downstream", OBJECT(ssram),
|
|
|
|
&error_fatal);
|
sysbus: Convert qdev_set_parent_bus() use with Coccinelle, part 1
I'm converting from qdev_set_parent_bus()/realize to qdev_realize();
recent commit "qdev: Convert uses of qdev_set_parent_bus() with
Coccinelle" explains why.
sysbus_init_child_obj() is a wrapper around
object_initialize_child_with_props() and qdev_set_parent_bus(). It
passes no properties.
Convert sysbus_init_child_obj()/realize to object_initialize_child()/
qdev_realize().
Coccinelle script:
@@
expression parent, name, size, type, errp;
expression child;
symbol true;
@@
- sysbus_init_child_obj(parent, name, &child, size, type);
+ sysbus_init_child_XXX(parent, name, &child, size, type);
...
- object_property_set_bool(OBJECT(&child), true, "realized", errp);
+ sysbus_realize(SYS_BUS_DEVICE(&child), errp);
@@
expression parent, name, size, type, errp;
expression child;
symbol true;
@@
- sysbus_init_child_obj(parent, name, child, size, type);
+ sysbus_init_child_XXX(parent, name, child, size, type);
...
- object_property_set_bool(OBJECT(child), true, "realized", errp);
+ sysbus_realize(SYS_BUS_DEVICE(child), errp);
@@
expression parent, name, size, type;
expression child;
expression dev;
expression expr;
@@
- sysbus_init_child_obj(parent, name, child, size, type);
+ sysbus_init_child_XXX(parent, name, child, size, type);
...
dev = DEVICE(child);
... when != dev = expr;
- qdev_init_nofail(dev);
+ sysbus_realize(SYS_BUS_DEVICE(dev), &error_fatal);
@@
expression parent, propname, type;
expression child;
@@
- sysbus_init_child_XXX(parent, propname, child, sizeof(*child), type)
+ object_initialize_child(parent, propname, child, type)
@@
expression parent, propname, type;
expression child;
@@
- sysbus_init_child_XXX(parent, propname, &child, sizeof(child), type)
+ object_initialize_child(parent, propname, &child, type)
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-48-armbru@redhat.com>
2020-06-10 08:32:36 +03:00
|
|
|
sysbus_realize(SYS_BUS_DEVICE(mpc), &error_fatal);
|
2018-06-22 15:28:41 +03:00
|
|
|
/* Map the upstream end of the MPC into system memory */
|
|
|
|
upstream = sysbus_mmio_get_region(SYS_BUS_DEVICE(mpc), 1);
|
|
|
|
memory_region_add_subregion(get_system_memory(), rambase[i], upstream);
|
|
|
|
/* and connect its interrupt to the IoTKit */
|
|
|
|
qdev_connect_gpio_out_named(DEVICE(mpc), "irq", 0,
|
|
|
|
qdev_get_gpio_in_named(DEVICE(&mms->iotkit),
|
|
|
|
"mpcexp_status", i));
|
|
|
|
|
|
|
|
/* The first SSRAM is a special case as it has an alias; accesses to
|
|
|
|
* the alias region at 0x00400000 must also go to the MPC upstream.
|
|
|
|
*/
|
|
|
|
if (i == 0) {
|
|
|
|
make_ram_alias(&mms->ssram1_m, "mps.ssram1_m", upstream, 0x00400000);
|
|
|
|
}
|
|
|
|
|
|
|
|
g_free(mpcname);
|
|
|
|
/* Return the register interface MR for our caller to map behind the PPC */
|
|
|
|
return sysbus_mmio_get_region(SYS_BUS_DEVICE(mpc), 0);
|
|
|
|
}
|
|
|
|
|
2018-08-24 15:17:44 +03:00
|
|
|
static MemoryRegion *make_dma(MPS2TZMachineState *mms, void *opaque,
|
|
|
|
const char *name, hwaddr size)
|
|
|
|
{
|
|
|
|
PL080State *dma = opaque;
|
|
|
|
int i = dma - &mms->dma[0];
|
|
|
|
SysBusDevice *s;
|
|
|
|
char *mscname = g_strdup_printf("%s-msc", name);
|
|
|
|
TZMSC *msc = &mms->msc[i];
|
|
|
|
DeviceState *iotkitdev = DEVICE(&mms->iotkit);
|
|
|
|
MemoryRegion *msc_upstream;
|
|
|
|
MemoryRegion *msc_downstream;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Each DMA device is a PL081 whose transaction master interface
|
|
|
|
* is guarded by a Master Security Controller. The downstream end of
|
|
|
|
* the MSC connects to the IoTKit AHB Slave Expansion port, so the
|
|
|
|
* DMA devices can see all devices and memory that the CPU does.
|
|
|
|
*/
|
sysbus: Convert qdev_set_parent_bus() use with Coccinelle, part 1
I'm converting from qdev_set_parent_bus()/realize to qdev_realize();
recent commit "qdev: Convert uses of qdev_set_parent_bus() with
Coccinelle" explains why.
sysbus_init_child_obj() is a wrapper around
object_initialize_child_with_props() and qdev_set_parent_bus(). It
passes no properties.
Convert sysbus_init_child_obj()/realize to object_initialize_child()/
qdev_realize().
Coccinelle script:
@@
expression parent, name, size, type, errp;
expression child;
symbol true;
@@
- sysbus_init_child_obj(parent, name, &child, size, type);
+ sysbus_init_child_XXX(parent, name, &child, size, type);
...
- object_property_set_bool(OBJECT(&child), true, "realized", errp);
+ sysbus_realize(SYS_BUS_DEVICE(&child), errp);
@@
expression parent, name, size, type, errp;
expression child;
symbol true;
@@
- sysbus_init_child_obj(parent, name, child, size, type);
+ sysbus_init_child_XXX(parent, name, child, size, type);
...
- object_property_set_bool(OBJECT(child), true, "realized", errp);
+ sysbus_realize(SYS_BUS_DEVICE(child), errp);
@@
expression parent, name, size, type;
expression child;
expression dev;
expression expr;
@@
- sysbus_init_child_obj(parent, name, child, size, type);
+ sysbus_init_child_XXX(parent, name, child, size, type);
...
dev = DEVICE(child);
... when != dev = expr;
- qdev_init_nofail(dev);
+ sysbus_realize(SYS_BUS_DEVICE(dev), &error_fatal);
@@
expression parent, propname, type;
expression child;
@@
- sysbus_init_child_XXX(parent, propname, child, sizeof(*child), type)
+ object_initialize_child(parent, propname, child, type)
@@
expression parent, propname, type;
expression child;
@@
- sysbus_init_child_XXX(parent, propname, &child, sizeof(child), type)
+ object_initialize_child(parent, propname, &child, type)
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-48-armbru@redhat.com>
2020-06-10 08:32:36 +03:00
|
|
|
object_initialize_child(OBJECT(mms), mscname, msc, TYPE_TZ_MSC);
|
2018-08-24 15:17:44 +03:00
|
|
|
msc_downstream = sysbus_mmio_get_region(SYS_BUS_DEVICE(&mms->iotkit), 0);
|
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 19:05:54 +03:00
|
|
|
object_property_set_link(OBJECT(msc), "downstream",
|
|
|
|
OBJECT(msc_downstream), &error_fatal);
|
|
|
|
object_property_set_link(OBJECT(msc), "idau", OBJECT(mms), &error_fatal);
|
sysbus: Convert qdev_set_parent_bus() use with Coccinelle, part 1
I'm converting from qdev_set_parent_bus()/realize to qdev_realize();
recent commit "qdev: Convert uses of qdev_set_parent_bus() with
Coccinelle" explains why.
sysbus_init_child_obj() is a wrapper around
object_initialize_child_with_props() and qdev_set_parent_bus(). It
passes no properties.
Convert sysbus_init_child_obj()/realize to object_initialize_child()/
qdev_realize().
Coccinelle script:
@@
expression parent, name, size, type, errp;
expression child;
symbol true;
@@
- sysbus_init_child_obj(parent, name, &child, size, type);
+ sysbus_init_child_XXX(parent, name, &child, size, type);
...
- object_property_set_bool(OBJECT(&child), true, "realized", errp);
+ sysbus_realize(SYS_BUS_DEVICE(&child), errp);
@@
expression parent, name, size, type, errp;
expression child;
symbol true;
@@
- sysbus_init_child_obj(parent, name, child, size, type);
+ sysbus_init_child_XXX(parent, name, child, size, type);
...
- object_property_set_bool(OBJECT(child), true, "realized", errp);
+ sysbus_realize(SYS_BUS_DEVICE(child), errp);
@@
expression parent, name, size, type;
expression child;
expression dev;
expression expr;
@@
- sysbus_init_child_obj(parent, name, child, size, type);
+ sysbus_init_child_XXX(parent, name, child, size, type);
...
dev = DEVICE(child);
... when != dev = expr;
- qdev_init_nofail(dev);
+ sysbus_realize(SYS_BUS_DEVICE(dev), &error_fatal);
@@
expression parent, propname, type;
expression child;
@@
- sysbus_init_child_XXX(parent, propname, child, sizeof(*child), type)
+ object_initialize_child(parent, propname, child, type)
@@
expression parent, propname, type;
expression child;
@@
- sysbus_init_child_XXX(parent, propname, &child, sizeof(child), type)
+ object_initialize_child(parent, propname, &child, type)
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-48-armbru@redhat.com>
2020-06-10 08:32:36 +03:00
|
|
|
sysbus_realize(SYS_BUS_DEVICE(msc), &error_fatal);
|
2018-08-24 15:17:44 +03:00
|
|
|
|
|
|
|
qdev_connect_gpio_out_named(DEVICE(msc), "irq", 0,
|
|
|
|
qdev_get_gpio_in_named(iotkitdev,
|
|
|
|
"mscexp_status", i));
|
|
|
|
qdev_connect_gpio_out_named(iotkitdev, "mscexp_clear", i,
|
|
|
|
qdev_get_gpio_in_named(DEVICE(msc),
|
|
|
|
"irq_clear", 0));
|
|
|
|
qdev_connect_gpio_out_named(iotkitdev, "mscexp_ns", i,
|
|
|
|
qdev_get_gpio_in_named(DEVICE(msc),
|
|
|
|
"cfg_nonsec", 0));
|
|
|
|
qdev_connect_gpio_out(DEVICE(&mms->sec_resp_splitter),
|
|
|
|
ARRAY_SIZE(mms->ppc) + i,
|
|
|
|
qdev_get_gpio_in_named(DEVICE(msc),
|
|
|
|
"cfg_sec_resp", 0));
|
|
|
|
msc_upstream = sysbus_mmio_get_region(SYS_BUS_DEVICE(msc), 0);
|
|
|
|
|
sysbus: Convert qdev_set_parent_bus() use with Coccinelle, part 1
I'm converting from qdev_set_parent_bus()/realize to qdev_realize();
recent commit "qdev: Convert uses of qdev_set_parent_bus() with
Coccinelle" explains why.
sysbus_init_child_obj() is a wrapper around
object_initialize_child_with_props() and qdev_set_parent_bus(). It
passes no properties.
Convert sysbus_init_child_obj()/realize to object_initialize_child()/
qdev_realize().
Coccinelle script:
@@
expression parent, name, size, type, errp;
expression child;
symbol true;
@@
- sysbus_init_child_obj(parent, name, &child, size, type);
+ sysbus_init_child_XXX(parent, name, &child, size, type);
...
- object_property_set_bool(OBJECT(&child), true, "realized", errp);
+ sysbus_realize(SYS_BUS_DEVICE(&child), errp);
@@
expression parent, name, size, type, errp;
expression child;
symbol true;
@@
- sysbus_init_child_obj(parent, name, child, size, type);
+ sysbus_init_child_XXX(parent, name, child, size, type);
...
- object_property_set_bool(OBJECT(child), true, "realized", errp);
+ sysbus_realize(SYS_BUS_DEVICE(child), errp);
@@
expression parent, name, size, type;
expression child;
expression dev;
expression expr;
@@
- sysbus_init_child_obj(parent, name, child, size, type);
+ sysbus_init_child_XXX(parent, name, child, size, type);
...
dev = DEVICE(child);
... when != dev = expr;
- qdev_init_nofail(dev);
+ sysbus_realize(SYS_BUS_DEVICE(dev), &error_fatal);
@@
expression parent, propname, type;
expression child;
@@
- sysbus_init_child_XXX(parent, propname, child, sizeof(*child), type)
+ object_initialize_child(parent, propname, child, type)
@@
expression parent, propname, type;
expression child;
@@
- sysbus_init_child_XXX(parent, propname, &child, sizeof(child), type)
+ object_initialize_child(parent, propname, &child, type)
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-48-armbru@redhat.com>
2020-06-10 08:32:36 +03:00
|
|
|
object_initialize_child(OBJECT(mms), name, dma, TYPE_PL081);
|
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 19:05:54 +03:00
|
|
|
object_property_set_link(OBJECT(dma), "downstream", OBJECT(msc_upstream),
|
|
|
|
&error_fatal);
|
sysbus: Convert qdev_set_parent_bus() use with Coccinelle, part 1
I'm converting from qdev_set_parent_bus()/realize to qdev_realize();
recent commit "qdev: Convert uses of qdev_set_parent_bus() with
Coccinelle" explains why.
sysbus_init_child_obj() is a wrapper around
object_initialize_child_with_props() and qdev_set_parent_bus(). It
passes no properties.
Convert sysbus_init_child_obj()/realize to object_initialize_child()/
qdev_realize().
Coccinelle script:
@@
expression parent, name, size, type, errp;
expression child;
symbol true;
@@
- sysbus_init_child_obj(parent, name, &child, size, type);
+ sysbus_init_child_XXX(parent, name, &child, size, type);
...
- object_property_set_bool(OBJECT(&child), true, "realized", errp);
+ sysbus_realize(SYS_BUS_DEVICE(&child), errp);
@@
expression parent, name, size, type, errp;
expression child;
symbol true;
@@
- sysbus_init_child_obj(parent, name, child, size, type);
+ sysbus_init_child_XXX(parent, name, child, size, type);
...
- object_property_set_bool(OBJECT(child), true, "realized", errp);
+ sysbus_realize(SYS_BUS_DEVICE(child), errp);
@@
expression parent, name, size, type;
expression child;
expression dev;
expression expr;
@@
- sysbus_init_child_obj(parent, name, child, size, type);
+ sysbus_init_child_XXX(parent, name, child, size, type);
...
dev = DEVICE(child);
... when != dev = expr;
- qdev_init_nofail(dev);
+ sysbus_realize(SYS_BUS_DEVICE(dev), &error_fatal);
@@
expression parent, propname, type;
expression child;
@@
- sysbus_init_child_XXX(parent, propname, child, sizeof(*child), type)
+ object_initialize_child(parent, propname, child, type)
@@
expression parent, propname, type;
expression child;
@@
- sysbus_init_child_XXX(parent, propname, &child, sizeof(child), type)
+ object_initialize_child(parent, propname, &child, type)
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-48-armbru@redhat.com>
2020-06-10 08:32:36 +03:00
|
|
|
sysbus_realize(SYS_BUS_DEVICE(dma), &error_fatal);
|
2018-08-24 15:17:44 +03:00
|
|
|
|
|
|
|
s = SYS_BUS_DEVICE(dma);
|
|
|
|
/* Wire up DMACINTR, DMACINTERR, DMACINTTC */
|
2019-02-01 17:55:43 +03:00
|
|
|
sysbus_connect_irq(s, 0, get_sse_irq_in(mms, 58 + i * 3));
|
|
|
|
sysbus_connect_irq(s, 1, get_sse_irq_in(mms, 56 + i * 3));
|
|
|
|
sysbus_connect_irq(s, 2, get_sse_irq_in(mms, 57 + i * 3));
|
2018-08-24 15:17:44 +03:00
|
|
|
|
2018-12-14 16:30:54 +03:00
|
|
|
g_free(mscname);
|
2018-08-24 15:17:44 +03:00
|
|
|
return sysbus_mmio_get_region(s, 0);
|
|
|
|
}
|
|
|
|
|
2018-08-24 15:17:47 +03:00
|
|
|
static MemoryRegion *make_spi(MPS2TZMachineState *mms, void *opaque,
|
|
|
|
const char *name, hwaddr size)
|
|
|
|
{
|
|
|
|
/*
|
|
|
|
* The AN505 has five PL022 SPI controllers.
|
|
|
|
* One of these should have the LCD controller behind it; the others
|
|
|
|
* are connected only to the FPGA's "general purpose SPI connector"
|
|
|
|
* or "shield" expansion connectors.
|
|
|
|
* Note that if we do implement devices behind SPI, the chip select
|
|
|
|
* lines are set via the "MISC" register in the MPS2 FPGAIO device.
|
|
|
|
*/
|
|
|
|
PL022State *spi = opaque;
|
|
|
|
int i = spi - &mms->spi[0];
|
|
|
|
SysBusDevice *s;
|
|
|
|
|
sysbus: Convert qdev_set_parent_bus() use with Coccinelle, part 1
I'm converting from qdev_set_parent_bus()/realize to qdev_realize();
recent commit "qdev: Convert uses of qdev_set_parent_bus() with
Coccinelle" explains why.
sysbus_init_child_obj() is a wrapper around
object_initialize_child_with_props() and qdev_set_parent_bus(). It
passes no properties.
Convert sysbus_init_child_obj()/realize to object_initialize_child()/
qdev_realize().
Coccinelle script:
@@
expression parent, name, size, type, errp;
expression child;
symbol true;
@@
- sysbus_init_child_obj(parent, name, &child, size, type);
+ sysbus_init_child_XXX(parent, name, &child, size, type);
...
- object_property_set_bool(OBJECT(&child), true, "realized", errp);
+ sysbus_realize(SYS_BUS_DEVICE(&child), errp);
@@
expression parent, name, size, type, errp;
expression child;
symbol true;
@@
- sysbus_init_child_obj(parent, name, child, size, type);
+ sysbus_init_child_XXX(parent, name, child, size, type);
...
- object_property_set_bool(OBJECT(child), true, "realized", errp);
+ sysbus_realize(SYS_BUS_DEVICE(child), errp);
@@
expression parent, name, size, type;
expression child;
expression dev;
expression expr;
@@
- sysbus_init_child_obj(parent, name, child, size, type);
+ sysbus_init_child_XXX(parent, name, child, size, type);
...
dev = DEVICE(child);
... when != dev = expr;
- qdev_init_nofail(dev);
+ sysbus_realize(SYS_BUS_DEVICE(dev), &error_fatal);
@@
expression parent, propname, type;
expression child;
@@
- sysbus_init_child_XXX(parent, propname, child, sizeof(*child), type)
+ object_initialize_child(parent, propname, child, type)
@@
expression parent, propname, type;
expression child;
@@
- sysbus_init_child_XXX(parent, propname, &child, sizeof(child), type)
+ object_initialize_child(parent, propname, &child, type)
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-48-armbru@redhat.com>
2020-06-10 08:32:36 +03:00
|
|
|
object_initialize_child(OBJECT(mms), name, spi, TYPE_PL022);
|
|
|
|
sysbus_realize(SYS_BUS_DEVICE(spi), &error_fatal);
|
2018-08-24 15:17:47 +03:00
|
|
|
s = SYS_BUS_DEVICE(spi);
|
2019-02-01 17:55:43 +03:00
|
|
|
sysbus_connect_irq(s, 0, get_sse_irq_in(mms, 51 + i));
|
2018-08-24 15:17:47 +03:00
|
|
|
return sysbus_mmio_get_region(s, 0);
|
|
|
|
}
|
|
|
|
|
2020-06-17 10:25:39 +03:00
|
|
|
static MemoryRegion *make_i2c(MPS2TZMachineState *mms, void *opaque,
|
|
|
|
const char *name, hwaddr size)
|
|
|
|
{
|
|
|
|
ArmSbconI2CState *i2c = opaque;
|
|
|
|
SysBusDevice *s;
|
|
|
|
|
|
|
|
object_initialize_child(OBJECT(mms), name, i2c, TYPE_ARM_SBCON_I2C);
|
|
|
|
s = SYS_BUS_DEVICE(i2c);
|
|
|
|
sysbus_realize(s, &error_fatal);
|
|
|
|
return sysbus_mmio_get_region(s, 0);
|
|
|
|
}
|
|
|
|
|
2018-03-02 13:45:40 +03:00
|
|
|
static void mps2tz_common_init(MachineState *machine)
|
|
|
|
{
|
|
|
|
MPS2TZMachineState *mms = MPS2TZ_MACHINE(machine);
|
2019-02-01 17:55:43 +03:00
|
|
|
MPS2TZMachineClass *mmc = MPS2TZ_MACHINE_GET_CLASS(mms);
|
2018-03-02 13:45:40 +03:00
|
|
|
MachineClass *mc = MACHINE_GET_CLASS(machine);
|
|
|
|
MemoryRegion *system_memory = get_system_memory();
|
|
|
|
DeviceState *iotkitdev;
|
|
|
|
DeviceState *dev_splitter;
|
|
|
|
int i;
|
|
|
|
|
|
|
|
if (strcmp(machine->cpu_type, mc->default_cpu_type) != 0) {
|
|
|
|
error_report("This board can only be used with CPU %s",
|
|
|
|
mc->default_cpu_type);
|
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
|
2020-02-19 19:08:56 +03:00
|
|
|
if (machine->ram_size != mc->default_ram_size) {
|
|
|
|
char *sz = size_to_str(mc->default_ram_size);
|
|
|
|
error_report("Invalid RAM size, should be %s", sz);
|
|
|
|
g_free(sz);
|
|
|
|
exit(EXIT_FAILURE);
|
|
|
|
}
|
|
|
|
|
sysbus: Convert qdev_set_parent_bus() use with Coccinelle, part 1
I'm converting from qdev_set_parent_bus()/realize to qdev_realize();
recent commit "qdev: Convert uses of qdev_set_parent_bus() with
Coccinelle" explains why.
sysbus_init_child_obj() is a wrapper around
object_initialize_child_with_props() and qdev_set_parent_bus(). It
passes no properties.
Convert sysbus_init_child_obj()/realize to object_initialize_child()/
qdev_realize().
Coccinelle script:
@@
expression parent, name, size, type, errp;
expression child;
symbol true;
@@
- sysbus_init_child_obj(parent, name, &child, size, type);
+ sysbus_init_child_XXX(parent, name, &child, size, type);
...
- object_property_set_bool(OBJECT(&child), true, "realized", errp);
+ sysbus_realize(SYS_BUS_DEVICE(&child), errp);
@@
expression parent, name, size, type, errp;
expression child;
symbol true;
@@
- sysbus_init_child_obj(parent, name, child, size, type);
+ sysbus_init_child_XXX(parent, name, child, size, type);
...
- object_property_set_bool(OBJECT(child), true, "realized", errp);
+ sysbus_realize(SYS_BUS_DEVICE(child), errp);
@@
expression parent, name, size, type;
expression child;
expression dev;
expression expr;
@@
- sysbus_init_child_obj(parent, name, child, size, type);
+ sysbus_init_child_XXX(parent, name, child, size, type);
...
dev = DEVICE(child);
... when != dev = expr;
- qdev_init_nofail(dev);
+ sysbus_realize(SYS_BUS_DEVICE(dev), &error_fatal);
@@
expression parent, propname, type;
expression child;
@@
- sysbus_init_child_XXX(parent, propname, child, sizeof(*child), type)
+ object_initialize_child(parent, propname, child, type)
@@
expression parent, propname, type;
expression child;
@@
- sysbus_init_child_XXX(parent, propname, &child, sizeof(child), type)
+ object_initialize_child(parent, propname, &child, type)
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-48-armbru@redhat.com>
2020-06-10 08:32:36 +03:00
|
|
|
object_initialize_child(OBJECT(machine), TYPE_IOTKIT, &mms->iotkit,
|
|
|
|
mmc->armsse_type);
|
2018-03-02 13:45:40 +03:00
|
|
|
iotkitdev = DEVICE(&mms->iotkit);
|
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 19:05:54 +03:00
|
|
|
object_property_set_link(OBJECT(&mms->iotkit), "memory",
|
|
|
|
OBJECT(system_memory), &error_abort);
|
2019-02-01 17:55:43 +03:00
|
|
|
qdev_prop_set_uint32(iotkitdev, "EXP_NUMIRQ", MPS2TZ_NUMIRQ);
|
2018-03-02 13:45:40 +03:00
|
|
|
qdev_prop_set_uint32(iotkitdev, "MAINCLK", SYSCLK_FRQ);
|
sysbus: Convert qdev_set_parent_bus() use with Coccinelle, part 1
I'm converting from qdev_set_parent_bus()/realize to qdev_realize();
recent commit "qdev: Convert uses of qdev_set_parent_bus() with
Coccinelle" explains why.
sysbus_init_child_obj() is a wrapper around
object_initialize_child_with_props() and qdev_set_parent_bus(). It
passes no properties.
Convert sysbus_init_child_obj()/realize to object_initialize_child()/
qdev_realize().
Coccinelle script:
@@
expression parent, name, size, type, errp;
expression child;
symbol true;
@@
- sysbus_init_child_obj(parent, name, &child, size, type);
+ sysbus_init_child_XXX(parent, name, &child, size, type);
...
- object_property_set_bool(OBJECT(&child), true, "realized", errp);
+ sysbus_realize(SYS_BUS_DEVICE(&child), errp);
@@
expression parent, name, size, type, errp;
expression child;
symbol true;
@@
- sysbus_init_child_obj(parent, name, child, size, type);
+ sysbus_init_child_XXX(parent, name, child, size, type);
...
- object_property_set_bool(OBJECT(child), true, "realized", errp);
+ sysbus_realize(SYS_BUS_DEVICE(child), errp);
@@
expression parent, name, size, type;
expression child;
expression dev;
expression expr;
@@
- sysbus_init_child_obj(parent, name, child, size, type);
+ sysbus_init_child_XXX(parent, name, child, size, type);
...
dev = DEVICE(child);
... when != dev = expr;
- qdev_init_nofail(dev);
+ sysbus_realize(SYS_BUS_DEVICE(dev), &error_fatal);
@@
expression parent, propname, type;
expression child;
@@
- sysbus_init_child_XXX(parent, propname, child, sizeof(*child), type)
+ object_initialize_child(parent, propname, child, type)
@@
expression parent, propname, type;
expression child;
@@
- sysbus_init_child_XXX(parent, propname, &child, sizeof(child), type)
+ object_initialize_child(parent, propname, &child, type)
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-48-armbru@redhat.com>
2020-06-10 08:32:36 +03:00
|
|
|
sysbus_realize(SYS_BUS_DEVICE(&mms->iotkit), &error_fatal);
|
2018-03-02 13:45:40 +03:00
|
|
|
|
2019-02-01 17:55:43 +03:00
|
|
|
/*
|
|
|
|
* The AN521 needs us to create splitters to feed the IRQ inputs
|
|
|
|
* for each CPU in the SSE-200 from each device in the board.
|
|
|
|
*/
|
|
|
|
if (mmc->fpga_type == FPGA_AN521) {
|
|
|
|
for (i = 0; i < MPS2TZ_NUMIRQ; i++) {
|
|
|
|
char *name = g_strdup_printf("mps2-irq-splitter%d", i);
|
|
|
|
SplitIRQ *splitter = &mms->cpu_irq_splitter[i];
|
|
|
|
|
qom: Less verbose object_initialize_child()
All users of object_initialize_child() pass the obvious child size
argument. Almost all pass &error_abort and no properties. Tiresome.
Rename object_initialize_child() to
object_initialize_child_with_props() to free the name. New
convenience wrapper object_initialize_child() automates the size
argument, and passes &error_abort and no properties.
Rename object_initialize_childv() to
object_initialize_child_with_propsv() for consistency.
Convert callers with this Coccinelle script:
@@
expression parent, propname, type;
expression child, size;
symbol error_abort;
@@
- object_initialize_child(parent, propname, OBJECT(child), size, type, &error_abort, NULL)
+ object_initialize_child(parent, propname, child, size, type, &error_abort, NULL)
@@
expression parent, propname, type;
expression child;
symbol error_abort;
@@
- object_initialize_child(parent, propname, child, sizeof(*child), type, &error_abort, NULL)
+ object_initialize_child(parent, propname, child, type)
@@
expression parent, propname, type;
expression child;
symbol error_abort;
@@
- object_initialize_child(parent, propname, &child, sizeof(child), type, &error_abort, NULL)
+ object_initialize_child(parent, propname, &child, type)
@@
expression parent, propname, type;
expression child, size, err;
expression list props;
@@
- object_initialize_child(parent, propname, child, size, type, err, props)
+ object_initialize_child_with_props(parent, propname, child, size, type, err, props)
Note that Coccinelle chokes on ARMSSE typedef vs. macro in
hw/arm/armsse.c. Worked around by temporarily renaming the macro for
the spatch run.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Acked-by: Alistair Francis <alistair.francis@wdc.com>
[Rebased: machine opentitan is new (commit fe0fe4735e7)]
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20200610053247.1583243-37-armbru@redhat.com>
2020-06-10 08:32:25 +03:00
|
|
|
object_initialize_child_with_props(OBJECT(machine), name,
|
|
|
|
splitter, sizeof(*splitter),
|
|
|
|
TYPE_SPLIT_IRQ, &error_fatal,
|
|
|
|
NULL);
|
2019-02-01 17:55:43 +03:00
|
|
|
g_free(name);
|
|
|
|
|
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 19:05:54 +03:00
|
|
|
object_property_set_int(OBJECT(splitter), "num-lines", 2,
|
2019-02-01 17:55:43 +03:00
|
|
|
&error_fatal);
|
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 08:32:45 +03:00
|
|
|
qdev_realize(DEVICE(splitter), NULL, &error_fatal);
|
2019-02-01 17:55:43 +03:00
|
|
|
qdev_connect_gpio_out(DEVICE(splitter), 0,
|
|
|
|
qdev_get_gpio_in_named(DEVICE(&mms->iotkit),
|
|
|
|
"EXP_IRQ", i));
|
|
|
|
qdev_connect_gpio_out(DEVICE(splitter), 1,
|
|
|
|
qdev_get_gpio_in_named(DEVICE(&mms->iotkit),
|
|
|
|
"EXP_CPU1_IRQ", i));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2018-03-02 13:45:40 +03:00
|
|
|
/* The sec_resp_cfg output from the IoTKit must be split into multiple
|
2018-08-24 15:17:44 +03:00
|
|
|
* lines, one for each of the PPCs we create here, plus one per MSC.
|
2018-03-02 13:45:40 +03:00
|
|
|
*/
|
2019-08-23 17:32:45 +03:00
|
|
|
object_initialize_child(OBJECT(machine), "sec-resp-splitter",
|
qom: Less verbose object_initialize_child()
All users of object_initialize_child() pass the obvious child size
argument. Almost all pass &error_abort and no properties. Tiresome.
Rename object_initialize_child() to
object_initialize_child_with_props() to free the name. New
convenience wrapper object_initialize_child() automates the size
argument, and passes &error_abort and no properties.
Rename object_initialize_childv() to
object_initialize_child_with_propsv() for consistency.
Convert callers with this Coccinelle script:
@@
expression parent, propname, type;
expression child, size;
symbol error_abort;
@@
- object_initialize_child(parent, propname, OBJECT(child), size, type, &error_abort, NULL)
+ object_initialize_child(parent, propname, child, size, type, &error_abort, NULL)
@@
expression parent, propname, type;
expression child;
symbol error_abort;
@@
- object_initialize_child(parent, propname, child, sizeof(*child), type, &error_abort, NULL)
+ object_initialize_child(parent, propname, child, type)
@@
expression parent, propname, type;
expression child;
symbol error_abort;
@@
- object_initialize_child(parent, propname, &child, sizeof(child), type, &error_abort, NULL)
+ object_initialize_child(parent, propname, &child, type)
@@
expression parent, propname, type;
expression child, size, err;
expression list props;
@@
- object_initialize_child(parent, propname, child, size, type, err, props)
+ object_initialize_child_with_props(parent, propname, child, size, type, err, props)
Note that Coccinelle chokes on ARMSSE typedef vs. macro in
hw/arm/armsse.c. Worked around by temporarily renaming the macro for
the spatch run.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Acked-by: Alistair Francis <alistair.francis@wdc.com>
[Rebased: machine opentitan is new (commit fe0fe4735e7)]
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20200610053247.1583243-37-armbru@redhat.com>
2020-06-10 08:32:25 +03:00
|
|
|
&mms->sec_resp_splitter, TYPE_SPLIT_IRQ);
|
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 19:05:54 +03:00
|
|
|
object_property_set_int(OBJECT(&mms->sec_resp_splitter), "num-lines",
|
2018-08-24 15:17:44 +03:00
|
|
|
ARRAY_SIZE(mms->ppc) + ARRAY_SIZE(mms->msc),
|
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 19:05:54 +03:00
|
|
|
&error_fatal);
|
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 08:32:45 +03:00
|
|
|
qdev_realize(DEVICE(&mms->sec_resp_splitter), NULL, &error_fatal);
|
2018-03-02 13:45:40 +03:00
|
|
|
dev_splitter = DEVICE(&mms->sec_resp_splitter);
|
|
|
|
qdev_connect_gpio_out_named(iotkitdev, "sec_resp_cfg", 0,
|
|
|
|
qdev_get_gpio_in(dev_splitter, 0));
|
|
|
|
|
|
|
|
/* The IoTKit sets up much of the memory layout, including
|
|
|
|
* the aliases between secure and non-secure regions in the
|
|
|
|
* address space. The FPGA itself contains:
|
|
|
|
*
|
|
|
|
* 0x00000000..0x003fffff SSRAM1
|
|
|
|
* 0x00400000..0x007fffff alias of SSRAM1
|
|
|
|
* 0x28000000..0x283fffff 4MB SSRAM2 + SSRAM3
|
|
|
|
* 0x40100000..0x4fffffff AHB Master Expansion 1 interface devices
|
|
|
|
* 0x80000000..0x80ffffff 16MB PSRAM
|
|
|
|
*/
|
|
|
|
|
|
|
|
/* The FPGA images have an odd combination of different RAMs,
|
|
|
|
* because in hardware they are different implementations and
|
|
|
|
* connected to different buses, giving varying performance/size
|
|
|
|
* tradeoffs. For QEMU they're all just RAM, though. We arbitrarily
|
|
|
|
* call the 16MB our "system memory", as it's the largest lump.
|
|
|
|
*/
|
2020-02-19 19:08:56 +03:00
|
|
|
memory_region_add_subregion(system_memory, 0x80000000, machine->ram);
|
2018-03-02 13:45:40 +03:00
|
|
|
|
|
|
|
/* The overflow IRQs for all UARTs are ORed together.
|
|
|
|
* Tx, Rx and "combined" IRQs are sent to the NVIC separately.
|
|
|
|
* Create the OR gate for this.
|
|
|
|
*/
|
2019-08-23 17:32:45 +03:00
|
|
|
object_initialize_child(OBJECT(mms), "uart-irq-orgate",
|
qom: Less verbose object_initialize_child()
All users of object_initialize_child() pass the obvious child size
argument. Almost all pass &error_abort and no properties. Tiresome.
Rename object_initialize_child() to
object_initialize_child_with_props() to free the name. New
convenience wrapper object_initialize_child() automates the size
argument, and passes &error_abort and no properties.
Rename object_initialize_childv() to
object_initialize_child_with_propsv() for consistency.
Convert callers with this Coccinelle script:
@@
expression parent, propname, type;
expression child, size;
symbol error_abort;
@@
- object_initialize_child(parent, propname, OBJECT(child), size, type, &error_abort, NULL)
+ object_initialize_child(parent, propname, child, size, type, &error_abort, NULL)
@@
expression parent, propname, type;
expression child;
symbol error_abort;
@@
- object_initialize_child(parent, propname, child, sizeof(*child), type, &error_abort, NULL)
+ object_initialize_child(parent, propname, child, type)
@@
expression parent, propname, type;
expression child;
symbol error_abort;
@@
- object_initialize_child(parent, propname, &child, sizeof(child), type, &error_abort, NULL)
+ object_initialize_child(parent, propname, &child, type)
@@
expression parent, propname, type;
expression child, size, err;
expression list props;
@@
- object_initialize_child(parent, propname, child, size, type, err, props)
+ object_initialize_child_with_props(parent, propname, child, size, type, err, props)
Note that Coccinelle chokes on ARMSSE typedef vs. macro in
hw/arm/armsse.c. Worked around by temporarily renaming the macro for
the spatch run.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Acked-by: Alistair Francis <alistair.francis@wdc.com>
[Rebased: machine opentitan is new (commit fe0fe4735e7)]
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20200610053247.1583243-37-armbru@redhat.com>
2020-06-10 08:32:25 +03:00
|
|
|
&mms->uart_irq_orgate, TYPE_OR_IRQ);
|
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 19:05:54 +03:00
|
|
|
object_property_set_int(OBJECT(&mms->uart_irq_orgate), "num-lines", 10,
|
2018-03-02 13:45:40 +03:00
|
|
|
&error_fatal);
|
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 08:32:45 +03:00
|
|
|
qdev_realize(DEVICE(&mms->uart_irq_orgate), NULL, &error_fatal);
|
2018-03-02 13:45:40 +03:00
|
|
|
qdev_connect_gpio_out(DEVICE(&mms->uart_irq_orgate), 0,
|
2019-02-01 17:55:43 +03:00
|
|
|
get_sse_irq_in(mms, 15));
|
2018-03-02 13:45:40 +03:00
|
|
|
|
|
|
|
/* Most of the devices in the FPGA are behind Peripheral Protection
|
|
|
|
* Controllers. The required order for initializing things is:
|
|
|
|
* + initialize the PPC
|
|
|
|
* + initialize, configure and realize downstream devices
|
|
|
|
* + connect downstream device MemoryRegions to the PPC
|
|
|
|
* + realize the PPC
|
|
|
|
* + map the PPC's MemoryRegions to the places in the address map
|
|
|
|
* where the downstream devices should appear
|
|
|
|
* + wire up the PPC's control lines to the IoTKit object
|
|
|
|
*/
|
|
|
|
|
|
|
|
const PPCInfo ppcs[] = { {
|
|
|
|
.name = "apb_ppcexp0",
|
|
|
|
.ports = {
|
2018-06-22 15:28:41 +03:00
|
|
|
{ "ssram-0", make_mpc, &mms->ssram_mpc[0], 0x58007000, 0x1000 },
|
|
|
|
{ "ssram-1", make_mpc, &mms->ssram_mpc[1], 0x58008000, 0x1000 },
|
|
|
|
{ "ssram-2", make_mpc, &mms->ssram_mpc[2], 0x58009000, 0x1000 },
|
2018-03-02 13:45:40 +03:00
|
|
|
},
|
|
|
|
}, {
|
|
|
|
.name = "apb_ppcexp1",
|
|
|
|
.ports = {
|
2018-08-24 15:17:47 +03:00
|
|
|
{ "spi0", make_spi, &mms->spi[0], 0x40205000, 0x1000 },
|
|
|
|
{ "spi1", make_spi, &mms->spi[1], 0x40206000, 0x1000 },
|
|
|
|
{ "spi2", make_spi, &mms->spi[2], 0x40209000, 0x1000 },
|
|
|
|
{ "spi3", make_spi, &mms->spi[3], 0x4020a000, 0x1000 },
|
|
|
|
{ "spi4", make_spi, &mms->spi[4], 0x4020b000, 0x1000 },
|
2018-03-02 13:45:40 +03:00
|
|
|
{ "uart0", make_uart, &mms->uart[0], 0x40200000, 0x1000 },
|
|
|
|
{ "uart1", make_uart, &mms->uart[1], 0x40201000, 0x1000 },
|
|
|
|
{ "uart2", make_uart, &mms->uart[2], 0x40202000, 0x1000 },
|
|
|
|
{ "uart3", make_uart, &mms->uart[3], 0x40203000, 0x1000 },
|
|
|
|
{ "uart4", make_uart, &mms->uart[4], 0x40204000, 0x1000 },
|
2020-06-17 10:25:39 +03:00
|
|
|
{ "i2c0", make_i2c, &mms->i2c[0], 0x40207000, 0x1000 },
|
|
|
|
{ "i2c1", make_i2c, &mms->i2c[1], 0x40208000, 0x1000 },
|
|
|
|
{ "i2c2", make_i2c, &mms->i2c[2], 0x4020c000, 0x1000 },
|
|
|
|
{ "i2c3", make_i2c, &mms->i2c[3], 0x4020d000, 0x1000 },
|
2018-03-02 13:45:40 +03:00
|
|
|
},
|
|
|
|
}, {
|
|
|
|
.name = "apb_ppcexp2",
|
|
|
|
.ports = {
|
|
|
|
{ "scc", make_scc, &mms->scc, 0x40300000, 0x1000 },
|
|
|
|
{ "i2s-audio", make_unimp_dev, &mms->i2s_audio,
|
|
|
|
0x40301000, 0x1000 },
|
|
|
|
{ "fpgaio", make_fpgaio, &mms->fpgaio, 0x40302000, 0x1000 },
|
|
|
|
},
|
|
|
|
}, {
|
|
|
|
.name = "ahb_ppcexp0",
|
|
|
|
.ports = {
|
|
|
|
{ "gfx", make_unimp_dev, &mms->gfx, 0x41000000, 0x140000 },
|
|
|
|
{ "gpio0", make_unimp_dev, &mms->gpio[0], 0x40100000, 0x1000 },
|
|
|
|
{ "gpio1", make_unimp_dev, &mms->gpio[1], 0x40101000, 0x1000 },
|
|
|
|
{ "gpio2", make_unimp_dev, &mms->gpio[2], 0x40102000, 0x1000 },
|
|
|
|
{ "gpio3", make_unimp_dev, &mms->gpio[3], 0x40103000, 0x1000 },
|
2018-06-15 16:57:13 +03:00
|
|
|
{ "eth", make_eth_dev, NULL, 0x42000000, 0x100000 },
|
2018-03-02 13:45:40 +03:00
|
|
|
},
|
|
|
|
}, {
|
|
|
|
.name = "ahb_ppcexp1",
|
|
|
|
.ports = {
|
2018-08-24 15:17:44 +03:00
|
|
|
{ "dma0", make_dma, &mms->dma[0], 0x40110000, 0x1000 },
|
|
|
|
{ "dma1", make_dma, &mms->dma[1], 0x40111000, 0x1000 },
|
|
|
|
{ "dma2", make_dma, &mms->dma[2], 0x40112000, 0x1000 },
|
|
|
|
{ "dma3", make_dma, &mms->dma[3], 0x40113000, 0x1000 },
|
2018-03-02 13:45:40 +03:00
|
|
|
},
|
|
|
|
},
|
|
|
|
};
|
|
|
|
|
|
|
|
for (i = 0; i < ARRAY_SIZE(ppcs); i++) {
|
|
|
|
const PPCInfo *ppcinfo = &ppcs[i];
|
|
|
|
TZPPC *ppc = &mms->ppc[i];
|
|
|
|
DeviceState *ppcdev;
|
|
|
|
int port;
|
|
|
|
char *gpioname;
|
|
|
|
|
sysbus: Convert qdev_set_parent_bus() use with Coccinelle, part 1
I'm converting from qdev_set_parent_bus()/realize to qdev_realize();
recent commit "qdev: Convert uses of qdev_set_parent_bus() with
Coccinelle" explains why.
sysbus_init_child_obj() is a wrapper around
object_initialize_child_with_props() and qdev_set_parent_bus(). It
passes no properties.
Convert sysbus_init_child_obj()/realize to object_initialize_child()/
qdev_realize().
Coccinelle script:
@@
expression parent, name, size, type, errp;
expression child;
symbol true;
@@
- sysbus_init_child_obj(parent, name, &child, size, type);
+ sysbus_init_child_XXX(parent, name, &child, size, type);
...
- object_property_set_bool(OBJECT(&child), true, "realized", errp);
+ sysbus_realize(SYS_BUS_DEVICE(&child), errp);
@@
expression parent, name, size, type, errp;
expression child;
symbol true;
@@
- sysbus_init_child_obj(parent, name, child, size, type);
+ sysbus_init_child_XXX(parent, name, child, size, type);
...
- object_property_set_bool(OBJECT(child), true, "realized", errp);
+ sysbus_realize(SYS_BUS_DEVICE(child), errp);
@@
expression parent, name, size, type;
expression child;
expression dev;
expression expr;
@@
- sysbus_init_child_obj(parent, name, child, size, type);
+ sysbus_init_child_XXX(parent, name, child, size, type);
...
dev = DEVICE(child);
... when != dev = expr;
- qdev_init_nofail(dev);
+ sysbus_realize(SYS_BUS_DEVICE(dev), &error_fatal);
@@
expression parent, propname, type;
expression child;
@@
- sysbus_init_child_XXX(parent, propname, child, sizeof(*child), type)
+ object_initialize_child(parent, propname, child, type)
@@
expression parent, propname, type;
expression child;
@@
- sysbus_init_child_XXX(parent, propname, &child, sizeof(child), type)
+ object_initialize_child(parent, propname, &child, type)
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-48-armbru@redhat.com>
2020-06-10 08:32:36 +03:00
|
|
|
object_initialize_child(OBJECT(machine), ppcinfo->name, ppc,
|
|
|
|
TYPE_TZ_PPC);
|
2018-03-02 13:45:40 +03:00
|
|
|
ppcdev = DEVICE(ppc);
|
|
|
|
|
|
|
|
for (port = 0; port < TZ_NUM_PORTS; port++) {
|
|
|
|
const PPCPortInfo *pinfo = &ppcinfo->ports[port];
|
|
|
|
MemoryRegion *mr;
|
|
|
|
char *portname;
|
|
|
|
|
|
|
|
if (!pinfo->devfn) {
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
mr = pinfo->devfn(mms, pinfo->opaque, pinfo->name, pinfo->size);
|
|
|
|
portname = g_strdup_printf("port[%d]", port);
|
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 19:05:54 +03:00
|
|
|
object_property_set_link(OBJECT(ppc), portname, OBJECT(mr),
|
|
|
|
&error_fatal);
|
2018-03-02 13:45:40 +03:00
|
|
|
g_free(portname);
|
|
|
|
}
|
|
|
|
|
sysbus: Convert qdev_set_parent_bus() use with Coccinelle, part 1
I'm converting from qdev_set_parent_bus()/realize to qdev_realize();
recent commit "qdev: Convert uses of qdev_set_parent_bus() with
Coccinelle" explains why.
sysbus_init_child_obj() is a wrapper around
object_initialize_child_with_props() and qdev_set_parent_bus(). It
passes no properties.
Convert sysbus_init_child_obj()/realize to object_initialize_child()/
qdev_realize().
Coccinelle script:
@@
expression parent, name, size, type, errp;
expression child;
symbol true;
@@
- sysbus_init_child_obj(parent, name, &child, size, type);
+ sysbus_init_child_XXX(parent, name, &child, size, type);
...
- object_property_set_bool(OBJECT(&child), true, "realized", errp);
+ sysbus_realize(SYS_BUS_DEVICE(&child), errp);
@@
expression parent, name, size, type, errp;
expression child;
symbol true;
@@
- sysbus_init_child_obj(parent, name, child, size, type);
+ sysbus_init_child_XXX(parent, name, child, size, type);
...
- object_property_set_bool(OBJECT(child), true, "realized", errp);
+ sysbus_realize(SYS_BUS_DEVICE(child), errp);
@@
expression parent, name, size, type;
expression child;
expression dev;
expression expr;
@@
- sysbus_init_child_obj(parent, name, child, size, type);
+ sysbus_init_child_XXX(parent, name, child, size, type);
...
dev = DEVICE(child);
... when != dev = expr;
- qdev_init_nofail(dev);
+ sysbus_realize(SYS_BUS_DEVICE(dev), &error_fatal);
@@
expression parent, propname, type;
expression child;
@@
- sysbus_init_child_XXX(parent, propname, child, sizeof(*child), type)
+ object_initialize_child(parent, propname, child, type)
@@
expression parent, propname, type;
expression child;
@@
- sysbus_init_child_XXX(parent, propname, &child, sizeof(child), type)
+ object_initialize_child(parent, propname, &child, type)
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-48-armbru@redhat.com>
2020-06-10 08:32:36 +03:00
|
|
|
sysbus_realize(SYS_BUS_DEVICE(ppc), &error_fatal);
|
2018-03-02 13:45:40 +03:00
|
|
|
|
|
|
|
for (port = 0; port < TZ_NUM_PORTS; port++) {
|
|
|
|
const PPCPortInfo *pinfo = &ppcinfo->ports[port];
|
|
|
|
|
|
|
|
if (!pinfo->devfn) {
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
sysbus_mmio_map(SYS_BUS_DEVICE(ppc), port, pinfo->addr);
|
|
|
|
|
|
|
|
gpioname = g_strdup_printf("%s_nonsec", ppcinfo->name);
|
|
|
|
qdev_connect_gpio_out_named(iotkitdev, gpioname, port,
|
|
|
|
qdev_get_gpio_in_named(ppcdev,
|
|
|
|
"cfg_nonsec",
|
|
|
|
port));
|
|
|
|
g_free(gpioname);
|
|
|
|
gpioname = g_strdup_printf("%s_ap", ppcinfo->name);
|
|
|
|
qdev_connect_gpio_out_named(iotkitdev, gpioname, port,
|
|
|
|
qdev_get_gpio_in_named(ppcdev,
|
|
|
|
"cfg_ap", port));
|
|
|
|
g_free(gpioname);
|
|
|
|
}
|
|
|
|
|
|
|
|
gpioname = g_strdup_printf("%s_irq_enable", ppcinfo->name);
|
|
|
|
qdev_connect_gpio_out_named(iotkitdev, gpioname, 0,
|
|
|
|
qdev_get_gpio_in_named(ppcdev,
|
|
|
|
"irq_enable", 0));
|
|
|
|
g_free(gpioname);
|
|
|
|
gpioname = g_strdup_printf("%s_irq_clear", ppcinfo->name);
|
|
|
|
qdev_connect_gpio_out_named(iotkitdev, gpioname, 0,
|
|
|
|
qdev_get_gpio_in_named(ppcdev,
|
|
|
|
"irq_clear", 0));
|
|
|
|
g_free(gpioname);
|
|
|
|
gpioname = g_strdup_printf("%s_irq_status", ppcinfo->name);
|
|
|
|
qdev_connect_gpio_out_named(ppcdev, "irq", 0,
|
|
|
|
qdev_get_gpio_in_named(iotkitdev,
|
|
|
|
gpioname, 0));
|
|
|
|
g_free(gpioname);
|
|
|
|
|
|
|
|
qdev_connect_gpio_out(dev_splitter, i,
|
|
|
|
qdev_get_gpio_in_named(ppcdev,
|
|
|
|
"cfg_sec_resp", 0));
|
|
|
|
}
|
|
|
|
|
|
|
|
create_unimplemented_device("FPGA NS PC", 0x48007000, 0x1000);
|
|
|
|
|
|
|
|
armv7m_load_kernel(ARM_CPU(first_cpu), machine->kernel_filename, 0x400000);
|
|
|
|
}
|
|
|
|
|
2018-08-24 15:17:44 +03:00
|
|
|
static void mps2_tz_idau_check(IDAUInterface *ii, uint32_t address,
|
|
|
|
int *iregion, bool *exempt, bool *ns, bool *nsc)
|
|
|
|
{
|
|
|
|
/*
|
|
|
|
* The MPS2 TZ FPGA images have IDAUs in them which are connected to
|
|
|
|
* the Master Security Controllers. Thes have the same logic as
|
|
|
|
* is used by the IoTKit for the IDAU connected to the CPU, except
|
|
|
|
* that MSCs don't care about the NSC attribute.
|
|
|
|
*/
|
|
|
|
int region = extract32(address, 28, 4);
|
|
|
|
|
|
|
|
*ns = !(region & 1);
|
|
|
|
*nsc = false;
|
|
|
|
/* 0xe0000000..0xe00fffff and 0xf0000000..0xf00fffff are exempt */
|
|
|
|
*exempt = (address & 0xeff00000) == 0xe0000000;
|
|
|
|
*iregion = region;
|
|
|
|
}
|
|
|
|
|
2018-03-02 13:45:40 +03:00
|
|
|
static void mps2tz_class_init(ObjectClass *oc, void *data)
|
|
|
|
{
|
|
|
|
MachineClass *mc = MACHINE_CLASS(oc);
|
2018-08-24 15:17:44 +03:00
|
|
|
IDAUInterfaceClass *iic = IDAU_INTERFACE_CLASS(oc);
|
2018-03-02 13:45:40 +03:00
|
|
|
|
|
|
|
mc->init = mps2tz_common_init;
|
2018-08-24 15:17:44 +03:00
|
|
|
iic->check = mps2_tz_idau_check;
|
2020-02-19 19:08:56 +03:00
|
|
|
mc->default_ram_size = 16 * MiB;
|
|
|
|
mc->default_ram_id = "mps.ram";
|
2018-03-02 13:45:40 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
static void mps2tz_an505_class_init(ObjectClass *oc, void *data)
|
|
|
|
{
|
|
|
|
MachineClass *mc = MACHINE_CLASS(oc);
|
|
|
|
MPS2TZMachineClass *mmc = MPS2TZ_MACHINE_CLASS(oc);
|
|
|
|
|
|
|
|
mc->desc = "ARM MPS2 with AN505 FPGA image for Cortex-M33";
|
2019-02-01 17:55:44 +03:00
|
|
|
mc->default_cpus = 1;
|
|
|
|
mc->min_cpus = mc->default_cpus;
|
|
|
|
mc->max_cpus = mc->default_cpus;
|
2018-03-02 13:45:40 +03:00
|
|
|
mmc->fpga_type = FPGA_AN505;
|
|
|
|
mc->default_cpu_type = ARM_CPU_TYPE_NAME("cortex-m33");
|
2018-08-24 15:17:47 +03:00
|
|
|
mmc->scc_id = 0x41045050;
|
2019-02-01 17:55:44 +03:00
|
|
|
mmc->armsse_type = TYPE_IOTKIT;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void mps2tz_an521_class_init(ObjectClass *oc, void *data)
|
|
|
|
{
|
|
|
|
MachineClass *mc = MACHINE_CLASS(oc);
|
|
|
|
MPS2TZMachineClass *mmc = MPS2TZ_MACHINE_CLASS(oc);
|
|
|
|
|
|
|
|
mc->desc = "ARM MPS2 with AN521 FPGA image for dual Cortex-M33";
|
|
|
|
mc->default_cpus = 2;
|
|
|
|
mc->min_cpus = mc->default_cpus;
|
|
|
|
mc->max_cpus = mc->default_cpus;
|
|
|
|
mmc->fpga_type = FPGA_AN521;
|
|
|
|
mc->default_cpu_type = ARM_CPU_TYPE_NAME("cortex-m33");
|
|
|
|
mmc->scc_id = 0x41045210;
|
|
|
|
mmc->armsse_type = TYPE_SSE200;
|
2018-03-02 13:45:40 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
static const TypeInfo mps2tz_info = {
|
|
|
|
.name = TYPE_MPS2TZ_MACHINE,
|
|
|
|
.parent = TYPE_MACHINE,
|
|
|
|
.abstract = true,
|
|
|
|
.instance_size = sizeof(MPS2TZMachineState),
|
|
|
|
.class_size = sizeof(MPS2TZMachineClass),
|
|
|
|
.class_init = mps2tz_class_init,
|
2018-08-24 15:17:44 +03:00
|
|
|
.interfaces = (InterfaceInfo[]) {
|
|
|
|
{ TYPE_IDAU_INTERFACE },
|
|
|
|
{ }
|
|
|
|
},
|
2018-03-02 13:45:40 +03:00
|
|
|
};
|
|
|
|
|
|
|
|
static const TypeInfo mps2tz_an505_info = {
|
|
|
|
.name = TYPE_MPS2TZ_AN505_MACHINE,
|
|
|
|
.parent = TYPE_MPS2TZ_MACHINE,
|
|
|
|
.class_init = mps2tz_an505_class_init,
|
|
|
|
};
|
|
|
|
|
2019-02-01 17:55:44 +03:00
|
|
|
static const TypeInfo mps2tz_an521_info = {
|
|
|
|
.name = TYPE_MPS2TZ_AN521_MACHINE,
|
|
|
|
.parent = TYPE_MPS2TZ_MACHINE,
|
|
|
|
.class_init = mps2tz_an521_class_init,
|
|
|
|
};
|
|
|
|
|
2018-03-02 13:45:40 +03:00
|
|
|
static void mps2tz_machine_init(void)
|
|
|
|
{
|
|
|
|
type_register_static(&mps2tz_info);
|
|
|
|
type_register_static(&mps2tz_an505_info);
|
2019-02-01 17:55:44 +03:00
|
|
|
type_register_static(&mps2tz_an521_info);
|
2018-03-02 13:45:40 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
type_init(mps2tz_machine_init);
|