[POWERPC] Use 1TB segments

This makes the kernel use 1TB segments for all kernel mappings and for
user addresses of 1TB and above, on machines which support them
(currently POWER5+, POWER6 and PA6T).

We detect that the machine supports 1TB segments by looking at the
ibm,processor-segment-sizes property in the device tree.

We don't currently use 1TB segments for user addresses < 1T, since
that would effectively prevent 32-bit processes from using huge pages
unless we also had a way to revert to using 256MB segments.  That
would be possible but would involve extra complications (such as
keeping track of which segment size was used when HPTEs were inserted)
and is not addressed here.

Parts of this patch were originally written by Ben Herrenschmidt.

Signed-off-by: Paul Mackerras <paulus@samba.org>

1 files changed, 3 insertions, 3 deletions

diff --git a/arch/powerpc/mm/stab.c b/arch/powerpc/mm/stab.c
index 28492bbdee8e..9e85bda76216 100644
--- a/arch/powerpc/mm/stab.c
+++ b/arch/powerpc/mm/stab.c
@@ -122,12 +122,12 @@ static int __ste_allocate(unsigned long ea, struct mm_struct *mm)
 
         /* Kernel or user address? */
         if (is_kernel_addr(ea)) {
-                vsid = get_kernel_vsid(ea);
+                vsid = get_kernel_vsid(ea, MMU_SEGSIZE_256M);
         } else {
                 if ((ea >= TASK_SIZE_USER64) || (! mm))
                         return 1;
 
-                vsid = get_vsid(mm->context.id, ea);
+                vsid = get_vsid(mm->context.id, ea, MMU_SEGSIZE_256M);
         }
 
         stab_entry = make_ste(get_paca()->stab_addr, GET_ESID(ea), vsid);
@@ -261,7 +261,7 @@ void __init stabs_alloc(void)
  */
 void stab_initialize(unsigned long stab)
 {
-        unsigned long vsid = get_kernel_vsid(PAGE_OFFSET);
+        unsigned long vsid = get_kernel_vsid(PAGE_OFFSET, MMU_SEGSIZE_256M);
         unsigned long stabreal;
 
         asm volatile("isync; slbia; isync":::"memory");