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 (file)
index 0000000..1f65304
--- /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 <gregkh@linuxfoundation.org>
+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 <gregkh@linuxfoundation.org>
+
+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 <harshit.m.mogalapalli@oracle.com>
+Link: https://lore.kernel.org/r/4d2928e1-c836-b817-3dc2-3fe9adcaf2d6@oracle.com
+Cc: Zhang Xiaoxu <zhangxiaoxu5@huawei.com>
+Cc: Trond Myklebust <trond.myklebust@hammerspace.com>
+Cc: Sasha Levin <sashal@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ 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 06273ba726b4d82cc9493d00ea02ab3da90b20e8..112cc19bdc73471571bf8631a8d40a954a4669b6 100644 (file)
--- 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 (file)
index 0000000..653b160
--- /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 <peter.chen@nxp.com>
+Date: Fri, 18 Sep 2020 16:17:47 +0300
+Subject: usb: host: xhci-plat: add wakeup entry at sysfs
+
+From: Peter Chen <peter.chen@nxp.com>
+
+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 <mka@chromium.org>
+Reviewed-by: Matthias Kaehlcke <mka@chromium.org>
+Signed-off-by: Peter Chen <peter.chen@nxp.com>
+Signed-off-by: Mathias Nyman <mathias.nyman@linux.intel.com>
+Link: https://lore.kernel.org/r/20200918131752.16488-6-mathias.nyman@linux.intel.com
+Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ 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,