hw/arm/aspeed: Improve QOM usage
v2 cover hw/arm/aspeed: Improve QOM usage
Yet another cleanup.
Simplify aspeed machine QOM usage.
Since v1, addressed Cédric review comments:
- Rename AspeedBoardState -> AspeedMachineState
Philippe Mathieu-Daudé (3):
hw/arm/aspeed: Remove extraneous MemoryRegion object owner hw/arm/aspeed: Rename AspeedBoardState as AspeedMachineState hw/arm/aspeed: QOM'ify AspeedMachineState
include/hw/arm/aspeed.h | 12 +++--------- hw/arm/aspeed.c | 33 ++++++++++++++++++--------------- 2 files changed, 21 insertions(+), 24 deletions(-)
Signature · 1 line
2.21.3
PATCH v2 1/3 hw/arm/aspeed: Remove extraneous MemoryRegion object owner
I'm confused by this code, 'bmc' is created as:
bmc = g_new0(AspeedBoardState, 1);
Then we use it as QOM owner for different MemoryRegion objects. But looking at memory_region_init_ram (similarly for ROM):
void memory_region_init_ram(MemoryRegion *mr,
struct Object *owner,
const char *name,
uint64_t size,
Error **errp)
{
DeviceState *owner_dev;
Error *err = NULL; memory_region_init_ram_nomigrate(mr, owner, name, size, &err);
if (err) {
error_propagate(errp, err);
return;
}
/* This will assert if owner is neither NULL nor a DeviceState.
* We only want the owner here for the purposes of defining a
* unique name for migration. TODO: Ideally we should implement
* a naming scheme for Objects which are not DeviceStates, in
* which case we can relax this restriction.
*/
owner_dev = DEVICE(owner);
vmstate_register_ram(mr, owner_dev);}
The expected assertion is not triggered ('bmc' is not NULL neither a DeviceState).
'bmc' structure is defined as:
struct AspeedBoardState {
AspeedSoCState soc;
MemoryRegion ram_container;
MemoryRegion max_ram;
};What happens is when using 'OBJECT(bmc)', the QOM macros cast the memory pointed by bmc, which first member is 'soc', which is initialized ...:
object_initialize_child(OBJECT(machine), "soc",
&bmc->soc, amc->soc_name);
The 'soc' object is indeed a DeviceState, so the assertion passes.
Since this is fragile and only happens to work by luck, remove the dangerous OBJECT(bmc) owner argument.
Note, this probably breaks migration for this machine.
--- hw/arm/aspeed.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
hw/arm/aspeed.c +3 -3
@@ -329,12 +329,12 @@ static void aspeed_machine_init(MachineState *machine)* needed by the flash modules of the Aspeed machines. */ if (ASPEED_MACHINE (machine)->mmio_exec) { -memory_region_init_alias (boot_rom,OBJECT (bmc),"aspeed.boot_rom" , +memory_region_init_alias (boot_rom,NULL ,"aspeed.boot_rom" , &fl->mmio,0 , fl->size);memory_region_add_subregion (get_system_memory (),FIRMWARE_ADDR , boot_rom); }else { -memory_region_init_rom (boot_rom,OBJECT (bmc),"aspeed.boot_rom" , +memory_region_init_rom (boot_rom,NULL ,"aspeed.boot_rom" , fl->size, &error_abort);memory_region_add_subregion (get_system_memory (),FIRMWARE_ADDR , boot_rom);
@@ -345,7 +345,7 @@ static void aspeed_machine_init(MachineState *machine)if (machine->kernel_filename && sc->num_cpus >1 ) {/* With no u-boot we must set up a boot stub for the secondary CPU */ MemoryRegion *smpboot =g_new (MemoryRegion,1 ); -memory_region_init_ram (smpboot,OBJECT (bmc),"aspeed.smpboot" , +memory_region_init_ram (smpboot,NULL ,"aspeed.smpboot" ,0x80 , &error_abort);memory_region_add_subregion (get_system_memory (),AST_SMP_MAILBOX_BASE , smpboot);
Signature · 1 line
2.21.3
PATCH v2 2/3 hw/arm/aspeed: Rename AspeedBoardState as AspeedMachineState
In reply to Philippe Mathieu-DaudéTo have a more consistent naming, rename AspeedBoardState as AspeedMachineState.
--- include/hw/arm/aspeed.h | 4 ++-- hw/arm/aspeed.c | 20 ++++++++++---------- 2 files changed, 12 insertions(+), 12 deletions(-)
include/hw/arm/aspeed.h +2 -2
@@ -11,7 +11,7 @@#include "hw/boards.h" -typedef struct AspeedBoardState AspeedBoardState ; +typedef struct AspeedMachineState AspeedMachineState ;#define TYPE_ASPEED_MACHINE MACHINE_TYPE_NAME("aspeed")#define ASPEED_MACHINE (obj) \
@@ -45,7 +45,7 @@ typedef struct AspeedMachineClass {const char *spi_model;uint32_t num_cs;uint32_t macs_mask; -void (*i2c_init)(AspeedBoardState *bmc); +void (*i2c_init)(AspeedMachineState *bmc); } AspeedMachineClass;
hw/arm/aspeed.c +10 -10
@@ -32,7 +32,7 @@ static struct arm_boot_info aspeed_board_binfo = { .board_id = -1, /* device-tree-only board */ }; -struct AspeedBoardState { +struct AspeedMachineState {AspeedSoCState soc;MemoryRegion ram_container;MemoryRegion max_ram;
@@ -253,7 +253,7 @@ static void sdhci_attach_drive(SDHCIState *sdhci, DriveInfo *dinfo)static void aspeed_machine_init (MachineState *machine) { -AspeedBoardState *bmc; +AspeedMachineState *bmc;AspeedMachineClass *amc =ASPEED_MACHINE_GET_CLASS (machine);AspeedSoCClass *sc;DriveInfo *drive0 =drive_get (IF_MTD ,0 ,0 );
@@ -261,7 +261,7 @@ static void aspeed_machine_init(MachineState *machine)int i;NICInfo *nd = &nd_table[0 ]; - bmc =g_new0 (AspeedBoardState,1 ); + bmc =g_new0 (AspeedMachineState,1 );memory_region_init (&bmc->ram_container,NULL ,"aspeed-ram-container" ,4 * GiB);
@@ -374,7 +374,7 @@ static void aspeed_machine_init(MachineState *machine)arm_load_kernel (ARM_CPU (first_cpu), machine, &aspeed_board_binfo); } -static void palmetto_bmc_i2c_init (AspeedBoardState *bmc) +static void palmetto_bmc_i2c_init (AspeedMachineState *bmc) {AspeedSoCState *soc = &bmc->soc;DeviceState *dev;
@@ -396,7 +396,7 @@ static void palmetto_bmc_i2c_init(AspeedBoardState *bmc)object_property_set_int (OBJECT (dev),110000 ,"temperature3" , &error_abort); } -static void ast2500_evb_i2c_init (AspeedBoardState *bmc) +static void ast2500_evb_i2c_init (AspeedMachineState *bmc) {AspeedSoCState *soc = &bmc->soc;uint8_t *eeprom_buf =g_malloc0 (8 *1024 );
@@ -413,13 +413,13 @@ static void ast2500_evb_i2c_init(AspeedBoardState *bmc)i2c_create_slave (aspeed_i2c_get_bus (DEVICE (&soc->i2c),11 ),"ds1338" ,0x32 ); } -static void ast2600_evb_i2c_init (AspeedBoardState *bmc) +static void ast2600_evb_i2c_init (AspeedMachineState *bmc) {/* Start with some devices on our I2C busses */ ast2500_evb_i2c_init (bmc); } -static void romulus_bmc_i2c_init (AspeedBoardState *bmc) +static void romulus_bmc_i2c_init (AspeedMachineState *bmc) {AspeedSoCState *soc = &bmc->soc;
@@ -428,7 +428,7 @@ static void romulus_bmc_i2c_init(AspeedBoardState *bmc)i2c_create_slave (aspeed_i2c_get_bus (DEVICE (&soc->i2c),11 ),"ds1338" ,0x32 ); } -static void swift_bmc_i2c_init (AspeedBoardState *bmc) +static void swift_bmc_i2c_init (AspeedMachineState *bmc) {AspeedSoCState *soc = &bmc->soc;
@@ -457,7 +457,7 @@ static void swift_bmc_i2c_init(AspeedBoardState *bmc)i2c_create_slave (aspeed_i2c_get_bus (DEVICE (&soc->i2c),12 ),"tmp105" ,0x4a ); } -static void sonorapass_bmc_i2c_init (AspeedBoardState *bmc) +static void sonorapass_bmc_i2c_init (AspeedMachineState *bmc) {AspeedSoCState *soc = &bmc->soc;
@@ -501,7 +501,7 @@ static void sonorapass_bmc_i2c_init(AspeedBoardState *bmc) } -static void witherspoon_bmc_i2c_init (AspeedBoardState *bmc) +static void witherspoon_bmc_i2c_init (AspeedMachineState *bmc) {AspeedSoCState *soc = &bmc->soc;uint8_t *eeprom_buf =g_malloc0 (8 *1024 );
Signature · 1 line
2.21.3
Re: [PATCH v2 2/3] hw/arm/aspeed: Rename AspeedBoardState as AspeedMachineState
Quoted 5 lines · Philippe Mathieu-Daudé
To have a more consistent naming, rename AspeedBoardState as AspeedMachineState.
Suggested-by Cédric Le Goater <[email protected]>Signed-off-by Philippe Mathieu-Daudé <[email protected]>
Quoted 120 lines
--- include/hw/arm/aspeed.h | 4 ++-- hw/arm/aspeed.c | 20 ++++++++++---------- 2 files changed, 12 insertions(+), 12 deletions(-)include/hw/arm/aspeed.h +2
-2@@ -11,7 +11,7 @@#include "hw/boards.h" -typedef struct AspeedBoardState AspeedBoardState ; +typedef struct AspeedMachineState AspeedMachineState ;#define TYPE_ASPEED_MACHINE MACHINE_TYPE_NAME("aspeed")#define ASPEED_MACHINE (obj) \@@ -45,7 +45,7 @@ typedef struct AspeedMachineClass {const char *spi_model;uint32_t num_cs;uint32_t macs_mask; -void (*i2c_init)(AspeedBoardState *bmc); +void (*i2c_init)(AspeedMachineState *bmc); } AspeedMachineClass;hw/arm/aspeed.c +10
-10@@ -32,7 +32,7 @@ static struct arm_boot_info aspeed_board_binfo = { .board_id = -1, /* device-tree-only board */ }; -struct AspeedBoardState { +struct AspeedMachineState {AspeedSoCState soc;MemoryRegion ram_container;MemoryRegion max_ram;@@ -253,7 +253,7 @@ static void sdhci_attach_drive(SDHCIState *sdhci, DriveInfo *dinfo)static void aspeed_machine_init (MachineState *machine) { -AspeedBoardState *bmc; +AspeedMachineState *bmc;AspeedMachineClass *amc =ASPEED_MACHINE_GET_CLASS (machine);AspeedSoCClass *sc;DriveInfo *drive0 =drive_get (IF_MTD ,0 ,0 );@@ -261,7 +261,7 @@ static void aspeed_machine_init(MachineState *machine)int i;NICInfo *nd = &nd_table[0 ]; - bmc =g_new0 (AspeedBoardState,1 ); + bmc =g_new0 (AspeedMachineState,1 );memory_region_init (&bmc->ram_container,NULL ,"aspeed-ram-container" ,4 * GiB);@@ -374,7 +374,7 @@ static void aspeed_machine_init(MachineState *machine)arm_load_kernel (ARM_CPU (first_cpu), machine, &aspeed_board_binfo); } -static void palmetto_bmc_i2c_init (AspeedBoardState *bmc) +static void palmetto_bmc_i2c_init (AspeedMachineState *bmc) {AspeedSoCState *soc = &bmc->soc;DeviceState *dev;@@ -396,7 +396,7 @@ static void palmetto_bmc_i2c_init(AspeedBoardState *bmc)object_property_set_int (OBJECT (dev),110000 ,"temperature3" , &error_abort); } -static void ast2500_evb_i2c_init (AspeedBoardState *bmc) +static void ast2500_evb_i2c_init (AspeedMachineState *bmc) {AspeedSoCState *soc = &bmc->soc;uint8_t *eeprom_buf =g_malloc0 (8 *1024 );@@ -413,13 +413,13 @@ static void ast2500_evb_i2c_init(AspeedBoardState *bmc)i2c_create_slave (aspeed_i2c_get_bus (DEVICE (&soc->i2c),11 ),"ds1338" ,0x32 ); } -static void ast2600_evb_i2c_init (AspeedBoardState *bmc) +static void ast2600_evb_i2c_init (AspeedMachineState *bmc) {/* Start with some devices on our I2C busses */ ast2500_evb_i2c_init (bmc); } -static void romulus_bmc_i2c_init (AspeedBoardState *bmc) +static void romulus_bmc_i2c_init (AspeedMachineState *bmc) {AspeedSoCState *soc = &bmc->soc;@@ -428,7 +428,7 @@ static void romulus_bmc_i2c_init(AspeedBoardState *bmc)i2c_create_slave (aspeed_i2c_get_bus (DEVICE (&soc->i2c),11 ),"ds1338" ,0x32 ); } -static void swift_bmc_i2c_init (AspeedBoardState *bmc) +static void swift_bmc_i2c_init (AspeedMachineState *bmc) {AspeedSoCState *soc = &bmc->soc;@@ -457,7 +457,7 @@ static void swift_bmc_i2c_init(AspeedBoardState *bmc)i2c_create_slave (aspeed_i2c_get_bus (DEVICE (&soc->i2c),12 ),"tmp105" ,0x4a ); } -static void sonorapass_bmc_i2c_init (AspeedBoardState *bmc) +static void sonorapass_bmc_i2c_init (AspeedMachineState *bmc) {AspeedSoCState *soc = &bmc->soc;@@ -501,7 +501,7 @@ static void sonorapass_bmc_i2c_init(AspeedBoardState *bmc) } -static void witherspoon_bmc_i2c_init (AspeedBoardState *bmc) +static void witherspoon_bmc_i2c_init (AspeedMachineState *bmc) {AspeedSoCState *soc = &bmc->soc;uint8_t *eeprom_buf =g_malloc0 (8 *1024 );
PATCH v2 3/3 hw/arm/aspeed: QOM'ify AspeedMachineState
In reply to Philippe Mathieu-DaudéAspeedMachineState seems crippled. We use incorrectly 2 different structures to do the same thing. Merge them altogether:
- Move AspeedMachine fields to AspeedMachineState
- AspeedMachineState is now QOM
- Remove unused AspeedMachine structure
--- include/hw/arm/aspeed.h | 8 +------- hw/arm/aspeed.c | 11 +++++++---- 2 files changed, 8 insertions(+), 11 deletions(-)
include/hw/arm/aspeed.h +1 -7
@@ -15,13 +15,7 @@ typedef struct AspeedMachineState AspeedMachineState;#define TYPE_ASPEED_MACHINE MACHINE_TYPE_NAME("aspeed")#define ASPEED_MACHINE (obj) \ - OBJECT_CHECK(AspeedMachine, (obj), TYPE_ASPEED_MACHINE) - -typedef struct AspeedMachine { -MachineState parent_obj; - -bool mmio_exec; -}AspeedMachine ; + OBJECT_CHECK(AspeedMachineState, (obj), TYPE_ASPEED_MACHINE)#define ASPEED_MAC0_ON (1 << 0)#define ASPEED_MAC1_ON (1 << 1)
hw/arm/aspeed.c +7 -4
@@ -33,9 +33,14 @@ static struct arm_boot_info aspeed_board_binfo = { };struct AspeedMachineState { +/* Private */ +MachineState parent_obj; +/* Public */ +AspeedSoCState soc;MemoryRegion ram_container;MemoryRegion max_ram; +bool mmio_exec; };/* Palmetto hardware value: 0x120CE416 */
@@ -253,7 +258,7 @@ static void sdhci_attach_drive(SDHCIState *sdhci, DriveInfo *dinfo)static void aspeed_machine_init (MachineState *machine) { -AspeedMachineState *bmc; +AspeedMachineState *bmc =ASPEED_MACHINE (machine);AspeedMachineClass *amc =ASPEED_MACHINE_GET_CLASS (machine);AspeedSoCClass *sc;DriveInfo *drive0 =drive_get (IF_MTD ,0 ,0 );
@@ -261,8 +266,6 @@ static void aspeed_machine_init(MachineState *machine)int i;NICInfo *nd = &nd_table[0 ]; - bmc =g_new0 (AspeedMachineState,1 ); -memory_region_init (&bmc->ram_container,NULL ,"aspeed-ram-container" ,4 * GiB);memory_region_add_subregion (&bmc->ram_container,0 , machine->ram);
@@ -751,7 +754,7 @@ static const TypeInfo aspeed_machine_types[] = { }, { .name = TYPE_ASPEED_MACHINE, .parent = TYPE_MACHINE, - .instance_size = sizeof(AspeedMachine), + .instance_size = sizeof(AspeedMachineState), .instance_init = aspeed_machine_instance_init, .class_size = sizeof(AspeedMachineClass), .class_init = aspeed_machine_class_init,
Signature · 1 line
2.21.3
Re: [PATCH v2 3/3] hw/arm/aspeed: QOM'ify AspeedMachineState
Quoted 8 lines · Philippe Mathieu-Daudé
AspeedMachineState seems crippled. We use incorrectly 2 different structures to do the same thing. Merge them altogether:
- Move AspeedMachine fields to AspeedMachineState
- AspeedMachineState is now QOM
- Remove unused AspeedMachine structureSigned-off-by Philippe Mathieu-Daudé <[email protected]>
Quoted 71 lines
--- include/hw/arm/aspeed.h | 8 +------- hw/arm/aspeed.c | 11 +++++++---- 2 files changed, 8 insertions(+), 11 deletions(-)include/hw/arm/aspeed.h +1
-7@@ -15,13 +15,7 @@ typedef struct AspeedMachineState AspeedMachineState;#define TYPE_ASPEED_MACHINE MACHINE_TYPE_NAME("aspeed")#define ASPEED_MACHINE (obj) \ - OBJECT_CHECK(AspeedMachine, (obj), TYPE_ASPEED_MACHINE) - -typedef struct AspeedMachine { -MachineState parent_obj; - -bool mmio_exec; -}AspeedMachine ; + OBJECT_CHECK(AspeedMachineState, (obj), TYPE_ASPEED_MACHINE)#define ASPEED_MAC0_ON (1 << 0)#define ASPEED_MAC1_ON (1 << 1)hw/arm/aspeed.c +7
-4@@ -33,9 +33,14 @@ static struct arm_boot_info aspeed_board_binfo = { };struct AspeedMachineState { +/* Private */ +MachineState parent_obj; +/* Public */ +AspeedSoCState soc;MemoryRegion ram_container;MemoryRegion max_ram; +bool mmio_exec; };/* Palmetto hardware value: 0x120CE416 */ @@ -253,7 +258,7 @@ static void sdhci_attach_drive(SDHCIState *sdhci, DriveInfo *dinfo)static void aspeed_machine_init (MachineState *machine) { -AspeedMachineState *bmc; +AspeedMachineState *bmc =ASPEED_MACHINE (machine);AspeedMachineClass *amc =ASPEED_MACHINE_GET_CLASS (machine);AspeedSoCClass *sc;DriveInfo *drive0 =drive_get (IF_MTD ,0 ,0 );@@ -261,8 +266,6 @@ static void aspeed_machine_init(MachineState *machine)int i;NICInfo *nd = &nd_table[0 ]; - bmc =g_new0 (AspeedMachineState,1 ); -memory_region_init (&bmc->ram_container,NULL ,"aspeed-ram-container" ,4 * GiB);memory_region_add_subregion (&bmc->ram_container,0 , machine->ram);@@ -751,7 +754,7 @@ static const TypeInfo aspeed_machine_types[] = { }, { .name = TYPE_ASPEED_MACHINE, .parent = TYPE_MACHINE, - .instance_size = sizeof(AspeedMachine), + .instance_size = sizeof(AspeedMachineState), .instance_init = aspeed_machine_instance_init, .class_size = sizeof(AspeedMachineClass), .class_init = aspeed_machine_class_init,
Peter Maydell
AppliedQuoted 7 lines · Philippe Mathieu-Daudé
Yet another cleanup.
Simplify aspeed machine QOM usage.Since v1, addressed Cédric review comments:
- Rename AspeedBoardState -> AspeedMachineState
Applied to target-arm.next, thanks.
-- PMM