27 files changed, 228 insertions, 155 deletions

diff --git a/arch/s390/appldata/appldata_mem.c b/arch/s390/appldata/appldata_mem.c
index 7ef60b52d6e0..42be53743133 100644
--- a/arch/s390/appldata/appldata_mem.c
+++ b/arch/s390/appldata/appldata_mem.c
@@ -32,7 +32,7 @@
  * book:
  * http://oss.software.ibm.com/developerworks/opensource/linux390/index.shtml
  */
-static struct appldata_mem_data {
+struct appldata_mem_data {
         u64 timestamp;
         u32 sync_count_1;       /* after VM collected the record data, */
         u32 sync_count_2;       /* sync_count_1 and sync_count_2 should be the
@@ -63,7 +63,7 @@ static struct appldata_mem_data {
         u64 pgmajfault;         /* page faults (major only) */
 // <-- New in 2.6
 
-} __attribute__((packed)) appldata_mem_data;
+} __packed;
 
 
 /*
@@ -118,7 +118,6 @@ static struct appldata_ops ops = {
         .record_nr = APPLDATA_RECORD_MEM_ID,
         .size      = sizeof(struct appldata_mem_data),
         .callback  = &appldata_get_mem_data,
-        .data      = &appldata_mem_data,
         .owner     = THIS_MODULE,
         .mod_lvl   = {0xF0, 0xF0},              /* EBCDIC "00" */
 };
@@ -131,7 +130,17 @@ static struct appldata_ops ops = {
  */
 static int __init appldata_mem_init(void)
 {
-        return appldata_register_ops(&ops);
+        int ret;
+
+        ops.data = kzalloc(sizeof(struct appldata_mem_data), GFP_KERNEL);
+        if (!ops.data)
+                return -ENOMEM;
+
+        ret = appldata_register_ops(&ops);
+        if (ret)
+                kfree(ops.data);
+
+        return ret;
 }
 
 /*
@@ -142,6 +151,7 @@ static int __init appldata_mem_init(void)
 static void __exit appldata_mem_exit(void)
 {
         appldata_unregister_ops(&ops);
+        kfree(ops.data);
 }
 
 
diff --git a/arch/s390/appldata/appldata_net_sum.c b/arch/s390/appldata/appldata_net_sum.c
index 2d224b945355..66037d2622b4 100644
--- a/arch/s390/appldata/appldata_net_sum.c
+++ b/arch/s390/appldata/appldata_net_sum.c
@@ -29,7 +29,7 @@
  * book:
  * http://oss.software.ibm.com/developerworks/opensource/linux390/index.shtml
  */
-static struct appldata_net_sum_data {
+struct appldata_net_sum_data {
         u64 timestamp;
         u32 sync_count_1;       /* after VM collected the record data, */
         u32 sync_count_2;       /* sync_count_1 and sync_count_2 should be the
@@ -51,7 +51,7 @@ static struct appldata_net_sum_data {
         u64 rx_dropped;         /* no space in linux buffers     */
         u64 tx_dropped;         /* no space available in linux   */
         u64 collisions;         /* collisions while transmitting */
-} __attribute__((packed)) appldata_net_sum_data;
+} __packed;
 
 
 /*
@@ -121,7 +121,6 @@ static struct appldata_ops ops = {
         .record_nr = APPLDATA_RECORD_NET_SUM_ID,
         .size      = sizeof(struct appldata_net_sum_data),
         .callback  = &appldata_get_net_sum_data,
-        .data      = &appldata_net_sum_data,
         .owner     = THIS_MODULE,
         .mod_lvl   = {0xF0, 0xF0},              /* EBCDIC "00" */
 };
@@ -134,7 +133,17 @@ static struct appldata_ops ops = {
  */
 static int __init appldata_net_init(void)
 {
-        return appldata_register_ops(&ops);
+        int ret;
+
+        ops.data = kzalloc(sizeof(struct appldata_net_sum_data), GFP_KERNEL);
+        if (!ops.data)
+                return -ENOMEM;
+
+        ret = appldata_register_ops(&ops);
+        if (ret)
+                kfree(ops.data);
+
+        return ret;
 }
 
 /*
@@ -145,6 +154,7 @@ static int __init appldata_net_init(void)
 static void __exit appldata_net_exit(void)
 {
         appldata_unregister_ops(&ops);
+        kfree(ops.data);
 }
 
 
diff --git a/arch/s390/hypfs/hypfs_diag.c b/arch/s390/hypfs/hypfs_diag.c
index 7fd3690b6760..138893e5f736 100644
--- a/arch/s390/hypfs/hypfs_diag.c
+++ b/arch/s390/hypfs/hypfs_diag.c
@@ -651,9 +651,7 @@ static int hypfs_create_cpu_files(struct super_block *sb,
         }
         diag224_idx2name(cpu_info__ctidx(diag204_info_type, cpu_info), buffer);
         rc = hypfs_create_str(sb, cpu_dir, "type", buffer);
-        if (IS_ERR(rc))
-                return PTR_ERR(rc);
-        return 0;
+        return PTR_RET(rc);
 }
 
 static void *hypfs_create_lpar_files(struct super_block *sb,
@@ -702,9 +700,7 @@ static int hypfs_create_phys_cpu_files(struct super_block *sb,
                 return PTR_ERR(rc);
         diag224_idx2name(phys_cpu__ctidx(diag204_info_type, cpu_info), buffer);
         rc = hypfs_create_str(sb, cpu_dir, "type", buffer);
-        if (IS_ERR(rc))
-                return PTR_ERR(rc);
-        return 0;
+        return PTR_RET(rc);
 }
 
 static void *hypfs_create_phys_files(struct super_block *sb,
diff --git a/arch/s390/include/asm/airq.h b/arch/s390/include/asm/airq.h
index 9819891ed7a2..4066cee0c2d2 100644
--- a/arch/s390/include/asm/airq.h
+++ b/arch/s390/include/asm/airq.h
@@ -9,9 +9,18 @@
 #ifndef _ASM_S390_AIRQ_H
 #define _ASM_S390_AIRQ_H
 
-typedef void (*adapter_int_handler_t)(void *, void *);
+struct airq_struct {
+        struct hlist_node list;         /* Handler queueing. */
+        void (*handler)(struct airq_struct *);  /* Thin-interrupt handler */
+        u8 *lsi_ptr;                    /* Local-Summary-Indicator pointer */
+        u8 lsi_mask;                    /* Local-Summary-Indicator mask */
+        u8 isc;                         /* Interrupt-subclass */
+        u8 flags;
+};
 
