Merge tag 'powerpc-4.16-4' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux

Pull powerpc fixes from Michael Ellerman:

 - Add handling for a missing instruction in our 32-bit BPF JIT so that
   it can be used for seccomp filtering.

 - Add a missing NULL pointer check before a function call in new EEH
   code.

 - Fix an error path in the new ocxl driver to correctly return EFAULT.

 - The support for the new ibm,drc-info device tree property turns out
   to need several fixes, so for now we just stop advertising to
   firmware that we support it until the bugs can be ironed out.

 - One fix for the new drmem code which was incorrectly modifying the
   device tree in place.

 - Finally two fixes for the RFI flush support, so that firmware can
   advertise to us that it should be disabled entirely so as not to
   affect performance.

Thanks to: Bharata B Rao, Frederic Barrat, Juan J. Alvarez, Mark Lord,
Michael Bringmann.

* tag 'powerpc-4.16-4' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux:
  powerpc/powernv: Support firmware disable of RFI flush
  powerpc/pseries: Support firmware disable of RFI flush
  powerpc/mm/drmem: Fix unexpected flag value in ibm,dynamic-memory-v2
  powerpc/bpf/jit: Fix 32-bit JIT for seccomp_data access
  powerpc/pseries: Revert support for ibm,drc-info devtree property
  powerpc/pseries: Fix duplicate firmware feature for DRC_INFO
  ocxl: Fix potential bad errno on irq allocation
  powerpc/eeh: Fix crashes in eeh_report_resume()

8 files changed, 20 insertions, 9 deletions

diff --git a/arch/powerpc/include/asm/firmware.h b/arch/powerpc/include/asm/firmware.h
index 511acfd7ab0d..535add3f7791 100644
--- a/arch/powerpc/include/asm/firmware.h
+++ b/arch/powerpc/include/asm/firmware.h
@@ -52,7 +52,7 @@
 #define FW_FEATURE_TYPE1_AFFINITY ASM_CONST(0x0000000100000000)
 #define FW_FEATURE_PRRN         ASM_CONST(0x0000000200000000)
 #define FW_FEATURE_DRMEM_V2     ASM_CONST(0x0000000400000000)
-#define FW_FEATURE_DRC_INFO     ASM_CONST(0x0000000400000000)
+#define FW_FEATURE_DRC_INFO     ASM_CONST(0x0000000800000000)
 
 #ifndef __ASSEMBLY__
 
diff --git a/arch/powerpc/kernel/eeh_driver.c b/arch/powerpc/kernel/eeh_driver.c
index beea2182d754..0c0b66fc5bfb 100644
--- a/arch/powerpc/kernel/eeh_driver.c
+++ b/arch/powerpc/kernel/eeh_driver.c
@@ -384,7 +384,8 @@ static void *eeh_report_resume(void *data, void *userdata)
         eeh_pcid_put(dev);
         pci_uevent_ers(dev, PCI_ERS_RESULT_RECOVERED);
 #ifdef CONFIG_PCI_IOV
-        eeh_ops->notify_resume(eeh_dev_to_pdn(edev));
+        if (eeh_ops->notify_resume && eeh_dev_to_pdn(edev))
+                eeh_ops->notify_resume(eeh_dev_to_pdn(edev));
 #endif
         return NULL;
 }
diff --git a/arch/powerpc/kernel/prom_init.c b/arch/powerpc/kernel/prom_init.c
index adf044daafd7..d22c41c26bb3 100644
--- a/arch/powerpc/kernel/prom_init.c
+++ b/arch/powerpc/kernel/prom_init.c
@@ -874,7 +874,7 @@ struct ibm_arch_vec __cacheline_aligned ibm_architecture_vec = {
                 .mmu = 0,
                 .hash_ext = 0,
                 .radix_ext = 0,
-                .byte22 = OV5_FEAT(OV5_DRC_INFO),
+                .byte22 = 0,
         },
 
         /* option vector 6: IBM PAPR hints */
diff --git a/arch/powerpc/mm/drmem.c b/arch/powerpc/mm/drmem.c
index 916844f99c64..3f1803672c9b 100644
--- a/arch/powerpc/mm/drmem.c
+++ b/arch/powerpc/mm/drmem.c
@@ -98,7 +98,7 @@ static void init_drconf_v2_cell(struct of_drconf_cell_v2 *dr_cell,
         dr_cell->base_addr = cpu_to_be64(lmb->base_addr);
         dr_cell->drc_index = cpu_to_be32(lmb->drc_index);
         dr_cell->aa_index = cpu_to_be32(lmb->aa_index);
-        dr_cell->flags = cpu_to_be32(lmb->flags);
+        dr_cell->flags = cpu_to_be32(drmem_lmb_flags(lmb));
 }
 
 static int drmem_update_dt_v2(struct device_node *memory,
@@ -121,7 +121,7 @@ static int drmem_update_dt_v2(struct device_node *memory,
                 }
 
                 if (prev_lmb->aa_index != lmb->aa_index ||
-                    prev_lmb->flags != lmb->flags)
+                    drmem_lmb_flags(prev_lmb) != drmem_lmb_flags(lmb))
                         lmb_sets++;
 
                 prev_lmb = lmb;
