[PATCH] ALSA: hda: intel-dsp-cfg: Add Chromebook quirk to ADL/RPL
AlderLake and RaptorLake Chromebooks currently use the HDA driver by default. Add a quirk to use the SOF driver on these platforms, which is needed for functional internal audio.
Signed-off-by: Brady Norander bradynorander@gmail.com --- sound/hda/intel-dsp-config.c | 151 ++++++++++++++++++++++++++++++++++- 1 file changed, 147 insertions(+), 4 deletions(-)
diff --git a/sound/hda/intel-dsp-config.c b/sound/hda/intel-dsp-config.c index dcf2453138a5..5fb5abb76679 100644 --- a/sound/hda/intel-dsp-config.c +++ b/sound/hda/intel-dsp-config.c @@ -167,10 +167,10 @@ static const struct config_entry config_table[] = { #endif
/* - * CoffeeLake, CannonLake, CometLake, IceLake, TigerLake use legacy - * HDAudio driver except for Google Chromebooks and when DMICs are - * present. Two cases are required since Coreboot does not expose NHLT - * tables. + * CoffeeLake, CannonLake, CometLake, IceLake, TigerLake, AlderLake, + * RaptorLake use legacy HDAudio driver except for Google Chromebooks + * and when DMICs are present. Two cases are required since Coreboot + * does not expose NHLT tables. * * When the Chromebook quirk is not present, it's based on information * that no such device exists. When the quirk is present, it could be @@ -400,14 +400,53 @@ static const struct config_entry config_table[] = {
/* Alder Lake / Raptor Lake */ #if IS_ENABLED(CONFIG_SND_SOC_SOF_ALDERLAKE) + { + .flags = FLAG_SOF, + .device = PCI_DEVICE_ID_INTEL_HDA_ADL_S, + .dmi_table = (const struct dmi_system_id []) { + { + .ident = "Google Chromebooks", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Google"), + } + }, + {} + } + }, { .flags = FLAG_SOF | FLAG_SOF_ONLY_IF_DMIC_OR_SOUNDWIRE, .device = PCI_DEVICE_ID_INTEL_HDA_ADL_S, }, + { + .flags = FLAG_SOF, + .device = PCI_DEVICE_ID_INTEL_HDA_RPL_S, + .dmi_table = (const struct dmi_system_id []) { + { + .ident = "Google Chromebooks", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Google"), + } + }, + {} + } + }, { .flags = FLAG_SOF | FLAG_SOF_ONLY_IF_DMIC_OR_SOUNDWIRE, .device = PCI_DEVICE_ID_INTEL_HDA_RPL_S, }, + { + .flags = FLAG_SOF, + .device = PCI_DEVICE_ID_INTEL_HDA_ADL_P, + .dmi_table = (const struct dmi_system_id []) { + { + .ident = "Google Chromebooks", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Google"), + } + }, + {} + } + }, { .flags = FLAG_SOF, .device = PCI_DEVICE_ID_INTEL_HDA_ADL_P, @@ -417,10 +456,36 @@ static const struct config_entry config_table[] = { .flags = FLAG_SOF | FLAG_SOF_ONLY_IF_DMIC_OR_SOUNDWIRE, .device = PCI_DEVICE_ID_INTEL_HDA_ADL_P, }, + { + .flags = FLAG_SOF, + .device = PCI_DEVICE_ID_INTEL_HDA_ADL_PX, + .dmi_table = (const struct dmi_system_id []) { + { + .ident = "Google Chromebooks", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Google"), + } + }, + {} + } + }, { .flags = FLAG_SOF | FLAG_SOF_ONLY_IF_DMIC_OR_SOUNDWIRE, .device = PCI_DEVICE_ID_INTEL_HDA_ADL_PX, }, + { + .flags = FLAG_SOF, + .device = PCI_DEVICE_ID_INTEL_HDA_ADL_PS, + .dmi_table = (const struct dmi_system_id []) { + { + .ident = "Google Chromebooks", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Google"), + } + }, + {} + } + }, { .flags = FLAG_SOF, .device = PCI_DEVICE_ID_INTEL_HDA_ADL_PS, @@ -430,26 +495,104 @@ static const struct config_entry config_table[] = { .flags = FLAG_SOF | FLAG_SOF_ONLY_IF_DMIC_OR_SOUNDWIRE, .device = PCI_DEVICE_ID_INTEL_HDA_ADL_PS, }, + { + .flags = FLAG_SOF, + .device = PCI_DEVICE_ID_INTEL_HDA_ADL_M, + .dmi_table = (const struct dmi_system_id []) { + { + .ident = "Google Chromebooks", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Google"), + } + }, + {} + } + }, { .flags = FLAG_SOF | FLAG_SOF_ONLY_IF_DMIC_OR_SOUNDWIRE, .device = PCI_DEVICE_ID_INTEL_HDA_ADL_M, }, + { + .flags = FLAG_SOF, + .device = PCI_DEVICE_ID_INTEL_HDA_ADL_N, + .dmi_table = (const struct dmi_system_id []) { + { + .ident = "Google Chromebooks", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Google"), + } + }, + {} + } + }, { .flags = FLAG_SOF | FLAG_SOF_ONLY_IF_DMIC_OR_SOUNDWIRE, .device = PCI_DEVICE_ID_INTEL_HDA_ADL_N, }, + { + .flags = FLAG_SOF, + .device = PCI_DEVICE_ID_INTEL_HDA_RPL_P_0, + .dmi_table = (const struct dmi_system_id []) { + { + .ident = "Google Chromebooks", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Google"), + } + }, + {} + } + }, { .flags = FLAG_SOF | FLAG_SOF_ONLY_IF_DMIC_OR_SOUNDWIRE, .device = PCI_DEVICE_ID_INTEL_HDA_RPL_P_0, }, + { + .flags = FLAG_SOF, + .device = PCI_DEVICE_ID_INTEL_HDA_RPL_P_1, + .dmi_table = (const struct dmi_system_id []) { + { + .ident = "Google Chromebooks", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Google"), + } + }, + {} + } + }, { .flags = FLAG_SOF | FLAG_SOF_ONLY_IF_DMIC_OR_SOUNDWIRE, .device = PCI_DEVICE_ID_INTEL_HDA_RPL_P_1, }, + { + .flags = FLAG_SOF, + .device = PCI_DEVICE_ID_INTEL_HDA_RPL_M, + .dmi_table = (const struct dmi_system_id []) { + { + .ident = "Google Chromebooks", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Google"), + } + }, + {} + } + }, { .flags = FLAG_SOF | FLAG_SOF_ONLY_IF_DMIC_OR_SOUNDWIRE, .device = PCI_DEVICE_ID_INTEL_HDA_RPL_M, }, + { + .flags = FLAG_SOF, + .device = PCI_DEVICE_ID_INTEL_HDA_RPL_PX, + .dmi_table = (const struct dmi_system_id []) { + { + .ident = "Google Chromebooks", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Google"), + } + }, + {} + } + }, { .flags = FLAG_SOF | FLAG_SOF_ONLY_IF_DMIC_OR_SOUNDWIRE, .device = PCI_DEVICE_ID_INTEL_HDA_RPL_PX,
On 8/13/23 20:26, Brady Norander wrote:
AlderLake and RaptorLake Chromebooks currently use the HDA driver by default. Add a quirk to use the SOF driver on these platforms, which is needed for functional internal audio.
that would be wise indeed, I must admit not recalling why this isn't the case. Curtis?
- {
.flags = FLAG_SOF,.device = PCI_DEVICE_ID_INTEL_HDA_ADL_PX,
Humm, that doesn't seem like a supported configuration, IIRC all the PX skews are for embedded Linux stuff.
.dmi_table = (const struct dmi_system_id []) {{.ident = "Google Chromebooks",.matches = {DMI_MATCH(DMI_SYS_VENDOR, "Google"),}},{}}- },
{ .flags = FLAG_SOF | FLAG_SOF_ONLY_IF_DMIC_OR_SOUNDWIRE, .device = PCI_DEVICE_ID_INTEL_HDA_RPL_M, },
- {
.flags = FLAG_SOF,.device = PCI_DEVICE_ID_INTEL_HDA_RPL_PX,
same here, I don't think we can blindly add quirks.
One might argue it doesn't hurt but not all SKUs are supported by Chrome.
.dmi_table = (const struct dmi_system_id []) {{.ident = "Google Chromebooks",.matches = {DMI_MATCH(DMI_SYS_VENDOR, "Google"),}},{}}- }, { .flags = FLAG_SOF | FLAG_SOF_ONLY_IF_DMIC_OR_SOUNDWIRE, .device = PCI_DEVICE_ID_INTEL_HDA_RPL_PX,
On Mon, Aug 14, 2023 at 08:54:15AM -0500, Pierre-Louis Bossart wrote:
same here, I don't think we can blindly add quirks.
One might argue it doesn't hurt but not all SKUs are supported by Chrome.
Fair enough. I wasn't sure which SKUs were used in Chrome platforms and which ones weren't so I figured it would be safer to include all of them than miss some that are needed. I can resend the patch without the quirk for the PX SKUs.
On Mon, Aug 14, 2023 at 11:01 AM Brady Norander bradynorander@gmail.com wrote:
On Mon, Aug 14, 2023 at 08:54:15AM -0500, Pierre-Louis Bossart wrote:
same here, I don't think we can blindly add quirks.
One might argue it doesn't hurt but not all SKUs are supported by Chrome.
Fair enough. I wasn't sure which SKUs were used in Chrome platforms and which ones weren't so I figured it would be safer to include all of them than miss some that are needed. I can resend the patch without the quirk for the PX SKUs.
FTR we carry a .conf which has the following config which is probably why we don't see this issue. I understand this behaviour for dual supported legacy platforms but it is indeed weird to see on SOF only supported platforms.
# Use the SOF driver for PCI_DEVICE(0x8086, 0x9dc8) instead of snd_hda_intel options snd_intel_sdw_acpi sdw_link_mask=0x5 options snd_intel_dspcfg dsp_driver=3 options snd_sof_intel_hda_common always_enable_dmi_l1=1 blacklist snd_hda_intel
On 8/13/23 20:26, Brady Norander wrote:
AlderLake and RaptorLake Chromebooks currently use the HDA driver by default. Add a quirk to use the SOF driver on these platforms, which is needed for functional internal audio.
After checking, here's a list of known Chromebooks.
Do you mind sending an updated v2?
Thanks!
- {
.flags = FLAG_SOF,.device = PCI_DEVICE_ID_INTEL_HDA_ADL_P,.dmi_table = (const struct dmi_system_id []) {{.ident = "Google Chromebooks",.matches = {DMI_MATCH(DMI_SYS_VENDOR, "Google"),}},{}}- },
- {
.flags = FLAG_SOF,.device = PCI_DEVICE_ID_INTEL_HDA_ADL_N,.dmi_table = (const struct dmi_system_id []) {{.ident = "Google Chromebooks",.matches = {DMI_MATCH(DMI_SYS_VENDOR, "Google"),}},{}}- },
.flags = FLAG_SOF,.device = PCI_DEVICE_ID_INTEL_HDA_RPL_P_0,.dmi_table = (const struct dmi_system_id []) {{.ident = "Google Chromebooks",.matches = {DMI_MATCH(DMI_SYS_VENDOR, "Google"),}},{}}- },
- {
.flags = FLAG_SOF,.device = PCI_DEVICE_ID_INTEL_HDA_RPL_P_1,.dmi_table = (const struct dmi_system_id []) {{.ident = "Google Chromebooks",.matches = {DMI_MATCH(DMI_SYS_VENDOR, "Google"),}},{}}- },
On Mon, Aug 14, 2023 at 06:54:06PM -0500, Pierre-Louis Bossart wrote:
On 8/13/23 20:26, Brady Norander wrote:
AlderLake and RaptorLake Chromebooks currently use the HDA driver by default. Add a quirk to use the SOF driver on these platforms, which is needed for functional internal audio.
After checking, here's a list of known Chromebooks.
Do you mind sending an updated v2?
Thanks!
Not at all. Just one thing I'm confused about, if I send a v2 patch, should it be a reply to my original thread or a new thread?
On Mon, Aug 14, 2023 at 4:55 PM Pierre-Louis Bossart < pierre-louis.bossart@linux.intel.com> wrote:
On 8/13/23 20:26, Brady Norander wrote:
AlderLake and RaptorLake Chromebooks currently use the HDA driver by default. Add a quirk to use the SOF driver on these platforms, which is needed for functional internal audio.
After checking, here's a list of known Chromebooks.
I think you forgot to hit paste :)
Curtis
participants (4)
-
Brady Norander -
Curtis Malainey -
Mark Brown -
Pierre-Louis Bossart