On 8/10/22 12:05, Daniel Henrique Barboza wrote:
> 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 {
May be :
g_assert_not_reached();
> + 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)) {