Merge tag 'powerpc-5.0-3' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux

Pull powerpc fixes from Michael Ellerman:
 "A couple of weeks of fixes.

  There's one fix for an oops on Power9 machines with Open CAPI
  adapters.

  And a fix for probable memory corruption in some of the new NPU code,
  caught by smatch though and not seen in the wild.

  Plus a few other minor fixes.

  There's one non-fix which is the perf_regs change. That was sent
  during the merge window but I accidentally only merged the first of
  two patches in the series. It's been in linux-next so hopefully
  doesn't conflict with anything in acme's tree.

  Thanks to: Alexey Kardashevskiy, Andrew Donnellan, Breno Leitao,
  Christian Lamparter, Christophe Leroy, Dan Carpenter, Frederic Barrat,
  Greg Kurz, Jason A. Donenfeld, Madhavan Srinivasan"

* tag 'powerpc-5.0-3' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux:
  powerpc/syscalls: Fix syscall tracing
  powerpc/pseries: Fix build break due to pnv_npu2_init()
  powerpc/4xx/ocm: Fix fix for phys_addr_t printf warnings
  powerpc/powernv/npu: Fix oops in pnv_try_setup_npu_table_group()
  powerpc/tm: Limit TM code inside PPC_TRANSACTIONAL_MEM
  powerpc/8xx: fix setting of pagetable for Abatron BDI debug tool.
  powerpc/powernv/npu: Allocate enough memory in pnv_try_setup_npu_table_group()
  powerpc/perf: Update perf_regs structure to include MMCRA

12 files changed, 25 insertions, 17 deletions

diff --git a/arch/powerpc/include/uapi/asm/perf_regs.h b/arch/powerpc/include/uapi/asm/perf_regs.h
index ff91192407d1..f599064dd8dc 100644
--- a/arch/powerpc/include/uapi/asm/perf_regs.h
+++ b/arch/powerpc/include/uapi/asm/perf_regs.h
@@ -47,6 +47,7 @@ enum perf_event_powerpc_regs {
         PERF_REG_POWERPC_DAR,
         PERF_REG_POWERPC_DSISR,
         PERF_REG_POWERPC_SIER,
+        PERF_REG_POWERPC_MMCRA,
         PERF_REG_POWERPC_MAX,
 };
 #endif /* _UAPI_ASM_POWERPC_PERF_REGS_H */
diff --git a/arch/powerpc/kernel/head_8xx.S b/arch/powerpc/kernel/head_8xx.S
index 57deb1e9ffea..20cc816b3508 100644
--- a/arch/powerpc/kernel/head_8xx.S
+++ b/arch/powerpc/kernel/head_8xx.S
@@ -852,11 +852,12 @@ start_here:
 
         /* set up the PTE pointers for the Abatron bdiGDB.
         */
-        tovirt(r6,r6)
         lis     r5, abatron_pteptrs@h
         ori     r5, r5, abatron_pteptrs@l
         stw     r5, 0xf0(0)     /* Must match your Abatron config file */
         tophys(r5,r5)
+        lis     r6, swapper_pg_dir@h
+        ori     r6, r6, swapper_pg_dir@l
         stw     r6, 0(r5)
 
 /* Now turn on the MMU for real! */
diff --git a/arch/powerpc/kernel/signal_64.c b/arch/powerpc/kernel/signal_64.c
index bd5e6834ca69..6794466f6420 100644
--- a/arch/powerpc/kernel/signal_64.c
+++ b/arch/powerpc/kernel/signal_64.c
@@ -755,11 +755,12 @@ SYSCALL_DEFINE0(rt_sigreturn)
                 if (restore_tm_sigcontexts(current, &uc->uc_mcontext,
                                            &uc_transact->uc_mcontext))
                         goto badframe;
-        }
+        } else
 #endif
