diff options
5 files changed, 164 insertions, 0 deletions
diff --git a/queue-6.1/alsa-hda-intel-add-thinkpad-e15-to-pm-deny-list.patch b/queue-6.1/alsa-hda-intel-add-thinkpad-e15-to-pm-deny-list.patch new file mode 100644 index 00000000000..98ce523cad6 --- /dev/null +++ b/queue-6.1/alsa-hda-intel-add-thinkpad-e15-to-pm-deny-list.patch @@ -0,0 +1,33 @@ +From c987a390f1b3b8bdac11031d7004e3410fe259bd Mon Sep 17 00:00:00 2001 +From: Takashi Iwai <tiwai@suse.de> +Date: Sun, 8 Jun 2025 11:14:14 +0200 +Subject: ALSA: hda/intel: Add Thinkpad E15 to PM deny list + +From: Takashi Iwai <tiwai@suse.de> + +commit c987a390f1b3b8bdac11031d7004e3410fe259bd upstream. + +Lenovo Thinkpad E15 with Conexant CX8070 codec seems causing ugly +noises after runtime-PM suspend. Disable the codec runtime PM as a +workaround. + +Link: https://bugzilla.kernel.org/show_bug.cgi?id=220210 +Cc: <stable@vger.kernel.org> +Link: https://patch.msgid.link/20250608091415.21170-1-tiwai@suse.de +Signed-off-by: Takashi Iwai <tiwai@suse.de> +Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +--- + sound/pci/hda/hda_intel.c | 2 ++ + 1 file changed, 2 insertions(+) + +--- a/sound/pci/hda/hda_intel.c ++++ b/sound/pci/hda/hda_intel.c +@@ -2261,6 +2261,8 @@ static const struct snd_pci_quirk power_ + SND_PCI_QUIRK(0x1734, 0x1232, "KONTRON SinglePC", 0), + /* Dell ALC3271 */ + SND_PCI_QUIRK(0x1028, 0x0962, "Dell ALC3271", 0), ++ /* https://bugzilla.kernel.org/show_bug.cgi?id=220210 */ ++ SND_PCI_QUIRK(0x17aa, 0x5079, "Lenovo Thinkpad E15", 0), + {} + }; + #endif /* CONFIG_PM */ diff --git a/queue-6.1/alsa-hda-realtek-enable-headset-mic-on-latitude-5420-rugged.patch b/queue-6.1/alsa-hda-realtek-enable-headset-mic-on-latitude-5420-rugged.patch new file mode 100644 index 00000000000..04178d25394 --- /dev/null +++ b/queue-6.1/alsa-hda-realtek-enable-headset-mic-on-latitude-5420-rugged.patch @@ -0,0 +1,32 @@ +From efa6bdf1bc75e26cafaa5f1d775e8bb7c5b0c431 Mon Sep 17 00:00:00 2001 +From: Jonathan Lane <jon@borg.moe> +Date: Wed, 11 Jun 2025 12:31:25 -0700 +Subject: ALSA: hda/realtek: enable headset mic on Latitude 5420 Rugged + +From: Jonathan Lane <jon@borg.moe> + +commit efa6bdf1bc75e26cafaa5f1d775e8bb7c5b0c431 upstream. + +Like many Dell laptops, the 3.5mm port by default can not detect a +combined headphones+mic headset or even a pure microphone. This +change enables the port's functionality. + +Signed-off-by: Jonathan Lane <jon@borg.moe> +Cc: <stable@vger.kernel.org> +Link: https://patch.msgid.link/20250611193124.26141-2-jon@borg.moe +Signed-off-by: Takashi Iwai <tiwai@suse.de> +Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +--- + sound/pci/hda/patch_realtek.c | 1 + + 1 file changed, 1 insertion(+) + +--- a/sound/pci/hda/patch_realtek.c ++++ b/sound/pci/hda/patch_realtek.c +@@ -9809,6 +9809,7 @@ static const struct snd_pci_quirk alc269 + SND_PCI_QUIRK(0x1028, 0x0871, "Dell Precision 3630", ALC255_FIXUP_DELL_HEADSET_MIC), + SND_PCI_QUIRK(0x1028, 0x0872, "Dell Precision 3630", ALC255_FIXUP_DELL_HEADSET_MIC), + SND_PCI_QUIRK(0x1028, 0x0873, "Dell Precision 3930", ALC255_FIXUP_DUMMY_LINEOUT_VERB), ++ SND_PCI_QUIRK(0x1028, 0x0879, "Dell Latitude 5420 Rugged", ALC269_FIXUP_DELL4_MIC_NO_PRESENCE), + SND_PCI_QUIRK(0x1028, 0x08ad, "Dell WYSE AIO", ALC225_FIXUP_DELL_WYSE_AIO_MIC_NO_PRESENCE), + SND_PCI_QUIRK(0x1028, 0x08ae, "Dell WYSE NB", ALC225_FIXUP_DELL1_MIC_NO_PRESENCE), + SND_PCI_QUIRK(0x1028, 0x0935, "Dell", ALC274_FIXUP_DELL_AIO_LINEOUT_VERB), diff --git a/queue-6.1/alsa-usb-audio-rename-alsa-kcontrol-pcm-and-pcm1-for-the-ktmicro-sound-card.patch b/queue-6.1/alsa-usb-audio-rename-alsa-kcontrol-pcm-and-pcm1-for-the-ktmicro-sound-card.patch new file mode 100644 index 00000000000..7c17276ad42 --- /dev/null +++ b/queue-6.1/alsa-usb-audio-rename-alsa-kcontrol-pcm-and-pcm1-for-the-ktmicro-sound-card.patch @@ -0,0 +1,49 @@ +From 93adf20ff4d6e865e0b974110d3cf2f07c057177 Mon Sep 17 00:00:00 2001 +From: wangdicheng <wangdicheng@kylinos.cn> +Date: Fri, 13 Jun 2025 14:36:36 +0800 +Subject: ALSA: usb-audio: Rename ALSA kcontrol PCM and PCM1 for the KTMicro sound card + +From: wangdicheng <wangdicheng@kylinos.cn> + +commit 93adf20ff4d6e865e0b974110d3cf2f07c057177 upstream. + +PCM1 not in Pulseaudio's control list; standardize control to +"Speaker" and "Headphone". + +Signed-off-by: wangdicheng <wangdicheng@kylinos.cn> +Cc: <stable@vger.kernel.org> +Link: https://patch.msgid.link/20250613063636.239683-1-wangdich9700@163.com +Signed-off-by: Takashi Iwai <tiwai@suse.de> +Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +--- + sound/usb/mixer_maps.c | 12 ++++++++++++ + 1 file changed, 12 insertions(+) + +--- a/sound/usb/mixer_maps.c ++++ b/sound/usb/mixer_maps.c +@@ -383,6 +383,13 @@ static const struct usbmix_name_map ms_u + { 0 } /* terminator */ + }; + ++/* KTMicro USB */ ++static struct usbmix_name_map s31b2_0022_map[] = { ++ { 23, "Speaker Playback" }, ++ { 18, "Headphone Playback" }, ++ { 0 } ++}; ++ + /* ASUS ROG Zenith II with Realtek ALC1220-VB */ + static const struct usbmix_name_map asus_zenith_ii_map[] = { + { 19, NULL, 12 }, /* FU, Input Gain Pad - broken response, disabled */ +@@ -692,6 +699,11 @@ static const struct usbmix_ctl_map usbmi + .id = USB_ID(0x045e, 0x083c), + .map = ms_usb_link_map, + }, ++ { ++ /* KTMicro USB */ ++ .id = USB_ID(0X31b2, 0x0022), ++ .map = s31b2_0022_map, ++ }, + { 0 } /* terminator */ + }; + diff --git a/queue-6.1/arm64-restrict-pagetable-teardown-to-avoid-false-warning.patch b/queue-6.1/arm64-restrict-pagetable-teardown-to-avoid-false-warning.patch new file mode 100644 index 00000000000..efaa7b1dfd3 --- /dev/null +++ b/queue-6.1/arm64-restrict-pagetable-teardown-to-avoid-false-warning.patch @@ -0,0 +1,46 @@ +From 650768c512faba8070bf4cfbb28c95eb5cd203f3 Mon Sep 17 00:00:00 2001 +From: Dev Jain <dev.jain@arm.com> +Date: Tue, 27 May 2025 13:56:33 +0530 +Subject: arm64: Restrict pagetable teardown to avoid false warning + +From: Dev Jain <dev.jain@arm.com> + +commit 650768c512faba8070bf4cfbb28c95eb5cd203f3 upstream. + +Commit 9c006972c3fe ("arm64: mmu: drop pXd_present() checks from +pXd_free_pYd_table()") removes the pxd_present() checks because the +caller checks pxd_present(). But, in case of vmap_try_huge_pud(), the +caller only checks pud_present(); pud_free_pmd_page() recurses on each +pmd through pmd_free_pte_page(), wherein the pmd may be none. Thus it is +possible to hit a warning in the latter, since pmd_none => !pmd_table(). +Thus, add a pmd_present() check in pud_free_pmd_page(). + +This problem was found by code inspection. + +Fixes: 9c006972c3fe ("arm64: mmu: drop pXd_present() checks from pXd_free_pYd_table()") +Cc: stable@vger.kernel.org +Reported-by: Ryan Roberts <ryan.roberts@arm.com> +Acked-by: David Hildenbrand <david@redhat.com> +Signed-off-by: Dev Jain <dev.jain@arm.com> +Reviewed-by: Catalin Marinas <catalin.marinas@arm.com> +Reviewed-by: Anshuman Khandual <anshuman.khandual@arm.com> +Reviewed-by: Ryan Roberts <ryan.roberts@arm.com> +Link: https://lore.kernel.org/r/20250527082633.61073-1-dev.jain@arm.com +Signed-off-by: Will Deacon <will@kernel.org> +Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +--- + arch/arm64/mm/mmu.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +--- a/arch/arm64/mm/mmu.c ++++ b/arch/arm64/mm/mmu.c +@@ -1503,7 +1503,8 @@ int pud_free_pmd_page(pud_t *pudp, unsig + next = addr; + end = addr + PUD_SIZE; + do { +- pmd_free_pte_page(pmdp, next); ++ if (pmd_present(pmdp_get(pmdp))) ++ pmd_free_pte_page(pmdp, next); + } while (pmdp++, next += PMD_SIZE, next != end); + + pud_clear(pudp); diff --git a/queue-6.1/series b/queue-6.1/series index 619bf1687b6..09951378e9e 100644 --- a/queue-6.1/series +++ b/queue-6.1/series @@ -458,3 +458,7 @@ selinux-fix-selinux_xfrm_alloc_user-to-set-correct-ctx_len.patch atm-revert-atm_account_tx-if-copy_from_iter_full-fails.patch input-sparcspkr-avoid-unannotated-fall-through.patch wifi-cfg80211-init-wiphy_work-before-allocating-rfkill-fails.patch +arm64-restrict-pagetable-teardown-to-avoid-false-warning.patch +alsa-usb-audio-rename-alsa-kcontrol-pcm-and-pcm1-for-the-ktmicro-sound-card.patch +alsa-hda-intel-add-thinkpad-e15-to-pm-deny-list.patch +alsa-hda-realtek-enable-headset-mic-on-latitude-5420-rugged.patch |