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

hw/arm/bcm2836: Rename bcm2836 type/struct to bcm283x

Browse Source 
Our BCM2836 type is really a generic one that can be any of
the bcm283x family. Rename it accordingly. We change only
the names which are visible via the header file to the
rest of the QEMU code, leaving private function names
in bcm2836.c as they are.

This is a preliminary to making bcm283x be an abstract
parent class to specific types for the bcm2836 and bcm2837.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Andrew Baumann <Andrew.Baumann@microsoft.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-id: 20180313153458.26822-6-peter.maydell@linaro.org
This commit is contained in:
Peter Maydell 2018-03-13 15:34:54 +00:00
parent 3d260cf3c6
commit 926dcdf073
3 changed files with 23 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
hw/arm/bcm2836.c
View File

@ -25,7 +25,7 @@
static void bcm2836_init(Object *obj) static void bcm2836_init(Object *obj)
{ {
BCM2836State *s = BCM2836(obj); BCM283XState *s = BCM283X(obj);
object_initialize(&s->control, sizeof(s->control), TYPE_BCM2836_CONTROL); object_initialize(&s->control, sizeof(s->control), TYPE_BCM2836_CONTROL);
object_property_add_child(obj, "control", OBJECT(&s->control), NULL); object_property_add_child(obj, "control", OBJECT(&s->control), NULL);
@ -44,7 +44,7 @@ static void bcm2836_init(Object *obj)
static void bcm2836_realize(DeviceState *dev, Error **errp) static void bcm2836_realize(DeviceState *dev, Error **errp)
{ {
BCM2836State *s = BCM2836(dev); BCM283XState *s = BCM283X(dev);
Object *obj; Object *obj;
Error *err = NULL; Error *err = NULL;
int n; int n;
@ -52,7 +52,7 @@ static void bcm2836_realize(DeviceState *dev, Error **errp)
/* common peripherals from bcm2835 */ /* common peripherals from bcm2835 */
obj = OBJECT(dev); obj = OBJECT(dev);
for (n = 0; n < BCM2836_NCPUS; n++) { for (n = 0; n < BCM283X_NCPUS; n++) {
object_initialize(&s->cpus[n], sizeof(s->cpus[n]), object_initialize(&s->cpus[n], sizeof(s->cpus[n]),
s->cpu_type); s->cpu_type);
object_property_add_child(obj, "cpu[*]", OBJECT(&s->cpus[n]), object_property_add_child(obj, "cpu[*]", OBJECT(&s->cpus[n]),
@ -102,7 +102,7 @@ static void bcm2836_realize(DeviceState *dev, Error **errp)
sysbus_connect_irq(SYS_BUS_DEVICE(&s->peripherals), 1, sysbus_connect_irq(SYS_BUS_DEVICE(&s->peripherals), 1,
qdev_get_gpio_in_named(DEVICE(&s->control), "gpu-fiq", 0)); qdev_get_gpio_in_named(DEVICE(&s->control), "gpu-fiq", 0));
for (n = 0; n < BCM2836_NCPUS; n++) { for (n = 0; n < BCM283X_NCPUS; n++) {
/* Mirror bcm2836, which has clusterid set to 0xf /* Mirror bcm2836, which has clusterid set to 0xf
* TODO: this should be converted to a property of ARM_CPU * TODO: this should be converted to a property of ARM_CPU
*/ */
@ -150,8 +150,9 @@ static void bcm2836_realize(DeviceState *dev, Error **errp)
} }
static Property bcm2836_props[] = { static Property bcm2836_props[] = {
DEFINE_PROP_STRING("cpu-type", BCM2836State, cpu_type), DEFINE_PROP_STRING("cpu-type", BCM283XState, cpu_type),
DEFINE_PROP_UINT32("enabled-cpus", BCM2836State, enabled_cpus, BCM2836_NCPUS), DEFINE_PROP_UINT32("enabled-cpus", BCM283XState, enabled_cpus,
BCM283X_NCPUS),
DEFINE_PROP_END_OF_LIST() DEFINE_PROP_END_OF_LIST()
}; };
@ -164,9 +165,9 @@ static void bcm2836_class_init(ObjectClass *oc, void *data)
} }
static const TypeInfo bcm2836_type_info = { static const TypeInfo bcm2836_type_info = {
.name = TYPE_BCM2836, .name = TYPE_BCM283X,
.parent = TYPE_DEVICE, .parent = TYPE_DEVICE,
.instance_size = sizeof(BCM2836State), .instance_size = sizeof(BCM283XState),
.instance_init = bcm2836_init, .instance_init = bcm2836_init,
.class_init = bcm2836_class_init, .class_init = bcm2836_class_init,
}; };

16
hw/arm/raspi.c
View File

@ -32,7 +32,7 @@
static const int raspi_boardid[] = {[1] = 0xc42, [2] = 0xc43, [3] = 0xc44}; static const int raspi_boardid[] = {[1] = 0xc42, [2] = 0xc43, [3] = 0xc44};
typedef struct RasPiState { typedef struct RasPiState {
BCM2836State soc; BCM283XState soc;
MemoryRegion ram; MemoryRegion ram;
} RasPiState; } RasPiState;
@ -136,7 +136,7 @@ static void raspi_init(MachineState *machine, int version)
BusState *bus; BusState *bus;
DeviceState *carddev; DeviceState *carddev;
object_initialize(&s->soc, sizeof(s->soc), TYPE_BCM2836); object_initialize(&s->soc, sizeof(s->soc), TYPE_BCM283X);
object_property_add_child(OBJECT(machine), "soc", OBJECT(&s->soc), object_property_add_child(OBJECT(machine), "soc", OBJECT(&s->soc),
&error_abort); &error_abort);
@ -189,9 +189,9 @@ static void raspi2_machine_init(MachineClass *mc)
mc->no_floppy = 1; mc->no_floppy = 1;
mc->no_cdrom = 1; mc->no_cdrom = 1;
mc->default_cpu_type = ARM_CPU_TYPE_NAME("cortex-a15"); mc->default_cpu_type = ARM_CPU_TYPE_NAME("cortex-a15");
mc->max_cpus = BCM2836_NCPUS; mc->max_cpus = BCM283X_NCPUS;
mc->min_cpus = BCM2836_NCPUS; mc->min_cpus = BCM283X_NCPUS;
mc->default_cpus = BCM2836_NCPUS; mc->default_cpus = BCM283X_NCPUS;
mc->default_ram_size = 1024 * 1024 * 1024; mc->default_ram_size = 1024 * 1024 * 1024;
mc->ignore_memory_transaction_failures = true; mc->ignore_memory_transaction_failures = true;
}; };
@ -212,9 +212,9 @@ static void raspi3_machine_init(MachineClass *mc)
mc->no_floppy = 1; mc->no_floppy = 1;
mc->no_cdrom = 1; mc->no_cdrom = 1;
mc->default_cpu_type = ARM_CPU_TYPE_NAME("cortex-a53"); mc->default_cpu_type = ARM_CPU_TYPE_NAME("cortex-a53");
mc->max_cpus = BCM2836_NCPUS; mc->max_cpus = BCM283X_NCPUS;
mc->min_cpus = BCM2836_NCPUS; mc->min_cpus = BCM283X_NCPUS;
mc->default_cpus = BCM2836_NCPUS; mc->default_cpus = BCM283X_NCPUS;
mc->default_ram_size = 1024 * 1024 * 1024; mc->default_ram_size = 1024 * 1024 * 1024;
} }
DEFINE_MACHINE("raspi3", raspi3_machine_init) DEFINE_MACHINE("raspi3", raspi3_machine_init)

12
include/hw/arm/bcm2836.h
View File

@ -15,12 +15,12 @@
#include "hw/arm/bcm2835_peripherals.h" #include "hw/arm/bcm2835_peripherals.h"
#include "hw/intc/bcm2836_control.h" #include "hw/intc/bcm2836_control.h"
#define TYPE_BCM2836 "bcm2836" #define TYPE_BCM283X "bcm283x"
#define BCM2836(obj) OBJECT_CHECK(BCM2836State, (obj), TYPE_BCM2836) #define BCM283X(obj) OBJECT_CHECK(BCM283XState, (obj), TYPE_BCM283X)
#define BCM2836_NCPUS 4 #define BCM283X_NCPUS 4
typedef struct BCM2836State { typedef struct BCM283XState {
/*< private >*/ /*< private >*/
DeviceState parent_obj; DeviceState parent_obj;
/*< public >*/ /*< public >*/
@ -28,9 +28,9 @@ typedef struct BCM2836State {
char *cpu_type; char *cpu_type;
uint32_t enabled_cpus; uint32_t enabled_cpus;
ARMCPU cpus[BCM2836_NCPUS]; ARMCPU cpus[BCM283X_NCPUS];
BCM2836ControlState control; BCM2836ControlState control;
BCM2835PeripheralState peripherals; BCM2835PeripheralState peripherals;
} BCM2836State; } BCM283XState;
#endif /* BCM2836_H */ #endif /* BCM2836_H */