-        /* Fall through, for non-TM restore */
-        if (!MSR_TM_ACTIVE(msr)) {
+        {
                 /*
+                 * Fall through, for non-TM restore
+                 *
                  * Unset MSR[TS] on the thread regs since MSR from user
                  * context does not have MSR active, and recheckpoint was
                  * not called since restore_tm_sigcontexts() was not called
diff --git a/arch/powerpc/kernel/trace/ftrace.c b/arch/powerpc/kernel/trace/ftrace.c
index 29746dc28df5..517662a56bdc 100644
--- a/arch/powerpc/kernel/trace/ftrace.c
+++ b/arch/powerpc/kernel/trace/ftrace.c
@@ -967,13 +967,6 @@ out:
 }
 #endif /* CONFIG_FUNCTION_GRAPH_TRACER */
 
-#if defined(CONFIG_FTRACE_SYSCALLS) && defined(CONFIG_PPC64)
-unsigned long __init arch_syscall_addr(int nr)
-{
-        return sys_call_table[nr*2];
-}
-#endif /* CONFIG_FTRACE_SYSCALLS && CONFIG_PPC64 */
-
 #ifdef PPC64_ELF_ABI_v1
 char *arch_ftrace_match_adjust(char *str, const char *search)
 {
diff --git a/arch/powerpc/perf/perf_regs.c b/arch/powerpc/perf/perf_regs.c
index 5c36b3a8d47a..3349f3f8fe84 100644
--- a/arch/powerpc/perf/perf_regs.c
+++ b/arch/powerpc/perf/perf_regs.c
@@ -70,6 +70,7 @@ static unsigned int pt_regs_offset[PERF_REG_POWERPC_MAX] = {
         PT_REGS_OFFSET(PERF_REG_POWERPC_DAR, dar),
         PT_REGS_OFFSET(PERF_REG_POWERPC_DSISR, dsisr),
         PT_REGS_OFFSET(PERF_REG_POWERPC_SIER, dar),
+        PT_REGS_OFFSET(PERF_REG_POWERPC_MMCRA, dsisr),
 };
 
 u64 perf_reg_value(struct pt_regs *regs, int idx)
@@ -83,6 +84,11 @@ u64 perf_reg_value(struct pt_regs *regs, int idx)
             !is_sier_available()))
                 return 0;
 
+        if (idx == PERF_REG_POWERPC_MMCRA &&
+           (IS_ENABLED(CONFIG_FSL_EMB_PERF_EVENT) ||
+            IS_ENABLED(CONFIG_PPC32)))
+                return 0;
+
         return regs_get_register(regs, pt_regs_offset[idx]);
 }
 
diff --git a/arch/powerpc/platforms/4xx/ocm.c b/arch/powerpc/platforms/4xx/ocm.c
index a1aaa1569d7c..f0e488d97567 100644
--- a/arch/powerpc/platforms/4xx/ocm.c
+++ b/arch/powerpc/platforms/4xx/ocm.c
@@ -237,12 +237,12 @@ static int ocm_debugfs_show(struct seq_file *m, void *v)
                         continue;
 
                 seq_printf(m, "PPC4XX OCM   : %d\n", ocm->index);
-                seq_printf(m, "PhysAddr     : %pa[p]\n", &(ocm->phys));
+                seq_printf(m, "PhysAddr     : %pa\n", &(ocm->phys));
                 seq_printf(m, "MemTotal     : %d Bytes\n", ocm->memtotal);
                 seq_printf(m, "MemTotal(NC) : %d Bytes\n", ocm->nc.memtotal);
                 seq_printf(m, "MemTotal(C)  : %d Bytes\n\n", ocm->c.memtotal);
 
-                seq_printf(m, "NC.PhysAddr  : %pa[p]\n", &(ocm->nc.phys));
+                seq_printf(m, "NC.PhysAddr  : %pa\n", &(ocm->nc.phys));
                 seq_printf(m, "NC.VirtAddr  : 0x%p\n", ocm->nc.virt);
                 seq_printf(m, "NC.MemTotal  : %d Bytes\n", ocm->nc.memtotal);
                 seq_printf(m, "NC.MemFree   : %d Bytes\n", ocm->nc.memfree);
@@ -252,7 +252,7 @@ static int ocm_debugfs_show(struct seq_file *m, void *v)
                                                         blk->size, blk->owner);
                 }
 
-                seq_printf(m, "\nC.PhysAddr   : %pa[p]\n", &(ocm->c.phys));
+                seq_printf(m, "\nC.PhysAddr   : %pa\n", &(ocm->c.phys));
                 seq_printf(m, "C.VirtAddr   : 0x%p\n", ocm->c.virt);
                 seq_printf(m, "C.MemTotal   : %d Bytes\n", ocm->c.memtotal);
                 seq_printf(m, "C.MemFree    : %d Bytes\n", ocm->c.memfree);
