Re: [powerpc v4 1/3] Setup AMOR in HV mode
From: Michael Ellerman <mpe@ellerman.id.au>
Date: 2016-11-15 02:30:47
Balbir Singh [off-list ref] writes:
quoted hunk ↗ jump to hunk
diff --git a/arch/powerpc/mm/pgtable-radix.c b/arch/powerpc/mm/pgtable-radix.c index ed7bddc..7343573 100644 --- a/arch/powerpc/mm/pgtable-radix.c +++ b/arch/powerpc/mm/pgtable-radix.c@@ -320,6 +320,25 @@ static void update_hid_for_radix(void) cpu_relax(); } +/* + * In HV mode, we init AMOR so that the hypervisor + * and guest can setup IMAR, enable key 0 and set + * it to 1 + * AMOR = 1100....00 (Mask for key 0 is 11) + */ +static void __init radix_init_amor(void)
This can't be __init because you call it from the secondary version, which can run after init due to CPU hotplug.
+{
+ unsigned long amor_mask = 0xc000000000000000;
+ unsigned long amor = mfspr(SPRN_AMOR);You don't use the amor value.
+ if (cpu_has_feature(CPU_FTR_POWER9_DD1)) + return;
This needs a comment explaining why we're not doing it on DD1.
+ + amor = amor_mask; + + mtspr(SPRN_AMOR, amor);
Just move the constant directly. cheers