powerpc/mm/radix: Update machine call back to support new HCALL.

This update the machine dep callback such that we can use the same
callback to register process table. The interface is updated such that
we can easily call H_REGISTER_PROC_TBL hcall. The HCALL itself is
introduced in a later patch.

No functionality change introduced by this patch.

Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>

diff --git a/arch/powerpc/include/asm/machdep.h b/arch/powerpc/include/asm/machdep.h
index a9af1bd6a51e003cffb36588ab01715baf6de83a..e62e7d33bda0472a8c8ac4fc24c2b346fbf0af39 100644 (file)
--- a/arch/powerpc/include/asm/machdep.h
+++ b/arch/powerpc/include/asm/machdep.h
@@ -256,7 +256,8 @@ struct machdep_calls {
 #ifdef CONFIG_ARCH_RANDOM
        int (*get_random_seed)(unsigned long *v);
 #endif
-       int (*update_partition_table)(u64);
+       int (*register_process_table)(unsigned long base, unsigned long page_size,
+                                     unsigned long tbl_size);
 };
 
 extern void e500_idle(void);

diff --git a/arch/powerpc/mm/hash_native_64.c b/arch/powerpc/mm/hash_native_64.c
index 70521ef171fc95453a834e8c918e5267ab73b594..cb3b4c98b637cd41d409421e3a97bec478798a97 100644 (file)
--- a/arch/powerpc/mm/hash_native_64.c
+++ b/arch/powerpc/mm/hash_native_64.c
@@ -725,8 +725,14 @@ static void native_flush_hash_range(unsigned long number, int local)
        local_irq_restore(flags);
 }
 
-static int native_update_partition_table(u64 patb1)
+static int native_register_proc_table(unsigned long base, unsigned long page_size,
+                                     unsigned long table_size)
 {
+       unsigned long patb1 = base << 25; /* VSID */
+
+       patb1 |= (page_size << 5);  /* sllp */
+       patb1 |= table_size;
+
        partition_tb->patb1 = cpu_to_be64(patb1);
        return 0;
 }
@@ -743,5 +749,5 @@ void __init hpte_init_native(void)
        ppc_md.hugepage_invalidate   = native_hugepage_invalidate;
 
        if (cpu_has_feature(CPU_FTR_ARCH_300))
-               ppc_md.update_partition_table = native_update_partition_table;
+               ppc_md.register_process_table = native_register_proc_table;
 }

diff --git a/arch/powerpc/mm/pgtable-radix.c b/arch/powerpc/mm/pgtable-radix.c
index 8636bf120985ea62d95db30e8ce423daf3752944..4ea1094c9fc4681afc7765ef0e5fb932d8cae97a 100644 (file)
--- a/arch/powerpc/mm/pgtable-radix.c
+++ b/arch/powerpc/mm/pgtable-radix.c
@@ -21,8 +21,11 @@
 
 #include <trace/events/thp.h>
 
-static int native_update_partition_table(u64 patb1)
+static int native_register_process_table(unsigned long base, unsigned long pg_sz,
+                                        unsigned long table_size)
 {
+       unsigned long patb1 = base | table_size | PATB_GR;
+
        partition_tb->patb1 = cpu_to_be64(patb1);
        return 0;
 }
@@ -168,7 +171,7 @@ redo:
         * of process table here. But our linear mapping also enable us to use
         * physical address here.
         */
-       ppc_md.update_partition_table(__pa(process_tb) | (PRTB_SIZE_SHIFT - 12) | PATB_GR);
+       ppc_md.register_process_table(__pa(process_tb), 0, PRTB_SIZE_SHIFT - 12);
        pr_info("Process table %p and radix root for kernel: %p\n", process_tb, init_mm.pgd);
 }
 
@@ -195,7 +198,7 @@ static void __init radix_init_partition_table(void)
 
 void __init radix_init_native(void)
 {
-       ppc_md.update_partition_table = native_update_partition_table;
+       ppc_md.register_process_table = native_register_process_table;
 }
 
 static int __init get_idx_from_shift(unsigned int shift)