From 92c7711a5940f9a7df6f720f8d5b6d15e66cdae5 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Fri, 16 Sep 2022 12:00:40 +0200 Subject: [PATCH] 5.15-stable patches added patches: input-goodix-add-compatible-string-for-gt1158.patch rdma-irdma-use-s-g-array-in-post-send-only-when-its-valid.patch --- ...dix-add-compatible-string-for-gt1158.patch | 30 ++++++++++++++ ...ray-in-post-send-only-when-its-valid.patch | 39 +++++++++++++++++++ queue-5.15/series | 2 + 3 files changed, 71 insertions(+) create mode 100644 queue-5.15/input-goodix-add-compatible-string-for-gt1158.patch create mode 100644 queue-5.15/rdma-irdma-use-s-g-array-in-post-send-only-when-its-valid.patch diff --git a/queue-5.15/input-goodix-add-compatible-string-for-gt1158.patch b/queue-5.15/input-goodix-add-compatible-string-for-gt1158.patch new file mode 100644 index 00000000000..2e02d43de72 --- /dev/null +++ b/queue-5.15/input-goodix-add-compatible-string-for-gt1158.patch @@ -0,0 +1,30 @@ +From 80b9ebd3e478cd41526cbf84f80c3e0eb885d1d3 Mon Sep 17 00:00:00 2001 +From: Jarrah Gosbell +Date: Tue, 23 Aug 2022 10:00:37 -0700 +Subject: Input: goodix - add compatible string for GT1158 + +From: Jarrah Gosbell + +commit 80b9ebd3e478cd41526cbf84f80c3e0eb885d1d3 upstream. + +Add compatible string for GT1158 missing from the previous patch. + +Fixes: 425fe4709c76 ("Input: goodix - add support for GT1158") +Signed-off-by: Jarrah Gosbell +Link: https://lore.kernel.org/r/20220813043821.9981-1-kernel@undef.tools +Signed-off-by: Dmitry Torokhov +Signed-off-by: Greg Kroah-Hartman +--- + drivers/input/touchscreen/goodix.c | 1 + + 1 file changed, 1 insertion(+) + +--- a/drivers/input/touchscreen/goodix.c ++++ b/drivers/input/touchscreen/goodix.c +@@ -1363,6 +1363,7 @@ MODULE_DEVICE_TABLE(acpi, goodix_acpi_ma + #ifdef CONFIG_OF + static const struct of_device_id goodix_of_match[] = { + { .compatible = "goodix,gt1151" }, ++ { .compatible = "goodix,gt1158" }, + { .compatible = "goodix,gt5663" }, + { .compatible = "goodix,gt5688" }, + { .compatible = "goodix,gt911" }, diff --git a/queue-5.15/rdma-irdma-use-s-g-array-in-post-send-only-when-its-valid.patch b/queue-5.15/rdma-irdma-use-s-g-array-in-post-send-only-when-its-valid.patch new file mode 100644 index 00000000000..29b1cab9173 --- /dev/null +++ b/queue-5.15/rdma-irdma-use-s-g-array-in-post-send-only-when-its-valid.patch @@ -0,0 +1,39 @@ +From 2c8844431d065ae15a6b442f5769b60aeaaa07af Mon Sep 17 00:00:00 2001 +From: Sindhu-Devale +Date: Tue, 6 Sep 2022 17:32:43 -0500 +Subject: RDMA/irdma: Use s/g array in post send only when its valid + +From: Sindhu-Devale + +commit 2c8844431d065ae15a6b442f5769b60aeaaa07af upstream. + +Send with invalidate verb call can pass in an +uninitialized s/g array with 0 sge's which is +filled into irdma WQE and causes a HW asynchronous +event. + +Fix this by using the s/g array in irdma post send +only when its valid. + +Fixes: 551c46e ("RDMA/irdma: Add user/kernel shared libraries") +Signed-off-by: Sindhu-Devale +Signed-off-by: Shiraz Saleem +Link: https://lore.kernel.org/r/20220906223244.1119-5-shiraz.saleem@intel.com +Signed-off-by: Leon Romanovsky +Signed-off-by: Greg Kroah-Hartman +--- + drivers/infiniband/hw/irdma/uk.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +--- a/drivers/infiniband/hw/irdma/uk.c ++++ b/drivers/infiniband/hw/irdma/uk.c +@@ -501,7 +501,8 @@ enum irdma_status_code irdma_uk_send(str + FIELD_PREP(IRDMAQPSQ_IMMDATA, info->imm_data)); + i = 0; + } else { +- qp->wqe_ops.iw_set_fragment(wqe, 0, op_info->sg_list, ++ qp->wqe_ops.iw_set_fragment(wqe, 0, ++ frag_cnt ? op_info->sg_list : NULL, + qp->swqe_polarity); + i = 1; + } diff --git a/queue-5.15/series b/queue-5.15/series index 6e1ed857baa..2b61bd544f2 100644 --- a/queue-5.15/series +++ b/queue-5.15/series @@ -31,3 +31,5 @@ mm-fix-tlb-flush-for-not-first-pfnmap-mappings-in-unmap_region.patch soc-fsl-select-fsl_guts-driver-for-dpio.patch usb-gadget-f_uac2-clean-up-some-inconsistent-indenting.patch usb-gadget-f_uac2-fix-superspeed-transfer.patch +rdma-irdma-use-s-g-array-in-post-send-only-when-its-valid.patch +input-goodix-add-compatible-string-for-gt1158.patch -- 2.47.3