Re: [PATCH v2 01/14] spapr: nested: move nested part of spapr_get_pate into spapr_nested.c

[Nicholas Piggin]

On Thu Oct 12, 2023 at 8:49 PM AEST, Harsh Prateek Bora wrote:
> Most of the nested code has already been moved to spapr_nested.c
> This logic inside spapr_get_pate is related to nested guests and
> better suited for spapr_nested.c, hence moving there.
>
> Signed-off-by: Harsh Prateek Bora <harshpb@linux.ibm.com>

Reviewed-by: Nicholas Piggin <npiggin@gmail.com>

> ---
>  hw/ppc/spapr.c                | 28 ++--------------------------
>  hw/ppc/spapr_nested.c         | 29 +++++++++++++++++++++++++++++
>  include/hw/ppc/spapr_nested.h |  3 ++-
>  3 files changed, 33 insertions(+), 27 deletions(-)
>
> diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
> index cb840676d3..a2c69d0f4f 100644
> --- a/hw/ppc/spapr.c
> +++ b/hw/ppc/spapr.c
> @@ -1341,7 +1341,6 @@ void spapr_init_all_lpcrs(target_ulong value, 
> target_ulong mask)
>      }
>  }
>  
> -
>  static bool spapr_get_pate(PPCVirtualHypervisor *vhyp, PowerPCCPU *cpu,
>                             target_ulong lpid, ppc_v3_pate_t *entry)
>  {
> @@ -1354,33 +1353,10 @@ static bool spapr_get_pate(PPCVirtualHypervisor 
> *vhyp, PowerPCCPU *cpu,
>          /* Copy PATE1:GR into PATE0:HR */
>          entry->dw0 = spapr->patb_entry & PATE0_HR;
>          entry->dw1 = spapr->patb_entry;
> -
> +        return true;
>      } else {
> -        uint64_t patb, pats;
> -
> -        assert(lpid != 0);
> -
> -        patb = spapr->nested_ptcr & PTCR_PATB;
> -        pats = spapr->nested_ptcr & PTCR_PATS;
> -
> -        /* Check if partition table is properly aligned */
> -        if (patb & MAKE_64BIT_MASK(0, pats + 12)) {
> -            return false;
> -        }
> -
> -        /* Calculate number of entries */
> -        pats = 1ull << (pats + 12 - 4);
> -        if (pats <= lpid) {
> -            return false;
> -        }
> -
> -        /* Grab entry */
> -        patb += 16 * lpid;
> -        entry->dw0 = ldq_phys(CPU(cpu)->as, patb);
> -        entry->dw1 = ldq_phys(CPU(cpu)->as, patb + 8);
> +        return spapr_get_pate_nested(spapr, cpu, lpid, entry);
>      }
> -
> -    return true;
>  }
>  
>  #define HPTE(_table, _i)   (void *)(((uint64_t *)(_table)) + ((_i) * 2))
> diff --git a/hw/ppc/spapr_nested.c b/hw/ppc/spapr_nested.c
> index 121aa96ddc..123e127b08 100644
> --- a/hw/ppc/spapr_nested.c
> +++ b/hw/ppc/spapr_nested.c
> @@ -6,6 +6,35 @@
>  #include "hw/ppc/spapr.h"
>  #include "hw/ppc/spapr_cpu_core.h"
>  #include "hw/ppc/spapr_nested.h"
> +#include "mmu-book3s-v3.h"
> +
> +bool spapr_get_pate_nested(SpaprMachineState *spapr, PowerPCCPU *cpu,
> +                           target_ulong lpid, ppc_v3_pate_t *entry)
> +{
> +    uint64_t patb, pats;
> +
> +    assert(lpid != 0);
> +
> +    patb = spapr->nested_ptcr & PTCR_PATB;
> +    pats = spapr->nested_ptcr & PTCR_PATS;
> +
> +    /* Check if partition table is properly aligned */
> +    if (patb & MAKE_64BIT_MASK(0, pats + 12)) {
> +        return false;
> +    }
> +
> +    /* Calculate number of entries */
> +    pats = 1ull << (pats + 12 - 4);
> +    if (pats <= lpid) {
> +        return false;
> +    }
> +
> +    /* Grab entry */
> +    patb += 16 * lpid;
> +    entry->dw0 = ldq_phys(CPU(cpu)->as, patb);
> +    entry->dw1 = ldq_phys(CPU(cpu)->as, patb + 8);
> +    return true;
> +}
>  
>  #ifdef CONFIG_TCG
>  #define PRTS_MASK      0x1f
> diff --git a/include/hw/ppc/spapr_nested.h b/include/hw/ppc/spapr_nested.h
> index d383486476..e3d15d6d0b 100644
> --- a/include/hw/ppc/spapr_nested.h
> +++ b/include/hw/ppc/spapr_nested.h
> @@ -98,5 +98,6 @@ struct nested_ppc_state {
>  
>  void spapr_register_nested(void);
>  void spapr_exit_nested(PowerPCCPU *cpu, int excp);
> -
> +bool spapr_get_pate_nested(SpaprMachineState *spapr, PowerPCCPU *cpu,
> +                           target_ulong lpid, ppc_v3_pate_t *entry);
>  #endif /* HW_SPAPR_NESTED_H */