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

Pull sparc updates from David Miller:
 "Mostly more sparc64 THP bug fixes, and a refactoring of SMP bootup on
  sparc32 from Sam Ravnborg."

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
  sparc32: refactor smp boot
  sparc64: Fix huge PMD to PTE translation for sun4u in TLB miss handler.
  sparc64: Fix tsb_grow() in atomic context.
  sparc64: Handle hugepage TSB being NULL.
  sparc64: Fix gfp_flags setting in tsb_grow().

3 files changed, 21 insertions, 12 deletions

diff --git a/arch/sparc/include/asm/hugetlb.h b/arch/sparc/include/asm/hugetlb.h
index 9661e9bc7bb6..7eb57d245044 100644
--- a/arch/sparc/include/asm/hugetlb.h
+++ b/arch/sparc/include/asm/hugetlb.h
@@ -12,7 +12,6 @@ pte_t huge_ptep_get_and_clear(struct mm_struct *mm, unsigned long addr,
 
 static inline void hugetlb_prefault_arch_hook(struct mm_struct *mm)
 {
-        hugetlb_setup(mm);
 }
 
 static inline int is_hugepage_only_range(struct mm_struct *mm,
diff --git a/arch/sparc/include/asm/page_64.h b/arch/sparc/include/asm/page_64.h
index 4b39f74d6ca0..e15538899f3d 100644
--- a/arch/sparc/include/asm/page_64.h
+++ b/arch/sparc/include/asm/page_64.h
@@ -27,8 +27,8 @@
 #ifndef __ASSEMBLY__
 
 #if defined(CONFIG_HUGETLB_PAGE) || defined(CONFIG_TRANSPARENT_HUGEPAGE)
-struct mm_struct;
-extern void hugetlb_setup(struct mm_struct *mm);
+struct pt_regs;
+extern void hugetlb_setup(struct pt_regs *regs);
 #endif
 
 #define WANT_PAGE_VIRTUAL
diff --git a/arch/sparc/include/asm/tsb.h b/arch/sparc/include/asm/tsb.h
index b4c258de4443..e696432b950d 100644
--- a/arch/sparc/include/asm/tsb.h
+++ b/arch/sparc/include/asm/tsb.h
@@ -157,17 +157,26 @@ extern struct tsb_phys_patch_entry __tsb_phys_patch, __tsb_phys_patch_end;
         andn            REG2, 0x7, REG2; \
         add             REG1, REG2, REG1;
 
-        /* This macro exists only to make the PMD translator below easier
-         * to read.  It hides the ELF section switch for the sun4v code
-         * patching.
+        /* These macros exists only to make the PMD translator below
+         * easier to read.  It hides the ELF section switch for the
+         * sun4v code patching.
          */
-#define OR_PTE_BIT(REG, NAME)                           \
+#define OR_PTE_BIT_1INSN(REG, NAME)                     \
 661:    or              REG, _PAGE_##NAME##_4U, REG;    \
         .section        .sun4v_1insn_patch, "ax";       \
         .word           661b;                           \
         or              REG, _PAGE_##NAME##_4V, REG;    \
         .previous;
 
+#define OR_PTE_BIT_2INSN(REG, TMP, NAME)                \
+661:    sethi           %hi(_PAGE_##NAME##_4U), TMP;    \
+        or              REG, TMP, REG;                  \
+        .section        .sun4v_2insn_patch, "ax";       \
+        .word           661b;                           \
+        mov             -1, TMP;                        \
+        or              REG, _PAGE_##NAME##_4V, REG;    \
+        .previous;
+
         /* Load into REG the PTE value for VALID, CACHE, and SZHUGE.  */
 #define BUILD_PTE_VALID_SZHUGE_CACHE(REG)                                  \
 661:    sethi           %uhi(_PAGE_VALID|_PAGE_SZHUGE_4U), REG;            \
@@ -214,12 +223,13 @@ extern struct tsb_phys_patch_entry __tsb_phys_patch, __tsb_phys_patch_end;
          andn           REG1, PMD_HUGE_PROTBITS, REG2;                        \
         sllx            REG2, PMD_PADDR_SHIFT, REG2;                          \
         /* REG2 now holds PFN << PAGE_SHIFT */                                \
-        andcc           REG1, PMD_HUGE_EXEC, %g0;                             \
-        bne,a,pt        %xcc, 1f;                                             \
-         OR_PTE_BIT(REG2, EXEC);                                              \
-1:      andcc           REG1, PMD_HUGE_WRITE, %g0;                            \
+        andcc           REG1, PMD_HUGE_WRITE, %g0;                            \
         bne,a,pt        %xcc, 1f;                                             \
-         OR_PTE_BIT(REG2, W);                                                 \
+         OR_PTE_BIT_1INSN(REG2, W);                                           \
+1:      andcc           REG1, PMD_HUGE_EXEC, %g0;                             \
+        be,pt           %xcc, 1f;                                             \
+         nop;                                                                 \
+        OR_PTE_BIT_2INSN(REG2, REG1, EXEC);                                   \
         /* REG1 can now be clobbered, build final PTE */                      \
 1:      BUILD_PTE_VALID_SZHUGE_CACHE(REG1);                                   \
         ba,pt           %xcc, PTE_LABEL;                                      \