[PATCH 0/2] ASoC/soundwire: add quirks for Intel 'Bishop County' NUC M15

[PATCH 0/2] ASoC/soundwire: add quirks for Intel 'Bishop County' NUC M15

[Pierre-Louis Bossart]

The 'Bishop County' NUC Laptops designed by Intel rely on SoundWire
peripherals. Quirks are required on the soundwire/ side to work-around
ACPI issues (bad _ADR) and sound/soc/ side for jack detection.

The two patches are independent and can be merged in the two subsystem
independently if desired. Both patches are however required in any
backport.

Thanks to Gilles van Eeden for reporting this issue and testing these
patches.

Pierre-Louis Bossart (2):
  soundwire: dmi-quirks: add quirk for Intel 'Bishop County' NUC M15
  ASOC: Intel: sof_sdw: add quirk for Intel 'Bishop County' NUC M15

 drivers/soundwire/dmi-quirks.c   | 16 ++++++++++++----
 sound/soc/intel/boards/sof_sdw.c | 11 +++++++++++
 2 files changed, 23 insertions(+), 4 deletions(-)

-- 
2.25.1

[PATCH 1/2] soundwire: dmi-quirks: add quirk for Intel 'Bishop County' NUC M15

[Pierre-Louis Bossart]

The same quirk is used for LAPBC510 and LAPBC710 skews who use the
same audio design.

These devices have the same BIOS issues inherited from the Intel
reference, add the same _ADR remap previously used on HP devices.

BugLink: https://github.com/thesofproject/linux/issues/3049
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: Bard Liao <bard.liao@intel.com>
Reviewed-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
Reviewed-by: Rander Wang <rander.wang@intel.com>
---
 drivers/soundwire/dmi-quirks.c | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/drivers/soundwire/dmi-quirks.c b/drivers/soundwire/dmi-quirks.c
index 1ac16687e315..0ca2a3e3a02e 100644
--- a/drivers/soundwire/dmi-quirks.c
+++ b/drivers/soundwire/dmi-quirks.c
@@ -16,11 +16,11 @@ struct adr_remap {
 };
 
 /*
- * HP Spectre 360 Convertible devices do not expose the correct _ADR
- * in the DSDT.
+ * Some TigerLake devices based on an initial Intel BIOS do not expose
+ * the correct _ADR in the DSDT.
  * Remap the bad _ADR values to the ones reported by hardware
  */
