| Message ID | 20220113192952.911188-17-danielhb413@gmail.com |
|---|---|
| State | New |
| Headers | show |
| Series | remove PnvPhb4PecStack from Powernv9 | expand |
On 1/13/22 20:29, Daniel Henrique Barboza wrote: > All the complexity that was scattered between PnvPhb4PecStack and > PnvPHB4 are now centered in the PnvPHB4 device. PnvPhb4PecStack does not > serve any purpose in the current code base. > > Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com> Reviewed-by: Cédric Le Goater <clg@kaod.org> Thanks, C. > --- > hw/pci-host/pnv_phb4_pec.c | 34 ---------------------------------- > include/hw/pci-host/pnv_phb4.h | 20 -------------------- > 2 files changed, 54 deletions(-) > > diff --git a/hw/pci-host/pnv_phb4_pec.c b/hw/pci-host/pnv_phb4_pec.c > index 61d7add25a..02e7689372 100644 > --- a/hw/pci-host/pnv_phb4_pec.c > +++ b/hw/pci-host/pnv_phb4_pec.c > @@ -282,43 +282,9 @@ static const TypeInfo pnv_pec_type_info = { > } > }; > > -static void pnv_pec_stk_realize(DeviceState *dev, Error **errp) > -{ > -} > - > -static Property pnv_pec_stk_properties[] = { > - DEFINE_PROP_UINT32("stack-no", PnvPhb4PecStack, stack_no, 0), > - DEFINE_PROP_LINK("pec", PnvPhb4PecStack, pec, TYPE_PNV_PHB4_PEC, > - PnvPhb4PecState *), > - DEFINE_PROP_END_OF_LIST(), > -}; > - > -static void pnv_pec_stk_class_init(ObjectClass *klass, void *data) > -{ > - DeviceClass *dc = DEVICE_CLASS(klass); > - > - device_class_set_props(dc, pnv_pec_stk_properties); > - dc->realize = pnv_pec_stk_realize; > - dc->user_creatable = false; > - > - /* TODO: reset regs ? */ > -} > - > -static const TypeInfo pnv_pec_stk_type_info = { > - .name = TYPE_PNV_PHB4_PEC_STACK, > - .parent = TYPE_DEVICE, > - .instance_size = sizeof(PnvPhb4PecStack), > - .class_init = pnv_pec_stk_class_init, > - .interfaces = (InterfaceInfo[]) { > - { TYPE_PNV_XSCOM_INTERFACE }, > - { } > - } > -}; > - > static void pnv_pec_register_types(void) > { > type_register_static(&pnv_pec_type_info); > - type_register_static(&pnv_pec_stk_type_info); > } > > type_init(pnv_pec_register_types); > diff --git a/include/hw/pci-host/pnv_phb4.h b/include/hw/pci-host/pnv_phb4.h > index 170de2e752..96e8583e48 100644 > --- a/include/hw/pci-host/pnv_phb4.h > +++ b/include/hw/pci-host/pnv_phb4.h > @@ -167,26 +167,6 @@ extern const MemoryRegionOps pnv_phb4_xscom_ops; > #define TYPE_PNV_PHB4_PEC "pnv-phb4-pec" > OBJECT_DECLARE_TYPE(PnvPhb4PecState, PnvPhb4PecClass, PNV_PHB4_PEC) > > -#define TYPE_PNV_PHB4_PEC_STACK "pnv-phb4-pec-stack" > -OBJECT_DECLARE_SIMPLE_TYPE(PnvPhb4PecStack, PNV_PHB4_PEC_STACK) > - > -/* Per-stack data */ > -struct PnvPhb4PecStack { > - DeviceState parent; > - > - /* My own stack number */ > - uint32_t stack_no; > - > - /* The owner PEC */ > - PnvPhb4PecState *pec; > - > - /* > - * PHB4 pointer. pnv_phb4_update_regions() needs to access > - * the PHB4 via a PnvPhb4PecStack pointer. > - */ > - PnvPHB4 *phb; > -}; > - > struct PnvPhb4PecState { > DeviceState parent; > >
diff --git a/hw/pci-host/pnv_phb4_pec.c b/hw/pci-host/pnv_phb4_pec.c index 61d7add25a..02e7689372 100644 --- a/hw/pci-host/pnv_phb4_pec.c +++ b/hw/pci-host/pnv_phb4_pec.c @@ -282,43 +282,9 @@ static const TypeInfo pnv_pec_type_info = { } }; -static void pnv_pec_stk_realize(DeviceState *dev, Error **errp) -{ -} - -static Property pnv_pec_stk_properties[] = { - DEFINE_PROP_UINT32("stack-no", PnvPhb4PecStack, stack_no, 0), - DEFINE_PROP_LINK("pec", PnvPhb4PecStack, pec, TYPE_PNV_PHB4_PEC, - PnvPhb4PecState *), - DEFINE_PROP_END_OF_LIST(), -}; - -static void pnv_pec_stk_class_init(ObjectClass *klass, void *data) -{ - DeviceClass *dc = DEVICE_CLASS(klass); - - device_class_set_props(dc, pnv_pec_stk_properties); - dc->realize = pnv_pec_stk_realize; - dc->user_creatable = false; - - /* TODO: reset regs ? */ -} - -static const TypeInfo pnv_pec_stk_type_info = { - .name = TYPE_PNV_PHB4_PEC_STACK, - .parent = TYPE_DEVICE, - .instance_size = sizeof(PnvPhb4PecStack), - .class_init = pnv_pec_stk_class_init, - .interfaces = (InterfaceInfo[]) { - { TYPE_PNV_XSCOM_INTERFACE }, - { } - } -}; - static void pnv_pec_register_types(void) { type_register_static(&pnv_pec_type_info); - type_register_static(&pnv_pec_stk_type_info); } type_init(pnv_pec_register_types); diff --git a/include/hw/pci-host/pnv_phb4.h b/include/hw/pci-host/pnv_phb4.h index 170de2e752..96e8583e48 100644 --- a/include/hw/pci-host/pnv_phb4.h +++ b/include/hw/pci-host/pnv_phb4.h @@ -167,26 +167,6 @@ extern const MemoryRegionOps pnv_phb4_xscom_ops; #define TYPE_PNV_PHB4_PEC "pnv-phb4-pec" OBJECT_DECLARE_TYPE(PnvPhb4PecState, PnvPhb4PecClass, PNV_PHB4_PEC) -#define TYPE_PNV_PHB4_PEC_STACK "pnv-phb4-pec-stack" -OBJECT_DECLARE_SIMPLE_TYPE(PnvPhb4PecStack, PNV_PHB4_PEC_STACK) - -/* Per-stack data */ -struct PnvPhb4PecStack { - DeviceState parent; - - /* My own stack number */ - uint32_t stack_no; - - /* The owner PEC */ - PnvPhb4PecState *pec; - - /* - * PHB4 pointer. pnv_phb4_update_regions() needs to access - * the PHB4 via a PnvPhb4PecStack pointer. - */ - PnvPHB4 *phb; -}; - struct PnvPhb4PecState { DeviceState parent;
All the complexity that was scattered between PnvPhb4PecStack and PnvPHB4 are now centered in the PnvPHB4 device. PnvPhb4PecStack does not serve any purpose in the current code base. Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com> --- hw/pci-host/pnv_phb4_pec.c | 34 ---------------------------------- include/hw/pci-host/pnv_phb4.h | 20 -------------------- 2 files changed, 54 deletions(-)