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

Commit 85b1da7c authored by Nitin Gupta's avatar Nitin Gupta Committed by David S. Miller
Browse files

sparc64: Add support for 2G hugepages 



Signed-off-by: default avatarNitin Gupta <nitin.m.gupta@oracle.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 59f1183d

arch/sparc/include/asm/page_64.h

+2 −1
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 


#define HPAGE_SHIFT		23

#define REAL_HPAGE_SHIFT	22

#define HPAGE_2GB_SHIFT		31

#define HPAGE_256MB_SHIFT	28

#define HPAGE_64K_SHIFT		16

#define REAL_HPAGE_SIZE		(_AC(1,UL) << REAL_HPAGE_SHIFT)
@@ -27,7 +28,7 @@ 
#define HUGETLB_PAGE_ORDER	(HPAGE_SHIFT - PAGE_SHIFT)

#define HAVE_ARCH_HUGETLB_UNMAPPED_AREA

#define REAL_HPAGE_PER_HPAGE	(_AC(1,UL) << (HPAGE_SHIFT - REAL_HPAGE_SHIFT))

#define HUGE_MAX_HSTATE		3

#define HUGE_MAX_HSTATE		4

#endif



#ifndef __ASSEMBLY__

arch/sparc/mm/hugetlbpage.c

+7 −0
Original line number Diff line number Diff line
@@ -143,6 +143,10 @@ static pte_t sun4v_hugepage_shift_to_tte(pte_t entry, unsigned int shift) 
	pte_val(entry) = pte_val(entry) & ~_PAGE_SZALL_4V;



	switch (shift) {

	case HPAGE_2GB_SHIFT:

		hugepage_size = _PAGE_SZ2GB_4V;

		pte_val(entry) |= _PAGE_PMD_HUGE;

		break;

	case HPAGE_256MB_SHIFT:

		hugepage_size = _PAGE_SZ256MB_4V;

		pte_val(entry) |= _PAGE_PMD_HUGE;
@@ -183,6 +187,9 @@ static unsigned int sun4v_huge_tte_to_shift(pte_t entry) 
	unsigned int shift;



	switch (tte_szbits) {

	case _PAGE_SZ2GB_4V:

		shift = HPAGE_2GB_SHIFT;

		break;

	case _PAGE_SZ256MB_4V:

		shift = HPAGE_256MB_SHIFT;

		break;

arch/sparc/mm/init_64.c

+4 −0
Original line number Diff line number Diff line
@@ -337,6 +337,10 @@ static int __init setup_hugepagesz(char *string) 
	hugepage_shift = ilog2(hugepage_size);



	switch (hugepage_shift) {

	case HPAGE_2GB_SHIFT:

		hv_pgsz_mask = HV_PGSZ_MASK_2GB;

		hv_pgsz_idx = HV_PGSZ_IDX_2GB;

		break;

	case HPAGE_256MB_SHIFT:

		hv_pgsz_mask = HV_PGSZ_MASK_256MB;

		hv_pgsz_idx = HV_PGSZ_IDX_256MB;