Commit f8e6859e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc 

Pull sparc updates from David Miller:

 1) Support multiple huge page sizes, from Nitin Gupta.

 2) Improve boot time on large memory configurations, from Pavel
    Tatashin.

 3) Make BRK handling more consistent and documented, from Vijay Kumar.

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
  sparc64: Fix build error in flush_tsb_user_page
  sparc64: memblock resizes are not handled properly
  sparc64: use latency groups to improve add_node_ranges speed
  sparc64: Add 64K page size support
  sparc64: Multi-page size support
  Documentation/sparc: Steps for sending break on sunhv console
  sparc64: Send break twice from console to return to boot prom
  sparc64: Migrate hvcons irq to panicked cpu
  sparc64: Set cpu state to offline when stopped
  sunvdc: Add support for setting physical sector size
  sparc64: fix for user probes in high memory
  sparc: topology_64.h: Fix condition for including cpudata.h
  sparc32: mm: srmmu: add __ro_after_init to sparc32_cachetlb_ops structures
parents a682e003 ac65e282

Documentation/sparc/console.txt

0 → 100644
+9 −0
Original line number Original line Diff line number Diff line 
Steps for sending 'break' on sunhv console:

===========================================



On Baremetal:

   1. press   Esc + 'B'



On LDOM:

   1. press    Ctrl + ']'

   2. telnet> send  break

arch/sparc/include/asm/page_64.h

+3 −1
Original line number Original line Diff line number Diff line
@@ -17,7 +17,8 @@ 




#define HPAGE_SHIFT		23

#define HPAGE_SHIFT		23

#define REAL_HPAGE_SHIFT	22

#define REAL_HPAGE_SHIFT	22



#define HPAGE_256MB_SHIFT	28

#define HPAGE_64K_SHIFT		16

#define REAL_HPAGE_SIZE		(_AC(1,UL) << REAL_HPAGE_SHIFT)

#define REAL_HPAGE_SIZE		(_AC(1,UL) << REAL_HPAGE_SHIFT)





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

#if defined(CONFIG_HUGETLB_PAGE) || defined(CONFIG_TRANSPARENT_HUGEPAGE)
@@ -26,6 +27,7 @@ 
#define HUGETLB_PAGE_ORDER	(HPAGE_SHIFT - PAGE_SHIFT)

#define HUGETLB_PAGE_ORDER	(HPAGE_SHIFT - PAGE_SHIFT)

#define HAVE_ARCH_HUGETLB_UNMAPPED_AREA

#define HAVE_ARCH_HUGETLB_UNMAPPED_AREA

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

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

#define HUGE_MAX_HSTATE		3

#endif

#endif





#ifndef __ASSEMBLY__

#ifndef __ASSEMBLY__

arch/sparc/include/asm/pgtable_64.h

+15 −8
Original line number Original line Diff line number Diff line
@@ -375,7 +375,10 @@ static inline pgprot_t pgprot_noncached(pgprot_t prot) 
#define pgprot_noncached pgprot_noncached

#define pgprot_noncached pgprot_noncached





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

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

static inline unsigned long __pte_huge_mask(void)

extern pte_t arch_make_huge_pte(pte_t entry, struct vm_area_struct *vma,

				struct page *page, int writable);

#define arch_make_huge_pte arch_make_huge_pte

static inline unsigned long __pte_default_huge_mask(void)

