Re: [PATCH 04/17] ppc/pnv: move intbar to PnvPHB4

[Cédric Le Goater]

On 1/13/22 20:29, Daniel Henrique Barboza wrote:
> This MemoryRegion can also be moved in a single step.
>
> 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.c         | 18 +++++++++---------
>   include/hw/pci-host/pnv_phb4.h |  2 +-
>   2 files changed, 10 insertions(+), 10 deletions(-)
>
> diff --git a/hw/pci-host/pnv_phb4.c b/hw/pci-host/pnv_phb4.c
> index 00eaf91fca..fbc475f27a 100644
> --- a/hw/pci-host/pnv_phb4.c
> +++ b/hw/pci-host/pnv_phb4.c
> @@ -877,7 +877,7 @@ static void pnv_phb4_update_regions(PnvPhb4PecStack *stack)
>           memory_region_del_subregion(&phb->phbbar, &phb->mr_regs);
>       }
>       if (memory_region_is_mapped(&phb->xsrc.esb_mmio)) {
> -        memory_region_del_subregion(&stack->intbar, &phb->xsrc.esb_mmio);
> +        memory_region_del_subregion(&phb->intbar, &phb->xsrc.esb_mmio);
>       }
>   
>       /* Map registers if enabled */
> @@ -886,8 +886,8 @@ static void pnv_phb4_update_regions(PnvPhb4PecStack *stack)
>       }
>   
>       /* Map ESB if enabled */
> -    if (memory_region_is_mapped(&stack->intbar)) {
> -        memory_region_add_subregion(&stack->intbar, 0, &phb->xsrc.esb_mmio);
> +    if (memory_region_is_mapped(&phb->intbar)) {
> +        memory_region_add_subregion(&phb->intbar, 0, &phb->xsrc.esb_mmio);
>       }
>   
>       /* Check/update m32 */
> @@ -924,9 +924,9 @@ static void pnv_pec_stk_update_map(PnvPhb4PecStack *stack)
>           !(bar_en & PEC_NEST_STK_BAR_EN_PHB)) {
>           memory_region_del_subregion(sysmem, &phb->phbbar);
>       }
> -    if (memory_region_is_mapped(&stack->intbar) &&
> +    if (memory_region_is_mapped(&phb->intbar) &&
>           !(bar_en & PEC_NEST_STK_BAR_EN_INT)) {
> -        memory_region_del_subregion(sysmem, &stack->intbar);
> +        memory_region_del_subregion(sysmem, &phb->intbar);
>       }
>   
>       /* Update PHB */
> @@ -966,14 +966,14 @@ static void pnv_pec_stk_update_map(PnvPhb4PecStack *stack)
>           memory_region_init(&phb->phbbar, OBJECT(phb), name, size);
>           memory_region_add_subregion(sysmem, bar, &phb->phbbar);
>       }
> -    if (!memory_region_is_mapped(&stack->intbar) &&
> +    if (!memory_region_is_mapped(&phb->intbar) &&
>           (bar_en & PEC_NEST_STK_BAR_EN_INT)) {
>           bar = stack->nest_regs[PEC_NEST_STK_INT_BAR] >> 8;
>           size = PNV_PHB4_MAX_INTs << 16;
> -        snprintf(name, sizeof(name), "pec-%d.%d-stack-%d-int",
> +        snprintf(name, sizeof(name), "pec-%d.%d-phb-%d-int",
>                    stack->pec->chip_id, stack->pec->index, stack->stack_no);
> -        memory_region_init(&stack->intbar, OBJECT(stack), name, size);
> -        memory_region_add_subregion(sysmem, bar, &stack->intbar);
> +        memory_region_init(&phb->intbar, OBJECT(phb), name, size);
> +        memory_region_add_subregion(sysmem, bar, &phb->intbar);
>       }
>   
>       /* Update PHB */
> diff --git a/include/hw/pci-host/pnv_phb4.h b/include/hw/pci-host/pnv_phb4.h
> index b11fa80e81..cf5dd4009c 100644
> --- a/include/hw/pci-host/pnv_phb4.h
> +++ b/include/hw/pci-host/pnv_phb4.h
> @@ -114,6 +114,7 @@ struct PnvPHB4 {
>   
>       /* Memory windows from PowerBus to PHB */
>       MemoryRegion phbbar;
> +    MemoryRegion intbar;
>   
>       /* On-chip IODA tables */
>       uint64_t ioda_LIST[PNV_PHB4_MAX_LSIs];
> @@ -169,7 +170,6 @@ struct PnvPhb4PecStack {
>       /* Memory windows from PowerBus to PHB */
>       MemoryRegion mmbar0;
>       MemoryRegion mmbar1;
> -    MemoryRegion intbar;
>       uint64_t mmio0_base;
>       uint64_t mmio0_size;
>       uint64_t mmio1_base;