Merge tag 'powerpc-3.19-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mpe/linux

Pull powerpc updates from Michael Ellerman:
 "Some nice cleanups like removing bootmem, and removal of
  __get_cpu_var().

  There is one patch to mm/gup.c.  This is the generic GUP
  implementation, but is only used by us and arm(64).  We have an ack
  from Steve Capper, and although we didn't get an ack from Andrew he
  told us to take the patch through the powerpc tree.

  There's one cxl patch.  This is in drivers/misc, but Greg said he was
  happy for us to manage fixes for it.

  There is an infrastructure patch to support an IPMI driver for OPAL.

  There is also an RTC driver for OPAL.  We weren't able to get any
  response from the RTC maintainer, Alessandro Zummo, so in the end we
  just merged the driver.

  The usual batch of Freescale updates from Scott"

* tag 'powerpc-3.19-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mpe/linux: (101 commits)
  powerpc/powernv: Return to cpu offline loop when finished in KVM guest
  powerpc/book3s: Fix partial invalidation of TLBs in MCE code.
  powerpc/mm: don't do tlbie for updatepp request with NO HPTE fault
  powerpc/xmon: Cleanup the breakpoint flags
  powerpc/xmon: Enable HW instruction breakpoint on POWER8
  powerpc/mm/thp: Use tlbiel if possible
  powerpc/mm/thp: Remove code duplication
  powerpc/mm/hugetlb: Sanity check gigantic hugepage count
  powerpc/oprofile: Disable pagefaults during user stack read
  powerpc/mm: Check for matching hpte without taking hpte lock
  powerpc: Drop useless warning in eeh_init()
  powerpc/powernv: Cleanup unused MCE definitions/declarations.
  powerpc/eeh: Dump PHB diag-data early
  powerpc/eeh: Recover EEH error on ownership change for BCM5719
  powerpc/eeh: Set EEH_PE_RESET on PE reset
  powerpc/eeh: Refactor eeh_reset_pe()
  powerpc: Remove more traces of bootmem
  powerpc/pseries: Initialise nvram_pstore_info's buf_lock
  cxl: Name interrupts in /proc/interrupt
  cxl: Return error to PSL if IRQ demultiplexing fails & print clearer warning
  ...

1 files changed, 26 insertions, 25 deletions

