Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c2b4d8b7 authored by Aneesh Kumar K.V's avatar Aneesh Kumar K.V Committed by Michael Ellerman
Browse files

powerpc/mm/hash64: Increase the VA range 



This patch increases the max virtual (effective) address value to 4PB.
With 4K page size config we continue to limit ourself to 64TB.

Signed-off-by: default avatarAneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
[mpe: Keep the H_PGTABLE_RANGE test, update it to work]
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent f384796c

arch/powerpc/include/asm/book3s/64/hash-64k.h

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 


#define H_PTE_INDEX_SIZE  8

#define H_PMD_INDEX_SIZE  10

#define H_PUD_INDEX_SIZE  7

#define H_PUD_INDEX_SIZE  10

#define H_PGD_INDEX_SIZE  8



/*

arch/powerpc/include/asm/processor.h

+8 −1
Original line number Diff line number Diff line
@@ -109,6 +109,13 @@ void release_thread(struct task_struct *); 
#define TASK_SIZE_64TB  (0x0000400000000000UL)

#define TASK_SIZE_128TB (0x0000800000000000UL)

#define TASK_SIZE_512TB (0x0002000000000000UL)

#define TASK_SIZE_1PB   (0x0004000000000000UL)

#define TASK_SIZE_2PB   (0x0008000000000000UL)

/*

 * With 52 bits in the address we can support

 * upto 4PB of range.

 */

#define TASK_SIZE_4PB   (0x0010000000000000UL)



/*

 * For now 512TB is only supported with book3s and 64K linux page size.
@@ -117,7 +124,7 @@ void release_thread(struct task_struct *); 
/*

 * Max value currently used:

 */

#define TASK_SIZE_USER64		TASK_SIZE_512TB

#define TASK_SIZE_USER64		TASK_SIZE_4PB

#define DEFAULT_MAP_WINDOW_USER64	TASK_SIZE_128TB

#define TASK_CONTEXT_SIZE		TASK_SIZE_512TB

#else

arch/powerpc/mm/init_64.c

+0 −6
Original line number Diff line number Diff line
@@ -68,12 +68,6 @@ 


#include "mmu_decl.h"



#ifdef CONFIG_PPC_BOOK3S_64

#if H_PGTABLE_RANGE > USER_VSID_RANGE

#warning Limited user VSID range means pagetable space is wasted

#endif

#endif /* CONFIG_PPC_BOOK3S_64 */



phys_addr_t memstart_addr = ~0;

EXPORT_SYMBOL_GPL(memstart_addr);

phys_addr_t kernstart_addr;

arch/powerpc/mm/pgtable-hash64.c

+4 −0
Original line number Diff line number Diff line
@@ -24,6 +24,10 @@ 
#define CREATE_TRACE_POINTS

#include <trace/events/thp.h>



#if H_PGTABLE_RANGE > (USER_VSID_RANGE * (TASK_SIZE_USER64 / TASK_CONTEXT_SIZE))

#warning Limited user VSID range means pagetable space is wasted

#endif



#ifdef CONFIG_SPARSEMEM_VMEMMAP

/*

 * vmemmap is the starting address of the virtual address space where

arch/powerpc/mm/pgtable_64.c

+0 −5
Original line number Diff line number Diff line
@@ -57,11 +57,6 @@ 


#include "mmu_decl.h"



#ifdef CONFIG_PPC_BOOK3S_64

#if TASK_SIZE_USER64 > (1UL << (ESID_BITS + SID_SHIFT))

#error TASK_SIZE_USER64 exceeds user VSID range

#endif

#endif



#ifdef CONFIG_PPC_BOOK3S_64

/*