[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH for-7.2 v3 09/11] ppc/pnv: change pnv_phb4_get_pec() to also retr
From: |
Daniel Henrique Barboza |
Subject: |
[PATCH for-7.2 v3 09/11] ppc/pnv: change pnv_phb4_get_pec() to also retrieve chip10->pecs |
Date: |
Wed, 10 Aug 2022 07:05:34 -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_phb.c | 17 +++++++++++++++--
1 file changed, 15 insertions(+), 2 deletions(-)
diff --git a/hw/pci-host/pnv_phb.c b/hw/pci-host/pnv_phb.c
index a142b8ff8d..feaef8137f 100644
--- a/hw/pci-host/pnv_phb.c
+++ b/hw/pci-host/pnv_phb.c
@@ -53,17 +53,30 @@ static void pnv_parent_bus_fixup(DeviceState *parent,
DeviceState *child)
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
- Re: [PATCH for-7.2 v3 06/11] ppc/pnv: enable user created pnv-phb for powernv8, (continued)
- [PATCH for-7.2 v3 10/11] ppc/pnv: user creatable pnv-phb for powernv10, Daniel Henrique Barboza, 2022/08/10
- [PATCH for-7.2 v3 04/11] ppc/pnv: add helpers for pnv-phb user devices, Daniel Henrique Barboza, 2022/08/10
- [PATCH for-7.2 v3 08/11] ppc/pnv: enable user created pnv-phb powernv9, Daniel Henrique Barboza, 2022/08/10
- [PATCH for-7.2 v3 05/11] ppc/pnv: turn chip8->phbs[] into a PnvPHB* array, Daniel Henrique Barboza, 2022/08/10
- [PATCH for-7.2 v3 09/11] ppc/pnv: change pnv_phb4_get_pec() to also retrieve chip10->pecs,
Daniel Henrique Barboza <=
- [PATCH for-7.2 v3 07/11] ppc/pnv: add PHB4 helpers for user created pnv-phb, Daniel Henrique Barboza, 2022/08/10
- [PATCH for-7.2 v3 11/11] ppc/pnv: fix QOM parenting of user creatable root ports, Daniel Henrique Barboza, 2022/08/10