[PATCH 0/2] ASoC: Intel: sof_sdw: Fix DMI match entries for a couple of Lenovo laptops

[PATCH 0/2] ASoC: Intel: sof_sdw: Fix DMI match entries for a couple of Lenovo laptops

[Bard Liao]

Those laptops use host DMIC. Correct the DMI match entries.

Simon Trimmer (2):
  ASoC: Intel: sof_sdw: Fix DMI match for Lenovo 83LC
  ASoC: Intel: sof_sdw: Fix DMI match for Lenovo 83JX, 83MC and 83NM

 sound/soc/intel/boards/sof_sdw.c | 23 +++++++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

-- 
2.43.0

[PATCH 1/2] ASoC: Intel: sof_sdw: Fix DMI match for Lenovo 83LC

[Bard Liao]

From: Simon Trimmer <simont@opensource.cirrus.com>

Update the DMI match for a Lenovo laptop to the new DMI identifier.

This laptop ships with a different DMI identifier to what was expected,
and also has the DMICs connected to the host rather than the cs42l43
codec.

Signed-off-by: Simon Trimmer <simont@opensource.cirrus.com>
Fixes: 83c062ae81e8 ("ASoC: Intel: sof_sdw: Add quirks for some new Lenovo laptops")
Reviewed-by: Liam Girdwood <liam.r.girdwood@intel.com>
Reviewed-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Signed-off-by: Bard Liao <yung-chuan.liao@linux.intel.com>
---
 sound/soc/intel/boards/sof_sdw.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sound/soc/intel/boards/sof_sdw.c b/sound/soc/intel/boards/sof_sdw.c
