| Message ID | 20210113160704.4106353-1-kai.vehmanen@linux.intel.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | ASoC: SOF: Intel: initial support to AlderLake-P | expand |
On Wed, 13 Jan 2021 17:07:04 +0100, Kai Vehmanen wrote: > > Add PCI id for the AlderLake-P. > > Signed-off-by: Kai Vehmanen <kai.vehmanen@linux.intel.com> > Reviewed-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com> > Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> > Reviewed-by: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com> > --- > sound/soc/sof/sof-pci-dev.c | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/sound/soc/sof/sof-pci-dev.c b/sound/soc/sof/sof-pci-dev.c > index 63b989e3ec40..9c3cb719e268 100644 > --- a/sound/soc/sof/sof-pci-dev.c > +++ b/sound/soc/sof/sof-pci-dev.c > @@ -512,6 +512,8 @@ static const struct pci_device_id sof_pci_ids[] = { > #if IS_ENABLED(CONFIG_SND_SOC_SOF_ALDERLAKE) > { PCI_DEVICE(0x8086, 0x7ad0), > .driver_data = (unsigned long)&adls_desc}, > + { PCI_DEVICE(0x8086, 0x51c8), > + .driver_data = (unsigned long)&tgl_desc}, Is it correct? It's referring to TGL thing and it's not enabled with CONFIG_SND_SOC_SOF_ALDERLAKE. Takashi
On 1/13/21 10:20 AM, Takashi Iwai wrote: > On Wed, 13 Jan 2021 17:07:04 +0100, > Kai Vehmanen wrote: >> >> Add PCI id for the AlderLake-P. >> >> Signed-off-by: Kai Vehmanen <kai.vehmanen@linux.intel.com> >> Reviewed-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com> >> Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> >> Reviewed-by: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com> >> --- >> sound/soc/sof/sof-pci-dev.c | 2 ++ >> 1 file changed, 2 insertions(+) >> >> diff --git a/sound/soc/sof/sof-pci-dev.c b/sound/soc/sof/sof-pci-dev.c >> index 63b989e3ec40..9c3cb719e268 100644 >> --- a/sound/soc/sof/sof-pci-dev.c >> +++ b/sound/soc/sof/sof-pci-dev.c >> @@ -512,6 +512,8 @@ static const struct pci_device_id sof_pci_ids[] = { >> #if IS_ENABLED(CONFIG_SND_SOC_SOF_ALDERLAKE) >> { PCI_DEVICE(0x8086, 0x7ad0), >> .driver_data = (unsigned long)&adls_desc}, >> + { PCI_DEVICE(0x8086, 0x51c8), >> + .driver_data = (unsigned long)&tgl_desc}, > > Is it correct? It's referring to TGL thing and it's not enabled with > CONFIG_SND_SOC_SOF_ALDERLAKE. Yes that should be CONFIG_SND_SOC_SOF_TIGERLAKE. I am starting to think as part of the Kconfig rework we might get rid of this granularity. It's not very useful to allow for a single PCI ID to be selected, and even internally we keep being confused by the platform variants. What would be more useful is to split by IP versions, that helps identify common parts and IP-specific ones. We could have multiple PCI drivers, one per IP version, and unconditionally include all PCI IDs for that version. See e.g. https://github.com/thesofproject/linux/pull/2683/commits/aafe349efc105f3dcba58ffff37bf783122e296b#diff-41bcb3c332dacee2f043205995bd688bdeca765334b4ddeba8056ad5735675bcR98 if we removed the #if IS_ENABLED() in that code it'd be a big simplification. I still think it's useful at the Kconfig level to present a 'user-friendly' option, but internally we should translate to which IP version is used and add additional choices (e.g. SoundWire only starts with CNL).
Hey, On Wed, 13 Jan 2021, Pierre-Louis Bossart wrote: > On 1/13/21 10:20 AM, Takashi Iwai wrote: > > > +++ b/sound/soc/sof/sof-pci-dev.c > > > @@ -512,6 +512,8 @@ static const struct pci_device_id sof_pci_ids[] = { > > > #if IS_ENABLED(CONFIG_SND_SOC_SOF_ALDERLAKE) > > > { PCI_DEVICE(0x8086, 0x7ad0), > > > .driver_data = (unsigned long)&adls_desc}, > > > + { PCI_DEVICE(0x8086, 0x51c8), > > > + .driver_data = (unsigned long)&tgl_desc}, > > > > Is it correct? It's referring to TGL thing and it's not enabled with > > CONFIG_SND_SOC_SOF_ALDERLAKE. > > Yes that should be CONFIG_SND_SOC_SOF_TIGERLAKE. ack Takashi, 'tgl_desc' is correct but the #if guards are not correct and will result in build fail if you disable just CONFIG_SND_SOC_SOF_TIGERLAKE. In SOF CI we of course have all platforms enabled (or none), so this is not caught. I'll send a V2 tomorrow (before Pierre completes the bigger rework to sof-pci-dev). > I am starting to think as part of the Kconfig rework we might get rid of this > granularity. It's not very useful to allow for a single PCI ID to be selected, Ack, my votes for this :) Br, Kai
On Wed, 13 Jan 2021 18:07:04 +0200, Kai Vehmanen wrote:
> Add PCI id for the AlderLake-P.
Applied to
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next
Thanks!
[1/1] ASoC: SOF: Intel: initial support to AlderLake-P
commit: 39860fe070c97e62ae9e80addce40ce0b3c2b082
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
diff --git a/sound/soc/sof/sof-pci-dev.c b/sound/soc/sof/sof-pci-dev.c index 63b989e3ec40..9c3cb719e268 100644 --- a/sound/soc/sof/sof-pci-dev.c +++ b/sound/soc/sof/sof-pci-dev.c @@ -512,6 +512,8 @@ static const struct pci_device_id sof_pci_ids[] = { #if IS_ENABLED(CONFIG_SND_SOC_SOF_ALDERLAKE) { PCI_DEVICE(0x8086, 0x7ad0), .driver_data = (unsigned long)&adls_desc}, + { PCI_DEVICE(0x8086, 0x51c8), + .driver_data = (unsigned long)&tgl_desc}, #endif { 0, } };