-void *s390_register_adapter_interrupt(adapter_int_handler_t, void *, u8);
-void s390_unregister_adapter_interrupt(void *, u8);
+#define AIRQ_PTR_ALLOCATED      0x01
+
+int register_adapter_interrupt(struct airq_struct *airq);
+void unregister_adapter_interrupt(struct airq_struct *airq);
 
 #endif /* _ASM_S390_AIRQ_H */
diff --git a/arch/s390/include/asm/dma-mapping.h b/arch/s390/include/asm/dma-mapping.h
index 2f8c1abeb086..3fbc67d9e197 100644
--- a/arch/s390/include/asm/dma-mapping.h
+++ b/arch/s390/include/asm/dma-mapping.h
@@ -53,7 +53,7 @@ static inline int dma_mapping_error(struct device *dev, dma_addr_t dma_addr)
         debug_dma_mapping_error(dev, dma_addr);
         if (dma_ops->mapping_error)
                 return dma_ops->mapping_error(dev, dma_addr);
-        return (dma_addr == DMA_ERROR_CODE);
+        return dma_addr == DMA_ERROR_CODE;
 }
 
 static inline void *dma_alloc_coherent(struct device *dev, size_t size,
diff --git a/arch/s390/include/asm/facility.h b/arch/s390/include/asm/facility.h
index 2ee66a65f2d4..0aa6a7ed95a3 100644
--- a/arch/s390/include/asm/facility.h
+++ b/arch/s390/include/asm/facility.h
@@ -13,6 +13,16 @@
 
 #define MAX_FACILITY_BIT (256*8)        /* stfle_fac_list has 256 bytes */
 
+static inline int __test_facility(unsigned long nr, void *facilities)
+{
+        unsigned char *ptr;
+
+        if (nr >= MAX_FACILITY_BIT)
+                return 0;
+        ptr = (unsigned char *) facilities + (nr >> 3);
+        return (*ptr & (0x80 >> (nr & 7))) != 0;
+}
+
 /*
  * The test_facility function uses the bit odering where the MSB is bit 0.
  * That makes it easier to query facility bits with the bit number as
@@ -20,12 +30,7 @@
  */
 static inline int test_facility(unsigned long nr)
 {
-        unsigned char *ptr;
-
-        if (nr >= MAX_FACILITY_BIT)
-                return 0;
-        ptr = (unsigned char *) &S390_lowcore.stfle_fac_list + (nr >> 3);
-        return (*ptr & (0x80 >> (nr & 7))) != 0;
+        return __test_facility(nr, &S390_lowcore.stfle_fac_list);
 }
 
 /**
diff --git a/arch/s390/include/asm/io.h b/arch/s390/include/asm/io.h
index fd9be010f9b2..cd6b9ee7b69c 100644
--- a/arch/s390/include/asm/io.h
+++ b/arch/s390/include/asm/io.h
@@ -13,28 +13,6 @@
 #include <asm/page.h>
 #include <asm/pci_io.h>
 
-/*
- * Change virtual addresses to physical addresses and vv.
- * These are pretty trivial
- */
-static inline unsigned long virt_to_phys(volatile void * address)
-{
-        unsigned long real_address;
-        asm volatile(
-                 "      lra     %0,0(%1)\n"
-                 "      jz      0f\n"
-                 "      la      %0,0\n"
-                 "0:"
-                 : "=a" (real_address) : "a" (address) : "cc");
-        return real_address;
-}
-#define virt_to_phys virt_to_phys
-
-static inline void * phys_to_virt(unsigned long address)
-{
-        return (void *) address;
-}
-
 void *xlate_dev_mem_ptr(unsigned long phys);
 #define xlate_dev_mem_ptr xlate_dev_mem_ptr
 void unxlate_dev_mem_ptr(unsigned long phys, void *addr);
diff --git a/arch/s390/include/asm/pci.h b/arch/s390/include/asm/pci.h
index 6c1801235db9..6e577ba0e5da 100644
--- a/arch/s390/include/asm/pci.h
+++ b/arch/s390/include/asm/pci.h
@@ -120,7 +120,6 @@ struct zpci_dev {
 
         struct dentry   *debugfs_dev;
         struct dentry   *debugfs_perf;
-        struct dentry   *debugfs_debug;
 };
 
 struct pci_hp_callback_ops {
@@ -143,7 +142,6 @@ int zpci_enable_device(struct zpci_dev *);
 int zpci_disable_device(struct zpci_dev *);
 void zpci_stop_device(struct zpci_dev *);
 void zpci_free_device(struct zpci_dev *);
-int zpci_scan_device(struct zpci_dev *);
 int zpci_register_ioat(struct zpci_dev *, u8, u64, u64, u64);
 int zpci_unregister_ioat(struct zpci_dev *, u8);
 
diff --git a/arch/s390/include/asm/pgalloc.h b/arch/s390/include/asm/pgalloc.h
index 590c3219c634..e1408ddb94f8 100644
--- a/arch/s390/include/asm/pgalloc.h
+++ b/arch/s390/include/asm/pgalloc.h
@@ -22,6 +22,9 @@ unsigned long *page_table_alloc(struct mm_struct *, unsigned long);
 void page_table_free(struct mm_struct *, unsigned long *);
 void page_table_free_rcu(struct mmu_gather *, unsigned long *);
 
+int set_guest_storage_key(struct mm_struct *mm, unsigned long addr,
+                          unsigned long key, bool nq);
+
 static inline void clear_table(unsigned long *s, unsigned long val, size_t n)
 {
         typedef struct { char _[n]; } addrtype;
diff --git a/arch/s390/include/asm/ptrace.h b/arch/s390/include/asm/ptrace.h
index 559512a455da..52b56533c57c 100644
--- a/arch/s390/include/asm/ptrace.h
+++ b/arch/s390/include/asm/ptrace.h
@@ -24,6 +24,7 @@ struct pt_regs
         unsigned long gprs[NUM_GPRS];
         unsigned long orig_gpr2;
         unsigned int int_code;
+        unsigned int int_parm;
         unsigned long int_parm_long;
 };
 
diff --git a/arch/s390/include/uapi/asm/Kbuild b/arch/s390/include/uapi/asm/Kbuild
index 9ccd1905bdad..6a9a9eb645f5 100644
--- a/arch/s390/include/uapi/asm/Kbuild
+++ b/arch/s390/include/uapi/asm/Kbuild
@@ -35,6 +35,7 @@ header-y += siginfo.h
 header-y += signal.h
 header-y += socket.h
 header-y += sockios.h
+header-y += sclp_ctl.h
 header-y += stat.h
 header-y += statfs.h
 header-y += swab.h
diff --git a/arch/s390/include/uapi/asm/chsc.h b/arch/s390/include/uapi/asm/chsc.h
index 1c6a7f85a581..65dc694725a8 100644
--- a/arch/s390/include/uapi/asm/chsc.h
+++ b/arch/s390/include/uapi/asm/chsc.h
@@ -29,6 +29,16 @@ struct chsc_async_area {
         __u8 data[CHSC_SIZE - sizeof(struct chsc_async_header)];
 } __attribute__ ((packed));
 
+struct chsc_header {
+        __u16 length;
+        __u16 code;
+} __attribute__ ((packed));
+
+struct chsc_sync_area {
+        struct chsc_header header;
+        __u8 data[CHSC_SIZE - sizeof(struct chsc_header)];
+} __attribute__ ((packed));
+
 struct chsc_response_struct {
         __u16 length;
         __u16 code;
@@ -126,5 +136,8 @@ struct chsc_cpd_info {
 #define CHSC_INFO_CCL _IOWR(CHSC_IOCTL_MAGIC, 0x86, struct chsc_comp_list)
 #define CHSC_INFO_CPD _IOWR(CHSC_IOCTL_MAGIC, 0x87, struct chsc_cpd_info)
 #define CHSC_INFO_DCAL _IOWR(CHSC_IOCTL_MAGIC, 0x88, struct chsc_dcal)
+#define CHSC_START_SYNC _IOWR(CHSC_IOCTL_MAGIC, 0x89, struct chsc_sync_area)
+#define CHSC_ON_CLOSE_SET _IOWR(CHSC_IOCTL_MAGIC, 0x8a, struct chsc_async_area)
+#define CHSC_ON_CLOSE_REMOVE _IO(CHSC_IOCTL_MAGIC, 0x8b)
 
 #endif
diff --git a/arch/s390/include/uapi/asm/dasd.h b/arch/s390/include/uapi/asm/dasd.h
index 38eca3ba40e2..5812a3b2df9e 100644
--- a/arch/s390/include/uapi/asm/dasd.h
+++ b/arch/s390/include/uapi/asm/dasd.h
@@ -261,6 +261,10 @@ struct dasd_snid_ioctl_data {
 #define BIODASDQUIESCE _IO(DASD_IOCTL_LETTER,6) 
 /* Resume IO on device */
 #define BIODASDRESUME  _IO(DASD_IOCTL_LETTER,7) 
+/* Abort all I/O on a device */
+#define BIODASDABORTIO _IO(DASD_IOCTL_LETTER, 240)
+/* Allow I/O on a device */
+#define BIODASDALLOWIO _IO(DASD_IOCTL_LETTER, 241)
 
 
 /* retrieve API version number */
diff --git a/arch/s390/include/uapi/asm/sclp_ctl.h b/arch/s390/include/uapi/asm/sclp_ctl.h
new file mode 100644
index 000000000000..f2818613ee41
--- /dev/null
+++ b/arch/s390/include/uapi/asm/sclp_ctl.h
@@ -0,0 +1,24 @@
+/*
+ * IOCTL interface for SCLP
+ *
+ * Copyright IBM Corp. 2012
+ *
+ * Author: Michael Holzheu <holzheu@linux.vnet.ibm.com>
+ */
+
+#ifndef _ASM_SCLP_CTL_H
+#define _ASM_SCLP_CTL_H
+
+#include <linux/types.h>
+
+struct sclp_ctl_sccb {
+        __u32   cmdw;
+        __u64   sccb;
+} __attribute__((packed));
+
+#define SCLP_CTL_IOCTL_MAGIC 0x10
+
+#define SCLP_CTL_SCCB \
+        _IOWR(SCLP_CTL_IOCTL_MAGIC, 0x10, struct sclp_ctl_sccb)
+
+#endif
diff --git a/arch/s390/kernel/asm-offsets.c b/arch/s390/kernel/asm-offsets.c
index 7a82f9f70100..d6de844bc30a 100644
--- a/arch/s390/kernel/asm-offsets.c
+++ b/arch/s390/kernel/asm-offsets.c
@@ -47,6 +47,7 @@ int main(void)
         DEFINE(__PT_GPRS, offsetof(struct pt_regs, gprs));
         DEFINE(__PT_ORIG_GPR2, offsetof(struct pt_regs, orig_gpr2));
         DEFINE(__PT_INT_CODE, offsetof(struct pt_regs, int_code));
+        DEFINE(__PT_INT_PARM, offsetof(struct pt_regs, int_parm));
         DEFINE(__PT_INT_PARM_LONG, offsetof(struct pt_regs, int_parm_long));
         DEFINE(__PT_SIZE, sizeof(struct pt_regs));
         BLANK();
diff --git a/arch/s390/kernel/entry.S b/arch/s390/kernel/entry.S
index 4d5e6f8a7978..be7a408be7a1 100644
--- a/arch/s390/kernel/entry.S
+++ b/arch/s390/kernel/entry.S
@@ -429,11 +429,19 @@ io_skip:
         stm     %r0,%r7,__PT_R0(%r11)
         mvc     __PT_R8(32,%r11),__LC_SAVE_AREA_ASYNC
         stm     %r8,%r9,__PT_PSW(%r11)
+        mvc     __PT_INT_CODE(12,%r11),__LC_SUBCHANNEL_ID
         TRACE_IRQS_OFF
         xc      __SF_BACKCHAIN(4,%r15),__SF_BACKCHAIN(%r15)
+io_loop:
         l       %r1,BASED(.Ldo_IRQ)
         lr      %r2,%r11                # pass pointer to pt_regs
         basr    %r14,%r1                # call do_IRQ
+        tm      __LC_MACHINE_FLAGS+2,0x10       # MACHINE_FLAG_LPAR
+        jz      io_return
+        tpi     0
+        jz      io_return
+        mvc     __PT_INT_CODE(12,%r11),__LC_SUBCHANNEL_ID
+        j       io_loop
 io_return:
         LOCKDEP_SYS_EXIT
         TRACE_IRQS_ON
@@ -573,10 +581,10 @@ ext_skip:
         stm     %r0,%r7,__PT_R0(%r11)
         mvc     __PT_R8(32,%r11),__LC_SAVE_AREA_ASYNC
         stm     %r8,%r9,__PT_PSW(%r11)
+        mvc     __PT_INT_CODE(4,%r11),__LC_EXT_CPU_ADDR
+        mvc     __PT_INT_PARM(4,%r11),__LC_EXT_PARAMS
         TRACE_IRQS_OFF
         lr      %r2,%r11                # pass pointer to pt_regs
-        l       %r3,__LC_EXT_CPU_ADDR   # get cpu address + interruption code
-        l       %r4,__LC_EXT_PARAMS     # get external parameters
         l       %r1,BASED(.Ldo_extint)
         basr    %r14,%r1                # call do_extint
         j       io_return
diff --git a/arch/s390/kernel/entry.h b/arch/s390/kernel/entry.h
index aa0ab02e9595..3ddbc26d246e 100644
--- a/arch/s390/kernel/entry.h
+++ b/arch/s390/kernel/entry.h
@@ -54,7 +54,7 @@ void handle_signal32(unsigned long sig, struct k_sigaction *ka,
 void do_notify_resume(struct pt_regs *regs);
 
 struct ext_code;
-void do_extint(struct pt_regs *regs, struct ext_code, unsigned int, unsigned long);
+void do_extint(struct pt_regs *regs);
 void do_restart(void);
 void __init startup_init(void);
 void die(struct pt_regs *regs, const char *str);
diff --git a/arch/s390/kernel/entry64.S b/arch/s390/kernel/entry64.S
index 4c17eece707e..bc5864c5148b 100644
--- a/arch/s390/kernel/entry64.S
+++ b/arch/s390/kernel/entry64.S
@@ -460,10 +460,18 @@ io_skip:
         stmg    %r0,%r7,__PT_R0(%r11)
         mvc     __PT_R8(64,%r11),__LC_SAVE_AREA_ASYNC
         stmg    %r8,%r9,__PT_PSW(%r11)
+        mvc     __PT_INT_CODE(12,%r11),__LC_SUBCHANNEL_ID
         TRACE_IRQS_OFF
         xc      __SF_BACKCHAIN(8,%r15),__SF_BACKCHAIN(%r15)
+io_loop:
         lgr     %r2,%r11                # pass pointer to pt_regs
         brasl   %r14,do_IRQ
+        tm      __LC_MACHINE_FLAGS+6,0x10       # MACHINE_FLAG_LPAR
+        jz      io_return
+        tpi     0
+        jz      io_return
+        mvc     __PT_INT_CODE(12,%r11),__LC_SUBCHANNEL_ID
+        j       io_loop
 io_return:
         LOCKDEP_SYS_EXIT
         TRACE_IRQS_ON
@@ -605,13 +613,13 @@ ext_skip:
         stmg    %r0,%r7,__PT_R0(%r11)
         mvc     __PT_R8(64,%r11),__LC_SAVE_AREA_ASYNC
         stmg    %r8,%r9,__PT_PSW(%r11)
+        lghi    %r1,__LC_EXT_PARAMS2
+        mvc     __PT_INT_CODE(4,%r11),__LC_EXT_CPU_ADDR
+        mvc     __PT_INT_PARM(4,%r11),__LC_EXT_PARAMS
+        mvc     __PT_INT_PARM_LONG(8,%r11),0(%r1)
         TRACE_IRQS_OFF
         xc      __SF_BACKCHAIN(8,%r15),__SF_BACKCHAIN(%r15)
-        lghi    %r1,4096
         lgr     %r2,%r11                # pass pointer to pt_regs
-        llgf    %r3,__LC_EXT_CPU_ADDR   # get cpu address + interruption code
-        llgf    %r4,__LC_EXT_PARAMS     # get external parameter
-        lg      %r5,__LC_EXT_PARAMS2-4096(%r1)  # get 64 bit external parameter
         brasl   %r14,do_extint
         j       io_return
 
diff --git a/arch/s390/kernel/irq.c b/arch/s390/kernel/irq.c
index dd3c1994b8bd..54b0995514e8 100644
--- a/arch/s390/kernel/irq.c
+++ b/arch/s390/kernel/irq.c
@@ -234,9 +234,9 @@ int unregister_external_interrupt(u16 code, ext_int_handler_t handler)
 }
 EXPORT_SYMBOL(unregister_external_interrupt);
 
-void __irq_entry do_extint(struct pt_regs *regs, struct ext_code ext_code,
-                           unsigned int param32, unsigned long param64)
+void __irq_entry do_extint(struct pt_regs *regs)
 {
+        struct ext_code ext_code;
         struct pt_regs *old_regs;
         struct ext_int_info *p;
         int index;
@@ -248,6 +248,7 @@ void __irq_entry do_extint(struct pt_regs *regs, struct ext_code ext_code,
                 clock_comparator_work();
         }
         kstat_incr_irqs_this_cpu(EXTERNAL_INTERRUPT, NULL);
+        ext_code = *(struct ext_code *) &regs->int_code;
         if (ext_code.code != 0x1004)
                 __get_cpu_var(s390_idle).nohz_delay = 1;
 
@@ -255,7 +256,8 @@ void __irq_entry do_extint(struct pt_regs *regs, struct ext_code ext_code,
         rcu_read_lock();
         list_for_each_entry_rcu(p, &ext_int_hash[index], entry)
                 if (likely(p->code == ext_code.code))
-                        p->handler(ext_code, param32, param64);
+                        p->handler(ext_code, regs->int_parm,
+                                   regs->int_parm_long);
         rcu_read_unlock();
         irq_exit();
         set_irq_regs(old_regs);
diff --git a/arch/s390/kernel/smp.c b/arch/s390/kernel/smp.c
index 4f977d0d25c2..15a016c10563 100644
--- a/arch/s390/kernel/smp.c
+++ b/arch/s390/kernel/smp.c
@@ -49,7 +49,6 @@
 
 enum {
         ec_schedule = 0,
-        ec_call_function,
         ec_call_function_single,
         ec_stop_cpu,
 };
@@ -438,8 +437,6 @@ static void smp_handle_ext_call(void)
                 smp_stop_cpu();
         if (test_bit(ec_schedule, &bits))
                 scheduler_ipi();
-        if (test_bit(ec_call_function, &bits))
-                generic_smp_call_function_interrupt();
         if (test_bit(ec_call_function_single, &bits))
                 generic_smp_call_function_single_interrupt();
 }
@@ -456,7 +453,7 @@ void arch_send_call_function_ipi_mask(const struct cpumask *mask)
         int cpu;
 
         for_each_cpu(cpu, mask)
-                pcpu_ec_call(pcpu_devices + cpu, ec_call_function);
+                pcpu_ec_call(pcpu_devices + cpu, ec_call_function_single);
 }
 
 void arch_send_call_function_single_ipi(int cpu)
diff --git a/arch/s390/mm/pgtable.c b/arch/s390/mm/pgtable.c
index a938b548f07e..74c29d922458 100644
--- a/arch/s390/mm/pgtable.c
+++ b/arch/s390/mm/pgtable.c
@@ -771,6 +771,54 @@ static inline void page_table_free_pgste(unsigned long *table)
         __free_page(page);
 }
 
+int set_guest_storage_key(struct mm_struct *mm, unsigned long addr,
+                          unsigned long key, bool nq)
+{
+        spinlock_t *ptl;
+        pgste_t old, new;
+        pte_t *ptep;
+
+        down_read(&mm->mmap_sem);
+        ptep = get_locked_pte(current->mm, addr, &ptl);
+        if (unlikely(!ptep)) {
+                up_read(&mm->mmap_sem);
+                return -EFAULT;
+        }
+
+        new = old = pgste_get_lock(ptep);
+        pgste_val(new) &= ~(PGSTE_GR_BIT | PGSTE_GC_BIT |
+                            PGSTE_ACC_BITS | PGSTE_FP_BIT);
+        pgste_val(new) |= (key & (_PAGE_CHANGED | _PAGE_REFERENCED)) << 48;
+        pgste_val(new) |= (key & (_PAGE_ACC_BITS | _PAGE_FP_BIT)) << 56;
+        if (!(pte_val(*ptep) & _PAGE_INVALID)) {
+                unsigned long address, bits;
+                unsigned char skey;
+
+                address = pte_val(*ptep) & PAGE_MASK;
+                skey = page_get_storage_key(address);
+                bits = skey & (_PAGE_CHANGED | _PAGE_REFERENCED);
+                /* Set storage key ACC and FP */
+                page_set_storage_key(address,
+                                (key & (_PAGE_ACC_BITS | _PAGE_FP_BIT)),
+                                !nq);
+
+                /* Merge host changed & referenced into pgste  */
+                pgste_val(new) |= bits << 52;
+                /* Transfer skey changed & referenced bit to kvm user bits */
+                pgste_val(new) |= bits << 45;   /* PGSTE_UR_BIT & PGSTE_UC_BIT */
+        }
+        /* changing the guest storage key is considered a change of the page */
+        if ((pgste_val(new) ^ pgste_val(old)) &
+            (PGSTE_ACC_BITS | PGSTE_FP_BIT | PGSTE_GR_BIT | PGSTE_GC_BIT))
+                pgste_val(new) |= PGSTE_UC_BIT;
+
+        pgste_set_unlock(ptep, new);
+        pte_unmap_unlock(*ptep, ptl);
+        up_read(&mm->mmap_sem);
+        return 0;
+}
+EXPORT_SYMBOL(set_guest_storage_key);
+
 #else /* CONFIG_PGSTE */
 
 static inline unsigned long *page_table_alloc_pgste(struct mm_struct *mm,
diff --git a/arch/s390/oprofile/hwsampler.h b/arch/s390/oprofile/hwsampler.h
index 1912f3bb190c..0022e1ebfbde 100644
--- a/arch/s390/oprofile/hwsampler.h
+++ b/arch/s390/oprofile/hwsampler.h
@@ -81,8 +81,8 @@ struct hws_data_entry {
         unsigned int:16;
         unsigned int prim_asn:16;   /* primary ASN                       */
         unsigned long long ia;      /* Instruction Address               */
-        unsigned long long lpp;     /* Logical-Partition Program Param.  */
-        unsigned long long vpp;     /* Virtual-Machine Program Param.    */
+        unsigned long long gpp;     /* Guest Program Parameter           */
+        unsigned long long hpp;     /* Host Program Parameter            */
 };
 
 struct hws_trailer_entry {
diff --git a/arch/s390/pci/pci.c b/arch/s390/pci/pci.c
index f1e5be85d592..e2956ad39a4f 100644
--- a/arch/s390/pci/pci.c
+++ b/arch/s390/pci/pci.c
@@ -82,10 +82,13 @@ struct intr_bucket {
 
 static struct intr_bucket *bucket;
 
-/* Adapter local summary indicator */
-static u8 *zpci_irq_si;
+/* Adapter interrupt definitions */
+static void zpci_irq_handler(struct airq_struct *airq);
 
-static atomic_t irq_retries = ATOMIC_INIT(0);
+static struct airq_struct zpci_airq = {
+        .handler = zpci_irq_handler,
+        .isc = PCI_ISC,
+};
 
 /* I/O Map */
 static DEFINE_SPINLOCK(zpci_iomap_lock);
@@ -404,7 +407,7 @@ static struct pci_ops pci_root_ops = {
 /* store the last handled bit to implement fair scheduling of devices */
 static DEFINE_PER_CPU(unsigned long, next_sbit);
 
-static void zpci_irq_handler(void *dont, void *need)
+static void zpci_irq_handler(struct airq_struct *airq)
 {
         unsigned long sbit, mbit, last = 0, start = __get_cpu_var(next_sbit);
         int rescan = 0, max = aisb_max;
@@ -452,7 +455,6 @@ scan:
         max = aisb_max;
         sbit = find_first_bit_left(bucket->aisb, max);
         if (sbit != max) {
-                atomic_inc(&irq_retries);
                 rescan++;
                 goto scan;
         }
@@ -565,7 +567,21 @@ static void zpci_map_resources(struct zpci_dev *zdev)
                 pr_debug("BAR%i: -> start: %Lx  end: %Lx\n",
                         i, pdev->resource[i].start, pdev->resource[i].end);
         }
-};
+}
+
+static void zpci_unmap_resources(struct zpci_dev *zdev)
+{
+        struct pci_dev *pdev = zdev->pdev;
+        resource_size_t len;
+        int i;
+
+        for (i = 0; i < PCI_BAR_COUNT; i++) {
+                len = pci_resource_len(pdev, i);
+                if (!len)
+                        continue;
+                pci_iounmap(pdev, (void *) pdev->resource[i].start);
+        }
+}
 
 struct zpci_dev *zpci_alloc_device(void)
 {
@@ -701,25 +717,20 @@ static int __init zpci_irq_init(void)
                 goto out_alloc;
         }
 
-        isc_register(PCI_ISC);
-        zpci_irq_si = s390_register_adapter_interrupt(&zpci_irq_handler, NULL, PCI_ISC);
-        if (IS_ERR(zpci_irq_si)) {
-                rc = PTR_ERR(zpci_irq_si);
-                zpci_irq_si = NULL;
+        rc = register_adapter_interrupt(&zpci_airq);
+        if (rc)
                 goto out_ai;
-        }
+        /* Set summary to 1 to be called every time for the ISC. */
+        *zpci_airq.lsi_ptr = 1;
 
         for_each_online_cpu(cpu)
                 per_cpu(next_sbit, cpu) = 0;
 
         spin_lock_init(&bucket->lock);
-        /* set summary to 1 to be called every time for the ISC */
-        *zpci_irq_si = 1;
         set_irq_ctrl(SIC_IRQ_MODE_SINGLE, NULL, PCI_ISC);
         return 0;
 
 out_ai:
-        isc_unregister(PCI_ISC);
         free_page((unsigned long) bucket->alloc);
 out_alloc:
         free_page((unsigned long) bucket->aisb);
@@ -732,21 +743,10 @@ static void zpci_irq_exit(void)
 {
         free_page((unsigned long) bucket->alloc);
         free_page((unsigned long) bucket->aisb);
-        s390_unregister_adapter_interrupt(zpci_irq_si, PCI_ISC);
-        isc_unregister(PCI_ISC);
+        unregister_adapter_interrupt(&zpci_airq);
         kfree(bucket);
 }
 
-void zpci_debug_info(struct zpci_dev *zdev, struct seq_file *m)
-{
-        if (!zdev)
-                return;
-
-        seq_printf(m, "global irq retries: %u\n", atomic_read(&irq_retries));
-        seq_printf(m, "aibv[0]:%016lx  aibv[1]:%016lx  aisb:%016lx\n",
-                   get_imap(0)->aibv, get_imap(1)->aibv, *bucket->aisb);
-}
-
 static struct resource *zpci_alloc_bus_resource(unsigned long start, unsigned long size,
                                                 unsigned long flags, int domain)
 {
@@ -810,6 +810,16 @@ int pcibios_add_device(struct pci_dev *pdev)
         return 0;
 }
 
+void pcibios_release_device(struct pci_dev *pdev)
+{
+        struct zpci_dev *zdev = get_zdev(pdev);
+
+        zpci_unmap_resources(zdev);
+        zpci_fmb_disable_device(zdev);
+        zpci_debug_exit_device(zdev);
+        zdev->pdev = NULL;
+}
+
 static int zpci_scan_bus(struct zpci_dev *zdev)
 {
         struct resource *res;
@@ -950,25 +960,6 @@ void zpci_stop_device(struct zpci_dev *zdev)
 }
 EXPORT_SYMBOL_GPL(zpci_stop_device);
 
-int zpci_scan_device(struct zpci_dev *zdev)
-{
-        zdev->pdev = pci_scan_single_device(zdev->bus, ZPCI_DEVFN);
-        if (!zdev->pdev) {
-                pr_err("pci_scan_single_device failed for fid: 0x%x\n",
-                        zdev->fid);
-                goto out;
-        }
-
-        pci_bus_add_devices(zdev->bus);
-
-        return 0;
-out:
-        zpci_dma_exit_device(zdev);
-        clp_disable_fh(zdev);
-        return -EIO;
-}
-EXPORT_SYMBOL_GPL(zpci_scan_device);
-
 static inline int barsize(u8 size)
 {
         return (size) ? (1 << size) >> 10 : 0;
diff --git a/arch/s390/pci/pci_clp.c b/arch/s390/pci/pci_clp.c
index bd34359d1546..2e9539625d93 100644
--- a/arch/s390/pci/pci_clp.c
+++ b/arch/s390/pci/pci_clp.c
@@ -236,7 +236,6 @@ int clp_disable_fh(struct zpci_dev *zdev)
         if (!zdev_enabled(zdev))
                 return 0;
 
-        dev_info(&zdev->pdev->dev, "disabling fn handle: 0x%x\n", fh);
         rc = clp_set_pci_fn(&fh, 0, CLP_SET_DISABLE_PCI_FN);
         if (!rc)
                 /* Success -> store disabled handle in zdev */
diff --git a/arch/s390/pci/pci_debug.c b/arch/s390/pci/pci_debug.c
index 771b82359af4..75c69b402e05 100644
--- a/arch/s390/pci/pci_debug.c
+++ b/arch/s390/pci/pci_debug.c
@@ -115,27 +115,6 @@ static const struct file_operations debugfs_pci_perf_fops = {
         .release = single_release,
 };
 
-static int pci_debug_show(struct seq_file *m, void *v)
-{
-        struct zpci_dev *zdev = m->private;
-
-        zpci_debug_info(zdev, m);
-        return 0;
-}
-
-static int pci_debug_seq_open(struct inode *inode, struct file *filp)
-{
-        return single_open(filp, pci_debug_show,
-                           file_inode(filp)->i_private);
-}
-
-static const struct file_operations debugfs_pci_debug_fops = {
-        .open    = pci_debug_seq_open,
-        .read    = seq_read,
-        .llseek  = seq_lseek,
-        .release = single_release,
-};
-
 void zpci_debug_init_device(struct zpci_dev *zdev)
 {
         zdev->debugfs_dev = debugfs_create_dir(dev_name(&zdev->pdev->dev),
@@ -149,19 +128,11 @@ void zpci_debug_init_device(struct zpci_dev *zdev)
                                 &debugfs_pci_perf_fops);
         if (IS_ERR(zdev->debugfs_perf))
                 zdev->debugfs_perf = NULL;
-
-        zdev->debugfs_debug = debugfs_create_file("debug",
-                                S_IFREG | S_IRUGO | S_IWUSR,
-                                zdev->debugfs_dev, zdev,
-                                &debugfs_pci_debug_fops);
-        if (IS_ERR(zdev->debugfs_debug))
-                zdev->debugfs_debug = NULL;
 }
 
 void zpci_debug_exit_device(struct zpci_dev *zdev)
 {
         debugfs_remove(zdev->debugfs_perf);
-        debugfs_remove(zdev->debugfs_debug);
         debugfs_remove(zdev->debugfs_dev);
 }
 
diff --git a/arch/s390/pci/pci_dma.c b/arch/s390/pci/pci_dma.c
index f8e69d5bc0a9..a2343c1f6e04 100644
--- a/arch/s390/pci/pci_dma.c
+++ b/arch/s390/pci/pci_dma.c
@@ -263,7 +263,7 @@ static dma_addr_t s390_dma_map_pages(struct device *dev, struct page *page,
                                      enum dma_data_direction direction,
                                      struct dma_attrs *attrs)
 {
-        struct zpci_dev *zdev = get_zdev(container_of(dev, struct pci_dev, dev));
+        struct zpci_dev *zdev = get_zdev(to_pci_dev(dev));
         unsigned long nr_pages, iommu_page_index;
         unsigned long pa = page_to_phys(page) + offset;
         int flags = ZPCI_PTE_VALID;
@@ -304,7 +304,7 @@ static void s390_dma_unmap_pages(struct device *dev, dma_addr_t dma_addr,
                                  size_t size, enum dma_data_direction direction,
                                  struct dma_attrs *attrs)
 {
-        struct zpci_dev *zdev = get_zdev(container_of(dev, struct pci_dev, dev));
+        struct zpci_dev *zdev = get_zdev(to_pci_dev(dev));
         unsigned long iommu_page_index;
         int npages;
 
@@ -323,7 +323,7 @@ static void *s390_dma_alloc(struct device *dev, size_t size,
                             dma_addr_t *dma_handle, gfp_t flag,
                             struct dma_attrs *attrs)
 {
-        struct zpci_dev *zdev = get_zdev(container_of(dev, struct pci_dev, dev));
+        struct zpci_dev *zdev = get_zdev(to_pci_dev(dev));
         struct page *page;
         unsigned long pa;
         dma_addr_t map;
diff --git a/arch/s390/pci/pci_sysfs.c b/arch/s390/pci/pci_sysfs.c
index a42cce69d0a0..e99a2557f186 100644
--- a/arch/s390/pci/pci_sysfs.c
+++ b/arch/s390/pci/pci_sysfs.c
@@ -15,40 +15,36 @@
 static ssize_t show_fid(struct device *dev, struct device_attribute *attr,
                         char *buf)
 {
-        struct zpci_dev *zdev = get_zdev(container_of(dev, struct pci_dev, dev));
+        struct zpci_dev *zdev = get_zdev(to_pci_dev(dev));
 
-        sprintf(buf, "0x%08x\n", zdev->fid);
-        return strlen(buf);
+        return sprintf(buf, "0x%08x\n", zdev->fid);
 }
 static DEVICE_ATTR(function_id, S_IRUGO, show_fid, NULL);
 
 static ssize_t show_fh(struct device *dev, struct device_attribute *attr,
                        char *buf)
 {
-        struct zpci_dev *zdev = get_zdev(container_of(dev, struct pci_dev, dev));
+        struct zpci_dev *zdev = get_zdev(to_pci_dev(dev));
 
-        sprintf(buf, "0x%08x\n", zdev->fh);
-        return strlen(buf);
+        return sprintf(buf, "0x%08x\n", zdev->fh);
 }
 static DEVICE_ATTR(function_handle, S_IRUGO, show_fh, NULL);
 
 static ssize_t show_pchid(struct device *dev, struct device_attribute *attr,
                           char *buf)
 {
-        struct zpci_dev *zdev = get_zdev(container_of(dev, struct pci_dev, dev));
+        struct zpci_dev *zdev = get_zdev(to_pci_dev(dev));
 
-        sprintf(buf, "0x%04x\n", zdev->pchid);
-        return strlen(buf);
+        return sprintf(buf, "0x%04x\n", zdev->pchid);
 }
 static DEVICE_ATTR(pchid, S_IRUGO, show_pchid, NULL);
 
 static ssize_t show_pfgid(struct device *dev, struct device_attribute *attr,
                           char *buf)
 {
-        struct zpci_dev *zdev = get_zdev(container_of(dev, struct pci_dev, dev));
+        struct zpci_dev *zdev = get_zdev(to_pci_dev(dev));
 
-        sprintf(buf, "0x%02x\n", zdev->pfgid);
-        return strlen(buf);
+        return sprintf(buf, "0x%02x\n", zdev->pfgid);
 }
 static DEVICE_ATTR(pfgid, S_IRUGO, show_pfgid, NULL);