Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux

Pull s390 update from Martin Schwidefsky:
 "Add support to generate code for the latest machine zEC12, MOD and XOR
  instruction support for the BPF jit compiler, the dasd safe offline
  feature and the big one: the s390 architecture gets PCI support!!
  Right before the world ends on the 21st ;-)"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux: (41 commits)
  s390/qdio: rename the misleading PCI flag of qdio devices
  s390/pci: remove obsolete email addresses
  s390/pci: speed up __iowrite64_copy by using pci store block insn
  s390/pci: enable NEED_DMA_MAP_STATE
  s390/pci: no msleep in potential IRQ context
  s390/pci: fix potential NULL pointer dereference in dma_free_seg_table()
  s390/pci: use kmem_cache_zalloc instead of kmem_cache_alloc/memset
  s390/bpf,jit: add support for XOR instruction
  s390/bpf,jit: add support MOD instruction
  s390/cio: fix pgid reserved check
  vga: compile fix, disable vga for s390
  s390/pci: add PCI Kconfig options
  s390/pci: s390 specific PCI sysfs attributes
  s390/pci: PCI hotplug support via SCLP
  s390/pci: CHSC PCI support for error and availability events
  s390/pci: DMA support
  s390/pci: PCI adapter interrupts for MSI/MSI-X
  s390/bitops: find leftmost bit instruction support
  s390/pci: CLP interface
  s390/pci: base support
  ...

1 files changed, 28 insertions, 0 deletions

diff --git a/arch/s390/net/bpf_jit_comp.c b/arch/s390/net/bpf_jit_comp.c
index 9b355b406afa..bb284419b0fd 100644
--- a/arch/s390/net/bpf_jit_comp.c
+++ b/arch/s390/net/bpf_jit_comp.c
@@ -341,6 +341,27 @@ static int bpf_jit_insn(struct bpf_jit *jit, struct sock_filter *filter,
                 /* lr %r5,%r4 */
                 EMIT2(0x1854);
                 break;
+        case BPF_S_ALU_MOD_X: /* A %= X */
+                jit->seen |= SEEN_XREG | SEEN_RET0;
+                /* ltr %r12,%r12 */
+                EMIT2(0x12cc);
+                /* jz <ret0> */
+                EMIT4_PCREL(0xa7840000, (jit->ret0_ip - jit->prg));
+                /* lhi %r4,0 */
+                EMIT4(0xa7480000);
+                /* dr %r4,%r12 */
+                EMIT2(0x1d4c);
+                /* lr %r5,%r4 */
+                EMIT2(0x1854);
+                break;
+        case BPF_S_ALU_MOD_K: /* A %= K */
+                /* lhi %r4,0 */
+                EMIT4(0xa7480000);
+                /* d %r4,<d(K)>(%r13) */
+                EMIT4_DISP(0x5d40d000, EMIT_CONST(K));
+                /* lr %r5,%r4 */
+                EMIT2(0x1854);
+                break;
         case BPF_S_ALU_AND_X: /* A &= X */
                 jit->seen |= SEEN_XREG;
                 /* nr %r5,%r12 */
@@ -368,10 +389,17 @@ static int bpf_jit_insn(struct bpf_jit *jit, struct sock_filter *filter,
                         EMIT4_DISP(0x5650d000, EMIT_CONST(K));
                 break;
         case BPF_S_ANC_ALU_XOR_X: /* A ^= X; */
+        case BPF_S_ALU_XOR_X:
                 jit->seen |= SEEN_XREG;
                 /* xr %r5,%r12 */
                 EMIT2(0x175c);
                 break;
+        case BPF_S_ALU_XOR_K: /* A ^= K */
+                if (!K)
+                        break;
+                /* x %r5,<d(K)>(%r13) */
+                EMIT4_DISP(0x5750d000, EMIT_CONST(K));
+                break;
         case BPF_S_ALU_LSH_X: /* A <<= X; */
                 jit->seen |= SEEN_XREG;
                 /* sll %r5,0(%r12) */