From: Greg Kroah-Hartman Date: Fri, 3 Feb 2023 09:25:34 +0000 (+0100) Subject: 5.4-stable patches X-Git-Tag: v4.14.305~10 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=81b70cc62ed01b58b56904f279a19d5ec806cdd8;p=thirdparty%2Fkernel%2Fstable-queue.git 5.4-stable patches added patches: revert-xprtrdma-fix-regbuf-data-not-freed-in-rpcrdma_req_create.patch usb-host-xhci-plat-add-wakeup-entry-at-sysfs.patch --- diff --git a/queue-5.4/revert-xprtrdma-fix-regbuf-data-not-freed-in-rpcrdma_req_create.patch b/queue-5.4/revert-xprtrdma-fix-regbuf-data-not-freed-in-rpcrdma_req_create.patch new file mode 100644 index 00000000000..1f6530436b9 --- /dev/null +++ b/queue-5.4/revert-xprtrdma-fix-regbuf-data-not-freed-in-rpcrdma_req_create.patch @@ -0,0 +1,33 @@ +From 6ecf326edd9789454a2e8e796ed68729b604a5c4 Mon Sep 17 00:00:00 2001 +From: Greg Kroah-Hartman +Date: Fri, 3 Feb 2023 10:22:16 +0100 +Subject: Revert "xprtrdma: Fix regbuf data not freed in rpcrdma_req_create()" + +From: Greg Kroah-Hartman + +This reverts commit bcebcb11fcbc744de1add88601c51cca8b4e762c which is +commit 9181f40fb2952fd59ecb75e7158620c9c669eee3 upstream. + +The backport to 5.4.y causes problems, as reported by Harshit, so revert +it for now and wait for a working backport to be added. + +Reported-by: Harshit Mogalapalli +Link: https://lore.kernel.org/r/4d2928e1-c836-b817-3dc2-3fe9adcaf2d6@oracle.com +Cc: Zhang Xiaoxu +Cc: Trond Myklebust +Cc: Sasha Levin +Signed-off-by: Greg Kroah-Hartman +--- + net/sunrpc/xprtrdma/verbs.c | 1 - + 1 file changed, 1 deletion(-) + +--- a/net/sunrpc/xprtrdma/verbs.c ++++ b/net/sunrpc/xprtrdma/verbs.c +@@ -1037,7 +1037,6 @@ out4: + kfree(req->rl_sendbuf); + out3: + kfree(req->rl_rdmabuf); +- rpcrdma_regbuf_free(req->rl_sendbuf); + out2: + kfree(req); + out1: diff --git a/queue-5.4/series b/queue-5.4/series index 06273ba726b..112cc19bdc7 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -130,3 +130,5 @@ docs-fix-path-paste-o-for-sys-kernel-warn_count.patch exit-use-read_once-for-all-oops-warn-limit-reads.patch ipv6-ensure-sane-device-mtu-in-tunnels.patch bluetooth-fix-null-ptr-deref-on-hci_sync_conn_complete_evt.patch +usb-host-xhci-plat-add-wakeup-entry-at-sysfs.patch +revert-xprtrdma-fix-regbuf-data-not-freed-in-rpcrdma_req_create.patch diff --git a/queue-5.4/usb-host-xhci-plat-add-wakeup-entry-at-sysfs.patch b/queue-5.4/usb-host-xhci-plat-add-wakeup-entry-at-sysfs.patch new file mode 100644 index 00000000000..653b16015dd --- /dev/null +++ b/queue-5.4/usb-host-xhci-plat-add-wakeup-entry-at-sysfs.patch @@ -0,0 +1,35 @@ +From 4bb4fc0dbfa23acab9b762949b91ffd52106fe4b Mon Sep 17 00:00:00 2001 +From: Peter Chen +Date: Fri, 18 Sep 2020 16:17:47 +0300 +Subject: usb: host: xhci-plat: add wakeup entry at sysfs + +From: Peter Chen + +commit 4bb4fc0dbfa23acab9b762949b91ffd52106fe4b upstream. + +With this change, there will be a wakeup entry at /sys/../power/wakeup, +and the user could use this entry to choose whether enable xhci wakeup +features (wake up system from suspend) or not. + +Tested-by: Matthias Kaehlcke +Reviewed-by: Matthias Kaehlcke +Signed-off-by: Peter Chen +Signed-off-by: Mathias Nyman +Link: https://lore.kernel.org/r/20200918131752.16488-6-mathias.nyman@linux.intel.com +Signed-off-by: Florian Fainelli +Signed-off-by: Greg Kroah-Hartman +--- + drivers/usb/host/xhci-plat.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/usb/host/xhci-plat.c ++++ b/drivers/usb/host/xhci-plat.c +@@ -276,7 +276,7 @@ static int xhci_plat_probe(struct platfo + *priv = *priv_match; + } + +- device_wakeup_enable(hcd->self.controller); ++ device_set_wakeup_capable(&pdev->dev, true); + + xhci->main_hcd = hcd; + xhci->shared_hcd = __usb_create_hcd(driver, sysdev, &pdev->dev,