powerpc/64: Enable use of radix MMU under hypervisor on POWER9

To use radix as a guest, we first need to tell the hypervisor via
the ibm,client-architecture call first that we support POWER9 and
architecture v3.00, and that we can do either radix or hash and
that we would like to choose later using an hcall (the
H_REGISTER_PROC_TBL hcall).

Then we need to check whether the hypervisor agreed to us using
radix.  We need to do this very early on in the kernel boot process
before any of the MMU initialization is done.  If the hypervisor
doesn't agree, we can't use radix and therefore clear the radix
MMU feature bit.

Later, when we have set up our process table, which points to the
radix tree for each process, we need to install that using the
H_REGISTER_PROC_TBL hcall.

Signed-off-by: Paul Mackerras <paulus@ozlabs.org>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>

1 files changed, 17 insertions, 1 deletions

diff --git a/arch/powerpc/kernel/prom_init.c b/arch/powerpc/kernel/prom_init.c
index ec47a939cbdd..358d43f8f84f 100644
--- a/arch/powerpc/kernel/prom_init.c
+++ b/arch/powerpc/kernel/prom_init.c
@@ -649,6 +649,7 @@ static void __init early_cmdline_parse(void)
 struct option_vector1 {
         u8 byte1;
         u8 arch_versions;
+        u8 arch_versions3;
 } __packed;
 
 struct option_vector2 {
@@ -691,6 +692,9 @@ struct option_vector5 {
         u8 reserved2;
         __be16 reserved3;
         u8 subprocessors;
+        u8 byte22;
+        u8 intarch;
+        u8 mmu;
 } __packed;
 
 struct option_vector6 {
@@ -700,7 +704,7 @@ struct option_vector6 {
 } __packed;
 
 struct ibm_arch_vec {
-        struct { u32 mask, val; } pvrs[10];
+        struct { u32 mask, val; } pvrs[12];
 
         u8 num_vectors;
 
@@ -750,6 +754,14 @@ struct ibm_arch_vec __cacheline_aligned ibm_architecture_vec = {
                         .val  = cpu_to_be32(0x004d0000),
                 },
                 {
+                        .mask = cpu_to_be32(0xffff0000), /* POWER9 */
+                        .val  = cpu_to_be32(0x004e0000),
+                },
+                {
+                        .mask = cpu_to_be32(0xffffffff), /* all 3.00-compliant */
+                        .val  = cpu_to_be32(0x0f000005),
+                },
+                {
                         .mask = cpu_to_be32(0xffffffff), /* all 2.07-compliant */
                         .val  = cpu_to_be32(0x0f000004),
                 },
@@ -774,6 +786,7 @@ struct ibm_arch_vec __cacheline_aligned ibm_architecture_vec = {
                 .byte1 = 0,
                 .arch_versions = OV1_PPC_2_00 | OV1_PPC_2_01 | OV1_PPC_2_02 | OV1_PPC_2_03 |
                                  OV1_PPC_2_04 | OV1_PPC_2_05 | OV1_PPC_2_06 | OV1_PPC_2_07,
+                .arch_versions3 = OV1_PPC_3_00,
         },
 
         .vec2_len = VECTOR_LENGTH(sizeof(struct option_vector2)),
@@ -836,6 +849,9 @@ struct ibm_arch_vec __cacheline_aligned ibm_architecture_vec = {
                 .reserved2 = 0,
                 .reserved3 = 0,
                 .subprocessors = 1,
+                .intarch = 0,
+                .mmu = OV5_FEAT(OV5_MMU_RADIX_300) | OV5_FEAT(OV5_MMU_HASH_300) |
+                        OV5_FEAT(OV5_MMU_PROC_TBL) | OV5_FEAT(OV5_MMU_GTSE),
         },
 
         /* option vector 6: IBM PAPR hints */