@@ -150,7 +150,7 @@ static int drmem_update_dt_v2(struct device_node *memory,
                 }
 
                 if (prev_lmb->aa_index != lmb->aa_index ||
-                    prev_lmb->flags != lmb->flags) {
+                    drmem_lmb_flags(prev_lmb) != drmem_lmb_flags(lmb)) {
                         /* end of one set, start of another */
                         dr_cell->seq_lmbs = cpu_to_be32(seq_lmbs);
                         dr_cell++;
diff --git a/arch/powerpc/net/bpf_jit_comp.c b/arch/powerpc/net/bpf_jit_comp.c
index 872d1f6dd11e..a9636d8cba15 100644
--- a/arch/powerpc/net/bpf_jit_comp.c
+++ b/arch/powerpc/net/bpf_jit_comp.c
@@ -327,6 +327,9 @@ static int bpf_jit_build_body(struct bpf_prog *fp, u32 *image,
                         BUILD_BUG_ON(FIELD_SIZEOF(struct sk_buff, len) != 4);
                         PPC_LWZ_OFFS(r_A, r_skb, offsetof(struct sk_buff, len));
                         break;
+                case BPF_LDX | BPF_W | BPF_ABS: /* A = *((u32 *)(seccomp_data + K)); */
+                        PPC_LWZ_OFFS(r_A, r_skb, K);
+                        break;
                 case BPF_LDX | BPF_W | BPF_LEN: /* X = skb->len; */
                         PPC_LWZ_OFFS(r_X, r_skb, offsetof(struct sk_buff, len));
                         break;
diff --git a/arch/powerpc/platforms/powernv/setup.c b/arch/powerpc/platforms/powernv/setup.c
index 4fb21e17504a..092715b9674b 100644
--- a/arch/powerpc/platforms/powernv/setup.c
+++ b/arch/powerpc/platforms/powernv/setup.c
@@ -80,6 +80,10 @@ static void pnv_setup_rfi_flush(void)
                 if (np && of_property_read_bool(np, "disabled"))
                         enable--;
 
+                np = of_get_child_by_name(fw_features, "speculation-policy-favor-security");
+                if (np && of_property_read_bool(np, "disabled"))
+                        enable = 0;
+
                 of_node_put(np);
                 of_node_put(fw_features);
         }
diff --git a/arch/powerpc/platforms/pseries/setup.c b/arch/powerpc/platforms/pseries/setup.c
index 372d7ada1a0c..1a527625acf7 100644
--- a/arch/powerpc/platforms/pseries/setup.c
+++ b/arch/powerpc/platforms/pseries/setup.c
@@ -482,7 +482,8 @@ static void pseries_setup_rfi_flush(void)
                 if (types == L1D_FLUSH_NONE)
                         types = L1D_FLUSH_FALLBACK;
 
-                if (!(result.behaviour & H_CPU_BEHAV_L1D_FLUSH_PR))
+                if ((!(result.behaviour & H_CPU_BEHAV_L1D_FLUSH_PR)) ||
+                    (!(result.behaviour & H_CPU_BEHAV_FAVOUR_SECURITY)))
                         enable = false;
         } else {
                 /* Default to fallback if case hcall is not available */
diff --git a/drivers/misc/ocxl/file.c b/drivers/misc/ocxl/file.c
index 2dd2db9bc1c9..337462e1569f 100644
--- a/drivers/misc/ocxl/file.c
+++ b/drivers/misc/ocxl/file.c
@@ -133,8 +133,10 @@ static long afu_ioctl(struct file *file, unsigned int cmd,
                 if (!rc) {
                         rc = copy_to_user((u64 __user *) args, &irq_offset,
                                         sizeof(irq_offset));
-                        if (rc)
+                        if (rc) {
                                 ocxl_afu_irq_free(ctx, irq_offset);
+                                return -EFAULT;
+                        }
                 }
                 break;
 
@@ -329,7 +331,7 @@ static ssize_t afu_read(struct file *file, char __user *buf, size_t count,
 
         used += sizeof(header);
 
-        rc = (ssize_t) used;
+        rc = used;
         return rc;
 }