Commit 3664ce2d authored by Linus Torvalds's avatar Linus Torvalds

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()
parents 9cb9c07d eb0a2d26
...@@ -52,7 +52,7 @@ ...@@ -52,7 +52,7 @@
#define FW_FEATURE_TYPE1_AFFINITY ASM_CONST(0x0000000100000000) #define FW_FEATURE_TYPE1_AFFINITY ASM_CONST(0x0000000100000000)
#define FW_FEATURE_PRRN ASM_CONST(0x0000000200000000) #define FW_FEATURE_PRRN ASM_CONST(0x0000000200000000)
#define FW_FEATURE_DRMEM_V2 ASM_CONST(0x0000000400000000) #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__ #ifndef __ASSEMBLY__
......
...@@ -384,7 +384,8 @@ static void *eeh_report_resume(void *data, void *userdata) ...@@ -384,7 +384,8 @@ static void *eeh_report_resume(void *data, void *userdata)
eeh_pcid_put(dev); eeh_pcid_put(dev);
pci_uevent_ers(dev, PCI_ERS_RESULT_RECOVERED); pci_uevent_ers(dev, PCI_ERS_RESULT_RECOVERED);
#ifdef CONFIG_PCI_IOV #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 #endif
return NULL; return NULL;
} }
......
...@@ -874,7 +874,7 @@ struct ibm_arch_vec __cacheline_aligned ibm_architecture_vec = { ...@@ -874,7 +874,7 @@ struct ibm_arch_vec __cacheline_aligned ibm_architecture_vec = {
.mmu = 0, .mmu = 0,
.hash_ext = 0, .hash_ext = 0,
.radix_ext = 0, .radix_ext = 0,
.byte22 = OV5_FEAT(OV5_DRC_INFO), .byte22 = 0,
}, },
/* option vector 6: IBM PAPR hints */ /* option vector 6: IBM PAPR hints */
......
...@@ -98,7 +98,7 @@ static void init_drconf_v2_cell(struct of_drconf_cell_v2 *dr_cell, ...@@ -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->base_addr = cpu_to_be64(lmb->base_addr);
dr_cell->drc_index = cpu_to_be32(lmb->drc_index); dr_cell->drc_index = cpu_to_be32(lmb->drc_index);
dr_cell->aa_index = cpu_to_be32(lmb->aa_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, static int drmem_update_dt_v2(struct device_node *memory,
...@@ -121,7 +121,7 @@ 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 || if (prev_lmb->aa_index != lmb->aa_index ||
prev_lmb->flags != lmb->flags) drmem_lmb_flags(prev_lmb) != drmem_lmb_flags(lmb))
lmb_sets++; lmb_sets++;
prev_lmb = lmb; prev_lmb = lmb;
...@@ -150,7 +150,7 @@ static int drmem_update_dt_v2(struct device_node *memory, ...@@ -150,7 +150,7 @@ static int drmem_update_dt_v2(struct device_node *memory,
} }
if (prev_lmb->aa_index != lmb->aa_index || 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 */ /* end of one set, start of another */
dr_cell->seq_lmbs = cpu_to_be32(seq_lmbs); dr_cell->seq_lmbs = cpu_to_be32(seq_lmbs);
dr_cell++; dr_cell++;
......
...@@ -327,6 +327,9 @@ static int bpf_jit_build_body(struct bpf_prog *fp, u32 *image, ...@@ -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); BUILD_BUG_ON(FIELD_SIZEOF(struct sk_buff, len) != 4);
PPC_LWZ_OFFS(r_A, r_skb, offsetof(struct sk_buff, len)); PPC_LWZ_OFFS(r_A, r_skb, offsetof(struct sk_buff, len));
break; 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; */ case BPF_LDX | BPF_W | BPF_LEN: /* X = skb->len; */
PPC_LWZ_OFFS(r_X, r_skb, offsetof(struct sk_buff, len)); PPC_LWZ_OFFS(r_X, r_skb, offsetof(struct sk_buff, len));
break; break;
......
...@@ -80,6 +80,10 @@ static void pnv_setup_rfi_flush(void) ...@@ -80,6 +80,10 @@ static void pnv_setup_rfi_flush(void)
if (np && of_property_read_bool(np, "disabled")) if (np && of_property_read_bool(np, "disabled"))
enable--; 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(np);
of_node_put(fw_features); of_node_put(fw_features);
} }
......
...@@ -482,7 +482,8 @@ static void pseries_setup_rfi_flush(void) ...@@ -482,7 +482,8 @@ static void pseries_setup_rfi_flush(void)
if (types == L1D_FLUSH_NONE) if (types == L1D_FLUSH_NONE)
types = L1D_FLUSH_FALLBACK; 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; enable = false;
} else { } else {
/* Default to fallback if case hcall is not available */ /* Default to fallback if case hcall is not available */
......
...@@ -133,8 +133,10 @@ static long afu_ioctl(struct file *file, unsigned int cmd, ...@@ -133,8 +133,10 @@ static long afu_ioctl(struct file *file, unsigned int cmd,
if (!rc) { if (!rc) {
rc = copy_to_user((u64 __user *) args, &irq_offset, rc = copy_to_user((u64 __user *) args, &irq_offset,
sizeof(irq_offset)); sizeof(irq_offset));
if (rc) if (rc) {
ocxl_afu_irq_free(ctx, irq_offset); ocxl_afu_irq_free(ctx, irq_offset);
return -EFAULT;
}
} }
break; break;
...@@ -329,7 +331,7 @@ static ssize_t afu_read(struct file *file, char __user *buf, size_t count, ...@@ -329,7 +331,7 @@ static ssize_t afu_read(struct file *file, char __user *buf, size_t count,
used += sizeof(header); used += sizeof(header);
rc = (ssize_t) used; rc = used;
return rc; return rc;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment