From fc9e497f9dbed3662c0302dc8250948471bb8e42 Mon Sep 17 00:00:00 2001 From: Sasha Levin Date: Mon, 27 Jan 2025 12:05:03 -0500 Subject: [PATCH] Fixes for 5.4 Signed-off-by: Sasha Levin --- .../asoc-wm8994-add-depends-on-mfd-core.patch | 38 +++++++++++++ ...sunxi-nmi-add-missing-skip_wake-flag.patch | 44 +++++++++++++++ ...edundant-response-for-iscsi_uevent_g.patch | 53 +++++++++++++++++++ queue-5.4/series | 3 ++ 4 files changed, 138 insertions(+) create mode 100644 queue-5.4/asoc-wm8994-add-depends-on-mfd-core.patch create mode 100644 queue-5.4/irqchip-sunxi-nmi-add-missing-skip_wake-flag.patch create mode 100644 queue-5.4/scsi-iscsi-fix-redundant-response-for-iscsi_uevent_g.patch diff --git a/queue-5.4/asoc-wm8994-add-depends-on-mfd-core.patch b/queue-5.4/asoc-wm8994-add-depends-on-mfd-core.patch new file mode 100644 index 0000000000..4e4eab4780 --- /dev/null +++ b/queue-5.4/asoc-wm8994-add-depends-on-mfd-core.patch @@ -0,0 +1,38 @@ +From c248d88ae3908f006da6d6543a9c7dd3bebe892e Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 6 Jan 2025 15:46:39 +0000 +Subject: ASoC: wm8994: Add depends on MFD core + +From: Charles Keepax + +[ 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 +Closes: https://lore.kernel.org/oe-kbuild-all/202501061337.R0DlBUoD-lkp@intel.com/ +Signed-off-by: Charles Keepax +Link: https://patch.msgid.link/20250106154639.3999553-1-ckeepax@opensource.cirrus.com +Signed-off-by: Mark Brown +Signed-off-by: Sasha Levin +--- + sound/soc/codecs/Kconfig | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig +index dfc536cd9d2fc..7b03ff158d782 100644 +--- a/sound/soc/codecs/Kconfig ++++ b/sound/soc/codecs/Kconfig +@@ -1400,6 +1400,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.4/irqchip-sunxi-nmi-add-missing-skip_wake-flag.patch b/queue-5.4/irqchip-sunxi-nmi-add-missing-skip_wake-flag.patch new file mode 100644 index 0000000000..9bf08344fc --- /dev/null +++ b/queue-5.4/irqchip-sunxi-nmi-add-missing-skip_wake-flag.patch @@ -0,0 +1,44 @@ +From 5c1ed30791f3ecd6d87e1839e8e0a804a1bf23be Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sun, 12 Jan 2025 13:34:02 +0100 +Subject: irqchip/sunxi-nmi: Add missing SKIP_WAKE flag + +From: Philippe Simons + +[ 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 +Signed-off-by: Thomas Gleixner +Link: https://lore.kernel.org/all/20250112123402.388520-1-simons.philippe@gmail.com +Signed-off-by: Sasha Levin +--- + 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.4/scsi-iscsi-fix-redundant-response-for-iscsi_uevent_g.patch b/queue-5.4/scsi-iscsi-fix-redundant-response-for-iscsi_uevent_g.patch new file mode 100644 index 0000000000..0b27a0905d --- /dev/null +++ b/queue-5.4/scsi-iscsi-fix-redundant-response-for-iscsi_uevent_g.patch @@ -0,0 +1,53 @@ +From ff8f005a7a2c76d308c4cf2c820b7511df26cac7 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +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 + +[ 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 +Link: https://lore.kernel.org/r/20250107022432.65390-1-hawkxiang.cpp@gmail.com +Reviewed-by: Mike Christie +Signed-off-by: Martin K. Petersen +Signed-off-by: Sasha Levin +--- + 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 51f53638629cb..9ef242d2a2c9d 100644 +--- a/drivers/scsi/scsi_transport_iscsi.c ++++ b/drivers/scsi/scsi_transport_iscsi.c +@@ -3746,7 +3746,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. +@@ -3755,6 +3755,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.4/series b/queue-5.4/series index aae9880314..955ae41b06 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -72,3 +72,6 @@ hrtimers-handle-cpu-state-correctly-on-hotplug.patch ipv6-avoid-possible-null-deref-in-rt6_uncached_list_flush_dev.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 +scsi-iscsi-fix-redundant-response-for-iscsi_uevent_g.patch +irqchip-sunxi-nmi-add-missing-skip_wake-flag.patch -- 2.47.3