index 9f721b88e606..d054be360d28 100644
--- a/sound/soc/intel/boards/sof_sdw.c
+++ b/sound/soc/intel/boards/sof_sdw.c
@@ -620,9 +620,9 @@ static const struct dmi_system_id sof_sdw_quirk_table[] = {
 		.callback = sof_sdw_quirk_cb,
 		.matches = {
 			DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
-			DMI_EXACT_MATCH(DMI_PRODUCT_SKU, "3832")
+			DMI_MATCH(DMI_PRODUCT_NAME, "83LC")
 		},
-		.driver_data = (void *)(SOC_SDW_SIDECAR_AMPS),
+		.driver_data = (void *)(SOC_SDW_SIDECAR_AMPS | SOC_SDW_CODEC_MIC),
 	},
 	{
 		.callback = sof_sdw_quirk_cb,
-- 
2.43.0

Re: [PATCH 1/2] ASoC: Intel: sof_sdw: Fix DMI match for Lenovo 83LC

[Pierre-Louis Bossart]

On 1/2/25 06:33, Bard Liao wrote:
> From: Simon Trimmer <simont@opensource.cirrus.com>
> 
> Update the DMI match for a Lenovo laptop to the new DMI identifier.
> 
> This laptop ships with a different DMI identifier to what was expected,
> and also has the DMICs connected to the host rather than the cs42l43
> codec.

If the DMICs are connected to the host, isn't there NHLT information 
telling the OS how many dmics are connected? If yes, then the 
machine-level DMI quirk isn't really needed, all you would need is a 
rule that sets it unconditionally when mach->mach_params.dmic_num is 
non-zero

> Signed-off-by: Simon Trimmer <simont@opensource.cirrus.com>
> Fixes: 83c062ae81e8 ("ASoC: Intel: sof_sdw: Add quirks for some new Lenovo laptops")
> Reviewed-by: Liam Girdwood <liam.r.girdwood@intel.com>
> Reviewed-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
> Signed-off-by: Bard Liao <yung-chuan.liao@linux.intel.com>
> ---
>   sound/soc/intel/boards/sof_sdw.c | 4 ++--
>   1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/sound/soc/intel/boards/sof_sdw.c b/sound/soc/intel/boards/sof_sdw.c
> index 9f721b88e606..d054be360d28 100644
> --- a/sound/soc/intel/boards/sof_sdw.c
> +++ b/sound/soc/intel/boards/sof_sdw.c
> @@ -620,9 +620,9 @@ static const struct dmi_system_id sof_sdw_quirk_table[] = {
>   		.callback = sof_sdw_quirk_cb,
>   		.matches = {
>   			DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
> -			DMI_EXACT_MATCH(DMI_PRODUCT_SKU, "3832")
> +			DMI_MATCH(DMI_PRODUCT_NAME, "83LC")
>   		},
> -		.driver_data = (void *)(SOC_SDW_SIDECAR_AMPS),
> +		.driver_data = (void *)(SOC_SDW_SIDECAR_AMPS | SOC_SDW_CODEC_MIC),
>   	},
>   	{
>   		.callback = sof_sdw_quirk_cb,

RE: [PATCH 1/2] ASoC: Intel: sof_sdw: Fix DMI match for Lenovo 83LC

[Liao, Bard]

> -----Original Message-----
> From: Pierre-Louis Bossart <pierre-louis.bossart@linux.dev>
> Sent: Friday, January 3, 2025 5:47 AM
> To: Bard Liao <yung-chuan.liao@linux.intel.com>; broonie@kernel.org;
> tiwai@suse.de
> Cc: linux-sound@vger.kernel.org; Liao, Bard <bard.liao@intel.com>
> Subject: Re: [PATCH 1/2] ASoC: Intel: sof_sdw: Fix DMI match for Lenovo 83LC
> 
> 
> 
> On 1/2/25 06:33, Bard Liao wrote:
> > From: Simon Trimmer <simont@opensource.cirrus.com>
> >
> > Update the DMI match for a Lenovo laptop to the new DMI identifier.
> >
> > This laptop ships with a different DMI identifier to what was expected,
> > and also has the DMICs connected to the host rather than the cs42l43
> > codec.
> 
> If the DMICs are connected to the host, isn't there NHLT information
> telling the OS how many dmics are connected? If yes, then the
> machine-level DMI quirk isn't really needed, all you would need is a
> rule that sets it unconditionally when mach->mach_params.dmic_num is
> non-zero

That is a good idea. However, we also test the case where the PCH DMIC
and SoundWire DMIC coexist in the developing stage. Maybe use a quirk
for the different DMIC coexist case?

> 
> > Signed-off-by: Simon Trimmer <simont@opensource.cirrus.com>
> > Fixes: 83c062ae81e8 ("ASoC: Intel: sof_sdw: Add quirks for some new Lenovo
> laptops")
> > Reviewed-by: Liam Girdwood <liam.r.girdwood@intel.com>
> > Reviewed-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
> > Signed-off-by: Bard Liao <yung-chuan.liao@linux.intel.com>
> > ---
> >   sound/soc/intel/boards/sof_sdw.c | 4 ++--
> >   1 file changed, 2 insertions(+), 2 deletions(-)
> >
> > diff --git a/sound/soc/intel/boards/sof_sdw.c
> b/sound/soc/intel/boards/sof_sdw.c
> > index 9f721b88e606..d054be360d28 100644
> > --- a/sound/soc/intel/boards/sof_sdw.c
> > +++ b/sound/soc/intel/boards/sof_sdw.c
> > @@ -620,9 +620,9 @@ static const struct dmi_system_id
> sof_sdw_quirk_table[] = {
> >   		.callback = sof_sdw_quirk_cb,
> >   		.matches = {
> >   			DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
> > -			DMI_EXACT_MATCH(DMI_PRODUCT_SKU, "3832")
> > +			DMI_MATCH(DMI_PRODUCT_NAME, "83LC")
> >   		},
> > -		.driver_data = (void *)(SOC_SDW_SIDECAR_AMPS),
> > +		.driver_data = (void *)(SOC_SDW_SIDECAR_AMPS |
> SOC_SDW_CODEC_MIC),
> >   	},
> >   	{
> >   		.callback = sof_sdw_quirk_cb,

RE: [PATCH 1/2] ASoC: Intel: sof_sdw: Fix DMI match for Lenovo 83LC

[Liao, Bard]

> -----Original Message-----
> From: Liao, Bard
> Sent: Friday, January 3, 2025 8:17 AM
> To: Pierre-Louis Bossart <pierre-louis.bossart@linux.dev>; Bard Liao <yung-
> chuan.liao@linux.intel.com>; broonie@kernel.org; tiwai@suse.de
> Cc: linux-sound@vger.kernel.org
> Subject: RE: [PATCH 1/2] ASoC: Intel: sof_sdw: Fix DMI match for Lenovo 83LC
> 
> 
> 
> > -----Original Message-----
> > From: Pierre-Louis Bossart <pierre-louis.bossart@linux.dev>
> > Sent: Friday, January 3, 2025 5:47 AM
> > To: Bard Liao <yung-chuan.liao@linux.intel.com>; broonie@kernel.org;
> > tiwai@suse.de
> > Cc: linux-sound@vger.kernel.org; Liao, Bard <bard.liao@intel.com>
> > Subject: Re: [PATCH 1/2] ASoC: Intel: sof_sdw: Fix DMI match for Lenovo 83LC
> >
> >
> >
> > On 1/2/25 06:33, Bard Liao wrote:
> > > From: Simon Trimmer <simont@opensource.cirrus.com>
> > >
> > > Update the DMI match for a Lenovo laptop to the new DMI identifier.
> > >
> > > This laptop ships with a different DMI identifier to what was expected,
> > > and also has the DMICs connected to the host rather than the cs42l43
> > > codec.
> >
> > If the DMICs are connected to the host, isn't there NHLT information
> > telling the OS how many dmics are connected? If yes, then the
> > machine-level DMI quirk isn't really needed, all you would need is a
> > rule that sets it unconditionally when mach->mach_params.dmic_num is
> > non-zero
> 
> That is a good idea. However, we also test the case where the PCH DMIC
> and SoundWire DMIC coexist in the developing stage. Maybe use a quirk
> for the different DMIC coexist case?

On second thought, we will eventually create the dai links by reading
the SDCA functions and remove those DMI quirks. Not sure is it worth
to change it or even add a new quirk just for temporary used?

> 
> >
> > > Signed-off-by: Simon Trimmer <simont@opensource.cirrus.com>
> > > Fixes: 83c062ae81e8 ("ASoC: Intel: sof_sdw: Add quirks for some new
> Lenovo
> > laptops")
> > > Reviewed-by: Liam Girdwood <liam.r.girdwood@intel.com>
> > > Reviewed-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
> > > Signed-off-by: Bard Liao <yung-chuan.liao@linux.intel.com>
> > > ---
> > >   sound/soc/intel/boards/sof_sdw.c | 4 ++--
> > >   1 file changed, 2 insertions(+), 2 deletions(-)
> > >
> > > diff --git a/sound/soc/intel/boards/sof_sdw.c
> > b/sound/soc/intel/boards/sof_sdw.c
> > > index 9f721b88e606..d054be360d28 100644
> > > --- a/sound/soc/intel/boards/sof_sdw.c
> > > +++ b/sound/soc/intel/boards/sof_sdw.c
> > > @@ -620,9 +620,9 @@ static const struct dmi_system_id
> > sof_sdw_quirk_table[] = {
> > >   		.callback = sof_sdw_quirk_cb,
> > >   		.matches = {
> > >   			DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
> > > -			DMI_EXACT_MATCH(DMI_PRODUCT_SKU, "3832")
> > > +			DMI_MATCH(DMI_PRODUCT_NAME, "83LC")
> > >   		},
> > > -		.driver_data = (void *)(SOC_SDW_SIDECAR_AMPS),
> > > +		.driver_data = (void *)(SOC_SDW_SIDECAR_AMPS |
> > SOC_SDW_CODEC_MIC),
> > >   	},
> > >   	{
> > >   		.callback = sof_sdw_quirk_cb,

Re: [PATCH 1/2] ASoC: Intel: sof_sdw: Fix DMI match for Lenovo 83LC

[Pierre-Louis Bossart]

>>>> This laptop ships with a different DMI identifier to what was expected,
>>>> and also has the DMICs connected to the host rather than the cs42l43
>>>> codec.
>>>
>>> If the DMICs are connected to the host, isn't there NHLT information
>>> telling the OS how many dmics are connected? If yes, then the
>>> machine-level DMI quirk isn't really needed, all you would need is a
>>> rule that sets it unconditionally when mach->mach_params.dmic_num is
>>> non-zero
>>
>> That is a good idea. However, we also test the case where the PCH DMIC
>> and SoundWire DMIC coexist in the developing stage. Maybe use a quirk
>> for the different DMIC coexist case?
> 
> On second thought, we will eventually create the dai links by reading
> the SDCA functions and remove those DMI quirks. Not sure is it worth
> to change it or even add a new quirk just for temporary used?

If you have any NHLT information, that's a very strong sign that the platform does rely on PCH-connected DMICS.
If you don't then quirks are indeed needed to select PCH or codec-based solutions. I think it's fine to add such quirks for now, it'd be up to Cirrus to remove them later on when all the SDCA parsing is available, which could take a while.

Re: [PATCH 1/2] ASoC: Intel: sof_sdw: Fix DMI match for Lenovo 83LC

[Charles Keepax]

On Mon, Jan 06, 2025 at 10:09:19AM -0600, Pierre-Louis Bossart wrote:
> 
> >>>> This laptop ships with a different DMI identifier to what was expected,
> >>>> and also has the DMICs connected to the host rather than the cs42l43
> >>>> codec.
> >>>
> >>> If the DMICs are connected to the host, isn't there NHLT information
> >>> telling the OS how many dmics are connected? If yes, then the
> >>> machine-level DMI quirk isn't really needed, all you would need is a
> >>> rule that sets it unconditionally when mach->mach_params.dmic_num is
> >>> non-zero
> >>
> >> That is a good idea. However, we also test the case where the PCH DMIC
> >> and SoundWire DMIC coexist in the developing stage. Maybe use a quirk
> >> for the different DMIC coexist case?
> > 
> > On second thought, we will eventually create the dai links by reading
> > the SDCA functions and remove those DMI quirks. Not sure is it worth
> > to change it or even add a new quirk just for temporary used?
> 
> If you have any NHLT information, that's a very strong sign that
> the platform does rely on PCH-connected DMICS. If you don't then
> quirks are indeed needed to select PCH or codec-based solutions. I
> think it's fine to add such quirks for now, it'd be up to Cirrus
> to remove them later on when all the SDCA parsing is available,
> which could take a while.
> 

Yeah I would suggest going with the quirk for now, then switching
to the DisCo information once we have that available. I think
that is likely to be more reliable than inferring from if the host
includes NHLT. Undoubtedly someone will make a system that has
some host DMICs and some CODEC DMICs or something like that.

Thanks,
Charles

[PATCH 2/2] ASoC: Intel: sof_sdw: Fix DMI match for Lenovo 83JX, 83MC and 83NM

[Bard Liao]

From: Simon Trimmer <simont@opensource.cirrus.com>

Update the DMI match for a Lenovo laptop to a new DMI identifier.

This laptop ships with a different DMI identifier to what was expected
and now has three match entries. It also has the DMICs connected to the
host rather than the cs42l43 codec.

Signed-off-by: Simon Trimmer <simont@opensource.cirrus.com>
Fixes: 83c062ae81e8 ("ASoC: Intel: sof_sdw: Add quirks for some new Lenovo laptops")
Reviewed-by: Liam Girdwood <liam.r.girdwood@intel.com>
Reviewed-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Signed-off-by: Bard Liao <yung-chuan.liao@linux.intel.com>
---
 sound/soc/intel/boards/sof_sdw.c | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/sound/soc/intel/boards/sof_sdw.c b/sound/soc/intel/boards/sof_sdw.c
index d054be360d28..b0d35fda7b17 100644
--- a/sound/soc/intel/boards/sof_sdw.c
+++ b/sound/soc/intel/boards/sof_sdw.c
@@ -612,9 +612,9 @@ static const struct dmi_system_id sof_sdw_quirk_table[] = {
 		.callback = sof_sdw_quirk_cb,
 		.matches = {
 			DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
-			DMI_EXACT_MATCH(DMI_PRODUCT_SKU, "3838")
+			DMI_MATCH(DMI_PRODUCT_NAME, "83JX")
 		},
-		.driver_data = (void *)(SOC_SDW_SIDECAR_AMPS),
+		.driver_data = (void *)(SOC_SDW_SIDECAR_AMPS | SOC_SDW_CODEC_MIC),
 	},
 	{
 		.callback = sof_sdw_quirk_cb,
@@ -624,6 +624,21 @@ static const struct dmi_system_id sof_sdw_quirk_table[] = {
 		},
 		.driver_data = (void *)(SOC_SDW_SIDECAR_AMPS | SOC_SDW_CODEC_MIC),
 	},
+	{
+		.callback = sof_sdw_quirk_cb,
+		.matches = {
+			DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
+			DMI_MATCH(DMI_PRODUCT_NAME, "83MC")
+		},
+		.driver_data = (void *)(SOC_SDW_SIDECAR_AMPS | SOC_SDW_CODEC_MIC),
+	},	{
+		.callback = sof_sdw_quirk_cb,
+		.matches = {
+			DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
+			DMI_MATCH(DMI_PRODUCT_NAME, "83NM")
+		},
+		.driver_data = (void *)(SOC_SDW_SIDECAR_AMPS | SOC_SDW_CODEC_MIC),
+	},
 	{
 		.callback = sof_sdw_quirk_cb,
 		.matches = {
-- 
2.43.0

Re: [PATCH 0/2] ASoC: Intel: sof_sdw: Fix DMI match entries for a couple of Lenovo laptops

[Mark Brown]

On Thu, 02 Jan 2025 20:33:33 +0800, Bard Liao wrote:
> Those laptops use host DMIC. Correct the DMI match entries.
> 
> Simon Trimmer (2):
>   ASoC: Intel: sof_sdw: Fix DMI match for Lenovo 83LC
>   ASoC: Intel: sof_sdw: Fix DMI match for Lenovo 83JX, 83MC and 83NM
> 
> sound/soc/intel/boards/sof_sdw.c | 23 +++++++++++++++++++----
>  1 file changed, 19 insertions(+), 4 deletions(-)
> 
> [...]

Applied to

   https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next

Thanks!

[1/2] ASoC: Intel: sof_sdw: Fix DMI match for Lenovo 83LC
      commit: c9e05763f334845ba69494dd71d7cbfd05fd0e6e
[2/2] ASoC: Intel: sof_sdw: Fix DMI match for Lenovo 83JX, 83MC and 83NM
      commit: 17615e4216115a0454e0f2007267a006231dcb7d

All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.

You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying
to this mail.

Thanks,
Mark