{

{

	unsigned long mask;

	unsigned long mask;
@@ -395,12 +398,14 @@ static inline unsigned long __pte_huge_mask(void) 




static inline pte_t pte_mkhuge(pte_t pte)

static inline pte_t pte_mkhuge(pte_t pte)

{

{

	return __pte(pte_val(pte) | _PAGE_PMD_HUGE | __pte_huge_mask());

	return __pte(pte_val(pte) | __pte_default_huge_mask());

}

}





static inline bool is_hugetlb_pte(pte_t pte)

static inline bool is_default_hugetlb_pte(pte_t pte)

{

{

	return !!(pte_val(pte) & __pte_huge_mask());

	unsigned long mask = __pte_default_huge_mask();



	return (pte_val(pte) & mask) == mask;

}

}





static inline bool is_hugetlb_pmd(pmd_t pmd)

static inline bool is_hugetlb_pmd(pmd_t pmd)
@@ -875,10 +880,12 @@ static inline unsigned long pud_pfn(pud_t pud) 




/* Actual page table PTE updates.  */

/* Actual page table PTE updates.  */

void tlb_batch_add(struct mm_struct *mm, unsigned long vaddr,

void tlb_batch_add(struct mm_struct *mm, unsigned long vaddr,

		   pte_t *ptep, pte_t orig, int fullmm);

		   pte_t *ptep, pte_t orig, int fullmm,

		   unsigned int hugepage_shift);





static void maybe_tlb_batch_add(struct mm_struct *mm, unsigned long vaddr,

static void maybe_tlb_batch_add(struct mm_struct *mm, unsigned long vaddr,

				pte_t *ptep, pte_t orig, int fullmm)

				pte_t *ptep, pte_t orig, int fullmm,

				unsigned int hugepage_shift)

{

{

	/* It is more efficient to let flush_tlb_kernel_range()

	/* It is more efficient to let flush_tlb_kernel_range()

	 * handle init_mm tlb flushes.

	 * handle init_mm tlb flushes.
@@ -887,7 +894,7 @@ static void maybe_tlb_batch_add(struct mm_struct *mm, unsigned long vaddr, 
	 *             and SUN4V pte layout, so this inline test is fine.

	 *             and SUN4V pte layout, so this inline test is fine.

	 */

	 */

	if (likely(mm != &init_mm) && pte_accessible(mm, orig))

	if (likely(mm != &init_mm) && pte_accessible(mm, orig))

		tlb_batch_add(mm, vaddr, ptep, orig, fullmm);

		tlb_batch_add(mm, vaddr, ptep, orig, fullmm, hugepage_shift);

}

}





#define __HAVE_ARCH_PMDP_HUGE_GET_AND_CLEAR

#define __HAVE_ARCH_PMDP_HUGE_GET_AND_CLEAR
@@ -906,7 +913,7 @@ static inline void __set_pte_at(struct mm_struct *mm, unsigned long addr, 
	pte_t orig = *ptep;

	pte_t orig = *ptep;





	*ptep = pte;

	*ptep = pte;

	maybe_tlb_batch_add(mm, addr, ptep, orig, fullmm);

	maybe_tlb_batch_add(mm, addr, ptep, orig, fullmm, PAGE_SHIFT);

}

}





#define set_pte_at(mm,addr,ptep,pte)	\

#define set_pte_at(mm,addr,ptep,pte)	\

arch/sparc/include/asm/setup.h

+4 −1
Original line number Original line Diff line number Diff line
@@ -59,8 +59,11 @@ extern atomic_t dcpage_flushes; 
extern atomic_t dcpage_flushes_xcall;

extern atomic_t dcpage_flushes_xcall;





extern int sysctl_tsb_ratio;

extern int sysctl_tsb_ratio;

#endif





#ifdef CONFIG_SERIAL_SUNHV

void sunhv_migrate_hvcons_irq(int cpu);

#endif

#endif

void sun_do_break(void);

void sun_do_break(void);

extern int stop_a_enabled;

extern int stop_a_enabled;

extern int scons_pwroff;

extern int scons_pwroff;

arch/sparc/include/asm/tlbflush_64.h

+3 −2
Original line number Original line Diff line number Diff line
@@ -8,7 +8,7 @@ 
#define TLB_BATCH_NR	192

#define TLB_BATCH_NR	192





struct tlb_batch {

struct tlb_batch {

	bool huge;

	unsigned int hugepage_shift;

	struct mm_struct *mm;

	struct mm_struct *mm;

	unsigned long tlb_nr;

	unsigned long tlb_nr;

	unsigned long active;

	unsigned long active;
@@ -17,7 +17,8 @@ struct tlb_batch { 




void flush_tsb_kernel_range(unsigned long start, unsigned long end);

void flush_tsb_kernel_range(unsigned long start, unsigned long end);

void flush_tsb_user(struct tlb_batch *tb);

void flush_tsb_user(struct tlb_batch *tb);

void flush_tsb_user_page(struct mm_struct *mm, unsigned long vaddr, bool huge);

void flush_tsb_user_page(struct mm_struct *mm, unsigned long vaddr,

			 unsigned int hugepage_shift);





/* TLB flush operations. */

/* TLB flush operations. */

CRA Git | Maintained and supported by SUSTech CRA and CCSE