diff mbox series

[10/17] ppc/pnv: use PnvPHB.version

Message ID 20220507190624.507419-11-danielhb413@gmail.com
State New
Headers show
Series powernv: introduce pnv-phb unified devices | expand

Commit Message

Daniel Henrique Barboza May 7, 2022, 7:06 p.m. UTC 
The 'version' attribute of the PnvPHB was never used. Instead of
removing it, let's make use of it by setting the PHB version the PnvPHB
device is currently running.

This distinction will be used next patch.

Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com>
---
 hw/pci-host/pnv_phb.c         | 11 +++++++++++
 include/hw/pci-host/pnv_phb.h |  7 +++++--
 2 files changed, 16 insertions(+), 2 deletions(-)
diff mbox series

Patch

diff --git a/hw/pci-host/pnv_phb.c b/hw/pci-host/pnv_phb.c
index 9583c703d4..cef6a57d50 100644
--- a/hw/pci-host/pnv_phb.c
+++ b/hw/pci-host/pnv_phb.c
@@ -63,6 +63,7 @@  static void pnv_phb_instance_init(Object *obj)
 
 static void pnv_phb_realize(DeviceState *dev, Error **errp)
 {
+    PnvPHB *phb = PNV_PHB(dev);
     g_autofree char *chip_typename = pnv_phb_get_chip_typename();
 
     g_assert(chip_typename != NULL);
@@ -71,10 +72,20 @@  static void pnv_phb_realize(DeviceState *dev, Error **errp)
         !strcmp(chip_typename, TYPE_PNV_CHIP_POWER8E) ||
         !strcmp(chip_typename, TYPE_PNV_CHIP_POWER8NVL)) {
         /* PnvPHB3 */
+        phb->version = PHB_VERSION_3;
         pnv_phb3_realize(dev, errp);
         return;
     }
 
+    if (!strcmp(chip_typename, TYPE_PNV_CHIP_POWER9)) {
+        phb->version = PHB_VERSION_4;
+    } else if (!strcmp(chip_typename, TYPE_PNV_CHIP_POWER10)) {
+        phb->version = PHB_VERSION_5;
+    } else {
+        error_setg(errp, "unknown PNV chip: %s", chip_typename);
+        return;
+    }
+
     pnv_phb4_realize(dev, errp);
 }
 
diff --git a/include/hw/pci-host/pnv_phb.h b/include/hw/pci-host/pnv_phb.h
index 46158e124f..cceb37d03c 100644
--- a/include/hw/pci-host/pnv_phb.h
+++ b/include/hw/pci-host/pnv_phb.h
@@ -103,9 +103,14 @@  typedef struct PnvPhb4PecState PnvPhb4PecState;
 #define TYPE_PNV_PHB "pnv-phb"
 OBJECT_DECLARE_SIMPLE_TYPE(PnvPHB, PNV_PHB)
 
+#define PHB_VERSION_3    3
+#define PHB_VERSION_4    4
+#define PHB_VERSION_5    5
+
 struct PnvPHB {
     PCIExpressHost parent_obj;
 
+    uint64_t version;
     uint32_t chip_id;
     uint32_t phb_id;
     char bus_path[8];
@@ -142,8 +147,6 @@  struct PnvPHB {
     /*
      * PnvPHB4 attributes
      */
-    uint64_t version;
-
     /* The owner PEC */
     PnvPhb4PecState *pec;