From: Sasha Levin Date: Thu, 21 Dec 2023 14:52:46 +0000 (-0500) Subject: Fixes for 4.19 X-Git-Tag: v5.15.145~9 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=02bc14d7cd5c23a2bb1e5912a88c7d65209a0790;p=thirdparty%2Fkernel%2Fstable-queue.git Fixes for 4.19 Signed-off-by: Sasha Levin --- diff --git a/queue-4.19/alsa-hda-realtek-add-quirk-for-lenovo-tianyi510pro-1.patch b/queue-4.19/alsa-hda-realtek-add-quirk-for-lenovo-tianyi510pro-1.patch new file mode 100644 index 00000000000..81df22e6725 --- /dev/null +++ b/queue-4.19/alsa-hda-realtek-add-quirk-for-lenovo-tianyi510pro-1.patch @@ -0,0 +1,85 @@ +From c2c0f6407a11290c1ddc694756a20037fbf1cf65 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 7 Dec 2022 21:32:18 +0800 +Subject: ALSA: hda/realtek: Add quirk for Lenovo TianYi510Pro-14IOB + +From: Edward Pacman + +[ Upstream commit 4bf5bf54476dffe60e6b6d8d539f67309ff599e2 ] + +Lenovo TianYi510Pro-14IOB (17aa:3742) +require quirk for enabling headset-mic + +Signed-off-by: Edward Pacman +Cc: +Link: https://bugzilla.kernel.org/show_bug.cgi?id=216756 +Link: https://lore.kernel.org/r/20221207133218.18989-1-edward@edward-p.xyz +Signed-off-by: Takashi Iwai +Stable-dep-of: 6f7e4664e597 ("ALSA: hda/realtek: Enable headset on Lenovo M90 Gen5") +Signed-off-by: Sasha Levin +--- + sound/pci/hda/patch_realtek.c | 27 +++++++++++++++++++++++++++ + 1 file changed, 27 insertions(+) + +diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c +index 44daf2a57d7e0..02e4b27c87671 100644 +--- a/sound/pci/hda/patch_realtek.c ++++ b/sound/pci/hda/patch_realtek.c +@@ -8606,6 +8606,17 @@ static void alc897_fixup_lenovo_headset_mic(struct hda_codec *codec, + } + } + ++static void alc897_fixup_lenovo_headset_mode(struct hda_codec *codec, ++ const struct hda_fixup *fix, int action) ++{ ++ struct alc_spec *spec = codec->spec; ++ ++ if (action == HDA_FIXUP_ACT_PRE_PROBE) { ++ spec->parse_flags |= HDA_PINCFG_HEADSET_MIC; ++ spec->gen.hp_automute_hook = alc897_hp_automute_hook; ++ } ++} ++ + static const struct coef_fw alc668_coefs[] = { + WRITE_COEF(0x01, 0xbebe), WRITE_COEF(0x02, 0xaaaa), WRITE_COEF(0x03, 0x0), + WRITE_COEF(0x04, 0x0180), WRITE_COEF(0x06, 0x0), WRITE_COEF(0x07, 0x0f80), +@@ -8688,6 +8699,8 @@ enum { + ALC897_FIXUP_LENOVO_HEADSET_MIC, + ALC897_FIXUP_HEADSET_MIC_PIN, + ALC897_FIXUP_HP_HSMIC_VERB, ++ ALC897_FIXUP_LENOVO_HEADSET_MODE, ++ ALC897_FIXUP_HEADSET_MIC_PIN2, + }; + + static const struct hda_fixup alc662_fixups[] = { +@@ -9095,6 +9108,19 @@ static const struct hda_fixup alc662_fixups[] = { + { } + }, + }, ++ [ALC897_FIXUP_LENOVO_HEADSET_MODE] = { ++ .type = HDA_FIXUP_FUNC, ++ .v.func = alc897_fixup_lenovo_headset_mode, ++ }, ++ [ALC897_FIXUP_HEADSET_MIC_PIN2] = { ++ .type = HDA_FIXUP_PINS, ++ .v.pins = (const struct hda_pintbl[]) { ++ { 0x1a, 0x01a11140 }, /* use as headset mic, without its own jack detect */ ++ { } ++ }, ++ .chained = true, ++ .chain_id = ALC897_FIXUP_LENOVO_HEADSET_MODE ++ }, + }; + + static const struct snd_pci_quirk alc662_fixup_tbl[] = { +@@ -9144,6 +9170,7 @@ static const struct snd_pci_quirk alc662_fixup_tbl[] = { + SND_PCI_QUIRK(0x17aa, 0x32cb, "Lenovo ThinkCentre M70", ALC897_FIXUP_HEADSET_MIC_PIN), + SND_PCI_QUIRK(0x17aa, 0x32cf, "Lenovo ThinkCentre M950", ALC897_FIXUP_HEADSET_MIC_PIN), + SND_PCI_QUIRK(0x17aa, 0x32f7, "Lenovo ThinkCentre M90", ALC897_FIXUP_HEADSET_MIC_PIN), ++ SND_PCI_QUIRK(0x17aa, 0x3742, "Lenovo TianYi510Pro-14IOB", ALC897_FIXUP_HEADSET_MIC_PIN2), + SND_PCI_QUIRK(0x17aa, 0x38af, "Lenovo Ideapad Y550P", ALC662_FIXUP_IDEAPAD), + SND_PCI_QUIRK(0x17aa, 0x3a0d, "Lenovo Ideapad Y550", ALC662_FIXUP_IDEAPAD), + SND_PCI_QUIRK(0x1849, 0x5892, "ASRock B150M", ALC892_FIXUP_ASROCK_MOBO), +-- +2.43.0 + diff --git a/queue-4.19/alsa-hda-realtek-enable-headset-on-lenovo-m90-gen5.patch b/queue-4.19/alsa-hda-realtek-enable-headset-on-lenovo-m90-gen5.patch new file mode 100644 index 00000000000..ea48782d07c --- /dev/null +++ b/queue-4.19/alsa-hda-realtek-enable-headset-on-lenovo-m90-gen5.patch @@ -0,0 +1,36 @@ +From 3de5db5719182522ba740144d41a8a5418bfd934 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 4 Dec 2023 18:04:50 +0800 +Subject: ALSA: hda/realtek: Enable headset on Lenovo M90 Gen5 + +From: Bin Li + +[ Upstream commit 6f7e4664e597440dfbdb8b2931c561b717030d07 ] + +Lenovo M90 Gen5 is equipped with ALC897, and it needs +ALC897_FIXUP_HEADSET_MIC_PIN quirk to make its headset mic work. + +Signed-off-by: Bin Li +Cc: +Link: https://lore.kernel.org/r/20231204100450.642783-1-bin.li@canonical.com +Signed-off-by: Takashi Iwai +Signed-off-by: Sasha Levin +--- + sound/pci/hda/patch_realtek.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c +index 67d4b87a6e85a..2b345ba083d81 100644 +--- a/sound/pci/hda/patch_realtek.c ++++ b/sound/pci/hda/patch_realtek.c +@@ -9172,6 +9172,7 @@ static const struct snd_pci_quirk alc662_fixup_tbl[] = { + SND_PCI_QUIRK(0x17aa, 0x32f7, "Lenovo ThinkCentre M90", ALC897_FIXUP_HEADSET_MIC_PIN), + SND_PCI_QUIRK(0x17aa, 0x3321, "Lenovo ThinkCentre M70 Gen4", ALC897_FIXUP_HEADSET_MIC_PIN), + SND_PCI_QUIRK(0x17aa, 0x331b, "Lenovo ThinkCentre M90 Gen4", ALC897_FIXUP_HEADSET_MIC_PIN), ++ SND_PCI_QUIRK(0x17aa, 0x3364, "Lenovo ThinkCentre M90 Gen5", ALC897_FIXUP_HEADSET_MIC_PIN), + SND_PCI_QUIRK(0x17aa, 0x3742, "Lenovo TianYi510Pro-14IOB", ALC897_FIXUP_HEADSET_MIC_PIN2), + SND_PCI_QUIRK(0x17aa, 0x38af, "Lenovo Ideapad Y550P", ALC662_FIXUP_IDEAPAD), + SND_PCI_QUIRK(0x17aa, 0x3a0d, "Lenovo Ideapad Y550", ALC662_FIXUP_IDEAPAD), +-- +2.43.0 + diff --git a/queue-4.19/alsa-hda-realtek-enable-headset-onlenovo-m70-m90.patch b/queue-4.19/alsa-hda-realtek-enable-headset-onlenovo-m70-m90.patch new file mode 100644 index 00000000000..a04e81e5c2e --- /dev/null +++ b/queue-4.19/alsa-hda-realtek-enable-headset-onlenovo-m70-m90.patch @@ -0,0 +1,39 @@ +From f77bff6f5b35efba7f1b28721e3662ae49fa16c0 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 24 May 2023 19:37:55 +0800 +Subject: ALSA: hda/realtek: Enable headset onLenovo M70/M90 + +From: Bin Li + +[ Upstream commit 4ca110cab46561cd74a2acd9b447435acb4bec5f ] + +Lenovo M70/M90 Gen4 are equipped with ALC897, and they need +ALC897_FIXUP_HEADSET_MIC_PIN quirk to make its headset mic work. +The previous quirk for M70/M90 is for Gen3. + +Signed-off-by: Bin Li +Cc: +Link: https://lore.kernel.org/r/20230524113755.1346928-1-bin.li@canonical.com +Signed-off-by: Takashi Iwai +Stable-dep-of: 6f7e4664e597 ("ALSA: hda/realtek: Enable headset on Lenovo M90 Gen5") +Signed-off-by: Sasha Levin +--- + sound/pci/hda/patch_realtek.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c +index 02e4b27c87671..67d4b87a6e85a 100644 +--- a/sound/pci/hda/patch_realtek.c ++++ b/sound/pci/hda/patch_realtek.c +@@ -9170,6 +9170,8 @@ static const struct snd_pci_quirk alc662_fixup_tbl[] = { + SND_PCI_QUIRK(0x17aa, 0x32cb, "Lenovo ThinkCentre M70", ALC897_FIXUP_HEADSET_MIC_PIN), + SND_PCI_QUIRK(0x17aa, 0x32cf, "Lenovo ThinkCentre M950", ALC897_FIXUP_HEADSET_MIC_PIN), + SND_PCI_QUIRK(0x17aa, 0x32f7, "Lenovo ThinkCentre M90", ALC897_FIXUP_HEADSET_MIC_PIN), ++ SND_PCI_QUIRK(0x17aa, 0x3321, "Lenovo ThinkCentre M70 Gen4", ALC897_FIXUP_HEADSET_MIC_PIN), ++ SND_PCI_QUIRK(0x17aa, 0x331b, "Lenovo ThinkCentre M90 Gen4", ALC897_FIXUP_HEADSET_MIC_PIN), + SND_PCI_QUIRK(0x17aa, 0x3742, "Lenovo TianYi510Pro-14IOB", ALC897_FIXUP_HEADSET_MIC_PIN2), + SND_PCI_QUIRK(0x17aa, 0x38af, "Lenovo Ideapad Y550P", ALC662_FIXUP_IDEAPAD), + SND_PCI_QUIRK(0x17aa, 0x3a0d, "Lenovo Ideapad Y550", ALC662_FIXUP_IDEAPAD), +-- +2.43.0 + diff --git a/queue-4.19/arm64-dts-mediatek-mt8173-evb-fix-regulator-fixed-no.patch b/queue-4.19/arm64-dts-mediatek-mt8173-evb-fix-regulator-fixed-no.patch new file mode 100644 index 00000000000..e487c0cd798 --- /dev/null +++ b/queue-4.19/arm64-dts-mediatek-mt8173-evb-fix-regulator-fixed-no.patch @@ -0,0 +1,47 @@ +From 9730e9fb5fe044bfd291a41414238308a0f63cfe Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 25 Oct 2023 11:38:15 +0200 +Subject: arm64: dts: mediatek: mt8173-evb: Fix regulator-fixed node names + +From: AngeloGioacchino Del Regno + +[ Upstream commit 24165c5dad7ba7c7624d05575a5e0cc851396c71 ] + +Fix a unit_address_vs_reg warning for the USB VBUS fixed regulators +by renaming the regulator nodes from regulator@{0,1} to regulator-usb-p0 +and regulator-usb-p1. + +Cc: stable@vger.kernel.org +Fixes: c0891284a74a ("arm64: dts: mediatek: add USB3 DRD driver") +Link: https://lore.kernel.org/r/20231025093816.44327-8-angelogioacchino.delregno@collabora.com +Signed-off-by: AngeloGioacchino Del Regno +Signed-off-by: Sasha Levin +--- + arch/arm64/boot/dts/mediatek/mt8173-evb.dts | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/arch/arm64/boot/dts/mediatek/mt8173-evb.dts b/arch/arm64/boot/dts/mediatek/mt8173-evb.dts +index 8e6ada20e6dbf..242a9e8dc0a9f 100644 +--- a/arch/arm64/boot/dts/mediatek/mt8173-evb.dts ++++ b/arch/arm64/boot/dts/mediatek/mt8173-evb.dts +@@ -51,7 +51,7 @@ extcon_usb: extcon_iddig { + id-gpio = <&pio 16 GPIO_ACTIVE_HIGH>; + }; + +- usb_p1_vbus: regulator@0 { ++ usb_p1_vbus: regulator-usb-p1 { + compatible = "regulator-fixed"; + regulator-name = "usb_vbus"; + regulator-min-microvolt = <5000000>; +@@ -60,7 +60,7 @@ usb_p1_vbus: regulator@0 { + enable-active-high; + }; + +- usb_p0_vbus: regulator@1 { ++ usb_p0_vbus: regulator-usb-p0 { + compatible = "regulator-fixed"; + regulator-name = "vbus"; + regulator-min-microvolt = <5000000>; +-- +2.43.0 + diff --git a/queue-4.19/ksmbd-fix-wrong-name-of-smb2_create_allocation_size.patch b/queue-4.19/ksmbd-fix-wrong-name-of-smb2_create_allocation_size.patch new file mode 100644 index 00000000000..be8d3728495 --- /dev/null +++ b/queue-4.19/ksmbd-fix-wrong-name-of-smb2_create_allocation_size.patch @@ -0,0 +1,40 @@ +From d079dd732cff424584683e7a285bb97942e290bf Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 6 Dec 2023 08:23:49 +0900 +Subject: ksmbd: fix wrong name of SMB2_CREATE_ALLOCATION_SIZE + +From: Namjae Jeon + +[ Upstream commit 13736654481198e519059d4a2e2e3b20fa9fdb3e ] + +MS confirm that "AISi" name of SMB2_CREATE_ALLOCATION_SIZE in MS-SMB2 +specification is a typo. cifs/ksmbd have been using this wrong name from +MS-SMB2. It should be "AlSi". Also It will cause problem when running +smb2.create.open test in smbtorture against ksmbd. + +Cc: stable@vger.kernel.org +Fixes: 12197a7fdda9 ("Clarify SMB2/SMB3 create context and add missing ones") +Signed-off-by: Namjae Jeon +Reviewed-by: Paulo Alcantara (SUSE) +Signed-off-by: Steve French +Signed-off-by: Sasha Levin +--- + fs/cifs/smb2pdu.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/fs/cifs/smb2pdu.h b/fs/cifs/smb2pdu.h +index 8a44d59947b70..dd6e749b24007 100644 +--- a/fs/cifs/smb2pdu.h ++++ b/fs/cifs/smb2pdu.h +@@ -610,7 +610,7 @@ struct smb2_tree_disconnect_rsp { + #define SMB2_CREATE_SD_BUFFER "SecD" /* security descriptor */ + #define SMB2_CREATE_DURABLE_HANDLE_REQUEST "DHnQ" + #define SMB2_CREATE_DURABLE_HANDLE_RECONNECT "DHnC" +-#define SMB2_CREATE_ALLOCATION_SIZE "AISi" ++#define SMB2_CREATE_ALLOCATION_SIZE "AlSi" + #define SMB2_CREATE_QUERY_MAXIMAL_ACCESS_REQUEST "MxAc" + #define SMB2_CREATE_TIMEWARP_REQUEST "TWrp" + #define SMB2_CREATE_QUERY_ON_DISK_ID "QFid" +-- +2.43.0 + diff --git a/queue-4.19/series b/queue-4.19/series index e69de29bb2d..0324b7a7193 100644 --- a/queue-4.19/series +++ b/queue-4.19/series @@ -0,0 +1,5 @@ +arm64-dts-mediatek-mt8173-evb-fix-regulator-fixed-no.patch +alsa-hda-realtek-add-quirk-for-lenovo-tianyi510pro-1.patch +alsa-hda-realtek-enable-headset-onlenovo-m70-m90.patch +alsa-hda-realtek-enable-headset-on-lenovo-m90-gen5.patch +ksmbd-fix-wrong-name-of-smb2_create_allocation_size.patch