Re: [PATCH v4 1/5] ppc/pnv: set phb4 properties in stk_realize()

[Cédric Le Goater]

On 1/11/22 01:55, Daniel Henrique Barboza wrote:
> Moving all phb4 properties setup to stk_realize() keeps this logic in
> a single place instead of having it scattered between stk_realize() and
> pec_realize().
>
> 'phb->index' can be retrieved using stack->stack_no and
> pnv_phb4_pec_get_phb_id(), deprecating the use of 'phb-id' alias that
> was being used for this purpose in pec_realize().
>
> Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com>

Reviewed-by: Cédric Le Goater <clg@kaod.org>

Thanks,

C.

> ---
>   hw/pci-host/pnv_phb4_pec.c | 6 +++---
>   1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/hw/pci-host/pnv_phb4_pec.c b/hw/pci-host/pnv_phb4_pec.c
> index d64310e7db..f8038dff17 100644
> --- a/hw/pci-host/pnv_phb4_pec.c
> +++ b/hw/pci-host/pnv_phb4_pec.c
> @@ -392,10 +392,8 @@ static void pnv_pec_realize(DeviceState *dev, Error **errp)
>       for (i = 0; i < pec->num_stacks; i++) {
>           PnvPhb4PecStack *stack = &pec->stacks[i];
>           Object *stk_obj = OBJECT(stack);
> -        int phb_id = pnv_phb4_pec_get_phb_id(pec, i);
>   
>           object_property_set_int(stk_obj, "stack-no", i, &error_abort);
> -        object_property_set_int(stk_obj, "phb-id", phb_id, &error_abort);
>           object_property_set_link(stk_obj, "pec", OBJECT(pec), &error_abort);
>           if (!qdev_realize(DEVICE(stk_obj), NULL, errp)) {
>               return;
> @@ -534,7 +532,6 @@ static void pnv_pec_stk_instance_init(Object *obj)
>       PnvPhb4PecStack *stack = PNV_PHB4_PEC_STACK(obj);
>   
>       object_initialize_child(obj, "phb", &stack->phb, TYPE_PNV_PHB4);
> -    object_property_add_alias(obj, "phb-id", OBJECT(&stack->phb), "index");
>   }
>   
>   static void pnv_pec_stk_realize(DeviceState *dev, Error **errp)
> @@ -543,6 +540,7 @@ static void pnv_pec_stk_realize(DeviceState *dev, Error 
> **errp)
>       PnvPhb4PecState *pec = stack->pec;
>       PnvPhb4PecClass *pecc = PNV_PHB4_PEC_GET_CLASS(pec);
>       PnvChip *chip = pec->chip;
> +    int phb_id = pnv_phb4_pec_get_phb_id(pec, stack->stack_no);
>       uint32_t pec_nest_base;
>       uint32_t pec_pci_base;
>       char name[64];
> @@ -570,6 +568,8 @@ static void pnv_pec_stk_realize(DeviceState *dev, Error 
> **errp)
>   
>       object_property_set_int(OBJECT(&stack->phb), "chip-id", pec->chip_id,
>                               &error_fatal);
> +    object_property_set_int(OBJECT(&stack->phb), "index", phb_id,
> +                            &error_fatal);
>       object_property_set_int(OBJECT(&stack->phb), "version", pecc->version,
>                               &error_fatal);
>       object_property_set_link(OBJECT(&stack->phb), "stack", OBJECT(stack),