Excerpts from Paul Mackerras's message of June 15, 2021 8:59 am: > Microwatt currently doesn't implement hypervisor mode and therefore > doesn't implement the partition table. It does implement the process > table and radix page table walks. > > This adds code to write the base address of the process table to the > PRTBL SPR,
Is there a particular reason you haven't called it PRTCR or similar to match PTCR? > which has been assigned SPR 720 for now, as that is in the > range of SPR numbers assigned for experimental use. PRTBL is only > written when we have neither the FW_FEATURE_LPAR feature nor the > CPU_FTR_HVMODE feature. Seems like reasonable architecture for a non-HV platform. Could it have a comment to say it's not architected, and a microwatt ifdef until that changes? The patch also does avoid touching LPCR or initing amor... Thanks, Nick > > Signed-off-by: Paul Mackerras <pau...@ozlabs.org> > --- > arch/powerpc/include/asm/reg.h | 1 + > arch/powerpc/mm/book3s64/radix_pgtable.c | 13 +++++++++---- > 2 files changed, 10 insertions(+), 4 deletions(-) > > diff --git a/arch/powerpc/include/asm/reg.h b/arch/powerpc/include/asm/reg.h > index da103e92c112..3200a2522d6c 100644 > --- a/arch/powerpc/include/asm/reg.h > +++ b/arch/powerpc/include/asm/reg.h > @@ -729,6 +729,7 @@ > #endif > #define SPRN_TIR 0x1BE /* Thread Identification Register */ > #define SPRN_PTCR 0x1D0 /* Partition table control Register */ > +#define SPRN_PRTBL 0x2D0 /* Process table pointer */ > #define SPRN_PSPB 0x09F /* Problem State Priority Boost reg */ > #define SPRN_PTEHI 0x3D5 /* 981 7450 PTE HI word (S/W TLB load) */ > #define SPRN_PTELO 0x3D6 /* 982 7450 PTE LO word (S/W TLB load) */ > diff --git a/arch/powerpc/mm/book3s64/radix_pgtable.c > b/arch/powerpc/mm/book3s64/radix_pgtable.c > index 98f0b243c1ab..6595859173a7 100644 > --- a/arch/powerpc/mm/book3s64/radix_pgtable.c > +++ b/arch/powerpc/mm/book3s64/radix_pgtable.c > @@ -646,10 +646,15 @@ void __init radix__early_init_mmu(void) > radix_init_pgtable(); > > if (!firmware_has_feature(FW_FEATURE_LPAR)) { > - lpcr = mfspr(SPRN_LPCR); > - mtspr(SPRN_LPCR, lpcr | LPCR_UPRT | LPCR_HR); > - radix_init_partition_table(); > - radix_init_amor(); > + if (cpu_has_feature(CPU_FTR_HVMODE)) { > + lpcr = mfspr(SPRN_LPCR); > + mtspr(SPRN_LPCR, lpcr | LPCR_UPRT | LPCR_HR); > + radix_init_partition_table(); > + radix_init_amor(); > + } else { > + mtspr(SPRN_PRTBL, (__pa(process_tb) | > + (PRTB_SIZE_SHIFT - 12))); > + } > } else { > radix_init_pseries(); > } > -- > 2.31.1 > >