merge originkernel-5.10.13-250.vanilla.knurd.1.fc32

4 files changed, 48 insertions, 90 deletions

diff --git a/arm-dts-rpi-4-disable-wifi-frequencies.patch b/arm-dts-rpi-4-disable-wifi-frequencies.patch
new file mode 100644
index 000000000..fc163935f
--- /dev/null
+++ b/arm-dts-rpi-4-disable-wifi-frequencies.patch
@@ -0,0 +1,37 @@
+From 358afb8b746d4a7ebaeeeaab7a1523895a8572c2 Mon Sep 17 00:00:00 2001
+From: Maxime Ripard <maxime@cerno.tech>
+Date: Thu, 29 Oct 2020 14:40:18 +0100
+Subject: ARM: dts: rpi-4: disable wifi frequencies
+
+The RPi4 WiFi chip and HDMI outputs have some frequency overlap with
+crosstalk around 2.4GHz. Let's mark it as such so we can use some evasive
+maneuvers.
+
+Signed-off-by: Maxime Ripard <maxime@cerno.tech>
+Signed-off-by: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
+Link: https://lore.kernel.org/r/20201029134018.1948636-3-maxime@cerno.tech
+---
+ arch/arm/boot/dts/bcm2711-rpi-4-b.dts | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
+index 09a1182c29363..403bacf986ebb 100644
+--- a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
++++ b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
+@@ -181,12 +181,14 @@
+ &hdmi0 {
+ 	clocks = <&firmware_clocks 13>, <&firmware_clocks 14>, <&dvp 0>, <&clk_27MHz>;
+ 	clock-names = "hdmi", "bvb", "audio", "cec";
++	wifi-2.4ghz-coexistence;
+ 	status = "okay";
+ };
+ 
+ &hdmi1 {
+ 	clocks = <&firmware_clocks 13>, <&firmware_clocks 14>, <&dvp 1>, <&clk_27MHz>;
+ 	clock-names = "hdmi", "bvb", "audio", "cec";
++	wifi-2.4ghz-coexistence;
+ 	status = "okay";
+ };
+ 
+-- 
+cgit 1.2.3-1.el7
diff --git a/hid-wacom-correct-null-dereference-on-aes-pen-proximity.patch b/hid-wacom-correct-null-dereference-on-aes-pen-proximity.patch
deleted file mode 100644
index d76b6489b..000000000
--- a/hid-wacom-correct-null-dereference-on-aes-pen-proximity.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-From MAILER-DAEMON Wed Jan 27 14:42:50 2021
-From: Jason Gerecke <killertofu@gmail.com>
-To: linux-input@vger.kernel.org, Jiri Kosina <jikos@kernel.org>, Benjamin Tissoires <benjamin.tissoires@redhat.com>
-Cc: Jason Gerecke <jason.gerecke@wacom.com>, stable@vger.kernel.org, Ping Cheng <ping.cheng@wacom.com>
-Subject: [PATCH] HID: wacom: Correct NULL dereference on AES pen proximity
-Date: Thu, 21 Jan 2021 10:46:49 -0800
-Message-Id: <20210121184649.157189-1-jason.gerecke@wacom.com>
-List-ID: <linux-input.vger.kernel.org>
-X-Mailing-List: linux-input@vger.kernel.org
-MIME-Version: 1.0
-Content-Type: text/plain; charset="utf-8"
-Content-Transfer-Encoding: 7bit
-
-The recent commit to fix a memory leak introduced an inadvertant NULL
-pointer dereference. The `wacom_wac->pen_fifo` variable was never
-intialized, resuling in a crash whenever functions tried to use it.
-Since the FIFO is only used by AES pens (to buffer events from pen
-proximity until the hardware reports the pen serial number) this would
-have been easily overlooked without testing an AES device.
-
-This patch converts `wacom_wac->pen_fifo` over to a pointer (since the
-call to `devres_alloc` allocates memory for us) and ensures that we assign
-it to point to the allocated and initalized `pen_fifo` before the function
-returns.
-
-Fixes: 37309f47e2f5 ("HID: wacom: Fix memory leakage caused by kfifo_alloc")
-Signed-off-by: Jason Gerecke <jason.gerecke@wacom.com>
-Tested-by: Ping Cheng <ping.cheng@wacom.com>
-CC: stable@vger.kernel.org # v4.19+
-Link: https://github.com/linuxwacom/input-wacom/issues/230
----
- drivers/hid/wacom_sys.c | 7 ++++---
- drivers/hid/wacom_wac.h | 2 +-
- 2 files changed, 5 insertions(+), 4 deletions(-)
-
-diff --git a/drivers/hid/wacom_sys.c b/drivers/hid/wacom_sys.c
-index e8acd235db2a..aa9e48876ced 100644
---- a/drivers/hid/wacom_sys.c
-+++ b/drivers/hid/wacom_sys.c
-@@ -147,9 +147,9 @@ static int wacom_wac_pen_serial_enforce(struct hid_device *hdev,
- 	}
- 
- 	if (flush)
--		wacom_wac_queue_flush(hdev, &wacom_wac->pen_fifo);
-+		wacom_wac_queue_flush(hdev, wacom_wac->pen_fifo);
- 	else if (insert)
--		wacom_wac_queue_insert(hdev, &wacom_wac->pen_fifo,
-+		wacom_wac_queue_insert(hdev, wacom_wac->pen_fifo,
- 				       raw_data, report_size);
- 
- 	return insert && !flush;
-@@ -1280,7 +1280,7 @@ static void wacom_devm_kfifo_release(struct device *dev, void *res)
- static int wacom_devm_kfifo_alloc(struct wacom *wacom)
- {
- 	struct wacom_wac *wacom_wac = &wacom->wacom_wac;
--	struct kfifo_rec_ptr_2 *pen_fifo = &wacom_wac->pen_fifo;
-+	struct kfifo_rec_ptr_2 *pen_fifo;
- 	int error;
- 
- 	pen_fifo = devres_alloc(wacom_devm_kfifo_release,
-@@ -1297,6 +1297,7 @@ static int wacom_devm_kfifo_alloc(struct wacom *wacom)
- 	}
- 
- 	devres_add(&wacom->hdev->dev, pen_fifo);
-+	wacom_wac->pen_fifo = pen_fifo;
- 
- 	return 0;
- }
-diff --git a/drivers/hid/wacom_wac.h b/drivers/hid/wacom_wac.h
-index da612b6e9c77..195910dd2154 100644
---- a/drivers/hid/wacom_wac.h
-+++ b/drivers/hid/wacom_wac.h
-@@ -342,7 +342,7 @@ struct wacom_wac {
- 	struct input_dev *pen_input;
- 	struct input_dev *touch_input;
- 	struct input_dev *pad_input;
--	struct kfifo_rec_ptr_2 pen_fifo;
-+	struct kfifo_rec_ptr_2 *pen_fifo;
- 	int pid;
- 	int num_contacts_left;
- 	u8 bt_features;
--- 
-2.30.0
-
-
diff --git a/kernel.spec b/kernel.spec
index b146d5f2e..e5126e7ab 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -99,7 +99,7 @@ Summary: The Linux kernel
 %define stable_rc 0 
 
 # Do we have a -stable update to apply?
-%define stable_update 12
+%define stable_update 13
 # Set rpm version accordingly
 %if 0%{?stable_update}
 %define stablerev %{stable_update}
@@ -867,15 +867,15 @@ Patch103: arm-pandaboard-fix-add-bluetooth.patch
 # Fix for USB on some newer RPi4 / firmware combinations
 Patch104: 0001-brcm-rpi4-fix-usb-numeration.patch
 
+# RPi-4 and wifi issues
+Patch105: arm-dts-rpi-4-disable-wifi-frequencies.patch
+
 # Nouveau mDP detection fix
 Patch107: 0001-drm-nouveau-kms-handle-mDP-connectors.patch
 
 # rhbz 1918778
 Patch108: media-pwc-fix-the-urb-buffer-allocation.patch
 
-#rhbz 1918486
-Patch109: hid-wacom-correct-null-dereference-on-aes-pen-proximity.patch
-
 # END OF PATCH DEFINITIONS
 
 %endif
@@ -2992,6 +2992,12 @@ fi
 #
 #
 %changelog
+* Thu Feb 04 2021 Justin M. Forbes <jforbes@fedoraproject.org> - 5.10.13-100
+- Linux v5.10.13
+
+* Mon Feb 01 2021 Justin M. Forbes <jforbes@fedoraproject.org> - 5.10.12-100
+- Linux v5.10.12
+
 * Wed Jan 27 08:07:52 CST 2021 Justin M. Forbes <jforbes@fedoraproject.org> - 5.10.11-100
 - Linux v5.10.11
 - Fix URB buffer allocation of pwc driver (rhbz 1918778)
diff --git a/sources b/sources
index 872532bad..12dc41ba6 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 SHA512 (linux-5.10.tar.xz) = c28d52bc0c1e2c99017ceeca0bf2e622427f3416e0692090b01f65e3b3a5bce0e3e52ce3cee15d71e84fcb965bd48bdfcccb818c0105035d712ebd07afde9452
-SHA512 (patch-5.10.12.xz) = 76c4ade1754a5e62c8b82dbaac7b7627d08c348455a5b286fded01d3a19245025ce77c1771fc65a931a4afe0339988301846f5135decd3221e207eaea199ff25
+SHA512 (patch-5.10.13.xz) = 34192c95ad2e2b7d8e03f0e5087d3ee88b13d32abd2a2fb2145bcc969b3d75cae189b118e5c390ce04c9706a6627f551a5e78fb3f0e13a7d3d00ac7129d13a10