ppc/pnv: Remove the XICSFabric Interface from the POWER9 machine
PATCH 1/1 ppc/pnv: Remove the XICSFabric Interface from the POWER9 machine
The POWER8 PowerNV machine needs to implement a XICSFabric interface as this is the POWER8 interrupt controller model. But the POWER9 machine uselessly inherits of XICSFabric from the common PowerNV machine definition.
Open code machine definitions to have a better control on the different interfaces each machine should define.
--- hw/ppc/pnv.c | 31 ++++++++++++++----------------- 1 file changed, 14 insertions(+), 17 deletions(-)
hw/ppc/pnv.c +14 -17
@@ -1485,23 +1485,21 @@ static void pnv_machine_class_init(ObjectClass *oc, void *data) .parent = TYPE_PNV9_CHIP, \ } -#define DEFINE_PNV_MACHINE_TYPE (cpu, class_initfn) \ - { \ - .name = MACHINE_TYPE_NAME(cpu), \ - .parent = TYPE_PNV_MACHINE, \ - .instance_size = sizeof(PnvMachineState), \ - .instance_init = pnv_machine_instance_init, \ - .class_init = class_initfn, \ - .interfaces = (InterfaceInfo[]) { \ - { TYPE_XICS_FABRIC }, \ - { TYPE_INTERRUPT_STATS_PROVIDER }, \ - { }, \ - }, \ - } -static const TypeInfo types[] = { -DEFINE_PNV_MACHINE_TYPE ("powernv8" , pnv_machine_power8_class_init), -DEFINE_PNV_MACHINE_TYPE ("powernv9" , pnv_machine_power9_class_init), + { + .name =MACHINE_TYPE_NAME ("powernv9" ), + .parent =TYPE_PNV_MACHINE , + .class_init = pnv_machine_power9_class_init, + }, + { + .name =MACHINE_TYPE_NAME ("powernv8" ), + .parent =TYPE_PNV_MACHINE , + .class_init = pnv_machine_power8_class_init, + .interfaces = (InterfaceInfo []) { + {TYPE_XICS_FABRIC }, + { }, + }, + }, { .name =TYPE_PNV_MACHINE , .parent =TYPE_MACHINE ,
@@ -1510,7 +1508,6 @@ static const TypeInfo types[] = { .instance_init = pnv_machine_instance_init, .class_init = pnv_machine_class_init, .interfaces = (InterfaceInfo []) { - {TYPE_XICS_FABRIC }, {TYPE_INTERRUPT_STATS_PROVIDER }, { }, },
Signature · 1 line
2.21.0
David Gibson
AppliedQuoted 10 lines · Cédric Le Goater
The POWER8 PowerNV machine needs to implement a XICSFabric interface as this is the POWER8 interrupt controller model. But the POWER9 machine uselessly inherits of XICSFabric from the common PowerNV machine definition.
Open code machine definitions to have a better control on the different interfaces each machine should define.
Fixes f30c843ced50 ("ppc/pnv: Introduce PowerNV machines with fixed CPU models")Signed-off-by Cédric Le Goater <[email protected]>
Applied to ppc-for-4.2, thanks.
Quoted 54 lines
--- hw/ppc/pnv.c | 31 ++++++++++++++----------------- 1 file changed, 14 insertions(+), 17 deletions(-)hw/ppc/pnv.c +14
-17@@ -1485,23 +1485,21 @@ static void pnv_machine_class_init(ObjectClass *oc, void *data) .parent = TYPE_PNV9_CHIP, \ } -#define DEFINE_PNV_MACHINE_TYPE (cpu, class_initfn) \ - { \ - .name = MACHINE_TYPE_NAME(cpu), \ - .parent = TYPE_PNV_MACHINE, \ - .instance_size = sizeof(PnvMachineState), \ - .instance_init = pnv_machine_instance_init, \ - .class_init = class_initfn, \ - .interfaces = (InterfaceInfo[]) { \ - { TYPE_XICS_FABRIC }, \ - { TYPE_INTERRUPT_STATS_PROVIDER }, \ - { }, \ - }, \ - } -static const TypeInfo types[] = { -DEFINE_PNV_MACHINE_TYPE ("powernv8" , pnv_machine_power8_class_init), -DEFINE_PNV_MACHINE_TYPE ("powernv9" , pnv_machine_power9_class_init), + { + .name =MACHINE_TYPE_NAME ("powernv9" ), + .parent =TYPE_PNV_MACHINE , + .class_init = pnv_machine_power9_class_init, + }, + { + .name =MACHINE_TYPE_NAME ("powernv8" ), + .parent =TYPE_PNV_MACHINE , + .class_init = pnv_machine_power8_class_init, + .interfaces = (InterfaceInfo []) { + {TYPE_XICS_FABRIC }, + { }, + }, + }, { .name =TYPE_PNV_MACHINE , .parent =TYPE_MACHINE ,@@ -1510,7 +1508,6 @@ static const TypeInfo types[] = { .instance_init = pnv_machine_instance_init, .class_init = pnv_machine_class_init, .interfaces = (InterfaceInfo []) { - {TYPE_XICS_FABRIC }, {TYPE_INTERRUPT_STATS_PROVIDER }, { }, },
Signature · 4 lines
David Gibson | I'll have my music baroque, and my code david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_ | _way_ _around_! http://www.ozlabs.org/~dgibson