[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 09/16] ppc/pnv: change pnv_phb4_get_pec() to also retrieve chi
From: |
Daniel Henrique Barboza |
Subject: |
[PATCH v2 09/16] ppc/pnv: change pnv_phb4_get_pec() to also retrieve chip10->pecs |
Date: |
Tue, 31 May 2022 18:49:10 -0300 |
The function assumes that we're always dealing with a PNV9_CHIP()
object. This is not the case when the pnv-phb device belongs to a
powernv10 machine.
Change pnv_phb4_get_pec() to be able to work with PNV10_CHIP() if
necessary.
Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com>
---
hw/pci-host/pnv_phb4.c | 17 +++++++++++++++--
1 file changed, 15 insertions(+), 2 deletions(-)
diff --git a/hw/pci-host/pnv_phb4.c b/hw/pci-host/pnv_phb4.c
index a5c8ae494b..e953aabcbe 100644
--- a/hw/pci-host/pnv_phb4.c
+++ b/hw/pci-host/pnv_phb4.c
@@ -1574,17 +1574,30 @@ void pnv_phb4_bus_init(DeviceState *dev, PnvPHB4 *phb)
static PnvPhb4PecState *pnv_phb4_get_pec(PnvChip *chip, PnvPHB4 *phb,
Error **errp)
{
- Pnv9Chip *chip9 = PNV9_CHIP(chip);
+ PnvPHB *phb_base = phb->phb_base;
+ PnvPhb4PecState *pecs = NULL;
int chip_id = phb->chip_id;
int index = phb->phb_id;
int i, j;
+ if (phb_base->version == 4) {
+ Pnv9Chip *chip9 = PNV9_CHIP(chip);
+
+ pecs = chip9->pecs;
+ } else if (phb_base->version == 5) {
+ Pnv10Chip *chip10 = PNV10_CHIP(chip);
+
+ pecs = chip10->pecs;
+ } else {
+ return NULL;
+ }
+
for (i = 0; i < chip->num_pecs; i++) {
/*
* For each PEC, check the amount of phbs it supports
* and see if the given phb4 index matches an index.
*/
- PnvPhb4PecState *pec = &chip9->pecs[i];
+ PnvPhb4PecState *pec = &pecs[i];
for (j = 0; j < pec->num_phbs; j++) {
if (index == pnv_phb4_pec_get_phb_id(pec, j)) {
--
2.36.1
- [PATCH v2 00/16] powernv: introduce pnv-phb base/proxy devices, Daniel Henrique Barboza, 2022/05/31
- [PATCH v2 01/16] ppc/pnv: add PHB3 bus init helper, Daniel Henrique Barboza, 2022/05/31
- [PATCH v2 02/16] ppc/pnv: add pnv_get_phb3_child(), Daniel Henrique Barboza, 2022/05/31
- [PATCH v2 03/16] ppc/pnv: add PnvPHB base/proxy device, Daniel Henrique Barboza, 2022/05/31
- [PATCH v2 04/16] ppc/pnv: change PnvPHB3 to be a PnvPHB backend, Daniel Henrique Barboza, 2022/05/31
- [PATCH v2 05/16] ppc/pnv: user created pnv-phb for powernv8, Daniel Henrique Barboza, 2022/05/31
- [PATCH v2 06/16] ppc/pnv: add PHB4 bus init helper, Daniel Henrique Barboza, 2022/05/31
- [PATCH v2 07/16] ppc/pnv: change PnvPHB4 to be a PnvPHB backend, Daniel Henrique Barboza, 2022/05/31
- [PATCH v2 08/16] ppc/pnv: user created pnv-phb for powernv9, Daniel Henrique Barboza, 2022/05/31
- [PATCH v2 09/16] ppc/pnv: change pnv_phb4_get_pec() to also retrieve chip10->pecs,
Daniel Henrique Barboza <=
- [PATCH v2 10/16] ppc/pnv: user creatable pnv-phb for powernv10, Daniel Henrique Barboza, 2022/05/31
- [PATCH v2 11/16] ppc/pnv: add pnv-phb-root-port device, Daniel Henrique Barboza, 2022/05/31
- [PATCH v2 12/16] ppc/pnv: remove pnv-phb3-root-port, Daniel Henrique Barboza, 2022/05/31
- [PATCH v2 13/16] ppc/pnv: remove pnv-phb4-root-port, Daniel Henrique Barboza, 2022/05/31
- [PATCH v2 14/16] ppc/pnv: remove 'phb_rootport_typename' in pnv_phb_realize(), Daniel Henrique Barboza, 2022/05/31
- [PATCH v2 15/16] ppc/pnv: remove pecc->rp_model, Daniel Henrique Barboza, 2022/05/31
- [PATCH v2 16/16] ppc/pnv: remove PnvPHB4.version, Daniel Henrique Barboza, 2022/05/31