5 files changed, 19 insertions, 3 deletions

diff --git a/arch/powerpc/kernel/kexec_elf_64.c b/arch/powerpc/kernel/kexec_elf_64.c
index ba4f18a43ee8..52a29fc73730 100644
--- a/arch/powerpc/kernel/kexec_elf_64.c
+++ b/arch/powerpc/kernel/kexec_elf_64.c
@@ -547,6 +547,7 @@ static int elf_exec_load(struct kimage *image, struct elfhdr *ehdr,
                 kbuf.memsz = phdr->p_memsz;
                 kbuf.buf_align = phdr->p_align;
                 kbuf.buf_min = phdr->p_paddr + base;
+                kbuf.mem = KEXEC_BUF_MEM_UNKNOWN;
                 ret = kexec_add_buffer(&kbuf);
                 if (ret)
                         goto out;
@@ -581,7 +582,8 @@ static void *elf64_load(struct kimage *image, char *kernel_buf,
         struct kexec_buf kbuf = { .image = image, .buf_min = 0,
                                   .buf_max = ppc64_rma_size };
         struct kexec_buf pbuf = { .image = image, .buf_min = 0,
-                                  .buf_max = ppc64_rma_size, .top_down = true };
+                                  .buf_max = ppc64_rma_size, .top_down = true,
+                                  .mem = KEXEC_BUF_MEM_UNKNOWN };
 
         ret = build_elf_exec_info(kernel_buf, kernel_len, &ehdr, &elf_info);
         if (ret)
@@ -606,6 +608,7 @@ static void *elf64_load(struct kimage *image, char *kernel_buf,
                 kbuf.bufsz = kbuf.memsz = initrd_len;
                 kbuf.buf_align = PAGE_SIZE;
                 kbuf.top_down = false;
+                kbuf.mem = KEXEC_BUF_MEM_UNKNOWN;
                 ret = kexec_add_buffer(&kbuf);
                 if (ret)
                         goto out;
@@ -638,6 +641,7 @@ static void *elf64_load(struct kimage *image, char *kernel_buf,
         kbuf.bufsz = kbuf.memsz = fdt_size;
         kbuf.buf_align = PAGE_SIZE;
         kbuf.top_down = true;
+        kbuf.mem = KEXEC_BUF_MEM_UNKNOWN;
         ret = kexec_add_buffer(&kbuf);
         if (ret)
                 goto out;
diff --git a/arch/powerpc/perf/core-book3s.c b/arch/powerpc/perf/core-book3s.c
index 7e129f62cd67..ca92e01d0bd1 100644
--- a/arch/powerpc/perf/core-book3s.c
+++ b/arch/powerpc/perf/core-book3s.c
@@ -1846,6 +1846,7 @@ static int power_pmu_event_init(struct perf_event *event)
         int n;
         int err;
         struct cpu_hw_events *cpuhw;
+        u64 bhrb_filter;
 
         if (!ppmu)
                 return -ENOENT;
@@ -1951,13 +1952,14 @@ static int power_pmu_event_init(struct perf_event *event)
         err = power_check_constraints(cpuhw, events, cflags, n + 1);
 
         if (has_branch_stack(event)) {
-                cpuhw->bhrb_filter = ppmu->bhrb_filter_map(
+                bhrb_filter = ppmu->bhrb_filter_map(
                                         event->attr.branch_sample_type);
 
-                if (cpuhw->bhrb_filter == -1) {
+                if (bhrb_filter == -1) {
                         put_cpu_var(cpu_hw_events);
                         return -EOPNOTSUPP;
                 }
+                cpuhw->bhrb_filter = bhrb_filter;
         }
 
         put_cpu_var(cpu_hw_events);
diff --git a/arch/powerpc/perf/power8-pmu.c b/arch/powerpc/perf/power8-pmu.c
index b47e9fb5e899..3a5fcc20ff31 100644
--- a/arch/powerpc/perf/power8-pmu.c
+++ b/arch/powerpc/perf/power8-pmu.c
@@ -25,6 +25,7 @@ enum {
 #define POWER8_MMCRA_IFM1               0x0000000040000000UL
 #define POWER8_MMCRA_IFM2               0x0000000080000000UL
 #define POWER8_MMCRA_IFM3               0x00000000C0000000UL
+#define POWER8_MMCRA_BHRB_MASK          0x00000000C0000000UL
 
 /*
  * Raw event encoding for PowerISA v2.07 (Power8):
@@ -239,6 +240,8 @@ static u64 power8_bhrb_filter_map(u64 branch_sample_type)
 
 static void power8_config_bhrb(u64 pmu_bhrb_filter)
 {
+        pmu_bhrb_filter &= POWER8_MMCRA_BHRB_MASK;
+
         /* Enable BHRB filter in PMU */
         mtspr(SPRN_MMCRA, (mfspr(SPRN_MMCRA) | pmu_bhrb_filter));
 }
diff --git a/arch/powerpc/perf/power9-pmu.c b/arch/powerpc/perf/power9-pmu.c
index 738ed26c538d..08c3ef796198 100644
--- a/arch/powerpc/perf/power9-pmu.c
+++ b/arch/powerpc/perf/power9-pmu.c
@@ -88,6 +88,7 @@ enum {
 #define POWER9_MMCRA_IFM1               0x0000000040000000UL
 #define POWER9_MMCRA_IFM2               0x0000000080000000UL
 #define POWER9_MMCRA_IFM3               0x00000000C0000000UL
+#define POWER9_MMCRA_BHRB_MASK          0x00000000C0000000UL
 
 /* Nasty Power9 specific hack */
 #define PVR_POWER9_CUMULUS              0x00002000
@@ -296,6 +297,8 @@ static u64 power9_bhrb_filter_map(u64 branch_sample_type)
 
 static void power9_config_bhrb(u64 pmu_bhrb_filter)
 {
+        pmu_bhrb_filter &= POWER9_MMCRA_BHRB_MASK;
+
         /* Enable BHRB filter in PMU */
         mtspr(SPRN_MMCRA, (mfspr(SPRN_MMCRA) | pmu_bhrb_filter));
 }
diff --git a/arch/powerpc/platforms/powernv/opal-imc.c b/arch/powerpc/platforms/powernv/opal-imc.c
index 1b6932890a73..186109bdd41b 100644
--- a/arch/powerpc/platforms/powernv/opal-imc.c
+++ b/arch/powerpc/platforms/powernv/opal-imc.c
@@ -157,6 +157,10 @@ static int imc_pmu_create(struct device_node *parent, int pmu_index, int domain)
         struct imc_pmu *pmu_ptr;
         u32 offset;
 
+        /* Return for unknown domain */
+        if (domain < 0)
+                return -EINVAL;
+
         /* memory for pmu */
         pmu_ptr = kzalloc(sizeof(*pmu_ptr), GFP_KERNEL);
         if (!pmu_ptr)