5 files changed, 124 insertions, 10 deletions

diff --git a/arch/s390/pci/Makefile b/arch/s390/pci/Makefile
index a9e1dc4ae442..805d8b29193a 100644
--- a/arch/s390/pci/Makefile
+++ b/arch/s390/pci/Makefile
@@ -3,4 +3,4 @@
 #
 
 obj-$(CONFIG_PCI)       += pci.o pci_dma.o pci_clp.o pci_sysfs.o \
-                           pci_event.o pci_debug.o pci_insn.o
+                           pci_event.o pci_debug.o pci_insn.o pci_mmio.o
diff --git a/arch/s390/pci/pci.c b/arch/s390/pci/pci.c
index d59c82569750..3290f11ae1d9 100644
--- a/arch/s390/pci/pci.c
+++ b/arch/s390/pci/pci.c
@@ -369,8 +369,7 @@ int arch_setup_msi_irqs(struct pci_dev *pdev, int nvec, int type)
 
         if (type == PCI_CAP_ID_MSI && nvec > 1)
                 return 1;
-        msi_vecs = min(nvec, ZPCI_MSI_VEC_MAX);
-        msi_vecs = min_t(unsigned int, msi_vecs, CONFIG_PCI_NR_MSI);
+        msi_vecs = min_t(unsigned int, nvec, zdev->max_msi);
 
         /* Allocate adapter summary indicator bit */
         rc = -EIO;
@@ -474,7 +473,8 @@ static void zpci_map_resources(struct zpci_dev *zdev)
                 len = pci_resource_len(pdev, i);
                 if (!len)
                         continue;
-                pdev->resource[i].start = (resource_size_t) pci_iomap(pdev, i, 0);
+                pdev->resource[i].start =
+                        (resource_size_t __force) pci_iomap(pdev, i, 0);
                 pdev->resource[i].end = pdev->resource[i].start + len - 1;
         }
 }
@@ -489,7 +489,8 @@ static void zpci_unmap_resources(struct zpci_dev *zdev)
                 len = pci_resource_len(pdev, i);
                 if (!len)
                         continue;
-                pci_iounmap(pdev, (void *) pdev->resource[i].start);
+                pci_iounmap(pdev, (void __iomem __force *)
+                            pdev->resource[i].start);
         }
 }
 
diff --git a/arch/s390/pci/pci_clp.c b/arch/s390/pci/pci_clp.c
index 6e22a247de9b..d6e411ed8b1f 100644
--- a/arch/s390/pci/pci_clp.c
+++ b/arch/s390/pci/pci_clp.c
@@ -62,6 +62,7 @@ static void clp_store_query_pci_fngrp(struct zpci_dev *zdev,
         zdev->tlb_refresh = response->refresh;
         zdev->dma_mask = response->dasm;
         zdev->msi_addr = response->msia;
+        zdev->max_msi = response->noi;
         zdev->fmb_update = response->mui;
 
         switch (response->version) {
diff --git a/arch/s390/pci/pci_debug.c b/arch/s390/pci/pci_debug.c
index eec598c5939f..3229a2e570df 100644
--- a/arch/s390/pci/pci_debug.c
+++ b/arch/s390/pci/pci_debug.c
@@ -158,10 +158,7 @@ int __init zpci_debug_init(void)
 
 void zpci_debug_exit(void)
 {
-        if (pci_debug_msg_id)
-                debug_unregister(pci_debug_msg_id);
-        if (pci_debug_err_id)
-                debug_unregister(pci_debug_err_id);
-
+        debug_unregister(pci_debug_msg_id);
+        debug_unregister(pci_debug_err_id);
         debugfs_remove(debugfs_root);
 }
diff --git a/arch/s390/pci/pci_mmio.c b/arch/s390/pci/pci_mmio.c
new file mode 100644
index 000000000000..62c5ea6d8682
--- /dev/null
+++ b/arch/s390/pci/pci_mmio.c
@@ -0,0 +1,115 @@
+/*
+ * Access to PCI I/O memory from user space programs.
+ *
+ * Copyright IBM Corp. 2014
+ * Author(s): Alexey Ishchuk <aishchuk@linux.vnet.ibm.com>
+ */
+#include <linux/kernel.h>
+#include <linux/syscalls.h>
+#include <linux/init.h>
+#include <linux/mm.h>
+#include <linux/errno.h>
+#include <linux/pci.h>
+
+static long get_pfn(unsigned long user_addr, unsigned long access,
+                    unsigned long *pfn)
+{
+        struct vm_area_struct *vma;
+        long ret;
+
+        down_read(&current->mm->mmap_sem);
+        ret = -EINVAL;
+        vma = find_vma(current->mm, user_addr);
+        if (!vma)
+                goto out;
+        ret = -EACCES;
+        if (!(vma->vm_flags & access))
+                goto out;
+        ret = follow_pfn(vma, user_addr, pfn);
+out:
+        up_read(&current->mm->mmap_sem);
+        return ret;
+}
+
+SYSCALL_DEFINE3(s390_pci_mmio_write, unsigned long, mmio_addr,
+                const void __user *, user_buffer, size_t, length)
+{
+        u8 local_buf[64];
+        void __iomem *io_addr;
+        void *buf;
+        unsigned long pfn;
+        long ret;
+
+        if (!zpci_is_enabled())
+                return -ENODEV;
+
+        if (length <= 0 || PAGE_SIZE - (mmio_addr & ~PAGE_MASK) < length)
+                return -EINVAL;
+        if (length > 64) {
+                buf = kmalloc(length, GFP_KERNEL);
+                if (!buf)
+                        return -ENOMEM;
+        } else
+                buf = local_buf;
+
+        ret = get_pfn(mmio_addr, VM_WRITE, &pfn);
+        if (ret)
+                goto out;
+        io_addr = (void *)((pfn << PAGE_SHIFT) | (mmio_addr & ~PAGE_MASK));
+
+        ret = -EFAULT;
+        if ((unsigned long) io_addr < ZPCI_IOMAP_ADDR_BASE)
+                goto out;
+
+        if (copy_from_user(buf, user_buffer, length))
+                goto out;
+
+        memcpy_toio(io_addr, buf, length);
+        ret = 0;
+out:
+        if (buf != local_buf)
+                kfree(buf);
+        return ret;
+}
+
+SYSCALL_DEFINE3(s390_pci_mmio_read, unsigned long, mmio_addr,
+                void __user *, user_buffer, size_t, length)
+{
+        u8 local_buf[64];
+        void __iomem *io_addr;
+        void *buf;
+        unsigned long pfn;
+        long ret;
+
+        if (!zpci_is_enabled())
+                return -ENODEV;
+
+        if (length <= 0 || PAGE_SIZE - (mmio_addr & ~PAGE_MASK) < length)
+                return -EINVAL;
+        if (length > 64) {
+                buf = kmalloc(length, GFP_KERNEL);
+                if (!buf)
+                        return -ENOMEM;
+        } else
+                buf = local_buf;
+
+        ret = get_pfn(mmio_addr, VM_READ, &pfn);
+        if (ret)
+                goto out;
+        io_addr = (void *)((pfn << PAGE_SHIFT) | (mmio_addr & ~PAGE_MASK));
+
+        ret = -EFAULT;
+        if ((unsigned long) io_addr < ZPCI_IOMAP_ADDR_BASE)
+                goto out;
+
+        memcpy_fromio(buf, io_addr, length);
+
+        if (copy_to_user(user_buffer, buf, length))
+                goto out;
+
+        ret = 0;
+out:
+        if (buf != local_buf)
+                kfree(buf);
+        return ret;
+}