Commit 4d9fbf53 authored by David S. Miller's avatar David S. Miller
Browse files

sparc64: Revert 16GB huge page support. 



It overflows the amount of space available in the initial .text section
of trap handler assembler in some configurations, resulting in build
failures.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 5389e239

arch/sparc/include/asm/hugetlb.h

+0 −7
Original line number Diff line number Diff line
@@ -4,13 +4,6 @@ 
#include <asm/page.h>

#include <asm-generic/hugetlb.h>



#ifdef CONFIG_HUGETLB_PAGE

struct pud_huge_patch_entry {

	unsigned int addr;

	unsigned int insn;

};

extern struct pud_huge_patch_entry __pud_huge_patch, __pud_huge_patch_end;

#endif



void set_huge_pte_at(struct mm_struct *mm, unsigned long addr,

		     pte_t *ptep, pte_t pte);

arch/sparc/include/asm/page_64.h

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


#define HPAGE_SHIFT		23

#define REAL_HPAGE_SHIFT	22

#define HPAGE_16GB_SHIFT	34

#define HPAGE_2GB_SHIFT		31

#define HPAGE_256MB_SHIFT	28

#define HPAGE_64K_SHIFT		16
@@ -29,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		5

#define HUGE_MAX_HSTATE		4

#endif



#ifndef __ASSEMBLY__

arch/sparc/include/asm/pgtable_64.h

+2 −18
Original line number Diff line number Diff line
@@ -414,11 +414,6 @@ static inline bool is_hugetlb_pmd(pmd_t pmd) 
	return !!(pmd_val(pmd) & _PAGE_PMD_HUGE);

}



static inline bool is_hugetlb_pud(pud_t pud)

{

	return !!(pud_val(pud) & _PAGE_PUD_HUGE);

}



#ifdef CONFIG_TRANSPARENT_HUGEPAGE

static inline pmd_t pmd_mkhuge(pmd_t pmd)

{
@@ -692,8 +687,6 @@ static inline unsigned long pmd_write(pmd_t pmd) 
	return pte_write(pte);

}



#define pud_write(pud)	pte_write(__pte(pud_val(pud)))



#ifdef CONFIG_TRANSPARENT_HUGEPAGE

static inline unsigned long pmd_dirty(pmd_t pmd)

{
@@ -830,18 +823,9 @@ static inline unsigned long __pmd_page(pmd_t pmd) 


	return ((unsigned long) __va(pfn << PAGE_SHIFT));

}



static inline unsigned long pud_page_vaddr(pud_t pud)

{

	pte_t pte = __pte(pud_val(pud));

	unsigned long pfn;



	pfn = pte_pfn(pte);



	return ((unsigned long) __va(pfn << PAGE_SHIFT));

}



#define pmd_page(pmd) 			virt_to_page((void *)__pmd_page(pmd))

#define pud_page_vaddr(pud)		\

	((unsigned long) __va(pud_val(pud)))

#define pud_page(pud) 			virt_to_page((void *)pud_page_vaddr(pud))

#define pmd_clear(pmdp)			(pmd_val(*(pmdp)) = 0UL)

#define pud_present(pud)		(pud_val(pud) != 0U)

arch/sparc/include/asm/tsb.h

+0 −36
Original line number Diff line number Diff line
@@ -195,41 +195,6 @@ extern struct tsb_phys_patch_entry __tsb_phys_patch, __tsb_phys_patch_end; 
	 nop; \

699:



	/* PUD has been loaded into REG1, interpret the value, seeing

	 * if it is a HUGE PUD or a normal one.  If it is not valid

	 * then jump to FAIL_LABEL.  If it is a HUGE PUD, and it

	 * translates to a valid PTE, branch to PTE_LABEL.

	 *

	 * We have to propagate bits [32:22] from the virtual address

	 * to resolve at 4M granularity.

	 */

#if defined(CONFIG_HUGETLB_PAGE) || defined(CONFIG_TRANSPARENT_HUGEPAGE)

#define USER_PGTABLE_CHECK_PUD_HUGE(VADDR, REG1, REG2, FAIL_LABEL, PTE_LABEL) \

700:	ba 700f;					\

	 nop;						\

	.section	.pud_huge_patch, "ax";		\

	.word		700b;				\

	nop;						\

	.previous;					\

	brz,pn		REG1, FAIL_LABEL;		\

	 sethi		%uhi(_PAGE_PUD_HUGE), REG2;	\

	sllx		REG2, 32, REG2;			\

	andcc		REG1, REG2, %g0;		\

	be,pt		%xcc, 700f;			\

	 sethi		%hi(0x1ffc0000), REG2;		\

	sllx		REG2, 1, REG2;			\

	brgez,pn	REG1, FAIL_LABEL;		\

	 andn		REG1, REG2, REG1;		\

	and		VADDR, REG2, REG2;		\

	brlz,pt		REG1, PTE_LABEL;		\

	 or		REG1, REG2, REG1;		\

700:

#else

#define USER_PGTABLE_CHECK_PUD_HUGE(VADDR, REG1, REG2, FAIL_LABEL, PTE_LABEL) \

	brz,pn		REG1, FAIL_LABEL; \

	 nop;

#endif



	/* PMD has been loaded into REG1, interpret the value, seeing

	 * if it is a HUGE PMD or a normal one.  If it is not valid

	 * then jump to FAIL_LABEL.  If it is a HUGE PMD, and it
@@ -277,7 +242,6 @@ extern struct tsb_phys_patch_entry __tsb_phys_patch, __tsb_phys_patch_end; 
	srlx		REG2, 64 - PAGE_SHIFT, REG2; \

	andn		REG2, 0x7, REG2; \

	ldxa		[REG1 + REG2] ASI_PHYS_USE_EC, REG1; \

	USER_PGTABLE_CHECK_PUD_HUGE(VADDR, REG1, REG2, FAIL_LABEL, 800f) \

	brz,pn		REG1, FAIL_LABEL; \

	 sllx		VADDR, 64 - (PMD_SHIFT + PMD_BITS), REG2; \

	srlx		REG2, 64 - PAGE_SHIFT, REG2; \

arch/sparc/kernel/tsb.S

+1 −1
Original line number Diff line number Diff line
@@ -117,7 +117,7 @@ tsb_miss_page_table_walk_sun4v_fastpath: 
	/* Valid PTE is now in %g5.  */



#if defined(CONFIG_HUGETLB_PAGE) || defined(CONFIG_TRANSPARENT_HUGEPAGE)

	sethi		%uhi(_PAGE_PMD_HUGE | _PAGE_PUD_HUGE), %g7

	sethi		%uhi(_PAGE_PMD_HUGE), %g7

	sllx		%g7, 32, %g7



	andcc		%g5, %g7, %g0