drop broken IB patches

diff --git a/queue-5.15/rdma-irdma-ensure-iwarp-qp-queue-memory-is-os-paged-aligned.patch b/queue-5.15/rdma-irdma-ensure-iwarp-qp-queue-memory-is-os-paged-aligned.patch
deleted file mode 100644 (file)
index b0f738f..0000000
--- a/queue-5.15/rdma-irdma-ensure-iwarp-qp-queue-memory-is-os-paged-aligned.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 0a5ec366de7e94192669ba08de6ed336607fd282 Mon Sep 17 00:00:00 2001
-From: Mike Marciniszyn <mike.marciniszyn@intel.com>
-Date: Wed, 29 Nov 2023 14:21:42 -0600
-Subject: RDMA/irdma: Ensure iWarp QP queue memory is OS paged aligned
-
-From: Mike Marciniszyn <mike.marciniszyn@intel.com>
-
-commit 0a5ec366de7e94192669ba08de6ed336607fd282 upstream.
-
-The SQ is shared for between kernel and used by storing the kernel page
-pointer and passing that to a kmap_atomic().
-
-This then requires that the alignment is PAGE_SIZE aligned.
-
-Fix by adding an iWarp specific alignment check.
-
-Fixes: e965ef0e7b2c ("RDMA/irdma: Split QP handler into irdma_reg_user_mr_type_qp")
-Link: https://lore.kernel.org/r/20231129202143.1434-3-shiraz.saleem@intel.com
-Signed-off-by: Mike Marciniszyn <mike.marciniszyn@intel.com>
-Signed-off-by: Shiraz Saleem <shiraz.saleem@intel.com>
-Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- drivers/infiniband/hw/irdma/verbs.c |    5 +++++
- 1 file changed, 5 insertions(+)
-
---- a/drivers/infiniband/hw/irdma/verbs.c
-+++ b/drivers/infiniband/hw/irdma/verbs.c
-@@ -2797,6 +2797,11 @@ static struct ib_mr *irdma_reg_user_mr(s
- 
-       switch (req.reg_type) {
-       case IRDMA_MEMREG_TYPE_QP:
-+              /* iWarp: Catch page not starting on OS page boundary */
-+              if (!rdma_protocol_roce(&iwdev->ibdev, 1) &&
-+                  ib_umem_offset(iwmr->region))
-+                      return -EINVAL;
-+
-               total = req.sq_pages + req.rq_pages + shadow_pgcnt;
-               if (total > iwmr->page_cnt) {
-                       err = -EINVAL;

diff --git a/queue-5.15/rdma-irdma-fix-support-for-64k-pages.patch b/queue-5.15/rdma-irdma-fix-support-for-64k-pages.patch
deleted file mode 100644 (file)
index 054b464..0000000
--- a/queue-5.15/rdma-irdma-fix-support-for-64k-pages.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 03769f72d66edab82484449ed594cb6b00ae0223 Mon Sep 17 00:00:00 2001
-From: Mike Marciniszyn <mike.marciniszyn@intel.com>
-Date: Wed, 29 Nov 2023 14:21:43 -0600
-Subject: RDMA/irdma: Fix support for 64k pages
-
-From: Mike Marciniszyn <mike.marciniszyn@intel.com>
-
-commit 03769f72d66edab82484449ed594cb6b00ae0223 upstream.
-
-Virtual QP and CQ require a 4K HW page size but the driver passes
-PAGE_SIZE to ib_umem_find_best_pgsz() instead.
-
-Fix this by using the appropriate 4k value in the bitmap passed to
-ib_umem_find_best_pgsz().
-
-Fixes: 693a5386eff0 ("RDMA/irdma: Split mr alloc and free into new functions")
-Link: https://lore.kernel.org/r/20231129202143.1434-4-shiraz.saleem@intel.com
-Signed-off-by: Mike Marciniszyn <mike.marciniszyn@intel.com>
-Signed-off-by: Shiraz Saleem <shiraz.saleem@intel.com>
-Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- drivers/infiniband/hw/irdma/verbs.c |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/drivers/infiniband/hw/irdma/verbs.c
-+++ b/drivers/infiniband/hw/irdma/verbs.c
-@@ -2777,7 +2777,7 @@ static struct ib_mr *irdma_reg_user_mr(s
-       iwmr->ibmr.pd = pd;
-       iwmr->ibmr.device = pd->device;
-       iwmr->ibmr.iova = virt;
--      iwmr->page_size = PAGE_SIZE;
-+      iwmr->page_size = SZ_4K;;
- 
-       if (req.reg_type == IRDMA_MEMREG_TYPE_MEM) {
-               iwmr->page_size = ib_umem_find_best_pgsz(region,

diff --git a/queue-5.15/series b/queue-5.15/series
index f254c645d93b450a4aaf4238f04863063bd0b8aa..467b1dc71cfb42c80ab385624bf8f81266276f2c 100644 (file)
--- a/queue-5.15/series
+++ b/queue-5.15/series
@@ -45,5 +45,3 @@ ksmbd-fix-potential-circular-locking-issue-in-smb2_set_ea.patch
 ksmbd-don-t-increment-epoch-if-current-state-and-request-state-are-same.patch
 ksmbd-send-lease-break-notification-on-file_rename_information.patch
 ksmbd-add-missing-set_freezable-for-freezable-kthread.patch
-rdma-irdma-ensure-iwarp-qp-queue-memory-is-os-paged-aligned.patch
-rdma-irdma-fix-support-for-64k-pages.patch

diff --git a/queue-6.1/rdma-irdma-ensure-iwarp-qp-queue-memory-is-os-paged-aligned.patch b/queue-6.1/rdma-irdma-ensure-iwarp-qp-queue-memory-is-os-paged-aligned.patch
deleted file mode 100644 (file)
index 2956614..0000000
--- a/queue-6.1/rdma-irdma-ensure-iwarp-qp-queue-memory-is-os-paged-aligned.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 0a5ec366de7e94192669ba08de6ed336607fd282 Mon Sep 17 00:00:00 2001
-From: Mike Marciniszyn <mike.marciniszyn@intel.com>
-Date: Wed, 29 Nov 2023 14:21:42 -0600
-Subject: RDMA/irdma: Ensure iWarp QP queue memory is OS paged aligned
-
-From: Mike Marciniszyn <mike.marciniszyn@intel.com>
-
-commit 0a5ec366de7e94192669ba08de6ed336607fd282 upstream.
-
-The SQ is shared for between kernel and used by storing the kernel page
-pointer and passing that to a kmap_atomic().
-
-This then requires that the alignment is PAGE_SIZE aligned.
-
-Fix by adding an iWarp specific alignment check.
-
-Fixes: e965ef0e7b2c ("RDMA/irdma: Split QP handler into irdma_reg_user_mr_type_qp")
-Link: https://lore.kernel.org/r/20231129202143.1434-3-shiraz.saleem@intel.com
-Signed-off-by: Mike Marciniszyn <mike.marciniszyn@intel.com>
-Signed-off-by: Shiraz Saleem <shiraz.saleem@intel.com>
-Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- drivers/infiniband/hw/irdma/verbs.c |    5 +++++
- 1 file changed, 5 insertions(+)
-
---- a/drivers/infiniband/hw/irdma/verbs.c
-+++ b/drivers/infiniband/hw/irdma/verbs.c
-@@ -2845,6 +2845,11 @@ static struct ib_mr *irdma_reg_user_mr(s
- 
-       switch (req.reg_type) {
-       case IRDMA_MEMREG_TYPE_QP:
-+              /* iWarp: Catch page not starting on OS page boundary */
-+              if (!rdma_protocol_roce(&iwdev->ibdev, 1) &&
-+                  ib_umem_offset(iwmr->region))
-+                      return -EINVAL;
-+
-               total = req.sq_pages + req.rq_pages + shadow_pgcnt;
-               if (total > iwmr->page_cnt) {
-                       err = -EINVAL;

diff --git a/queue-6.1/rdma-irdma-fix-support-for-64k-pages.patch b/queue-6.1/rdma-irdma-fix-support-for-64k-pages.patch
deleted file mode 100644 (file)
index c1ee2b0..0000000
--- a/queue-6.1/rdma-irdma-fix-support-for-64k-pages.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 03769f72d66edab82484449ed594cb6b00ae0223 Mon Sep 17 00:00:00 2001
-From: Mike Marciniszyn <mike.marciniszyn@intel.com>
-Date: Wed, 29 Nov 2023 14:21:43 -0600
-Subject: RDMA/irdma: Fix support for 64k pages
-
-From: Mike Marciniszyn <mike.marciniszyn@intel.com>
-
-commit 03769f72d66edab82484449ed594cb6b00ae0223 upstream.
-
-Virtual QP and CQ require a 4K HW page size but the driver passes
-PAGE_SIZE to ib_umem_find_best_pgsz() instead.
-
-Fix this by using the appropriate 4k value in the bitmap passed to
-ib_umem_find_best_pgsz().
-
-Fixes: 693a5386eff0 ("RDMA/irdma: Split mr alloc and free into new functions")
-Link: https://lore.kernel.org/r/20231129202143.1434-4-shiraz.saleem@intel.com
-Signed-off-by: Mike Marciniszyn <mike.marciniszyn@intel.com>
-Signed-off-by: Shiraz Saleem <shiraz.saleem@intel.com>
-Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- drivers/infiniband/hw/irdma/verbs.c |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/drivers/infiniband/hw/irdma/verbs.c
-+++ b/drivers/infiniband/hw/irdma/verbs.c
-@@ -2825,7 +2825,7 @@ static struct ib_mr *irdma_reg_user_mr(s
-       iwmr->ibmr.pd = pd;
-       iwmr->ibmr.device = pd->device;
-       iwmr->ibmr.iova = virt;
--      iwmr->page_size = PAGE_SIZE;
-+      iwmr->page_size = SZ_4K;;
- 
-       if (req.reg_type == IRDMA_MEMREG_TYPE_MEM) {
-               iwmr->page_size = ib_umem_find_best_pgsz(region,

diff --git a/queue-6.1/series b/queue-6.1/series
index 83663ea3bcce2be98a11e3a3a7d9033951694ad5..a26dddf5931553dc809447c542df0aba9fddb55f 100644 (file)
--- a/queue-6.1/series
+++ b/queue-6.1/series
@@ -73,7 +73,5 @@ ksmbd-fix-potential-circular-locking-issue-in-smb2_set_ea.patch
 ksmbd-don-t-increment-epoch-if-current-state-and-request-state-are-same.patch
 ksmbd-send-lease-break-notification-on-file_rename_information.patch
 ksmbd-add-missing-set_freezable-for-freezable-kthread.patch
-rdma-irdma-ensure-iwarp-qp-queue-memory-is-os-paged-aligned.patch
-rdma-irdma-fix-support-for-64k-pages.patch
 revert-drm-amd-enable-pcie-pme-from-d3.patch
 drm-amd-display-pbn_div-need-be-updated-for-hotplug-event.patch