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

kvaneesh · mpe · commit 83209bc86129 · 2016-07-17T16:42:54.000+10:00
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 &lt;aneesh.kumar@linux.vnet.ibm.com&gt;
Signed-off-by: Michael Ellerman &lt;mpe@ellerman.id.au&gt;
diff --git 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
@@ -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
@@ -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 @@ static void __init radix_init_pgtable(void)
 	 * 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)

Original file line number	Diff line number	Diff line change
`@@ -725,8 +725,14 @@ static void native_flush_hash_range(unsigned long number, int local)`
`725`	`725`	`local_irq_restore(flags);`
`726`	`726`	`}`
`727`	`727`
`728`		`-static int native_update_partition_table(u64 patb1)`
	`728`	`+static int native_register_proc_table(unsigned long base, unsigned long page_size,`
	`729`	`+ unsigned long table_size)`
`729`	`730`	`{`
	`731`	`+ unsigned long patb1 = base << 25; /* VSID */`
	`732`	`+`
	`733`	`+ patb1 \|= (page_size << 5); /* sllp */`
	`734`	`+ patb1 \|= table_size;`
	`735`	`+`
`730`	`736`	`partition_tb->patb1 = cpu_to_be64(patb1);`
`731`	`737`	`return 0;`
`732`	`738`	`}`
`@@ -743,5 +749,5 @@ void __init hpte_init_native(void)`
`743`	`749`	`ppc_md.hugepage_invalidate = native_hugepage_invalidate;`
`744`	`750`
`745`	`751`	`if (cpu_has_feature(CPU_FTR_ARCH_300))`
`746`		`- ppc_md.update_partition_table = native_update_partition_table;`
	`752`	`+ ppc_md.register_process_table = native_register_proc_table;`
`747`	`753`	`}`
Original file line number	Diff line number	Diff line change
`@@ -21,8 +21,11 @@`
`21`	`21`
`22`	`22`	`#include <trace/events/thp.h>`
`23`	`23`
`24`		`-static int native_update_partition_table(u64 patb1)`
	`24`	`+static int native_register_process_table(unsigned long base, unsigned long pg_sz,`
	`25`	`+ unsigned long table_size)`
`25`	`26`	`{`
	`27`	`+ unsigned long patb1 = base \| table_size \| PATB_GR;`
	`28`	`+`
`26`	`29`	`partition_tb->patb1 = cpu_to_be64(patb1);`
`27`	`30`	`return 0;`
`28`	`31`	`}`
`@@ -168,7 +171,7 @@ static void __init radix_init_pgtable(void)`
`168`	`171`	`* of process table here. But our linear mapping also enable us to use`
`169`	`172`	`* physical address here.`
`170`	`173`	`*/`
`171`		`- ppc_md.update_partition_table(__pa(process_tb) \| (PRTB_SIZE_SHIFT - 12) \| PATB_GR);`
	`174`	`+ ppc_md.register_process_table(__pa(process_tb), 0, PRTB_SIZE_SHIFT - 12);`
`172`	`175`	`pr_info("Process table %p and radix root for kernel: %p\n", process_tb, init_mm.pgd);`
`173`	`176`	`}`
`174`	`177`
`@@ -195,7 +198,7 @@ static void __init radix_init_partition_table(void)`
`195`	`198`
`196`	`199`	`void __init radix_init_native(void)`
`197`	`200`	`{`
`198`		`- ppc_md.update_partition_table = native_update_partition_table;`
	`201`	`+ ppc_md.register_process_table = native_register_process_table;`
`199`	`202`	`}`
`200`	`203`
`201`	`204`	`static int __init get_idx_from_shift(unsigned int shift)`