[PATCH] thinkbook 16p gen4 sound fix

From: Huayu Zhang
Date: Sun Oct 08 2023 - 12:59:56 EST

Next message: Kees Cook: "[PATCH] randstruct: Fix gcc-plugin performance mode to stay in group"
Previous message: syzbot: "Re: [syzbot] [net?] [wireless?] INFO: rcu detected stall in cfg80211_wiphy_work"
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

---
sound/pci/hda/cs35l41_hda_property.c | 41 ++++++++++++++++++++++++++++
sound/pci/hda/patch_realtek.c | 1 +
2 files changed, 42 insertions(+)

diff --git a/sound/pci/hda/cs35l41_hda_property.c
b/sound/pci/hda/cs35l41_hda_property.c
index b62a4e6968e2..af359fbeb671 100644
--- a/sound/pci/hda/cs35l41_hda_property.c
+++ b/sound/pci/hda/cs35l41_hda_property.c
@@ -74,6 +74,46 @@ static int hp_vision_acpi_fix(struct cs35l41_hda
*cs35l41, struct device *physde
return 0;
}
+static int lenovo_thinkbook16pgen4_no_acpi(struct cs35l41_hda
*cs35l41, struct device *physdev, int id,
+ const char *hid)
+{
+ struct cs35l41_hw_cfg *hw_cfg =3D &cs35l41->hw_cfg;
+
+ dev_info(cs35l41->dev, "Adding DSD properties for %s\n",
cs35l41->acpi_subsystem_id);
+
+ printk("CSC3551: id =3D=3D 0x%x\n", id);
+
+ // cirrus,dev-index
+ cs35l41->index =3D id =3D=3D 0x40 ? 0 : 1;
+ cs35l41->channel_index =3D 0;
+
+ // cs35l41->reset_gpio =3D gpiod_get_index(physdev, NULL,
cs35l41->index, GPIOD_OUT_LOW);
+ cs35l41->reset_gpio =3D gpiod_get_index(physdev, NULL, 0, GPIOD_OUT_HIGH)=
;
+ printk("CS3551: reset_gpio =3D=3D 0x%x\n", cs35l41->reset_gpio);
+
+ // cs35l41->speaker_id =3D cs35l41_get_speaker_id(physdev,
cs35l41->index, nval, -1);
+ cs35l41->speaker_id =3D cs35l41_get_speaker_id(physdev, 0, 0, 2);
+
+ // cirrus,speaker-position
+ hw_cfg->spk_pos =3D cs35l41->index;
+
+ // cirrus,gpio1-func
+ hw_cfg->gpio1.func =3D CS35l41_VSPK_SWITCH;
+ hw_cfg->gpio1.valid =3D true;
+
+ // cirrus,gpio2-func
+ hw_cfg->gpio2.func =3D CS35L41_INTERRUPT;
+ hw_cfg->gpio2.valid =3D true;
+
+ hw_cfg->bst_type =3D CS35L41_EXT_BOOST;
+ hw_cfg->valid =3D true;
+
+ put_device(physdev);
+ printk("CSC3551: Done.\n");
+
+ return 0;
+}
+
struct cs35l41_prop_model {
const char *hid;
const char *ssid;
@@ -85,6 +125,7 @@ static const struct cs35l41_prop_model
cs35l41_prop_model_table[] =3D {
{ "CLSA0100", NULL, lenovo_legion_no_acpi },
{ "CLSA0101", NULL, lenovo_legion_no_acpi },
{ "CSC3551", "103C89C6", hp_vision_acpi_fix },
+ { "CSC3551", "17AA38A9", lenovo_thinkbook16pgen4_no_acpi },
{}
};
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
index 751783f3a15c..fc884fdcec5f 100644
--- a/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
@@ -10031,6 +10031,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[=
] =3D {
SND_PCI_QUIRK(0x17aa, 0x3886, "Y780 VECO DUAL", ALC287_FIXUP_TAS2781_I2C),
SND_PCI_QUIRK(0x17aa, 0x38a7, "Y780P AMD YG dual", ALC287_FIXUP_TAS2781_I2C=
),
SND_PCI_QUIRK(0x17aa, 0x38a8, "Y780P AMD VECO dual", ALC287_FIXUP_TAS2781_I=
2C),
+ SND_PCI_QUIRK(0x17aa, 0x38a9, "Lenovo ThinkBook 16p Gen 4",
ALC287_FIXUP_CS35L41_I2C_2),
SND_PCI_QUIRK(0x17aa, 0x38ba, "Yoga S780-14.5 Air AMD quad YC",
ALC287_FIXUP_TAS2781_I2C),
SND_PCI_QUIRK(0x17aa, 0x38bb, "Yoga S780-14.5 Air AMD quad AAC",
ALC287_FIXUP_TAS2781_I2C),
SND_PCI_QUIRK(0x17aa, 0x38be, "Yoga S980-14.5 proX YC Dual",
ALC287_FIXUP_TAS2781_I2C),
--=20
2.42.0

Here is also my alsa info output:
http://alsa-project.org/db/?f=3D1ad9f2709886f0ec5d2d87d5d8e59a0ac05384be

And the output of `dmesg | grep CSC` using the kernel with above patch:

[ 4.509280] Serial bus multi instantiate pseudo device driver
CSC3551:00: Instantiated 2 I2C devices.
[ 4.716009] cs35l41-hda i2c-CSC3551:00-cs35l41-hda.0: Adding DSD
properties for 17AA38A9
[ 4.716011] CSC3551: id =3D=3D 0x40
[ 4.716728] CSC3551: Done.
[ 4.716729] cs35l41-hda i2c-CSC3551:00-cs35l41-hda.0: Using extra
_DSD properties, bypassing _DSD in ACPI
[ 4.760514] cs35l41-hda i2c-CSC3551:00-cs35l41-hda.0: Cirrus Logic
CS35L41 (35a40), Revision: B2
[ 4.760776] cs35l41-hda i2c-CSC3551:00-cs35l41-hda.1: Adding DSD
properties for 17AA38A9
[ 4.760777] CSC3551: id =3D=3D 0x41
[ 4.761107] CSC3551: Done.
[ 4.761108] cs35l41-hda i2c-CSC3551:00-cs35l41-hda.1: Using extra
_DSD properties, bypassing _DSD in ACPI
[ 4.761108] cs35l41-hda i2c-CSC3551:00-cs35l41-hda.1: Reset line
busy, assuming shared reset
[ 4.802203] cs35l41-hda i2c-CSC3551:00-cs35l41-hda.1: Cirrus Logic
CS35L41 (35a40), Revision: B2
[ 5.041334] cs35l41-hda i2c-CSC3551:00-cs35l41-hda.0: Falling back
to default firmware.
[ 5.041896] cs35l41-hda i2c-CSC3551:00-cs35l41-hda.0: DSP1:
Firmware version: 3
[ 5.041897] cs35l41-hda i2c-CSC3551:00-cs35l41-hda.0: DSP1:
cirrus/cs35l41-dsp1-spk-prot.wmfw: Fri 24 Jun 2022 14:55:56 GMT
Daylight Time
[ 5.501809] cs35l41-hda i2c-CSC3551:00-cs35l41-hda.0: DSP1:
Firmware: 400a4 vendor: 0x2 v0.58.0, 2 algorithms
[ 5.503073] cs35l41-hda i2c-CSC3551:00-cs35l41-hda.0: DSP1:
cirrus/cs35l41-dsp1-spk-prot.bin: v0.58.0
[ 5.503079] cs35l41-hda i2c-CSC3551:00-cs35l41-hda.0: DSP1:
spk-prot: e:\workspace\workspace\tibranch_release_playback_6.76_2\ormis\sta=
ging\default_tunings\internal\CS35L53\Fixed_Attenuation_Mono_48000_29.78.0\=
full\Fixed_Attenuation_Mono_48000_29.78.0_full.bin
[ 5.538264] cs35l41-hda i2c-CSC3551:00-cs35l41-hda.0: CS35L41 Bound
- SSID: 17AA38A9, BST: 1, VSPK: 1, CH: L, FW EN: 1, SPKID: 0
[ 5.538277] snd_hda_codec_realtek ehdaudio0D0: bound
i2c-CSC3551:00-cs35l41-hda.0 (ops cs35l41_hda_comp_ops
[snd_hda_scodec_cs35l41])
[ 5.538545] cs35l41-hda i2c-CSC3551:00-cs35l41-hda.1: Falling back
to default firmware.
[ 5.539404] cs35l41-hda i2c-CSC3551:00-cs35l41-hda.1: DSP1:
Firmware version: 3
[ 5.539409] cs35l41-hda i2c-CSC3551:00-cs35l41-hda.1: DSP1:
cirrus/cs35l41-dsp1-spk-prot.wmfw: Fri 24 Jun 2022 14:55:56 GMT
Daylight Time
[ 5.999448] cs35l41-hda i2c-CSC3551:00-cs35l41-hda.1: DSP1:
Firmware: 400a4 vendor: 0x2 v0.58.0, 2 algorithms
[ 6.000638] cs35l41-hda i2c-CSC3551:00-cs35l41-hda.1: DSP1:
cirrus/cs35l41-dsp1-spk-prot.bin: v0.58.0
[ 6.000640] cs35l41-hda i2c-CSC3551:00-cs35l41-hda.1: DSP1:
spk-prot: e:\workspace\workspace\tibranch_release_playback_6.76_2\ormis\sta=
ging\default_tunings\internal\CS35L53\Fixed_Attenuation_Mono_48000_29.78.0\=
full\Fixed_Attenuation_Mono_48000_29.78.0_full.bin
[ 6.031058] cs35l41-hda i2c-CSC3551:00-cs35l41-hda.1: CS35L41 Bound
- SSID: 17AA38A9, BST: 1, VSPK: 1, CH: R, FW EN: 1, SPKID: 0
[ 6.031062] snd_hda_codec_realtek ehdaudio0D0: bound
i2c-CSC3551:00-cs35l41-hda.1 (ops cs35l41_hda_comp_ops
[snd_hda_scodec_cs35l41])

Thanks again. Nice day~

Cheers,
Huayu

On Tue, Oct 3, 2023 at 11:07=E2=80=AFPM Stefan Binding
<sbinding@xxxxxxxxxxxxxxxxxxxxx> wrote:
>
>
> On 03/10/2023 15:45, Luke Jones wrote:
> >
> >
> > On Thu, Aug 24 2023 at 08:31:06 AM +12:00:00, Luke Jones
> > <luke@xxxxxxxxxx> wrote:
> >>
> >>>
> >>> The second member variable in cs35l41_prop_model_table is the SSID to
> >>> match against.
> >>> The Lenovo laptops in the initial patch didn't have different SSIDs s=
o
> >>> the entry was set to NULL for those.
> >>> Future entries using CSC3551 MUST always have an accompanying SSID
> >>> with this entry.
> >>> Takashi was correct, the implementation is intended to also be used t=
o
> >>> patch incorrect DSD.
> >>>
> >>> We have a potential solution to workaround the SPI cs-gpios issue
> >>> inside here,
> >>> though the drawback for that is that it only works for laptops with 2
> >>> SPI amps.
> >>
> >> Can you provide me this so I can test? I have laptops with SPI 2 and
> >> 4 speaker setups.
> >
> > Hi Stefan,
> >
> > Do you have any further information about the status of this in
> > regards to the 2023 laptops?
>
> Hi,
>
> We are currently working on adding support for 2023 ASUS laptops without
> _DSD.
>
> >
> >>
> >>> I also took a look at the function for applying DSD properties for th=
e
> >>> 2023 ROG laptops.
> >>> Unfortunately the one-size-fits-all approach will not work, some of
> >>> these laptops are i2c
> >>> and some are SPI, meaning the GPIO indexes are different for differen=
t
> >>> laptops.
> >>
> >> Do you mean "spk-id-gpios"? For all the laptops I know of this seems
> >> to be
> >> Package () { "spk-id-gpios", Package () {
> >> SPK1, 0x02, Zero, Zero,
> >> SPK1, 0x02, Zero, Zero
> >> } },
> >>
> >> There is one laptop where it is One not 0x02 (the GA402N)
> >>
> >>> Some of the laptops do no have Speaker IDs.
> >>> Also, no laptop other than the 2 I added already should ever use
> >>> CS35L41_EXT_BOOST_NO_VSPK_SWITCH (in fact I believe all these laptops
> >>> are internal
> >>> boost anyway).
> >>
> >> Grazie.
> >>
> >>>
> >>> We are currently working internally on adding support for the 2023 RO=
G
> >>> laptops, so we
> >>> ask for you guys to hold off on trying to upstream support for these
> >>> laptops.
> >>
> >> Ah great. Thank you. I apologise for trying to rush things, but I do
> >> have a discord server of over 4000 people, many of whom have laptops
> >> with cirrus amps.
> >>
> >> For now I'm including a patch in my kernel builds with this mapping:
> >>
> >> const struct cs35l41_prop_model cs35l41_prop_model_table[] =3D {
> >> { "CLSA0100", NULL, lenovo_legion_no_acpi },
> >> { "CLSA0101", NULL, lenovo_legion_no_acpi },
> >> { "CSC3551", "10431433", asus_rog_2023_no_acpi }, // ASUS GS650P
> >> - i2c
> >> { "CSC3551", "10431463", asus_rog_2023_no_acpi }, // ASUS GA402X
> >> - i2c
> >> { "CSC3551", "10431473", asus_rog_2023_no_acpi }, // ASUS GU604V
> >> - spi
> >> { "CSC3551", "10431483", asus_rog_2023_no_acpi }, // ASUS GU603V
> >> - spi
> >> { "CSC3551", "10431493", asus_rog_2023_no_acpi }, // ASUS GV601V
> >> - spi
> >> { "CSC3551", "10431573", asus_rog_2023_no_acpi }, // ASUS GZ301V
> >> - spi
> >> { "CSC3551", "104317F3", asus_rog_2023_no_acpi }, // ASUS ROG
> >> ALLY - i2c
> >> { "CSC3551", "10431B93", asus_rog_2023_no_acpi }, // ASUS G614J -
> >> spi
> >> { "CSC3551", "10431CAF", asus_rog_2023_no_acpi }, // ASUS G634J -
> >> spi
> >> { "CSC3551", "10431C9F", asus_rog_2023_no_acpi }, // ASUS G614JI
> >> -spi
> >> { "CSC3551", "10431D1F", asus_rog_2023_no_acpi }, // ASUS G713P -
> >> i2c
> >> { "CSC3551", "10431F1F", asus_rog_2023_no_acpi }, // ASUS H7604JV
> >> - spi
> >> {}
> >> };
> >>
> >> These are the machines I have verified the gpios and such for.
> >
> > I have a new version of this patch with all listed models confirmed as
> > working, and with slightly different settings for some. The only thing
> > missing in a solution to the gpio-cs issue.
> >
> > Can you please provide an update on where you are with ASUS support in
> > particular so that I may consider if it is worth my time submitting
> > the updated patch.
> We would prefer for you to wait, as we are looking to push up this
> support in the coming weeks.
> >
> >>
> >> Cheers,
> >> Luke.
> >>
> >>
> >
> >

Next message: Kees Cook: "[PATCH] randstruct: Fix gcc-plugin performance mode to stay in group"
Previous message: syzbot: "Re: [syzbot] [net?] [wireless?] INFO: rcu detected stall in cfg80211_wiphy_work"
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]