diff --git a/arch/powerpc/platforms/powernv/npu-dma.c b/arch/powerpc/platforms/powernv/npu-dma.c
index d7f742ed48ba..3f58c7dbd581 100644
--- a/arch/powerpc/platforms/powernv/npu-dma.c
+++ b/arch/powerpc/platforms/powernv/npu-dma.c
@@ -564,7 +564,7 @@ struct iommu_table_group *pnv_try_setup_npu_table_group(struct pnv_ioda_pe *pe)
                 }
         } else {
                 /* Create a group for 1 GPU and attached NPUs for POWER8 */
-                pe->npucomp = kzalloc(sizeof(pe->npucomp), GFP_KERNEL);
+                pe->npucomp = kzalloc(sizeof(*pe->npucomp), GFP_KERNEL);
                 table_group = &pe->npucomp->table_group;
                 table_group->ops = &pnv_npu_peers_ops;
                 iommu_register_group(table_group, hose->global_number,
diff --git a/arch/powerpc/platforms/powernv/pci-ioda.c b/arch/powerpc/platforms/powernv/pci-ioda.c
index 1d6406a051f1..7db3119f8a5b 100644
--- a/arch/powerpc/platforms/powernv/pci-ioda.c
+++ b/arch/powerpc/platforms/powernv/pci-ioda.c
@@ -2681,7 +2681,8 @@ static void pnv_pci_ioda_setup_iommu_api(void)
         list_for_each_entry(hose, &hose_list, list_node) {
                 phb = hose->private_data;
 
-                if (phb->type == PNV_PHB_NPU_NVLINK)
+                if (phb->type == PNV_PHB_NPU_NVLINK ||
+                    phb->type == PNV_PHB_NPU_OCAPI)
                         continue;
 
                 list_for_each_entry(pe, &phb->ioda.pe_list, list) {
diff --git a/arch/powerpc/platforms/pseries/pci.c b/arch/powerpc/platforms/pseries/pci.c
index 7725825d887d..37a77e57893e 100644
--- a/arch/powerpc/platforms/pseries/pci.c
+++ b/arch/powerpc/platforms/pseries/pci.c
@@ -264,7 +264,9 @@ void __init pSeries_final_fixup(void)
                         if (!of_device_is_compatible(nvdn->parent,
                                                 "ibm,power9-npu"))
                                 continue;
+#ifdef CONFIG_PPC_POWERNV
                         WARN_ON_ONCE(pnv_npu2_init(hose));
+#endif
                         break;
                 }
         }
diff --git a/tools/arch/powerpc/include/uapi/asm/perf_regs.h b/tools/arch/powerpc/include/uapi/asm/perf_regs.h
index ff91192407d1..f599064dd8dc 100644
--- a/tools/arch/powerpc/include/uapi/asm/perf_regs.h
+++ b/tools/arch/powerpc/include/uapi/asm/perf_regs.h
@@ -47,6 +47,7 @@ enum perf_event_powerpc_regs {
         PERF_REG_POWERPC_DAR,
         PERF_REG_POWERPC_DSISR,
         PERF_REG_POWERPC_SIER,
+        PERF_REG_POWERPC_MMCRA,
         PERF_REG_POWERPC_MAX,
 };
 #endif /* _UAPI_ASM_POWERPC_PERF_REGS_H */
diff --git a/tools/perf/arch/powerpc/include/perf_regs.h b/tools/perf/arch/powerpc/include/perf_regs.h
index 1076393e6f43..e18a3556f5e3 100644
--- a/tools/perf/arch/powerpc/include/perf_regs.h
+++ b/tools/perf/arch/powerpc/include/perf_regs.h
@@ -63,7 +63,8 @@ static const char *reg_names[] = {
         [PERF_REG_POWERPC_TRAP] = "trap",
         [PERF_REG_POWERPC_DAR] = "dar",
         [PERF_REG_POWERPC_DSISR] = "dsisr",
-        [PERF_REG_POWERPC_SIER] = "sier"
+        [PERF_REG_POWERPC_SIER] = "sier",
+        [PERF_REG_POWERPC_MMCRA] = "mmcra"
 };
 
 static inline const char *perf_reg_name(int id)
diff --git a/tools/perf/arch/powerpc/util/perf_regs.c b/tools/perf/arch/powerpc/util/perf_regs.c
index 07fcd977d93e..34d5134681d9 100644
--- a/tools/perf/arch/powerpc/util/perf_regs.c
+++ b/tools/perf/arch/powerpc/util/perf_regs.c
@@ -53,6 +53,7 @@ const struct sample_reg sample_reg_masks[] = {
         SMPL_REG(dar, PERF_REG_POWERPC_DAR),
         SMPL_REG(dsisr, PERF_REG_POWERPC_DSISR),
         SMPL_REG(sier, PERF_REG_POWERPC_SIER),
+        SMPL_REG(mmcra, PERF_REG_POWERPC_MMCRA),
         SMPL_REG_END
 };