[PATCH AUTOSEL 5.7 15/53] ASoC: SOF: Intel: add PCI IDs for ICL-H and TGL-H
From: Pierre-Louis Bossart pierre-louis.bossart@linux.intel.com
[ Upstream commit c8d2e2bfaeffa0f914330e8b4e45b986c8d30b58 ]
Usually the DSP is not traditionally enabled on H skews but this might be used moving forward.
Signed-off-by: Pierre-Louis Bossart pierre-louis.bossart@linux.intel.com Reviewed-by: Guennadi Liakhovetski guennadi.liakhovetski@linux.intel.com Reviewed-by: Kai Vehmanen kai.vehmanen@linux.intel.com Link: https://lore.kernel.org/r/20200617164755.18104-4-pierre-louis.bossart@linux.... Signed-off-by: Mark Brown broonie@kernel.org Signed-off-by: Sasha Levin sashal@kernel.org --- sound/soc/sof/sof-pci-dev.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/sound/soc/sof/sof-pci-dev.c b/sound/soc/sof/sof-pci-dev.c index 7b1846aeadd59..3a71f813fb563 100644 --- a/sound/soc/sof/sof-pci-dev.c +++ b/sound/soc/sof/sof-pci-dev.c @@ -411,8 +411,11 @@ static const struct pci_device_id sof_pci_ids[] = { .driver_data = (unsigned long)&cfl_desc}, #endif #if IS_ENABLED(CONFIG_SND_SOC_SOF_ICELAKE) - { PCI_DEVICE(0x8086, 0x34C8), + { PCI_DEVICE(0x8086, 0x34C8), /* ICL-LP */ .driver_data = (unsigned long)&icl_desc}, + { PCI_DEVICE(0x8086, 0x3dc8), /* ICL-H */ + .driver_data = (unsigned long)&icl_desc}, + #endif #if IS_ENABLED(CONFIG_SND_SOC_SOF_JASPERLAKE) { PCI_DEVICE(0x8086, 0x38c8), @@ -431,8 +434,11 @@ static const struct pci_device_id sof_pci_ids[] = { .driver_data = (unsigned long)&cml_desc}, #endif #if IS_ENABLED(CONFIG_SND_SOC_SOF_TIGERLAKE) - { PCI_DEVICE(0x8086, 0xa0c8), + { PCI_DEVICE(0x8086, 0xa0c8), /* TGL-LP */ .driver_data = (unsigned long)&tgl_desc}, + { PCI_DEVICE(0x8086, 0x43c8), /* TGL-H */ + .driver_data = (unsigned long)&tgl_desc}, + #endif #if IS_ENABLED(CONFIG_SND_SOC_SOF_ELKHARTLAKE) { PCI_DEVICE(0x8086, 0x4b55),
On Wed, Jul 01, 2020 at 09:21:24PM -0400, Sasha Levin wrote:
From: Pierre-Louis Bossart pierre-louis.bossart@linux.intel.com
[ Upstream commit c8d2e2bfaeffa0f914330e8b4e45b986c8d30b58 ]
Usually the DSP is not traditionally enabled on H skews but this might be used moving forward.
"This might be used moving forward"?
On 7/2/20 6:18 AM, Mark Brown wrote:
On Wed, Jul 01, 2020 at 09:21:24PM -0400, Sasha Levin wrote:
From: Pierre-Louis Bossart pierre-louis.bossart@linux.intel.com
[ Upstream commit c8d2e2bfaeffa0f914330e8b4e45b986c8d30b58 ]
Usually the DSP is not traditionally enabled on H skews but this might be used moving forward.
"This might be used moving forward"?
There are two conditions for the SOF driver to be used in a distro: a) the DSP needs to be enabled (as reported by the pci class info) b) sound/hda/intel-dsp-config.c needs to contain a quirk to select SOF over the legacy HDaudio, such as presence of DMIC/SoundWire or a known vendor DMI.
Traditionally for desktops neither a) nor b) are true, but this is changing: we will start adding quirks for specific product lines as requested by OEMs.
Does this answer to your question?
On Thu, Jul 02, 2020 at 10:42:21AM -0500, Pierre-Louis Bossart wrote:
On 7/2/20 6:18 AM, Mark Brown wrote:
On Wed, Jul 01, 2020 at 09:21:24PM -0400, Sasha Levin wrote:
From: Pierre-Louis Bossart pierre-louis.bossart@linux.intel.com
[ Upstream commit c8d2e2bfaeffa0f914330e8b4e45b986c8d30b58 ]
Usually the DSP is not traditionally enabled on H skews but this might be used moving forward.
"This might be used moving forward"?
There are two conditions for the SOF driver to be used in a distro: a) the DSP needs to be enabled (as reported by the pci class info) b) sound/hda/intel-dsp-config.c needs to contain a quirk to select SOF over the legacy HDaudio, such as presence of DMIC/SoundWire or a known vendor DMI.
Traditionally for desktops neither a) nor b) are true, but this is changing: we will start adding quirks for specific product lines as requested by OEMs.
Does this answer to your question?
The question was more of a why is this being backported one - without those extra quirks this does nothing, and frankly with them it seems like a *major* change someone might see in stable if they update their kernel and it suddenly switches to an entirely different DSP software stack.
On Thu, Jul 02, 2020 at 05:05:28PM +0100, Mark Brown wrote:
On Thu, Jul 02, 2020 at 10:42:21AM -0500, Pierre-Louis Bossart wrote:
On 7/2/20 6:18 AM, Mark Brown wrote:
On Wed, Jul 01, 2020 at 09:21:24PM -0400, Sasha Levin wrote:
From: Pierre-Louis Bossart pierre-louis.bossart@linux.intel.com
[ Upstream commit c8d2e2bfaeffa0f914330e8b4e45b986c8d30b58 ]
Usually the DSP is not traditionally enabled on H skews but this might be used moving forward.
"This might be used moving forward"?
There are two conditions for the SOF driver to be used in a distro: a) the DSP needs to be enabled (as reported by the pci class info) b) sound/hda/intel-dsp-config.c needs to contain a quirk to select SOF over the legacy HDaudio, such as presence of DMIC/SoundWire or a known vendor DMI.
Traditionally for desktops neither a) nor b) are true, but this is changing: we will start adding quirks for specific product lines as requested by OEMs.
Does this answer to your question?
The question was more of a why is this being backported one - without those extra quirks this does nothing, and frankly with them it seems like a *major* change someone might see in stable if they update their kernel and it suddenly switches to an entirely different DSP software stack.
Hey Mark,
It got picked up because the stable rules explicitly call out PCI IDs as something we take into the stable trees, and so the AUTOSEL brains picked up on this...
I'll drop this patch as it doesn't do much.
participants (3)
-
Mark Brown -
Pierre-Louis Bossart -
Sasha Levin