4.9-stable patches

added patches:
	rdma-hns-modify-the-mapping-attribute-of-doorbell-to-device.patch
	rdma-rxe-fix-a-typo-in-opcode-name.patch

diff --git a/queue-4.9/rdma-hns-modify-the-mapping-attribute-of-doorbell-to-device.patch b/queue-4.9/rdma-hns-modify-the-mapping-attribute-of-doorbell-to-device.patch
new file mode 100644 (file)
index 0000000..a68ae92
--- /dev/null
+++ b/queue-4.9/rdma-hns-modify-the-mapping-attribute-of-doorbell-to-device.patch
@@ -0,0 +1,33 @@
+From 39d5534b1302189c809e90641ffae8cbdc42a8fc Mon Sep 17 00:00:00 2001
+From: Yixing Liu <liuyixing1@huawei.com>
+Date: Mon, 6 Dec 2021 21:36:52 +0800
+Subject: RDMA/hns: Modify the mapping attribute of doorbell to device
+
+From: Yixing Liu <liuyixing1@huawei.com>
+
+commit 39d5534b1302189c809e90641ffae8cbdc42a8fc upstream.
+
+It is more general for ARM device drivers to use the device attribute to
+map PCI BAR spaces.
+
+Fixes: 9a4435375cd1 ("IB/hns: Add driver files for hns RoCE driver")
+Link: https://lore.kernel.org/r/20211206133652.27476-1-liangwenpeng@huawei.com
+Signed-off-by: Yixing Liu <liuyixing1@huawei.com>
+Signed-off-by: Wenpeng Liang <liangwenpeng@huawei.com>
+Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/infiniband/hw/hns/hns_roce_main.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/infiniband/hw/hns/hns_roce_main.c
++++ b/drivers/infiniband/hw/hns/hns_roce_main.c
+@@ -556,7 +556,7 @@ static int hns_roce_mmap(struct ib_ucont
+               return -EINVAL;
+ 
+       if (vma->vm_pgoff == 0) {
+-              vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot);
++              vma->vm_page_prot = pgprot_device(vma->vm_page_prot);
+               if (io_remap_pfn_range(vma, vma->vm_start,
+                                      to_hr_ucontext(context)->uar.pfn,
+                                      PAGE_SIZE, vma->vm_page_prot))

diff --git a/queue-4.9/rdma-rxe-fix-a-typo-in-opcode-name.patch b/queue-4.9/rdma-rxe-fix-a-typo-in-opcode-name.patch
new file mode 100644 (file)
index 0000000..098be4e
--- /dev/null
+++ b/queue-4.9/rdma-rxe-fix-a-typo-in-opcode-name.patch
@@ -0,0 +1,34 @@
+From 8d1cfb884e881efd69a3be4ef10772c71cb22216 Mon Sep 17 00:00:00 2001
+From: Chengguang Xu <cgxu519@mykernel.net>
+Date: Sat, 18 Dec 2021 19:23:20 +0800
+Subject: RDMA/rxe: Fix a typo in opcode name
+
+From: Chengguang Xu <cgxu519@mykernel.net>
+
+commit 8d1cfb884e881efd69a3be4ef10772c71cb22216 upstream.
+
+There is a redundant ']' in the name of opcode IB_OPCODE_RC_SEND_MIDDLE,
+so just fix it.
+
+Fixes: 8700e3e7c485 ("Soft RoCE driver")
+Link: https://lore.kernel.org/r/20211218112320.3558770-1-cgxu519@mykernel.net
+Signed-off-by: Chengguang Xu <cgxu519@mykernel.net>
+Acked-by: Zhu Yanjun <zyjzyj2000@gmail.com>
+Reviewed-by: Bob Pearson <rpearsonhpe@gmail.com>
+Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/infiniband/sw/rxe/rxe_opcode.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/infiniband/sw/rxe/rxe_opcode.c
++++ b/drivers/infiniband/sw/rxe/rxe_opcode.c
+@@ -137,7 +137,7 @@ struct rxe_opcode_info rxe_opcode[RXE_NU
+               }
+       },
+       [IB_OPCODE_RC_SEND_MIDDLE]              = {
+-              .name   = "IB_OPCODE_RC_SEND_MIDDLE]",
++              .name   = "IB_OPCODE_RC_SEND_MIDDLE",
+               .mask   = RXE_PAYLOAD_MASK | RXE_REQ_MASK | RXE_SEND_MASK
+                               | RXE_MIDDLE_MASK,
+               .length = RXE_BTH_BYTES,

diff --git a/queue-4.9/series b/queue-4.9/series
index 86e441e381d1135562ecfc75e241f250bf6b5d2b..4cf26a389549a0f412be19b798f97da5b6b3ddf0 100644 (file)
--- a/queue-4.9/series
+++ b/queue-4.9/series
@@ -125,3 +125,5 @@ ext4-don-t-use-the-orphan-list-when-migrating-an-inode.patch
 fuse-fix-bad-inode.patch
 fuse-fix-live-lock-in-fuse_iget.patch
 drm-radeon-fix-error-handling-in-radeon_driver_open_kms.patch
+rdma-hns-modify-the-mapping-attribute-of-doorbell-to-device.patch
+rdma-rxe-fix-a-typo-in-opcode-name.patch