From: Greg Kroah-Hartman Date: Mon, 5 May 2025 05:55:32 +0000 (+0200) Subject: 6.14-stable patches X-Git-Tag: v6.1.137~14 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=646780e765a75273aabdd04979f9faddba7e2661;p=thirdparty%2Fkernel%2Fstable-queue.git 6.14-stable patches added patches: alsa-hda-realtek-add-more-hp-laptops-which-need-mute-led-fixup.patch alsa-usb-audio-add-retry-on-eproto-from-usb_set_interface.patch alsa-usb-audio-add-second-usb-id-for-jabra-evolve-65-headset.patch asoc-renesas-rz-ssi-use-noirq_system_sleep_pm_ops.patch revert-rndis_host-flag-rndis-modems-as-wwan-devices.patch series --- diff --git a/queue-6.14/alsa-hda-realtek-add-more-hp-laptops-which-need-mute-led-fixup.patch b/queue-6.14/alsa-hda-realtek-add-more-hp-laptops-which-need-mute-led-fixup.patch new file mode 100644 index 0000000000..e4bcea6abd --- /dev/null +++ b/queue-6.14/alsa-hda-realtek-add-more-hp-laptops-which-need-mute-led-fixup.patch @@ -0,0 +1,35 @@ +From 63f5235e0291152a2ac2c4ef3c1196cb6dfb3ef7 Mon Sep 17 00:00:00 2001 +From: Chris Chiu +Date: Wed, 30 Apr 2025 18:18:43 +0800 +Subject: ALSA: hda/realtek - Add more HP laptops which need mute led fixup + +From: Chris Chiu + +commit 63f5235e0291152a2ac2c4ef3c1196cb6dfb3ef7 upstream. + +More HP EliteBook with Realtek HDA codec ALC3247 and combined CS35L56 +Amplifiers need quirk ALC236_FIXUP_HP_GPIO_LED to fix the micmute LED. + +Signed-off-by: Chris Chiu +Cc: +Link: https://patch.msgid.link/20250430101843.150833-1-chris.chiu@canonical.com +Signed-off-by: Takashi Iwai +Signed-off-by: Greg Kroah-Hartman +--- + sound/pci/hda/patch_realtek.c | 3 +++ + 1 file changed, 3 insertions(+) + +--- a/sound/pci/hda/patch_realtek.c ++++ b/sound/pci/hda/patch_realtek.c +@@ -10732,8 +10732,11 @@ static const struct hda_quirk alc269_fix + SND_PCI_QUIRK(0x103c, 0x8de8, "HP Gemtree", ALC245_FIXUP_TAS2781_SPI_2), + SND_PCI_QUIRK(0x103c, 0x8de9, "HP Gemtree", ALC245_FIXUP_TAS2781_SPI_2), + SND_PCI_QUIRK(0x103c, 0x8dec, "HP EliteBook 640 G12", ALC236_FIXUP_HP_GPIO_LED), ++ SND_PCI_QUIRK(0x103c, 0x8ded, "HP EliteBook 640 G12", ALC236_FIXUP_HP_GPIO_LED), + SND_PCI_QUIRK(0x103c, 0x8dee, "HP EliteBook 660 G12", ALC236_FIXUP_HP_GPIO_LED), ++ SND_PCI_QUIRK(0x103c, 0x8def, "HP EliteBook 660 G12", ALC236_FIXUP_HP_GPIO_LED), + SND_PCI_QUIRK(0x103c, 0x8df0, "HP EliteBook 630 G12", ALC236_FIXUP_HP_GPIO_LED), ++ SND_PCI_QUIRK(0x103c, 0x8df1, "HP EliteBook 630 G12", ALC236_FIXUP_HP_GPIO_LED), + SND_PCI_QUIRK(0x103c, 0x8dfc, "HP EliteBook 645 G12", ALC236_FIXUP_HP_GPIO_LED), + SND_PCI_QUIRK(0x103c, 0x8dfe, "HP EliteBook 665 G12", ALC236_FIXUP_HP_GPIO_LED), + SND_PCI_QUIRK(0x103c, 0x8e14, "HP ZBook Firefly 14 G12", ALC285_FIXUP_HP_GPIO_LED), diff --git a/queue-6.14/alsa-usb-audio-add-retry-on-eproto-from-usb_set_interface.patch b/queue-6.14/alsa-usb-audio-add-retry-on-eproto-from-usb_set_interface.patch new file mode 100644 index 0000000000..6f80a16a74 --- /dev/null +++ b/queue-6.14/alsa-usb-audio-add-retry-on-eproto-from-usb_set_interface.patch @@ -0,0 +1,55 @@ +From f406005e162b660dc405b4f18bf7bcb93a515608 Mon Sep 17 00:00:00 2001 +From: "Geoffrey D. Bennett" +Date: Thu, 17 Apr 2025 04:19:23 +0930 +Subject: ALSA: usb-audio: Add retry on -EPROTO from usb_set_interface() + +From: Geoffrey D. Bennett + +commit f406005e162b660dc405b4f18bf7bcb93a515608 upstream. + +During initialisation of Focusrite USB audio interfaces, -EPROTO is +sometimes returned from usb_set_interface(), which sometimes prevents +the device from working: subsequent usb_set_interface() and +uac_clock_source_is_valid() calls fail. + +This patch adds up to 5 retries in endpoint_set_interface(), with a +delay starting at 5ms and doubling each time. 5 retries was chosen to +allow for longer than expected waits for the interface to start +responding correctly; in testing, a single 5ms delay was sufficient to +fix the issue. + +Closes: https://github.com/geoffreybennett/fcp-support/issues/2 +Cc: stable@vger.kernel.org +Signed-off-by: Geoffrey D. Bennett +Link: https://patch.msgid.link/Z//7s9dKsmVxHzY2@m.b4.vu +Signed-off-by: Takashi Iwai +Signed-off-by: Greg Kroah-Hartman +--- + sound/usb/endpoint.c | 7 +++++++ + 1 file changed, 7 insertions(+) + +--- a/sound/usb/endpoint.c ++++ b/sound/usb/endpoint.c +@@ -926,6 +926,8 @@ static int endpoint_set_interface(struct + { + int altset = set ? ep->altsetting : 0; + int err; ++ int retries = 0; ++ const int max_retries = 5; + + if (ep->iface_ref->altset == altset) + return 0; +@@ -935,8 +937,13 @@ static int endpoint_set_interface(struct + + usb_audio_dbg(chip, "Setting usb interface %d:%d for EP 0x%x\n", + ep->iface, altset, ep->ep_num); ++retry: + err = usb_set_interface(chip->dev, ep->iface, altset); + if (err < 0) { ++ if (err == -EPROTO && ++retries <= max_retries) { ++ msleep(5 * (1 << (retries - 1))); ++ goto retry; ++ } + usb_audio_err_ratelimited( + chip, "%d:%d: usb_set_interface failed (%d)\n", + ep->iface, altset, err); diff --git a/queue-6.14/alsa-usb-audio-add-second-usb-id-for-jabra-evolve-65-headset.patch b/queue-6.14/alsa-usb-audio-add-second-usb-id-for-jabra-evolve-65-headset.patch new file mode 100644 index 0000000000..11b605005b --- /dev/null +++ b/queue-6.14/alsa-usb-audio-add-second-usb-id-for-jabra-evolve-65-headset.patch @@ -0,0 +1,34 @@ +From 1149719442d28c96dc63cad432b5a6db7c300e1a Mon Sep 17 00:00:00 2001 +From: Joachim Priesner +Date: Mon, 28 Apr 2025 07:36:06 +0200 +Subject: ALSA: usb-audio: Add second USB ID for Jabra Evolve 65 headset + +From: Joachim Priesner + +commit 1149719442d28c96dc63cad432b5a6db7c300e1a upstream. + +There seem to be multiple USB device IDs used for these; +the one I have reports as 0b0e:030c when powered on. +(When powered off, it reports as 0b0e:0311.) + +Signed-off-by: Joachim Priesner +Cc: +Link: https://patch.msgid.link/20250428053606.9237-1-joachim.priesner@web.de +Signed-off-by: Takashi Iwai +Signed-off-by: Greg Kroah-Hartman +--- + sound/usb/format.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +--- a/sound/usb/format.c ++++ b/sound/usb/format.c +@@ -260,7 +260,8 @@ static int parse_audio_format_rates_v1(s + } + + /* Jabra Evolve 65 headset */ +- if (chip->usb_id == USB_ID(0x0b0e, 0x030b)) { ++ if (chip->usb_id == USB_ID(0x0b0e, 0x030b) || ++ chip->usb_id == USB_ID(0x0b0e, 0x030c)) { + /* only 48kHz for playback while keeping 16kHz for capture */ + if (fp->nr_rates != 1) + return set_fixed_rate(fp, 48000, SNDRV_PCM_RATE_48000); diff --git a/queue-6.14/asoc-renesas-rz-ssi-use-noirq_system_sleep_pm_ops.patch b/queue-6.14/asoc-renesas-rz-ssi-use-noirq_system_sleep_pm_ops.patch new file mode 100644 index 0000000000..2dd38efd3d --- /dev/null +++ b/queue-6.14/asoc-renesas-rz-ssi-use-noirq_system_sleep_pm_ops.patch @@ -0,0 +1,51 @@ +From c1b0f5183a4488b6b7790f834ce3a786725b3583 Mon Sep 17 00:00:00 2001 +From: Claudiu Beznea +Date: Thu, 10 Apr 2025 17:15:25 +0300 +Subject: ASoC: renesas: rz-ssi: Use NOIRQ_SYSTEM_SLEEP_PM_OPS() + +From: Claudiu Beznea + +commit c1b0f5183a4488b6b7790f834ce3a786725b3583 upstream. + +In the latest kernel versions system crashes were noticed occasionally +during suspend/resume. This occurs because the RZ SSI suspend trigger +(called from snd_soc_suspend()) is executed after rz_ssi_pm_ops->suspend() +and it accesses IP registers. After the rz_ssi_pm_ops->suspend() is +executed the IP clocks are disabled and its reset line is asserted. + +Since snd_soc_suspend() is invoked through snd_soc_pm_ops->suspend(), +snd_soc_pm_ops is associated with soc_driver (defined in +sound/soc/soc-core.c), and there is no parent-child relationship between +soc_driver and rz_ssi_driver the power management subsystem does not +enforce a specific suspend/resume order between the RZ SSI platform driver +and soc_driver. + +To ensure that the suspend/resume function of rz-ssi is executed after +snd_soc_suspend(), use NOIRQ_SYSTEM_SLEEP_PM_OPS(). + +Fixes: 1fc778f7c833 ("ASoC: renesas: rz-ssi: Add suspend to RAM support") +Cc: stable@vger.kernel.org +Signed-off-by: Claudiu Beznea +Link: https://patch.msgid.link/20250410141525.4126502-1-claudiu.beznea.uj@bp.renesas.com +Signed-off-by: Mark Brown +Signed-off-by: Greg Kroah-Hartman +--- + sound/soc/renesas/rz-ssi.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/sound/soc/renesas/rz-ssi.c b/sound/soc/renesas/rz-ssi.c +index 3a0af4ca7ab6..0f7458a43901 100644 +--- a/sound/soc/renesas/rz-ssi.c ++++ b/sound/soc/renesas/rz-ssi.c +@@ -1244,7 +1244,7 @@ static int rz_ssi_runtime_resume(struct device *dev) + + static const struct dev_pm_ops rz_ssi_pm_ops = { + RUNTIME_PM_OPS(rz_ssi_runtime_suspend, rz_ssi_runtime_resume, NULL) +- SYSTEM_SLEEP_PM_OPS(pm_runtime_force_suspend, pm_runtime_force_resume) ++ NOIRQ_SYSTEM_SLEEP_PM_OPS(pm_runtime_force_suspend, pm_runtime_force_resume) + }; + + static struct platform_driver rz_ssi_driver = { +-- +2.49.0 + diff --git a/queue-6.14/revert-rndis_host-flag-rndis-modems-as-wwan-devices.patch b/queue-6.14/revert-rndis_host-flag-rndis-modems-as-wwan-devices.patch new file mode 100644 index 0000000000..ea8efeace0 --- /dev/null +++ b/queue-6.14/revert-rndis_host-flag-rndis-modems-as-wwan-devices.patch @@ -0,0 +1,63 @@ +From 765f253e28909f161b0211f85cf0431cfee7d6df Mon Sep 17 00:00:00 2001 +From: Christian Heusel +Date: Thu, 24 Apr 2025 16:00:28 +0200 +Subject: Revert "rndis_host: Flag RNDIS modems as WWAN devices" + +From: Christian Heusel + +commit 765f253e28909f161b0211f85cf0431cfee7d6df upstream. + +This reverts commit 67d1a8956d2d62fe6b4c13ebabb57806098511d8. Since this +commit has been proven to be problematic for the setup of USB-tethered +ethernet connections and the related breakage is very noticeable for +users it should be reverted until a fixed version of the change can be +rolled out. + +Closes: https://lore.kernel.org/all/e0df2d85-1296-4317-b717-bd757e3ab928@heusel.eu/ +Link: https://chaos.social/@gromit/114377862699921553 +Link: https://bugzilla.kernel.org/show_bug.cgi?id=220002 +Link: https://bugs.gentoo.org/953555 +Link: https://bbs.archlinux.org/viewtopic.php?id=304892 +Cc: stable@vger.kernel.org +Acked-by: Lubomir Rintel +Signed-off-by: Christian Heusel +Link: https://patch.msgid.link/20250424-usb-tethering-fix-v1-1-b65cf97c740e@heusel.eu +Signed-off-by: Jakub Kicinski +Signed-off-by: Greg Kroah-Hartman +--- + drivers/net/usb/rndis_host.c | 16 ++-------------- + 1 file changed, 2 insertions(+), 14 deletions(-) + +--- a/drivers/net/usb/rndis_host.c ++++ b/drivers/net/usb/rndis_host.c +@@ -630,16 +630,6 @@ static const struct driver_info zte_rndi + .tx_fixup = rndis_tx_fixup, + }; + +-static const struct driver_info wwan_rndis_info = { +- .description = "Mobile Broadband RNDIS device", +- .flags = FLAG_WWAN | FLAG_POINTTOPOINT | FLAG_FRAMING_RN | FLAG_NO_SETINT, +- .bind = rndis_bind, +- .unbind = rndis_unbind, +- .status = rndis_status, +- .rx_fixup = rndis_rx_fixup, +- .tx_fixup = rndis_tx_fixup, +-}; +- + /*-------------------------------------------------------------------------*/ + + static const struct usb_device_id products [] = { +@@ -676,11 +666,9 @@ static const struct usb_device_id produc + USB_INTERFACE_INFO(USB_CLASS_WIRELESS_CONTROLLER, 1, 3), + .driver_info = (unsigned long) &rndis_info, + }, { +- /* Mobile Broadband Modem, seen in Novatel Verizon USB730L and +- * Telit FN990A (RNDIS) +- */ ++ /* Novatel Verizon USB730L */ + USB_INTERFACE_INFO(USB_CLASS_MISC, 4, 1), +- .driver_info = (unsigned long)&wwan_rndis_info, ++ .driver_info = (unsigned long) &rndis_info, + }, + { }, // END + }; diff --git a/queue-6.14/series b/queue-6.14/series new file mode 100644 index 0000000000..932cb44bc0 --- /dev/null +++ b/queue-6.14/series @@ -0,0 +1,5 @@ +revert-rndis_host-flag-rndis-modems-as-wwan-devices.patch +alsa-hda-realtek-add-more-hp-laptops-which-need-mute-led-fixup.patch +alsa-usb-audio-add-retry-on-eproto-from-usb_set_interface.patch +alsa-usb-audio-add-second-usb-id-for-jabra-evolve-65-headset.patch +asoc-renesas-rz-ssi-use-noirq_system_sleep_pm_ops.patch