ppc/pnv: change pnv_phb4_get_pec() to also retrieve chip10->pecs
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> Reviewed-by: Cédric Le Goater <clg@kaod.org> Reviewed-by: Frederic Barrat <fbarrat@linux.ibm.com> Message-Id: <20220811163950.578927-10-danielhb413@gmail.com>
This commit is contained in:
parent
d786be3fe7
commit
607e9316d3
17
hw/ppc/pnv.c
17
hw/ppc/pnv.c
|
@ -284,17 +284,30 @@ static void pnv_dt_icp(PnvChip *chip, void *fdt, uint32_t pir,
|
||||||
static PnvPhb4PecState *pnv_phb4_get_pec(PnvChip *chip, PnvPHB4 *phb,
|
static PnvPhb4PecState *pnv_phb4_get_pec(PnvChip *chip, PnvPHB4 *phb,
|
||||||
Error **errp)
|
Error **errp)
|
||||||
{
|
{
|
||||||
Pnv9Chip *chip9 = PNV9_CHIP(chip);
|
PnvPHB *phb_base = phb->phb_base;
|
||||||
|
PnvPhb4PecState *pecs = NULL;
|
||||||
int chip_id = phb->chip_id;
|
int chip_id = phb->chip_id;
|
||||||
int index = phb->phb_id;
|
int index = phb->phb_id;
|
||||||
int i, j;
|
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 {
|
||||||
|
g_assert_not_reached();
|
||||||
|
}
|
||||||
|
|
||||||
for (i = 0; i < chip->num_pecs; i++) {
|
for (i = 0; i < chip->num_pecs; i++) {
|
||||||
/*
|
/*
|
||||||
* For each PEC, check the amount of phbs it supports
|
* For each PEC, check the amount of phbs it supports
|
||||||
* and see if the given phb4 index matches an index.
|
* 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++) {
|
for (j = 0; j < pec->num_phbs; j++) {
|
||||||
if (index == pnv_phb4_pec_get_phb_id(pec, j)) {
|
if (index == pnv_phb4_pec_get_phb_id(pec, j)) {
|
||||||
|
|
Loading…
Reference in New Issue