[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 24/31] ppc/pnv: move default_phb_realize() to pec_realize()
From: |
Cédric Le Goater |
Subject: |
[PULL 24/31] ppc/pnv: move default_phb_realize() to pec_realize() |
Date: |
Tue, 18 Jan 2022 14:07:23 +0100 |
From: Daniel Henrique Barboza <danielhb413@gmail.com>
Move the current pnv_pec_stk_default_phb_realize() call to
pec_realize(), renaming the function to pnv_pec_default_phb_realize(),
and set the PHB attributes using the PEC object directly.
This will be important to allow for PECs devices to handle PHB4s
directly later on.
Reviewed-by: Cédric Le Goater <clg@kaod.org>
Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com>
Message-Id: <20220114180719.52117-5-danielhb413@gmail.com>
Signed-off-by: Cédric Le Goater <clg@kaod.org>
---
hw/pci-host/pnv_phb4_pec.c | 63 ++++++++++++++++++++------------------
1 file changed, 33 insertions(+), 30 deletions(-)
diff --git a/hw/pci-host/pnv_phb4_pec.c b/hw/pci-host/pnv_phb4_pec.c
index ed1d6441821a..a80a21db771a 100644
--- a/hw/pci-host/pnv_phb4_pec.c
+++ b/hw/pci-host/pnv_phb4_pec.c
@@ -112,6 +112,30 @@ static const MemoryRegionOps pnv_pec_pci_xscom_ops = {
.endianness = DEVICE_BIG_ENDIAN,
};
+static void pnv_pec_default_phb_realize(PnvPhb4PecStack *stack,
+ int stack_no,
+ Error **errp)
+{
+ PnvPhb4PecState *pec = stack->pec;
+ PnvPhb4PecClass *pecc = PNV_PHB4_PEC_GET_CLASS(pec);
+ int phb_id = pnv_phb4_pec_get_phb_id(pec, stack_no);
+
+ stack->phb = PNV_PHB4(qdev_new(TYPE_PNV_PHB4));
+
+ object_property_set_link(OBJECT(stack->phb), "pec", OBJECT(pec),
+ &error_abort);
+ object_property_set_int(OBJECT(stack->phb), "chip-id", pec->chip_id,
+ &error_fatal);
+ object_property_set_int(OBJECT(stack->phb), "index", phb_id,
+ &error_fatal);
+ object_property_set_int(OBJECT(stack->phb), "version", pecc->version,
+ &error_fatal);
+
+ if (!sysbus_realize(SYS_BUS_DEVICE(stack->phb), errp)) {
+ return;
+ }
+}
+
static void pnv_pec_instance_init(Object *obj)
{
PnvPhb4PecState *pec = PNV_PHB4_PEC(obj);
@@ -144,6 +168,15 @@ static void pnv_pec_realize(DeviceState *dev, Error **errp)
object_property_set_int(stk_obj, "stack-no", i, &error_abort);
object_property_set_link(stk_obj, "pec", OBJECT(pec), &error_abort);
+
+ if (defaults_enabled()) {
+ pnv_pec_default_phb_realize(stack, i, errp);
+ }
+
+ /*
+ * qdev gets angry if we don't realize 'stack' here, even
+ * if stk_realize() is now empty.
+ */
if (!qdev_realize(DEVICE(stk_obj), NULL, errp)) {
return;
}
@@ -276,38 +309,8 @@ static const TypeInfo pnv_pec_type_info = {
}
};
-static void pnv_pec_stk_default_phb_realize(PnvPhb4PecStack *stack,
- Error **errp)
-{
- PnvPhb4PecState *pec = stack->pec;
- PnvPhb4PecClass *pecc = PNV_PHB4_PEC_GET_CLASS(pec);
- int phb_id = pnv_phb4_pec_get_phb_id(pec, stack->stack_no);
-
- stack->phb = PNV_PHB4(qdev_new(TYPE_PNV_PHB4));
-
- object_property_set_link(OBJECT(stack->phb), "pec", OBJECT(pec),
- &error_abort);
- object_property_set_int(OBJECT(stack->phb), "chip-id", pec->chip_id,
- &error_fatal);
- object_property_set_int(OBJECT(stack->phb), "index", phb_id,
- &error_fatal);
- object_property_set_int(OBJECT(stack->phb), "version", pecc->version,
- &error_fatal);
-
- if (!sysbus_realize(SYS_BUS_DEVICE(stack->phb), errp)) {
- return;
- }
-}
-
static void pnv_pec_stk_realize(DeviceState *dev, Error **errp)
{
- PnvPhb4PecStack *stack = PNV_PHB4_PEC_STACK(dev);
-
- if (!defaults_enabled()) {
- return;
- }
-
- pnv_pec_stk_default_phb_realize(stack, errp);
}
static Property pnv_pec_stk_properties[] = {
--
2.31.1
- [PULL 19/31] ppc/pnv: move nest_regs_mr to PnvPHB4, (continued)
- [PULL 19/31] ppc/pnv: move nest_regs_mr to PnvPHB4, Cédric Le Goater, 2022/01/18
- [PULL 28/31] ppc/pnv: rename pnv_pec_stk_update_map(), Cédric Le Goater, 2022/01/18
- [PULL 30/31] ppc/pnv: Add a 'rp_model' class attribute for the PHB4 PEC, Cédric Le Goater, 2022/01/18
- [PULL 26/31] ppc/pnv: make PECs create and realize PHB4s, Cédric Le Goater, 2022/01/18
- [PULL 29/31] ppc/pnv: Move root port allocation under pnv_pec_default_phb_realize(), Cédric Le Goater, 2022/01/18
- [PULL 18/31] ppc/pnv: change pnv_pec_stk_update_map() to use PnvPHB4, Cédric Le Goater, 2022/01/18
- [PULL 20/31] ppc/pnv: move phb_regs_mr to PnvPHB4, Cédric Le Goater, 2022/01/18
- [PULL 27/31] ppc/pnv: remove PnvPhb4PecStack object, Cédric Le Goater, 2022/01/18
- [PULL 17/31] ppc/pnv: move nest_regs[] to PnvPHB4, Cédric Le Goater, 2022/01/18
- [PULL 23/31] ppc/pnv: remove stack pointer from PnvPHB4, Cédric Le Goater, 2022/01/18
- [PULL 24/31] ppc/pnv: move default_phb_realize() to pec_realize(),
Cédric Le Goater <=
- [PULL 31/31] ppc/pnv: Remove PHB4 version property, Cédric Le Goater, 2022/01/18
- Re: [PULL 00/31] ppc queue, Peter Maydell, 2022/01/18