[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 11/17] ppc/pnv: change pnv_phb4_get_pec() to also retrieve chip10
From: |
Daniel Henrique Barboza |
Subject: |
[PATCH 11/17] ppc/pnv: change pnv_phb4_get_pec() to also retrieve chip10->pecs |
Date: |
Sat, 7 May 2022 16:06:18 -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 | 16 ++++++++++++++--
1 file changed, 14 insertions(+), 2 deletions(-)
diff --git a/hw/pci-host/pnv_phb4.c b/hw/pci-host/pnv_phb4.c
index 262251ebcf..f911957f10 100644
--- a/hw/pci-host/pnv_phb4.c
+++ b/hw/pci-host/pnv_phb4.c
@@ -1547,17 +1547,29 @@ void pnv_phb4_instance_init(Object *obj)
static PnvPhb4PecState *pnv_phb4_get_pec(PnvChip *chip, PnvPHB *phb,
Error **errp)
{
- Pnv9Chip *chip9 = PNV9_CHIP(chip);
+ PnvPhb4PecState *pecs = NULL;
int chip_id = phb->chip_id;
int index = phb->phb_id;
int i, j;
+ if (phb->version == PHB_VERSION_4) {
+ Pnv9Chip *chip9 = PNV9_CHIP(chip);
+
+ pecs = chip9->pecs;
+ } else if (phb->version == PHB_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.32.0
- [PATCH 01/17] ppc/pnv: rename PnvPHB3.ioda* to PnvPHB3.ioda2*, (continued)
- [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, 2022/05/07
- [PATCH 11/17] ppc/pnv: change pnv_phb4_get_pec() to also retrieve chip10->pecs,
Daniel Henrique Barboza <=
- [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