| Message ID | 20220811163950.578927-7-danielhb413@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | enable pnv-phb user created devices | expand |
On 11/08/2022 18:39, Daniel Henrique Barboza wrote: > The bulk of the work was already done by previous patches. > > Use defaults_enabled() to determine whether we need to create the > default devices or not. > > Reviewed-by: Cédric Le Goater <clg@kaod.org> > Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com> > --- The QOM relationship for user-created root port is not ideal, but it's addressed in the last patch of the series. Reviewed-by: Frederic Barrat <fbarrat@linux.ibm.com> Fred > hw/pci-host/pnv_phb.c | 9 +++++++-- > hw/ppc/pnv.c | 32 ++++++++++++++++++-------------- > 2 files changed, 25 insertions(+), 16 deletions(-) > > diff --git a/hw/pci-host/pnv_phb.c b/hw/pci-host/pnv_phb.c > index 5dc44f45d1..1f53ff77c5 100644 > --- a/hw/pci-host/pnv_phb.c > +++ b/hw/pci-host/pnv_phb.c > @@ -17,6 +17,7 @@ > #include "hw/ppc/pnv.h" > #include "hw/qdev-properties.h" > #include "qom/object.h" > +#include "sysemu/sysemu.h" > > > /* > @@ -166,6 +167,10 @@ static void pnv_phb_realize(DeviceState *dev, Error **errp) > pnv_phb4_bus_init(dev, PNV_PHB4(phb->backend)); > } > > + if (phb->version == 3 && !defaults_enabled()) { > + return; > + } > + > pnv_phb_attach_root_port(pci); > } > > @@ -201,7 +206,7 @@ static void pnv_phb_class_init(ObjectClass *klass, void *data) > dc->realize = pnv_phb_realize; > device_class_set_props(dc, pnv_phb_properties); > set_bit(DEVICE_CATEGORY_BRIDGE, dc->categories); > - dc->user_creatable = false; > + dc->user_creatable = true; > } > > static void pnv_phb_root_port_reset(DeviceState *dev) > @@ -292,7 +297,7 @@ static void pnv_phb_root_port_class_init(ObjectClass *klass, void *data) > device_class_set_parent_reset(dc, pnv_phb_root_port_reset, > &rpc->parent_reset); > dc->reset = &pnv_phb_root_port_reset; > - dc->user_creatable = false; > + dc->user_creatable = true; > > k->vendor_id = PCI_VENDOR_ID_IBM; > /* device_id will be written during realize() */ > diff --git a/hw/ppc/pnv.c b/hw/ppc/pnv.c > index e53e9e297d..e82d6522f0 100644 > --- a/hw/ppc/pnv.c > +++ b/hw/ppc/pnv.c > @@ -1178,20 +1178,22 @@ static void pnv_chip_power8_instance_init(Object *obj) > > object_initialize_child(obj, "homer", &chip8->homer, TYPE_PNV8_HOMER); > > - chip8->num_phbs = pcc->num_phbs; > - > - for (i = 0; i < chip8->num_phbs; i++) { > - Object *phb = object_new(TYPE_PNV_PHB); > - > - /* > - * We need the chip to parent the PHB to allow the DT > - * to build correctly (via pnv_xscom_dt()). > - * > - * TODO: the PHB should be parented by a PEC device that, at > - * this moment, is not modelled powernv8/phb3. > - */ > - object_property_add_child(obj, "phb[*]", phb); > - chip8->phbs[i] = PNV_PHB(phb); > + if (defaults_enabled()) { > + chip8->num_phbs = pcc->num_phbs; > + > + for (i = 0; i < chip8->num_phbs; i++) { > + Object *phb = object_new(TYPE_PNV_PHB); > + > + /* > + * We need the chip to parent the PHB to allow the DT > + * to build correctly (via pnv_xscom_dt()). > + * > + * TODO: the PHB should be parented by a PEC device that, at > + * this moment, is not modelled powernv8/phb3. > + */ > + object_property_add_child(obj, "phb[*]", phb); > + chip8->phbs[i] = PNV_PHB(phb); > + } > } > > } > @@ -2130,6 +2132,8 @@ static void pnv_machine_power8_class_init(ObjectClass *oc, void *data) > > pmc->compat = compat; > pmc->compat_size = sizeof(compat); > + > + machine_class_allow_dynamic_sysbus_dev(mc, TYPE_PNV_PHB); > } > > static void pnv_machine_power9_class_init(ObjectClass *oc, void *data)
diff --git a/hw/pci-host/pnv_phb.c b/hw/pci-host/pnv_phb.c index 5dc44f45d1..1f53ff77c5 100644 --- a/hw/pci-host/pnv_phb.c +++ b/hw/pci-host/pnv_phb.c @@ -17,6 +17,7 @@ #include "hw/ppc/pnv.h" #include "hw/qdev-properties.h" #include "qom/object.h" +#include "sysemu/sysemu.h" /* @@ -166,6 +167,10 @@ static void pnv_phb_realize(DeviceState *dev, Error **errp) pnv_phb4_bus_init(dev, PNV_PHB4(phb->backend)); } + if (phb->version == 3 && !defaults_enabled()) { + return; + } + pnv_phb_attach_root_port(pci); } @@ -201,7 +206,7 @@ static void pnv_phb_class_init(ObjectClass *klass, void *data) dc->realize = pnv_phb_realize; device_class_set_props(dc, pnv_phb_properties); set_bit(DEVICE_CATEGORY_BRIDGE, dc->categories); - dc->user_creatable = false; + dc->user_creatable = true; } static void pnv_phb_root_port_reset(DeviceState *dev) @@ -292,7 +297,7 @@ static void pnv_phb_root_port_class_init(ObjectClass *klass, void *data) device_class_set_parent_reset(dc, pnv_phb_root_port_reset, &rpc->parent_reset); dc->reset = &pnv_phb_root_port_reset; - dc->user_creatable = false; + dc->user_creatable = true; k->vendor_id = PCI_VENDOR_ID_IBM; /* device_id will be written during realize() */ diff --git a/hw/ppc/pnv.c b/hw/ppc/pnv.c index e53e9e297d..e82d6522f0 100644 --- a/hw/ppc/pnv.c +++ b/hw/ppc/pnv.c @@ -1178,20 +1178,22 @@ static void pnv_chip_power8_instance_init(Object *obj) object_initialize_child(obj, "homer", &chip8->homer, TYPE_PNV8_HOMER); - chip8->num_phbs = pcc->num_phbs; - - for (i = 0; i < chip8->num_phbs; i++) { - Object *phb = object_new(TYPE_PNV_PHB); - - /* - * We need the chip to parent the PHB to allow the DT - * to build correctly (via pnv_xscom_dt()). - * - * TODO: the PHB should be parented by a PEC device that, at - * this moment, is not modelled powernv8/phb3. - */ - object_property_add_child(obj, "phb[*]", phb); - chip8->phbs[i] = PNV_PHB(phb); + if (defaults_enabled()) { + chip8->num_phbs = pcc->num_phbs; + + for (i = 0; i < chip8->num_phbs; i++) { + Object *phb = object_new(TYPE_PNV_PHB); + + /* + * We need the chip to parent the PHB to allow the DT + * to build correctly (via pnv_xscom_dt()). + * + * TODO: the PHB should be parented by a PEC device that, at + * this moment, is not modelled powernv8/phb3. + */ + object_property_add_child(obj, "phb[*]", phb); + chip8->phbs[i] = PNV_PHB(phb); + } } } @@ -2130,6 +2132,8 @@ static void pnv_machine_power8_class_init(ObjectClass *oc, void *data) pmc->compat = compat; pmc->compat_size = sizeof(compat); + + machine_class_allow_dynamic_sysbus_dev(mc, TYPE_PNV_PHB); } static void pnv_machine_power9_class_init(ObjectClass *oc, void *data)