From: Greg Kroah-Hartman Date: Wed, 28 Dec 2022 09:08:37 +0000 (+0100) Subject: 5.4-stable patches X-Git-Tag: v5.15.86~48 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7276d9ae3b1e6324adeea66de470c1a57e17d673;p=thirdparty%2Fkernel%2Fstable-queue.git 5.4-stable patches added patches: alsa-hda-hdmi-add-hp-device-0x8711-to-force-connect-list.patch alsa-hda-realtek-add-quirk-for-lenovo-tianyi510pro-14iob.patch usb-dwc3-core-defer-probe-on-ulpi_read_id-timeout.patch --- diff --git a/queue-5.4/alsa-hda-hdmi-add-hp-device-0x8711-to-force-connect-list.patch b/queue-5.4/alsa-hda-hdmi-add-hp-device-0x8711-to-force-connect-list.patch new file mode 100644 index 00000000000..2e04009d99d --- /dev/null +++ b/queue-5.4/alsa-hda-hdmi-add-hp-device-0x8711-to-force-connect-list.patch @@ -0,0 +1,32 @@ +From 31b573946ea55e1ea0e08ae8e83bcf879b30f83a Mon Sep 17 00:00:00 2001 +From: Jiao Zhou +Date: Tue, 6 Dec 2022 13:53:11 -0500 +Subject: ALSA: hda/hdmi: Add HP Device 0x8711 to force connect list + +From: Jiao Zhou + +commit 31b573946ea55e1ea0e08ae8e83bcf879b30f83a upstream. + +HDMI audio is not working on the HP EliteDesk 800 G6 because the pin is +unconnected. This issue can be resolved by using the 'hdajackretask' +tool to override the unconnected pin to force it to connect. + +Signed-off-by: Jiao Zhou +Cc: +Link: https://lore.kernel.org/r/20221206185311.3669950-1-jiaozhou@google.com +Signed-off-by: Takashi Iwai +Signed-off-by: Greg Kroah-Hartman +--- + sound/pci/hda/patch_hdmi.c | 1 + + 1 file changed, 1 insertion(+) + +--- a/sound/pci/hda/patch_hdmi.c ++++ b/sound/pci/hda/patch_hdmi.c +@@ -1820,6 +1820,7 @@ static int hdmi_add_cvt(struct hda_codec + static const struct snd_pci_quirk force_connect_list[] = { + SND_PCI_QUIRK(0x103c, 0x870f, "HP", 1), + SND_PCI_QUIRK(0x103c, 0x871a, "HP", 1), ++ SND_PCI_QUIRK(0x103c, 0x8711, "HP", 1), + SND_PCI_QUIRK(0x1462, 0xec94, "MS-7C94", 1), + {} + }; diff --git a/queue-5.4/alsa-hda-realtek-add-quirk-for-lenovo-tianyi510pro-14iob.patch b/queue-5.4/alsa-hda-realtek-add-quirk-for-lenovo-tianyi510pro-14iob.patch new file mode 100644 index 00000000000..0f1d2a4be03 --- /dev/null +++ b/queue-5.4/alsa-hda-realtek-add-quirk-for-lenovo-tianyi510pro-14iob.patch @@ -0,0 +1,79 @@ +From 4bf5bf54476dffe60e6b6d8d539f67309ff599e2 Mon Sep 17 00:00:00 2001 +From: Edward Pacman +Date: Wed, 7 Dec 2022 21:32:18 +0800 +Subject: ALSA: hda/realtek: Add quirk for Lenovo TianYi510Pro-14IOB + +From: Edward Pacman + +commit 4bf5bf54476dffe60e6b6d8d539f67309ff599e2 upstream. + +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 +Signed-off-by: Greg Kroah-Hartman +--- + sound/pci/hda/patch_realtek.c | 27 +++++++++++++++++++++++++++ + 1 file changed, 27 insertions(+) + +--- a/sound/pci/hda/patch_realtek.c ++++ b/sound/pci/hda/patch_realtek.c +@@ -9777,6 +9777,17 @@ static void alc897_fixup_lenovo_headset_ + } + } + ++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), +@@ -9860,6 +9871,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[] = { +@@ -10286,6 +10299,19 @@ static const struct hda_fixup alc662_fix + { } + }, + }, ++ [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[] = { +@@ -10338,6 +10364,7 @@ static const struct snd_pci_quirk alc662 + 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), diff --git a/queue-5.4/series b/queue-5.4/series index 09a7140f87b..ed2d1fcdba9 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -442,3 +442,6 @@ asoc-rt5670-remove-unbalanced-pm_runtime_put.patch pstore-switch-pmsg_lock-to-an-rt_mutex-to-avoid-prio.patch perf-debug-set-debug_peo_args-and-redirect_to_stderr.patch pstore-make-sure-config_pstore_pmsg-selects-config_r.patch +alsa-hda-realtek-add-quirk-for-lenovo-tianyi510pro-14iob.patch +alsa-hda-hdmi-add-hp-device-0x8711-to-force-connect-list.patch +usb-dwc3-core-defer-probe-on-ulpi_read_id-timeout.patch diff --git a/queue-5.4/usb-dwc3-core-defer-probe-on-ulpi_read_id-timeout.patch b/queue-5.4/usb-dwc3-core-defer-probe-on-ulpi_read_id-timeout.patch new file mode 100644 index 00000000000..585b22770c3 --- /dev/null +++ b/queue-5.4/usb-dwc3-core-defer-probe-on-ulpi_read_id-timeout.patch @@ -0,0 +1,58 @@ +From 63130462c919ece0ad0d9bb5a1f795ef8d79687e Mon Sep 17 00:00:00 2001 +From: Ferry Toth +Date: Mon, 5 Dec 2022 21:15:27 +0100 +Subject: usb: dwc3: core: defer probe on ulpi_read_id timeout + +From: Ferry Toth + +commit 63130462c919ece0ad0d9bb5a1f795ef8d79687e upstream. + +Since commit 0f0101719138 ("usb: dwc3: Don't switch OTG -> peripheral +if extcon is present"), Dual Role support on Intel Merrifield platform +broke due to rearranging the call to dwc3_get_extcon(). + +It appears to be caused by ulpi_read_id() masking the timeout on the first +test write. In the past dwc3 probe continued by calling dwc3_core_soft_reset() +followed by dwc3_get_extcon() which happend to return -EPROBE_DEFER. +On deferred probe ulpi_read_id() finally succeeded. Due to above mentioned +rearranging -EPROBE_DEFER is not returned and probe completes without phy. + +On Intel Merrifield the timeout on the first test write issue is reproducible +but it is difficult to find the root cause. Using a mainline kernel and +rootfs with buildroot ulpi_read_id() succeeds. As soon as adding +ftrace / bootconfig to find out why, ulpi_read_id() fails and we can't +analyze the flow. Using another rootfs ulpi_read_id() fails even without +adding ftrace. We suspect the issue is some kind of timing / race, but +merely retrying ulpi_read_id() does not resolve the issue. + +As we now changed ulpi_read_id() to return -ETIMEDOUT in this case, we +need to handle the error by calling dwc3_core_soft_reset() and request +-EPROBE_DEFER. On deferred probe ulpi_read_id() is retried and succeeds. + +Fixes: ef6a7bcfb01c ("usb: ulpi: Support device discovery via DT") +Cc: stable@vger.kernel.org +Acked-by: Thinh Nguyen +Signed-off-by: Ferry Toth +Link: https://lore.kernel.org/r/20221205201527.13525-3-ftoth@exalondelft.nl +Signed-off-by: Greg Kroah-Hartman +--- + drivers/usb/dwc3/core.c | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +--- a/drivers/usb/dwc3/core.c ++++ b/drivers/usb/dwc3/core.c +@@ -931,8 +931,13 @@ static int dwc3_core_init(struct dwc3 *d + + if (!dwc->ulpi_ready) { + ret = dwc3_core_ulpi_init(dwc); +- if (ret) ++ if (ret) { ++ if (ret == -ETIMEDOUT) { ++ dwc3_core_soft_reset(dwc); ++ ret = -EPROBE_DEFER; ++ } + goto err0; ++ } + dwc->ulpi_ready = true; + } +