[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 16/19] ppc/pnv: Reparent user created PHB3 devices to the PnvC
From: |
Cédric Le Goater |
Subject: |
[PATCH v2 16/19] ppc/pnv: Reparent user created PHB3 devices to the PnvChip |
Date: |
Mon, 13 Dec 2021 14:28:27 +0100 |
The powernv machine uses the object hierarchy to populate the device
tree and each device should be parented to the chip it belongs to.
This is not the case for user created devices which are parented to
the container "/unattached".
Make sure a PHB3 device is parented to its chip by reparenting the
object if necessary.
Reviewed-by: Daniel Henrique Barboza <danielhb413@gmail.com>
Reviewed-by: Frederic Barrat <fbarrat@linux.ibm.com>
Signed-off-by: Cédric Le Goater <clg@kaod.org>
---
include/hw/ppc/pnv.h | 1 +
hw/pci-host/pnv_phb3.c | 6 ++++++
hw/ppc/pnv.c | 17 +++++++++++++++++
3 files changed, 24 insertions(+)
diff --git a/include/hw/ppc/pnv.h b/include/hw/ppc/pnv.h
index 9b06a9e9948d..ca27bd39f0ac 100644
--- a/include/hw/ppc/pnv.h
+++ b/include/hw/ppc/pnv.h
@@ -177,6 +177,7 @@ DECLARE_INSTANCE_CHECKER(PnvChip, PNV_CHIP_POWER10,
TYPE_PNV_CHIP_POWER10)
PowerPCCPU *pnv_chip_find_cpu(PnvChip *chip, uint32_t pir);
+void pnv_chip_parent_fixup(PnvChip *chip, Object *obj, int index);
#define TYPE_PNV_MACHINE MACHINE_TYPE_NAME("powernv")
typedef struct PnvMachineClass PnvMachineClass;
diff --git a/hw/pci-host/pnv_phb3.c b/hw/pci-host/pnv_phb3.c
index 4a022de7c1dc..62a184c9ddc9 100644
--- a/hw/pci-host/pnv_phb3.c
+++ b/hw/pci-host/pnv_phb3.c
@@ -1000,6 +1000,12 @@ static void pnv_phb3_realize(DeviceState *dev, Error
**errp)
error_setg(errp, "invalid chip id: %d", phb->chip_id);
return;
}
+
+ /*
+ * Reparent user created devices to the chip to build
+ * correctly the device tree.
+ */
+ pnv_chip_parent_fixup(phb->chip, OBJECT(phb), phb->phb_id);
}
if (phb->phb_id >= PNV_CHIP_GET_CLASS(phb->chip)->num_phbs) {
diff --git a/hw/ppc/pnv.c b/hw/ppc/pnv.c
index d134eca0ee9d..ac048a0a5d24 100644
--- a/hw/ppc/pnv.c
+++ b/hw/ppc/pnv.c
@@ -1806,6 +1806,23 @@ static ICSState *pnv_ics_get(XICSFabric *xi, int irq)
return NULL;
}
+void pnv_chip_parent_fixup(PnvChip *chip, Object *obj, int index)
+{
+ Object *parent = OBJECT(chip);
+ g_autofree char *default_id =
+ g_strdup_printf("%s[%d]", object_get_typename(obj), index);
+
+ if (obj->parent == parent) {
+ return;
+ }
+
+ object_ref(obj);
+ object_unparent(obj);
+ object_property_add_child(
+ parent, DEVICE(obj)->id ? DEVICE(obj)->id : default_id, obj);
+ object_unref(obj);
+}
+
PnvChip *pnv_get_chip(PnvMachineState *pnv, uint32_t chip_id)
{
int i;
--
2.31.1
- [PATCH v2 10/19] ppc/pnv: Introduce a num_stack class attribute, (continued)
- [PATCH v2 10/19] ppc/pnv: Introduce a num_stack class attribute, Cédric Le Goater, 2021/12/13
- [PATCH v2 11/19] ppc/pnv: Compute the PHB index from the PHB4 PEC model, Cédric Le Goater, 2021/12/13
- [PATCH v2 05/19] ppc/pnv: Move mapping of the PHB3 CQ regions under pnv_pbcq_realize(), Cédric Le Goater, 2021/12/13
- [PATCH v2 03/19] ppc/pnv: Use the chip class to check the index of PHB3 devices, Cédric Le Goater, 2021/12/13
- [PATCH v2 14/19] ppc/pnv: Use QOM hierarchy to scan PEC PHB4 devices, Cédric Le Goater, 2021/12/13
- [PATCH v2 01/19] ppc/pnv: Change the maximum of PHB3 devices for Power8NVL, Cédric Le Goater, 2021/12/13
- [PATCH v2 15/19] ppc/pnv: Introduce support for user created PHB3 devices, Cédric Le Goater, 2021/12/13
- [PATCH v2 16/19] ppc/pnv: Reparent user created PHB3 devices to the PnvChip,
Cédric Le Goater <=
- [PATCH v2 13/19] ppc/pnv: Move realize of PEC stacks under the PEC model, Cédric Le Goater, 2021/12/13
- [PATCH v2 18/19] ppc/pnv: Introduce support for user created PHB4 devices, Cédric Le Goater, 2021/12/13
- [PATCH v2 04/19] ppc/pnv: Drop the "num-phbs" property, Cédric Le Goater, 2021/12/13
- [PATCH v2 17/19] ppc/pnv: Complete user created PHB3 devices, Cédric Le Goater, 2021/12/13
- [PATCH v2 19/19] ppc/pnv: Move num_phbs under Pnv8Chip, Cédric Le Goater, 2021/12/13
- [PATCH v2 07/19] ppc/pnv: Introduce a num_pecs class attribute for PHB4 PEC devices, Cédric Le Goater, 2021/12/13
- [PATCH v2 09/19] ppc/pnv: Introduce a "chip" property under the PHB4 model, Cédric Le Goater, 2021/12/13
- Re: [PATCH v2 00/19] ppc/pnv: Add support for user created PHB3/PHB4 devices, Cédric Le Goater, 2021/12/15