-static const struct adr_remap hp_spectre_360[] = {
+static const struct adr_remap intel_tgl_bios[] = {
 	{
 		0x000010025D070100ull,
 		0x000020025D071100ull
@@ -61,7 +61,15 @@ static const struct dmi_system_id adr_remap_quirk_table[] = {
 			DMI_MATCH(DMI_SYS_VENDOR, "HP"),
 			DMI_MATCH(DMI_PRODUCT_NAME, "HP Spectre x360 Convertible"),
 		},
-		.driver_data = (void *)hp_spectre_360,
+		.driver_data = (void *)intel_tgl_bios,
+	},
+	{
+		/* quirk used for NUC15 'Bishop County' LAPBC510 and LAPBC710 skews */
+		.matches = {
+			DMI_MATCH(DMI_SYS_VENDOR, "Intel(R) Client Systems"),
+			DMI_MATCH(DMI_PRODUCT_NAME, "LAPBC"),
+		},
+		.driver_data = (void *)intel_tgl_bios,
 	},
 	{
 		.matches = {
-- 
2.25.1

Re: [PATCH 1/2] soundwire: dmi-quirks: add quirk for Intel 'Bishop County' NUC M15

[Vinod Koul]

On 19-07-21, 18:32, Pierre-Louis Bossart wrote:
> The same quirk is used for LAPBC510 and LAPBC710 skews who use the
> same audio design.
> 
> These devices have the same BIOS issues inherited from the Intel
> reference, add the same _ADR remap previously used on HP devices.

This fails to apply on rc1, pls rebase or if there are any dependencies,
do spell them out

-- 
~Vinod

Re: [PATCH 1/2] soundwire: dmi-quirks: add quirk for Intel 'Bishop County' NUC M15

[Pierre-Louis Bossart]

On 7/22/21 9:02 AM, Vinod Koul wrote:
> On 19-07-21, 18:32, Pierre-Louis Bossart wrote:
>> The same quirk is used for LAPBC510 and LAPBC710 skews who use the
>> same audio design.
>>
>> These devices have the same BIOS issues inherited from the Intel
>> reference, add the same _ADR remap previously used on HP devices.
> 
> This fails to apply on rc1, pls rebase or if there are any dependencies,
> do spell them out

it likely depends on

[PATCH] soundwire: dmi-quirks: add ull suffix for SoundWire _ADR values

which was sent by Bard when the merge window opened.

Re: [PATCH 1/2] soundwire: dmi-quirks: add quirk for Intel 'Bishop County' NUC M15

[Pierre-Louis Bossart]

On 7/22/21 9:25 AM, Pierre-Louis Bossart wrote:
> 
> 
> On 7/22/21 9:02 AM, Vinod Koul wrote:
>> On 19-07-21, 18:32, Pierre-Louis Bossart wrote:
>>> The same quirk is used for LAPBC510 and LAPBC710 skews who use the
>>> same audio design.
>>>
>>> These devices have the same BIOS issues inherited from the Intel
>>> reference, add the same _ADR remap previously used on HP devices.
>>
>> This fails to apply on rc1, pls rebase or if there are any dependencies,
>> do spell them out
> 
> it likely depends on
> 
> [PATCH] soundwire: dmi-quirks: add ull suffix for SoundWire _ADR values
> 
> which was sent by Bard when the merge window opened.

And you've just applied that dependency, do you mind retrying Vinod?

Re: [PATCH 1/2] soundwire: dmi-quirks: add quirk for Intel 'Bishop County' NUC M15

[Vinod Koul]

On 22-07-21, 09:29, Pierre-Louis Bossart wrote:
> 
> 
> On 7/22/21 9:25 AM, Pierre-Louis Bossart wrote:
> > 
> > 
> > On 7/22/21 9:02 AM, Vinod Koul wrote:
> >> On 19-07-21, 18:32, Pierre-Louis Bossart wrote:
> >>> The same quirk is used for LAPBC510 and LAPBC710 skews who use the
> >>> same audio design.
> >>>
> >>> These devices have the same BIOS issues inherited from the Intel
> >>> reference, add the same _ADR remap previously used on HP devices.
> >>
> >> This fails to apply on rc1, pls rebase or if there are any dependencies,
> >> do spell them out
> > 
> > it likely depends on
> > 
> > [PATCH] soundwire: dmi-quirks: add ull suffix for SoundWire _ADR values
> > 
> > which was sent by Bard when the merge window opened.
> 
> And you've just applied that dependency, do you mind retrying Vinod?

Yes it applies now...

-- 
~Vinod

Re: [PATCH 1/2] soundwire: dmi-quirks: add quirk for Intel 'Bishop County' NUC M15

[Vinod Koul]

On 22-07-21, 09:25, Pierre-Louis Bossart wrote:
> 
> 
> On 7/22/21 9:02 AM, Vinod Koul wrote:
> > On 19-07-21, 18:32, Pierre-Louis Bossart wrote:
> >> The same quirk is used for LAPBC510 and LAPBC710 skews who use the
> >> same audio design.
> >>
> >> These devices have the same BIOS issues inherited from the Intel
> >> reference, add the same _ADR remap previously used on HP devices.
> > 
> > This fails to apply on rc1, pls rebase or if there are any dependencies,
> > do spell them out
> 
> it likely depends on
> 
> [PATCH] soundwire: dmi-quirks: add ull suffix for SoundWire _ADR values

As I said above, if there is a dependency, pls spell it out!

> which was sent by Bard when the merge window opened.

-- 
~Vinod

[PATCH 2/2] ASOC: Intel: sof_sdw: add quirk for Intel 'Bishop County' NUC M15

[Pierre-Louis Bossart]

The same quirk is used for LAPBC510 and LAPBC710 skews who use the
same audio design, with an RT711 headset codec using JD1 mode and one
RT1308 amplifier, along with 4 DMICs.

BugLink: https://github.com/thesofproject/linux/issues/3049
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: Bard Liao <bard.liao@intel.com>
Reviewed-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
Reviewed-by: Rander Wang <rander.wang@intel.com>
---
 sound/soc/intel/boards/sof_sdw.c | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/sound/soc/intel/boards/sof_sdw.c b/sound/soc/intel/boards/sof_sdw.c
index b05769982c42..b606d9f4e316 100644
--- a/sound/soc/intel/boards/sof_sdw.c
+++ b/sound/soc/intel/boards/sof_sdw.c
@@ -178,6 +178,17 @@ static const struct dmi_system_id sof_sdw_quirk_table[] = {
 					SOF_SDW_PCH_DMIC |
 					RT711_JD2),
 	},
+	{
+		/* NUC15 'Bishop County' LAPBC510 and LAPBC710 skews */
+		.callback = sof_sdw_quirk_cb,
+		.matches = {
+			DMI_MATCH(DMI_SYS_VENDOR, "Intel(R) Client Systems"),
+			DMI_MATCH(DMI_PRODUCT_NAME, "LAPBC"),
+		},
+		.driver_data = (void *)(SOF_SDW_TGL_HDMI |
+					SOF_SDW_PCH_DMIC |
+					RT711_JD1),
+	},
 	/* TigerLake-SDCA devices */
 	{
 		.callback = sof_sdw_quirk_cb,
-- 
2.25.1

Re: (subset) [PATCH 0/2] ASoC/soundwire: add quirks for Intel 'Bishop County' NUC M15

[Mark Brown]

On Mon, 19 Jul 2021 18:32:46 -0500, Pierre-Louis Bossart wrote:
> The 'Bishop County' NUC Laptops designed by Intel rely on SoundWire
> peripherals. Quirks are required on the soundwire/ side to work-around
> ACPI issues (bad _ADR) and sound/soc/ side for jack detection.
> 
> The two patches are independent and can be merged in the two subsystem
> independently if desired. Both patches are however required in any
> backport.
> 
> [...]

Applied to

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

Thanks!

[2/2] ASOC: Intel: sof_sdw: add quirk for Intel 'Bishop County' NUC M15
      commit: 1bd80ff2cfb38582e258baf681211a21d448984f

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