Attachment 160469 Details for Bug 250496 – ib_ehca_user_space_support_for_rhel5.patch

[patch] ib_ehca_user_space_support_for_rhel5.patch

ib_ehca_user_space_support_for_rhel5.patch (text/plain), 3.51 KB, created by Scott Moser on 2007-08-01 21:58:45 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Scott Moser

Created: 2007-08-01 21:58:45 UTC

Size: 3.51 KB

patch

obsolete

>diff -Nurp linux-2.6.18.ppc64_orig/drivers/infiniband/hw/ehca/ehca_classes.h linux-2.6.18.ppc64/drivers/infiniband/hw/ehca/ehca_classes.h
>--- linux-2.6.18.ppc64_orig/drivers/infiniband/hw/ehca/ehca_classes.h	2007-08-01 12:12:13.000000000 +0200
>+++ linux-2.6.18.ppc64/drivers/infiniband/hw/ehca/ehca_classes.h	2007-08-01 16:38:16.000000000 +0200
>@@ -294,6 +294,8 @@ struct ehca_create_cq_resp {
> 	u32 cq_number;
> 	u32 token;
> 	struct ipzu_queue_resp ipz_queue;
>+	u32 fw_handle_ofs;
>+	u32 dummy;
> };
> 
> struct ehca_create_qp_resp {
>@@ -303,7 +305,7 @@ struct ehca_create_qp_resp {
> 	u32 qkey;
> 	/* qp_num assigned by ehca: sqp0/1 may have got different numbers */
> 	u32 real_qp_num;
>-	u32 dummy; /* padding for 8 byte alignment */
>+	u32 fw_handle_ofs;
> 	struct ipzu_queue_resp ipz_squeue;
> 	struct ipzu_queue_resp ipz_rqueue;
> };
>diff -Nurp linux-2.6.18.ppc64_orig/drivers/infiniband/hw/ehca/ehca_cq.c linux-2.6.18.ppc64/drivers/infiniband/hw/ehca/ehca_cq.c
>--- linux-2.6.18.ppc64_orig/drivers/infiniband/hw/ehca/ehca_cq.c	2007-08-01 12:12:13.000000000 +0200
>+++ linux-2.6.18.ppc64/drivers/infiniband/hw/ehca/ehca_cq.c	2007-08-01 16:52:51.000000000 +0200
>@@ -276,6 +276,8 @@ struct ib_cq *ehca_create_cq(struct ib_d
> 		resp.ipz_queue.queue_length = ipz_queue->queue_length;
> 		resp.ipz_queue.pagesize = ipz_queue->pagesize;
> 		resp.ipz_queue.toggle_state = ipz_queue->toggle_state;
>+		resp.fw_handle_ofs = (u32)
>+		  (my_cq->galpas.user.fw_handle & (PAGE_SIZE - 1));
> 		if (ib_copy_to_udata(udata, &resp, sizeof(resp))) {
> 			ehca_err(device, "Copy to udata failed.");
> 			goto create_cq_exit4;
>diff -Nurp linux-2.6.18.ppc64_orig/drivers/infiniband/hw/ehca/ehca_qp.c linux-2.6.18.ppc64/drivers/infiniband/hw/ehca/ehca_qp.c
>--- linux-2.6.18.ppc64_orig/drivers/infiniband/hw/ehca/ehca_qp.c	2007-08-01 12:12:13.000000000 +0200
>+++ linux-2.6.18.ppc64/drivers/infiniband/hw/ehca/ehca_qp.c	2007-08-01 16:53:00.000000000 +0200
>@@ -656,6 +656,8 @@ struct ib_qp *ehca_create_qp(struct ib_p
> 		resp.ipz_squeue.queue_length = ipz_squeue->queue_length;
> 		resp.ipz_squeue.pagesize = ipz_squeue->pagesize;
> 		resp.ipz_squeue.toggle_state = ipz_squeue->toggle_state;
>+		resp.fw_handle_ofs = (u32)
>+		  (my_qp->galpas.user.fw_handle & (PAGE_SIZE - 1));
> 		if (ib_copy_to_udata(udata, &resp, sizeof resp)) {
> 			ehca_err(pd->device, "Copy to udata failed");
> 			ret = -EINVAL;
>diff -Nurp linux-2.6.18.ppc64_orig/drivers/infiniband/hw/ehca/ehca_uverbs.c linux-2.6.18.ppc64/drivers/infiniband/hw/ehca/ehca_uverbs.c
>--- linux-2.6.18.ppc64_orig/drivers/infiniband/hw/ehca/ehca_uverbs.c	2007-08-01 12:12:13.000000000 +0200
>+++ linux-2.6.18.ppc64/drivers/infiniband/hw/ehca/ehca_uverbs.c	2007-08-01 16:42:49.000000000 +0200
>@@ -109,17 +109,25 @@ static int ehca_mmap_fw(struct vm_area_s
> 	u64 vsize, physical;
> 
> 	vsize = vma->vm_end - vma->vm_start;
>+#ifndef CONFIG_PPC_64K_PAGES
> 	if (vsize != EHCA_PAGESIZE) {
> 		ehca_gen_err("invalid vsize=%lx", vma->vm_end - vma->vm_start);
> 		return -EINVAL;
> 	}
>+#endif
> 
> 	physical = galpas->user.fw_handle;
> 	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() */
>+#ifdef CONFIG_PPC_64K_PAGES
>+	/* make sure we map only 4k for fw context */
>+	ret = remap_4k_pfn(vma, vma->vm_start, physical >> EHCA_PAGESHIFT,
>+			   vma->vm_page_prot);
>+#else
> 	ret = remap_pfn_range(vma, vma->vm_start, physical >> PAGE_SHIFT,
> 			      vsize, vma->vm_page_prot);
>+#endif
> 	if (unlikely(ret)) {
> 		ehca_gen_err("remap_pfn_range() failed ret=%x", ret);
> 		return -ENOMEM;

Actions: View | Diff

Attachments on bug 250496: 160469