IB/ehca: Use remap_4k_pfn() to map firmware contexts to user space

Use Paul's new remap_4k_pfn() function to map our 4K firmware contexts
into user space on 64K-page machines without exposing neighboring
firmware contexts. Return the context's offset within a 64K page to
user space so it can determine the proper virtual address.

For details about remap_4k_pfn(), see commit 721151d0 or
http://patchwork.ozlabs.org/linuxppc/patch?id=10281

Signed-off-by: Joachim Fenkes <fenkes@de.ibm.com>
Signed-off-by: Roland Dreier <rolandd@cisco.com>

1 files changed, 3 insertions, 3 deletions

diff --git a/drivers/infiniband/hw/ehca/ehca_uverbs.c b/drivers/infiniband/hw/ehca/ehca_uverbs.c
index 3340f49f0211..84a16bcfd536 100644
--- a/drivers/infiniband/hw/ehca/ehca_uverbs.c
+++ b/drivers/infiniband/hw/ehca/ehca_uverbs.c
@@ -109,7 +109,7 @@ static int ehca_mmap_fw(struct vm_area_struct *vma, struct h_galpas *galpas,
         u64 vsize, physical;
 
         vsize = vma->vm_end - vma->vm_start;
-        if (vsize != EHCA_PAGESIZE) {
+        if (vsize < EHCA_PAGESIZE) {
                 ehca_gen_err("invalid vsize=%lx", vma->vm_end - vma->vm_start);
                 return -EINVAL;
         }
@@ -118,8 +118,8 @@ static int ehca_mmap_fw(struct vm_area_struct *vma, struct h_galpas *galpas,
         vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot);
         ehca_gen_dbg("vsize=%lx physical=%lx", vsize, physical);
         /* VM_IO | VM_RESERVED are set by remap_pfn_range() */
-        ret = remap_pfn_range(vma, vma->vm_start, physical >> PAGE_SHIFT,
-                              vsize, vma->vm_page_prot);
+        ret = remap_4k_pfn(vma, vma->vm_start, physical >> EHCA_PAGESHIFT,
+                           vma->vm_page_prot);
         if (unlikely(ret)) {
                 ehca_gen_err("remap_pfn_range() failed ret=%x", ret);
                 return -ENOMEM;