]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
Fixes for 5.10
authorSasha Levin <sashal@kernel.org>
Mon, 27 Jan 2025 17:05:02 +0000 (12:05 -0500)
committerSasha Levin <sashal@kernel.org>
Mon, 27 Jan 2025 17:05:02 +0000 (12:05 -0500)
Signed-off-by: Sasha Levin <sashal@kernel.org>
queue-5.10/asoc-samsung-add-missing-depends-on-i2c.patch [new file with mode: 0644]
queue-5.10/asoc-samsung-add-missing-selects-for-mfd_wm8994.patch [new file with mode: 0644]
queue-5.10/asoc-wm8994-add-depends-on-mfd-core.patch [new file with mode: 0644]
queue-5.10/irqchip-sunxi-nmi-add-missing-skip_wake-flag.patch [new file with mode: 0644]
queue-5.10/scsi-iscsi-fix-redundant-response-for-iscsi_uevent_g.patch [new file with mode: 0644]
queue-5.10/seccomp-stub-for-config_seccomp.patch [new file with mode: 0644]
queue-5.10/series

diff --git a/queue-5.10/asoc-samsung-add-missing-depends-on-i2c.patch b/queue-5.10/asoc-samsung-add-missing-depends-on-i2c.patch
new file mode 100644 (file)
index 0000000..f6a2367
--- /dev/null
@@ -0,0 +1,49 @@
+From 66f7803646c8c117c0ebd2b2d1a3fd41af46bc3f Mon Sep 17 00:00:00 2001
+From: Sasha Levin <sashal@kernel.org>
+Date: Wed, 8 Jan 2025 13:48:28 +0000
+Subject: ASoC: samsung: Add missing depends on I2C
+
+From: Charles Keepax <ckeepax@opensource.cirrus.com>
+
+[ Upstream commit 704dbe97a68153a84319ad63f526e12ba868b88e ]
+
+When switching to selects for MFD_WM8994 a dependency should have also
+been added for I2C, as the dependency on MFD_WM8994 will not be
+considered by the select.
+
+Fixes: fd55c6065bec ("ASoC: samsung: Add missing selects for MFD_WM8994")
+Reported-by: kernel test robot <lkp@intel.com>
+Closes: https://lore.kernel.org/oe-kbuild-all/202501082020.2bpGGVTW-lkp@intel.com/
+Signed-off-by: Charles Keepax <ckeepax@opensource.cirrus.com>
+Link: https://patch.msgid.link/20250108134828.246570-1-ckeepax@opensource.cirrus.com
+Signed-off-by: Mark Brown <broonie@kernel.org>
+Signed-off-by: Sasha Levin <sashal@kernel.org>
+---
+ sound/soc/samsung/Kconfig | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/sound/soc/samsung/Kconfig b/sound/soc/samsung/Kconfig
+index 159bc501186f9..c04c38d58804c 100644
+--- a/sound/soc/samsung/Kconfig
++++ b/sound/soc/samsung/Kconfig
+@@ -214,7 +214,7 @@ config SND_SOC_SAMSUNG_TM2_WM5110
+ config SND_SOC_SAMSUNG_ARIES_WM8994
+       tristate "SoC I2S Audio support for WM8994 on Aries"
+-      depends on SND_SOC_SAMSUNG && IIO && EXTCON
++      depends on SND_SOC_SAMSUNG && I2C && IIO && EXTCON
+       select SND_SOC_BT_SCO
+       select MFD_WM8994
+       select SND_SOC_WM8994
+@@ -228,7 +228,7 @@ config SND_SOC_SAMSUNG_ARIES_WM8994
+ config SND_SOC_SAMSUNG_MIDAS_WM1811
+       tristate "SoC I2S Audio support for Midas boards"
+-      depends on SND_SOC_SAMSUNG
++      depends on SND_SOC_SAMSUNG && I2C
+       select SND_SAMSUNG_I2S
+       select MFD_WM8994
+       select SND_SOC_WM8994
+-- 
+2.39.5
+
diff --git a/queue-5.10/asoc-samsung-add-missing-selects-for-mfd_wm8994.patch b/queue-5.10/asoc-samsung-add-missing-selects-for-mfd_wm8994.patch
new file mode 100644 (file)
index 0000000..a2719f8
--- /dev/null
@@ -0,0 +1,48 @@
+From e038b6f03ff77391e3455581695368d2becf6f13 Mon Sep 17 00:00:00 2001
+From: Sasha Levin <sashal@kernel.org>
+Date: Tue, 7 Jan 2025 10:41:34 +0000
+Subject: ASoC: samsung: Add missing selects for MFD_WM8994
+
+From: Charles Keepax <ckeepax@opensource.cirrus.com>
+
+[ Upstream commit fd55c6065bec5268740e944a1800e6fad00974d9 ]
+
+Anything selecting SND_SOC_WM8994 should also select MFD_WM8994, as
+SND_SOC_WM8994 does not automatically do so. Add the missing selects.
+
+Reported-by: kernel test robot <lkp@intel.com>
+Closes: https://lore.kernel.org/oe-kbuild-all/202501071530.UwIXs7OL-lkp@intel.com/
+Signed-off-by: Charles Keepax <ckeepax@opensource.cirrus.com>
+Link: https://patch.msgid.link/20250107104134.12147-1-ckeepax@opensource.cirrus.com
+Signed-off-by: Mark Brown <broonie@kernel.org>
+Signed-off-by: Sasha Levin <sashal@kernel.org>
+---
+ sound/soc/samsung/Kconfig | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/sound/soc/samsung/Kconfig b/sound/soc/samsung/Kconfig
+index a2221ebb1b6ab..159bc501186f9 100644
+--- a/sound/soc/samsung/Kconfig
++++ b/sound/soc/samsung/Kconfig
+@@ -214,8 +214,9 @@ config SND_SOC_SAMSUNG_TM2_WM5110
+ config SND_SOC_SAMSUNG_ARIES_WM8994
+       tristate "SoC I2S Audio support for WM8994 on Aries"
+-      depends on SND_SOC_SAMSUNG && MFD_WM8994 && IIO && EXTCON
++      depends on SND_SOC_SAMSUNG && IIO && EXTCON
+       select SND_SOC_BT_SCO
++      select MFD_WM8994
+       select SND_SOC_WM8994
+       select SND_SAMSUNG_I2S
+       help
+@@ -229,6 +230,7 @@ config SND_SOC_SAMSUNG_MIDAS_WM1811
+       tristate "SoC I2S Audio support for Midas boards"
+       depends on SND_SOC_SAMSUNG
+       select SND_SAMSUNG_I2S
++      select MFD_WM8994
+       select SND_SOC_WM8994
+       help
+         Say Y if you want to add support for SoC audio on the Midas boards.
+-- 
+2.39.5
+
diff --git a/queue-5.10/asoc-wm8994-add-depends-on-mfd-core.patch b/queue-5.10/asoc-wm8994-add-depends-on-mfd-core.patch
new file mode 100644 (file)
index 0000000..634790b
--- /dev/null
@@ -0,0 +1,38 @@
+From 232580ed84c9bb286a55e356019c011523413c0d Mon Sep 17 00:00:00 2001
+From: Sasha Levin <sashal@kernel.org>
+Date: Mon, 6 Jan 2025 15:46:39 +0000
+Subject: ASoC: wm8994: Add depends on MFD core
+
+From: Charles Keepax <ckeepax@opensource.cirrus.com>
+
+[ Upstream commit 5ed01155cea69801f1f0c908954a56a5a3474bed ]
+
+The ASoC driver should not be used without the MFD component. This was
+causing randconfig issues with regmap IRQ which is selected by the MFD
+part of the wm8994 driver.
+
+Reported-by: kernel test robot <lkp@intel.com>
+Closes: https://lore.kernel.org/oe-kbuild-all/202501061337.R0DlBUoD-lkp@intel.com/
+Signed-off-by: Charles Keepax <ckeepax@opensource.cirrus.com>
+Link: https://patch.msgid.link/20250106154639.3999553-1-ckeepax@opensource.cirrus.com
+Signed-off-by: Mark Brown <broonie@kernel.org>
+Signed-off-by: Sasha Levin <sashal@kernel.org>
+---
+ sound/soc/codecs/Kconfig | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig
+index a8b9eb6ce2ea8..18131ad99c6da 100644
+--- a/sound/soc/codecs/Kconfig
++++ b/sound/soc/codecs/Kconfig
+@@ -1647,6 +1647,7 @@ config SND_SOC_WM8993
+ config SND_SOC_WM8994
+       tristate
++      depends on MFD_WM8994
+ config SND_SOC_WM8995
+       tristate
+-- 
+2.39.5
+
diff --git a/queue-5.10/irqchip-sunxi-nmi-add-missing-skip_wake-flag.patch b/queue-5.10/irqchip-sunxi-nmi-add-missing-skip_wake-flag.patch
new file mode 100644 (file)
index 0000000..9fc4181
--- /dev/null
@@ -0,0 +1,44 @@
+From efb27bf25b5fca6f8b0c6ea00308bb0ab3920ab8 Mon Sep 17 00:00:00 2001
+From: Sasha Levin <sashal@kernel.org>
+Date: Sun, 12 Jan 2025 13:34:02 +0100
+Subject: irqchip/sunxi-nmi: Add missing SKIP_WAKE flag
+
+From: Philippe Simons <simons.philippe@gmail.com>
+
+[ Upstream commit 3a748d483d80f066ca4b26abe45cdc0c367d13e9 ]
+
+Some boards with Allwinner SoCs connect the PMIC's IRQ pin to the SoC's NMI
+pin instead of a normal GPIO. Since the power key is connected to the PMIC,
+and people expect to wake up a suspended system via this key, the NMI IRQ
+controller must stay alive when the system goes into suspend.
+
+Add the SKIP_WAKE flag to prevent the sunxi NMI controller from going to
+sleep, so that the power key can wake up those systems.
+
+[ tglx: Fixed up coding style ]
+
+Signed-off-by: Philippe Simons <simons.philippe@gmail.com>
+Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
+Link: https://lore.kernel.org/all/20250112123402.388520-1-simons.philippe@gmail.com
+Signed-off-by: Sasha Levin <sashal@kernel.org>
+---
+ drivers/irqchip/irq-sunxi-nmi.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/drivers/irqchip/irq-sunxi-nmi.c b/drivers/irqchip/irq-sunxi-nmi.c
+index a412b5d5d0fac..a2aadfdc47728 100644
+--- a/drivers/irqchip/irq-sunxi-nmi.c
++++ b/drivers/irqchip/irq-sunxi-nmi.c
+@@ -200,7 +200,8 @@ static int __init sunxi_sc_nmi_irq_init(struct device_node *node,
+       gc->chip_types[0].chip.irq_unmask       = irq_gc_mask_set_bit;
+       gc->chip_types[0].chip.irq_eoi          = irq_gc_ack_set_bit;
+       gc->chip_types[0].chip.irq_set_type     = sunxi_sc_nmi_set_type;
+-      gc->chip_types[0].chip.flags            = IRQCHIP_EOI_THREADED | IRQCHIP_EOI_IF_HANDLED;
++      gc->chip_types[0].chip.flags            = IRQCHIP_EOI_THREADED | IRQCHIP_EOI_IF_HANDLED |
++                                                IRQCHIP_SKIP_SET_WAKE;
+       gc->chip_types[0].regs.ack              = reg_offs->pend;
+       gc->chip_types[0].regs.mask             = reg_offs->enable;
+       gc->chip_types[0].regs.type             = reg_offs->ctrl;
+-- 
+2.39.5
+
diff --git a/queue-5.10/scsi-iscsi-fix-redundant-response-for-iscsi_uevent_g.patch b/queue-5.10/scsi-iscsi-fix-redundant-response-for-iscsi_uevent_g.patch
new file mode 100644 (file)
index 0000000..e39c08a
--- /dev/null
@@ -0,0 +1,53 @@
+From bed8a7c8a16431b4622fe5eb1fbb37ea5f885651 Mon Sep 17 00:00:00 2001
+From: Sasha Levin <sashal@kernel.org>
+Date: Tue, 7 Jan 2025 10:24:31 +0800
+Subject: scsi: iscsi: Fix redundant response for ISCSI_UEVENT_GET_HOST_STATS
+ request
+
+From: Xiang Zhang <hawkxiang.cpp@gmail.com>
+
+[ Upstream commit 63ca02221cc5aa0731fe2b0cc28158aaa4b84982 ]
+
+The ISCSI_UEVENT_GET_HOST_STATS request is already handled in
+iscsi_get_host_stats(). This fix ensures that redundant responses are
+skipped in iscsi_if_rx().
+
+ - On success: send reply and stats from iscsi_get_host_stats()
+   within if_recv_msg().
+
+ - On error: fall through.
+
+Signed-off-by: Xiang Zhang <hawkxiang.cpp@gmail.com>
+Link: https://lore.kernel.org/r/20250107022432.65390-1-hawkxiang.cpp@gmail.com
+Reviewed-by: Mike Christie <michael.christie@oracle.com>
+Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
+Signed-off-by: Sasha Levin <sashal@kernel.org>
+---
+ drivers/scsi/scsi_transport_iscsi.c | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/drivers/scsi/scsi_transport_iscsi.c b/drivers/scsi/scsi_transport_iscsi.c
+index 074cbd64aa253..c636a6d3bdcc1 100644
+--- a/drivers/scsi/scsi_transport_iscsi.c
++++ b/drivers/scsi/scsi_transport_iscsi.c
+@@ -4076,7 +4076,7 @@ iscsi_if_rx(struct sk_buff *skb)
+               }
+               do {
+                       /*
+-                       * special case for GET_STATS:
++                       * special case for GET_STATS, GET_CHAP and GET_HOST_STATS:
+                        * on success - sending reply and stats from
+                        * inside of if_recv_msg(),
+                        * on error - fall through.
+@@ -4085,6 +4085,8 @@ iscsi_if_rx(struct sk_buff *skb)
+                               break;
+                       if (ev->type == ISCSI_UEVENT_GET_CHAP && !err)
+                               break;
++                      if (ev->type == ISCSI_UEVENT_GET_HOST_STATS && !err)
++                              break;
+                       err = iscsi_if_send_reply(portid, nlh->nlmsg_type,
+                                                 ev, sizeof(*ev));
+                       if (err == -EAGAIN && --retries < 0) {
+-- 
+2.39.5
+
diff --git a/queue-5.10/seccomp-stub-for-config_seccomp.patch b/queue-5.10/seccomp-stub-for-config_seccomp.patch
new file mode 100644 (file)
index 0000000..5e52e18
--- /dev/null
@@ -0,0 +1,50 @@
+From 3636bd1f045dc5d9b23386dc136f8a5a28897dc2 Mon Sep 17 00:00:00 2001
+From: Sasha Levin <sashal@kernel.org>
+Date: Wed, 8 Jan 2025 23:44:45 +0100
+Subject: seccomp: Stub for !CONFIG_SECCOMP
+
+From: Linus Walleij <linus.walleij@linaro.org>
+
+[ Upstream commit f90877dd7fb5085dd9abd6399daf63dd2969fc90 ]
+
+When using !CONFIG_SECCOMP with CONFIG_GENERIC_ENTRY, the
+randconfig bots found the following snag:
+
+   kernel/entry/common.c: In function 'syscall_trace_enter':
+>> kernel/entry/common.c:52:23: error: implicit declaration
+   of function '__secure_computing' [-Wimplicit-function-declaration]
+      52 |                 ret = __secure_computing(NULL);
+         |                       ^~~~~~~~~~~~~~~~~~
+
+Since generic entry calls __secure_computing() unconditionally,
+fix this by moving the stub out of the ifdef clause for
+CONFIG_HAVE_ARCH_SECCOMP_FILTER so it's always available.
+
+Link: https://lore.kernel.org/oe-kbuild-all/202501061240.Fzk9qiFZ-lkp@intel.com/
+Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
+Link: https://lore.kernel.org/r/20250108-seccomp-stub-2-v2-1-74523d49420f@linaro.org
+Signed-off-by: Kees Cook <kees@kernel.org>
+Signed-off-by: Sasha Levin <sashal@kernel.org>
+---
+ include/linux/seccomp.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/include/linux/seccomp.h b/include/linux/seccomp.h
+index 02aef2844c38e..a5a9406da2287 100644
+--- a/include/linux/seccomp.h
++++ b/include/linux/seccomp.h
+@@ -68,10 +68,10 @@ struct seccomp_data;
+ #ifdef CONFIG_HAVE_ARCH_SECCOMP_FILTER
+ static inline int secure_computing(void) { return 0; }
+-static inline int __secure_computing(const struct seccomp_data *sd) { return 0; }
+ #else
+ static inline void secure_computing_strict(int this_syscall) { return; }
+ #endif
++static inline int __secure_computing(const struct seccomp_data *sd) { return 0; }
+ static inline long prctl_get_seccomp(void)
+ {
+-- 
+2.39.5
+
index 2c7949896fd709a12e4955f6d7595c7879680b5b..b125cc37ada1a29aade94922d6059f6a4d8491d5 100644 (file)
@@ -112,3 +112,9 @@ vsock-prevent-null-ptr-deref-in-vsock_.patch
 x86-xen-fix-sls-mitigation-in-xen_hypercall_iret.patch
 scsi-sg-fix-slab-use-after-free-read-in-sg_release.patch
 net-fix-data-races-around-sk-sk_forward_alloc.patch
+asoc-wm8994-add-depends-on-mfd-core.patch
+asoc-samsung-add-missing-selects-for-mfd_wm8994.patch
+seccomp-stub-for-config_seccomp.patch
+scsi-iscsi-fix-redundant-response-for-iscsi_uevent_g.patch
+irqchip-sunxi-nmi-add-missing-skip_wake-flag.patch
+asoc-samsung-add-missing-depends-on-i2c.patch