[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 10/17] ppc/pnv: use PnvPHB.version
From: |
Daniel Henrique Barboza |
Subject: |
[PATCH 10/17] ppc/pnv: use PnvPHB.version |
Date: |
Sat, 7 May 2022 16:06:17 -0300 |
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 --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;
--
2.32.0
- [PATCH 00/17] powernv: introduce pnv-phb unified devices, Daniel Henrique Barboza, 2022/05/07
- [PATCH 01/17] ppc/pnv: rename PnvPHB3.ioda* to PnvPHB3.ioda2*, Daniel Henrique Barboza, 2022/05/07
- [PATCH 02/17] ppc/pnv: rename PnvPHB3.regs[] to PnvPHB3.regs3[], Daniel Henrique Barboza, 2022/05/07
- [PATCH 03/17] ppc/pnv: rename PnvPHB3.dma_spaces to PnvPHB3.v3_dma_spaces, Daniel Henrique Barboza, 2022/05/07
- [PATCH 04/17] ppc/pnv: add unified pnv-phb header, Daniel Henrique Barboza, 2022/05/07
- [PATCH 05/17] ppc/pnv: add pnv-phb device, Daniel Henrique Barboza, 2022/05/07
- [PATCH 06/17] ppc/pnv: remove PnvPHB3, Daniel Henrique Barboza, 2022/05/07
- [PATCH 07/17] ppc/pnv: user created pnv-phb for powernv8, Daniel Henrique Barboza, 2022/05/07
- [PATCH 08/17] ppc/pnv: remove PnvPHB4, Daniel Henrique Barboza, 2022/05/07
- [PATCH 09/17] ppc/pnv: user creatable pnv-phb for powernv9, Daniel Henrique Barboza, 2022/05/07
- [PATCH 10/17] ppc/pnv: use PnvPHB.version,
Daniel Henrique Barboza <=
- [PATCH 11/17] ppc/pnv: change pnv_phb4_get_pec() to also retrieve chip10->pecs, Daniel Henrique Barboza, 2022/05/07
- [PATCH 14/17] ppc/pnv: add pnv-phb-root-port device, Daniel Henrique Barboza, 2022/05/07
- [PATCH 12/17] ppc/pnv: user creatable pnv-phb for powernv10, Daniel Henrique Barboza, 2022/05/07
- [PATCH 16/17] ppc/pnv: remove pnv-phb4-root-port, Daniel Henrique Barboza, 2022/05/07
- [PATCH 13/17] ppc/pnv: add pnv_phb_get_current_machine(), Daniel Henrique Barboza, 2022/05/07
- [PATCH 15/17] ppc/pnv: remove pnv-phb3-root-port, Daniel Henrique Barboza, 2022/05/07
- [PATCH 17/17] ppc/pnv: remove pecc->rp_model, Daniel Henrique Barboza, 2022/05/07
- Re: [PATCH 00/17] powernv: introduce pnv-phb unified devices, Mark Cave-Ayland, 2022/05/09