5.15-stable patches

added patches:
	usb-dwc3-xilinx-fix-uninitialized-return-value.patch
	usr-include-makefile-add-linux-nfc.h-to-the-compile-test-coverage.patch

diff --git a/queue-5.15/series b/queue-5.15/series
index f4bb84d7d04b946a6c4b9d54d5be12bdc568aef2..e48b6399cf17fbc8930e471353f97de10040bfff 100644 (file)
--- a/queue-5.15/series
+++ b/queue-5.15/series
@@ -165,3 +165,5 @@ dt-bindings-can-tcan4x5x-fix-mram-cfg-rx-fifo-config.patch
 perf-core-fix-cgroup-event-list-management.patch
 psi-fix-no-previous-prototype-warnings-when-config_cgroups-n.patch
 psi-fix-defined-but-not-used-warnings-when-config_proc_fs-n.patch
+usb-dwc3-xilinx-fix-uninitialized-return-value.patch
+usr-include-makefile-add-linux-nfc.h-to-the-compile-test-coverage.patch

diff --git a/queue-5.15/usb-dwc3-xilinx-fix-uninitialized-return-value.patch b/queue-5.15/usb-dwc3-xilinx-fix-uninitialized-return-value.patch
new file mode 100644 (file)
index 0000000..1fc8100
--- /dev/null
+++ b/queue-5.15/usb-dwc3-xilinx-fix-uninitialized-return-value.patch
@@ -0,0 +1,34 @@
+From b470947c3672f7eb7c4c271d510383d896831cc2 Mon Sep 17 00:00:00 2001
+From: Robert Hancock <robert.hancock@calian.com>
+Date: Thu, 27 Jan 2022 16:15:00 -0600
+Subject: usb: dwc3: xilinx: fix uninitialized return value
+
+From: Robert Hancock <robert.hancock@calian.com>
+
+commit b470947c3672f7eb7c4c271d510383d896831cc2 upstream.
+
+A previous patch to skip part of the initialization when a USB3 PHY was
+not present could result in the return value being uninitialized in that
+case, causing spurious probe failures. Initialize ret to 0 to avoid this.
+
+Fixes: 9678f3361afc ("usb: dwc3: xilinx: Skip resets and USB3 register settings for USB2.0 mode")
+Cc: <stable@vger.kernel.org>
+Reviewed-by: Nathan Chancellor <nathan@kernel.org>
+Signed-off-by: Robert Hancock <robert.hancock@calian.com>
+Link: https://lore.kernel.org/r/20220127221500.177021-1-robert.hancock@calian.com
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/usb/dwc3/dwc3-xilinx.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/usb/dwc3/dwc3-xilinx.c
++++ b/drivers/usb/dwc3/dwc3-xilinx.c
+@@ -99,7 +99,7 @@ static int dwc3_xlnx_init_zynqmp(struct
+       struct device           *dev = priv_data->dev;
+       struct reset_control    *crst, *hibrst, *apbrst;
+       struct phy              *usb3_phy;
+-      int                     ret;
++      int                     ret = 0;
+       u32                     reg;
+ 
+       usb3_phy = devm_phy_optional_get(dev, "usb3-phy");

diff --git a/queue-5.15/usr-include-makefile-add-linux-nfc.h-to-the-compile-test-coverage.patch b/queue-5.15/usr-include-makefile-add-linux-nfc.h-to-the-compile-test-coverage.patch
new file mode 100644 (file)
index 0000000..664d53b
--- /dev/null
+++ b/queue-5.15/usr-include-makefile-add-linux-nfc.h-to-the-compile-test-coverage.patch
@@ -0,0 +1,32 @@
+From 10756dc5b02bff370ddd351d7744bc99ada659c2 Mon Sep 17 00:00:00 2001
+From: "Dmitry V. Levin" <ldv@altlinux.org>
+Date: Mon, 3 Jan 2022 04:24:02 +0300
+Subject: usr/include/Makefile: add linux/nfc.h to the compile-test coverage
+
+From: Dmitry V. Levin <ldv@altlinux.org>
+
+commit 10756dc5b02bff370ddd351d7744bc99ada659c2 upstream.
+
+As linux/nfc.h userspace compilation was finally fixed by commits
+79b69a83705e ("nfc: uapi: use kernel size_t to fix user-space builds")
+and 7175f02c4e5f ("uapi: fix linux/nfc.h userspace compilation errors"),
+there is no need to keep the compile-test exception for it in
+usr/include/Makefile.
+
+Signed-off-by: Dmitry V. Levin <ldv@altlinux.org>
+Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ usr/include/Makefile |    1 -
+ 1 file changed, 1 deletion(-)
+
+--- a/usr/include/Makefile
++++ b/usr/include/Makefile
+@@ -35,7 +35,6 @@ no-header-test += linux/hdlc/ioctl.h
+ no-header-test += linux/ivtv.h
+ no-header-test += linux/kexec.h
+ no-header-test += linux/matroxfb.h
+-no-header-test += linux/nfc.h
+ no-header-test += linux/omap3isp.h
+ no-header-test += linux/omapfb.h
+ no-header-test += linux/patchkey.h