diff --git a/arch/powerpc/mm/hugetlbpage.c b/arch/powerpc/mm/hugetlbpage.c
index 6a4a5fcb9730..5ff4e07d920a 100644
--- a/arch/powerpc/mm/hugetlbpage.c
+++ b/arch/powerpc/mm/hugetlbpage.c
@@ -62,6 +62,9 @@ static unsigned nr_gpages;
 /*
  * We have PGD_INDEX_SIZ = 12 and PTE_INDEX_SIZE = 8, so that we can have
  * 16GB hugepage pte in PGD and 16MB hugepage pte at PMD;
+ *
+ * Defined in such a way that we can optimize away code block at build time
+ * if CONFIG_HUGETLB_PAGE=n.
  */
 int pmd_huge(pmd_t pmd)
 {
@@ -230,7 +233,7 @@ pte_t *huge_pte_alloc(struct mm_struct *mm, unsigned long addr, unsigned long sz
         if (hugepd_none(*hpdp) && __hugepte_alloc(mm, hpdp, addr, pdshift, pshift))
                 return NULL;
 
-        return hugepte_offset(hpdp, addr, pdshift);
+        return hugepte_offset(*hpdp, addr, pdshift);
 }
 
 #else
@@ -270,13 +273,13 @@ pte_t *huge_pte_alloc(struct mm_struct *mm, unsigned long addr, unsigned long sz
         if (hugepd_none(*hpdp) && __hugepte_alloc(mm, hpdp, addr, pdshift, pshift))
                 return NULL;
 
-        return hugepte_offset(hpdp, addr, pdshift);
+        return hugepte_offset(*hpdp, addr, pdshift);
 }
 #endif
 
 #ifdef CONFIG_PPC_FSL_BOOK3E
 /* Build list of addresses of gigantic pages.  This function is used in early
- * boot before the buddy or bootmem allocator is setup.
+ * boot before the buddy allocator is setup.
  */
 void add_gpage(u64 addr, u64 page_size, unsigned long number_of_pages)
 {
@@ -312,7 +315,7 @@ int alloc_bootmem_huge_page(struct hstate *hstate)
          * If gpages can be in highmem we can't use the trick of storing the
          * data structure in the page; allocate space for this
          */
-        m = alloc_bootmem(sizeof(struct huge_bootmem_page));
+        m = memblock_virt_alloc(sizeof(struct huge_bootmem_page), 0);
         m->phys = gpage_freearray[idx].gpage_list[--nr_gpages];
 #else
         m = phys_to_virt(gpage_freearray[idx].gpage_list[--nr_gpages]);
@@ -352,6 +355,13 @@ static int __init do_gpage_early_setup(char *param, char *val,
                 if (size != 0) {
                         if (sscanf(val, "%lu", &npages) <= 0)
                                 npages = 0;
+                        if (npages > MAX_NUMBER_GPAGES) {
+                                pr_warn("MMU: %lu pages requested for page "
+                                        "size %llu KB, limiting to "
+                                        __stringify(MAX_NUMBER_GPAGES) "\n",
+                                        npages, size / 1024);
+                                npages = MAX_NUMBER_GPAGES;
+                        }
                         gpage_npages[shift_to_mmu_psize(__ffs(size))] = npages;
                         size = 0;
                 }
@@ -399,7 +409,7 @@ void __init reserve_hugetlb_gpages(void)
 #else /* !PPC_FSL_BOOK3E */
 
 /* Build list of addresses of gigantic pages.  This function is used in early
- * boot before the buddy or bootmem allocator is setup.
+ * boot before the buddy allocator is setup.
  */
 void add_gpage(u64 addr, u64 page_size, unsigned long number_of_pages)
 {
@@ -462,7 +472,7 @@ static void hugepd_free(struct mmu_gather *tlb, void *hugepte)
 {
         struct hugepd_freelist **batchp;
 
-        batchp = &get_cpu_var(hugepd_freelist_cur);
+        batchp = this_cpu_ptr(&hugepd_freelist_cur);
 
         if (atomic_read(&tlb->mm->mm_users) < 2 ||
             cpumask_equal(mm_cpumask(tlb->mm),
@@ -536,7 +546,7 @@ static void hugetlb_free_pmd_range(struct mmu_gather *tlb, pud_t *pud,
         do {
                 pmd = pmd_offset(pud, addr);
                 next = pmd_addr_end(addr, end);
-                if (!is_hugepd(pmd)) {
+                if (!is_hugepd(__hugepd(pmd_val(*pmd)))) {
                         /*
                          * if it is not hugepd pointer, we should already find
                          * it cleared.
@@ -585,7 +595,7 @@ static void hugetlb_free_pud_range(struct mmu_gather *tlb, pgd_t *pgd,
         do {
                 pud = pud_offset(pgd, addr);
                 next = pud_addr_end(addr, end);
-                if (!is_hugepd(pud)) {
+                if (!is_hugepd(__hugepd(pud_val(*pud)))) {
                         if (pud_none_or_clear_bad(pud))
                                 continue;
                         hugetlb_free_pmd_range(tlb, pud, addr, next, floor,
@@ -651,7 +661,7 @@ void hugetlb_free_pgd_range(struct mmu_gather *tlb,
         do {
                 next = pgd_addr_end(addr, end);
                 pgd = pgd_offset(tlb->mm, addr);
-                if (!is_hugepd(pgd)) {
+                if (!is_hugepd(__hugepd(pgd_val(*pgd)))) {
                         if (pgd_none_or_clear_bad(pgd))
                                 continue;
                         hugetlb_free_pud_range(tlb, pgd, addr, next, floor, ceiling);
@@ -711,12 +721,11 @@ static unsigned long hugepte_addr_end(unsigned long addr, unsigned long end,
         return (__boundary - 1 < end - 1) ? __boundary : end;
 }
 
-int gup_hugepd(hugepd_t *hugepd, unsigned pdshift,
-               unsigned long addr, unsigned long end,
-               int write, struct page **pages, int *nr)
+int gup_huge_pd(hugepd_t hugepd, unsigned long addr, unsigned pdshift,
+                unsigned long end, int write, struct page **pages, int *nr)
 {
         pte_t *ptep;
-        unsigned long sz = 1UL << hugepd_shift(*hugepd);
+        unsigned long sz = 1UL << hugepd_shift(hugepd);
         unsigned long next;
 
         ptep = hugepte_offset(hugepd, addr, pdshift);
@@ -959,7 +968,7 @@ pte_t *find_linux_pte_or_hugepte(pgd_t *pgdir, unsigned long ea, unsigned *shift
         else if (pgd_huge(pgd)) {
                 ret_pte = (pte_t *) pgdp;
                 goto out;
-        } else if (is_hugepd(&pgd))
+        } else if (is_hugepd(__hugepd(pgd_val(pgd))))
                 hpdp = (hugepd_t *)&pgd;
         else {
                 /*
@@ -976,7 +985,7 @@ pte_t *find_linux_pte_or_hugepte(pgd_t *pgdir, unsigned long ea, unsigned *shift
                 else if (pud_huge(pud)) {
                         ret_pte = (pte_t *) pudp;
                         goto out;
-                } else if (is_hugepd(&pud))
+                } else if (is_hugepd(__hugepd(pud_val(pud))))
                         hpdp = (hugepd_t *)&pud;
                 else {
                         pdshift = PMD_SHIFT;
@@ -997,7 +1006,7 @@ pte_t *find_linux_pte_or_hugepte(pgd_t *pgdir, unsigned long ea, unsigned *shift
                         if (pmd_huge(pmd) || pmd_large(pmd)) {
                                 ret_pte = (pte_t *) pmdp;
                                 goto out;
-                        } else if (is_hugepd(&pmd))
+                        } else if (is_hugepd(__hugepd(pmd_val(pmd))))
                                 hpdp = (hugepd_t *)&pmd;
                         else
                                 return pte_offset_kernel(&pmd, ea);
@@ -1006,7 +1015,7 @@ pte_t *find_linux_pte_or_hugepte(pgd_t *pgdir, unsigned long ea, unsigned *shift
         if (!hpdp)
                 return NULL;
 
-        ret_pte = hugepte_offset(hpdp, ea, pdshift);
+        ret_pte = hugepte_offset(*hpdp, ea, pdshift);
         pdshift = hugepd_shift(*hpdp);
 out:
         if (shift)
@@ -1036,14 +1045,6 @@ int gup_hugepte(pte_t *ptep, unsigned long sz, unsigned long addr,
         if ((pte_val(pte) & mask) != mask)
                 return 0;
 
-#ifdef CONFIG_TRANSPARENT_HUGEPAGE
-        /*
-         * check for splitting here
-         */
-        if (pmd_trans_splitting(pte_pmd(pte)))
-                return 0;
-#endif
-
         /* hugepages are never "special" */
         VM_BUG_ON(!pfn_valid(pte_pfn(pte)));