From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
To: "Amadeusz Sławiński" <amadeuszx.slawinski@linux.intel.com>
Cc: Bjorn Helgaas <bhelgaas@google.com>,
Mark Brown <broonie@kernel.org>, Takashi Iwai <tiwai@suse.com>,
alsa-devel@alsa-project.org, linux-pci@vger.kernel.org,
linux-kernel@vger.kernel.org,
Cezary Rojewski <cezary.rojewski@intel.com>,
Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>,
Kai Vehmanen <kai.vehmanen@linux.intel.com>,
Hans de Goede <hdegoede@redhat.com>
Subject: Re: [PATCH 07/13] ALSA: intel-dsp-config: Convert to PCI device IDs defines
Date: Tue, 11 Jul 2023 17:00:08 +0300 [thread overview]
Message-ID: <ZK1gaER7n4JUjIeW@smile.fi.intel.com> (raw)
In-Reply-To: <20230711125726.3509391-8-amadeuszx.slawinski@linux.intel.com>
On Tue, Jul 11, 2023 at 02:57:20PM +0200, Amadeusz Sławiński wrote:
> Use PCI device IDs from pci_ids.h header. Also simplify comments for
> Alder Lake and Raptor Lake platforms, as new IDs make it clear what
> revision is in use.
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> # for Intel Tangier ID
One remark below.
> Acked-by: Mark Brown <broonie@kernel.org>
> Signed-off-by: Amadeusz Sławiński <amadeuszx.slawinski@linux.intel.com>
> ---
> sound/hda/intel-dsp-config.c | 119 ++++++++++++++++-------------------
> 1 file changed, 55 insertions(+), 64 deletions(-)
>
> diff --git a/sound/hda/intel-dsp-config.c b/sound/hda/intel-dsp-config.c
> index 317bdf6dcbef..2a71fa5ffec1 100644
> --- a/sound/hda/intel-dsp-config.c
> +++ b/sound/hda/intel-dsp-config.c
> @@ -50,14 +50,14 @@ static const struct config_entry config_table[] = {
> #if IS_ENABLED(CONFIG_SND_SOC_SOF_MERRIFIELD)
> {
> .flags = FLAG_SOF,
> - .device = 0x119a,
> + .device = PCI_DEVICE_ID_INTEL_ADSP_TNG,
Yeah, somebody familiar with Intel history of SST/HDA/wtf should really
tell why HDA code is using this ID. Does it mean that SST implies HDA
always? Only for this (or this family of) platform?
It might affect the ID naming, but otherwise it's orthogonal to the series.
> },
> #endif
> /* Broxton-T */
> #if IS_ENABLED(CONFIG_SND_SOC_SOF_APOLLOLAKE)
> {
> .flags = FLAG_SOF,
> - .device = 0x1a98,
> + .device = PCI_DEVICE_ID_INTEL_HDA_APL_T,
> },
> #endif
> /*
> @@ -68,7 +68,7 @@ static const struct config_entry config_table[] = {
> #if IS_ENABLED(CONFIG_SND_SOC_SOF_APOLLOLAKE)
> {
> .flags = FLAG_SOF,
> - .device = 0x5a98,
> + .device = PCI_DEVICE_ID_INTEL_HDA_APL,
> .dmi_table = (const struct dmi_system_id []) {
> {
> .ident = "Up Squared",
> @@ -82,14 +82,14 @@ static const struct config_entry config_table[] = {
> },
> {
> .flags = FLAG_SOF,
> - .device = 0x5a98,
> + .device = PCI_DEVICE_ID_INTEL_HDA_APL,
> .codec_hid = &essx_83x6,
> },
> #endif
> #if IS_ENABLED(CONFIG_SND_SOC_INTEL_APL)
> {
> .flags = FLAG_SST,
> - .device = 0x5a98,
> + .device = PCI_DEVICE_ID_INTEL_HDA_APL,
> .dmi_table = (const struct dmi_system_id []) {
> {
> .ident = "Google Chromebooks",
> @@ -110,7 +110,7 @@ static const struct config_entry config_table[] = {
> #if IS_ENABLED(CONFIG_SND_SOC_INTEL_SKL)
> {
> .flags = FLAG_SST,
> - .device = 0x9d70,
> + .device = PCI_DEVICE_ID_INTEL_HDA_SKL_LP,
> .dmi_table = (const struct dmi_system_id []) {
> {
> .ident = "Google Chromebooks",
> @@ -123,14 +123,14 @@ static const struct config_entry config_table[] = {
> },
> {
> .flags = FLAG_SST | FLAG_SST_ONLY_IF_DMIC,
> - .device = 0x9d70,
> + .device = PCI_DEVICE_ID_INTEL_HDA_SKL_LP,
> },
> #endif
> /* Kabylake-LP */
> #if IS_ENABLED(CONFIG_SND_SOC_INTEL_KBL)
> {
> .flags = FLAG_SST,
> - .device = 0x9d71,
> + .device = PCI_DEVICE_ID_INTEL_HDA_KBL_LP,
> .dmi_table = (const struct dmi_system_id []) {
> {
> .ident = "Google Chromebooks",
> @@ -143,7 +143,7 @@ static const struct config_entry config_table[] = {
> },
> {
> .flags = FLAG_SST | FLAG_SST_ONLY_IF_DMIC,
> - .device = 0x9d71,
> + .device = PCI_DEVICE_ID_INTEL_HDA_KBL_LP,
> },
> #endif
>
> @@ -155,7 +155,7 @@ static const struct config_entry config_table[] = {
> #if IS_ENABLED(CONFIG_SND_SOC_SOF_GEMINILAKE)
> {
> .flags = FLAG_SOF,
> - .device = 0x3198,
> + .device = PCI_DEVICE_ID_INTEL_HDA_GML,
> .dmi_table = (const struct dmi_system_id []) {
> {
> .ident = "Google Chromebooks",
> @@ -168,7 +168,7 @@ static const struct config_entry config_table[] = {
> },
> {
> .flags = FLAG_SOF,
> - .device = 0x3198,
> + .device = PCI_DEVICE_ID_INTEL_HDA_GML,
> .codec_hid = &essx_83x6,
> },
> #endif
> @@ -188,7 +188,7 @@ static const struct config_entry config_table[] = {
> #if IS_ENABLED(CONFIG_SND_SOC_SOF_CANNONLAKE)
> {
> .flags = FLAG_SOF,
> - .device = 0x9dc8,
> + .device = PCI_DEVICE_ID_INTEL_HDA_CNL_LP,
> .dmi_table = (const struct dmi_system_id []) {
> {
> .ident = "Google Chromebooks",
> @@ -207,12 +207,12 @@ static const struct config_entry config_table[] = {
> },
> {
> .flags = FLAG_SOF,
> - .device = 0x09dc8,
> + .device = PCI_DEVICE_ID_INTEL_HDA_CNL_LP,
> .codec_hid = &essx_83x6,
> },
> {
> .flags = FLAG_SOF | FLAG_SOF_ONLY_IF_DMIC_OR_SOUNDWIRE,
> - .device = 0x9dc8,
> + .device = PCI_DEVICE_ID_INTEL_HDA_CNL_LP,
> },
> #endif
>
> @@ -220,7 +220,7 @@ static const struct config_entry config_table[] = {
> #if IS_ENABLED(CONFIG_SND_SOC_SOF_COFFEELAKE)
> {
> .flags = FLAG_SOF,
> - .device = 0xa348,
> + .device = PCI_DEVICE_ID_INTEL_HDA_CNL_H,
> .dmi_table = (const struct dmi_system_id []) {
> {
> .ident = "Google Chromebooks",
> @@ -233,7 +233,7 @@ static const struct config_entry config_table[] = {
> },
> {
> .flags = FLAG_SOF | FLAG_SOF_ONLY_IF_DMIC_OR_SOUNDWIRE,
> - .device = 0xa348,
> + .device = PCI_DEVICE_ID_INTEL_HDA_CNL_H,
> },
> #endif
>
> @@ -241,7 +241,7 @@ static const struct config_entry config_table[] = {
> /* Cometlake-LP */
> {
> .flags = FLAG_SOF,
> - .device = 0x02c8,
> + .device = PCI_DEVICE_ID_INTEL_HDA_CML_LP,
> .dmi_table = (const struct dmi_system_id []) {
> {
> .ident = "Google Chromebooks",
> @@ -267,17 +267,17 @@ static const struct config_entry config_table[] = {
> },
> {
> .flags = FLAG_SOF,
> - .device = 0x02c8,
> + .device = PCI_DEVICE_ID_INTEL_HDA_CML_LP,
> .codec_hid = &essx_83x6,
> },
> {
> .flags = FLAG_SOF | FLAG_SOF_ONLY_IF_DMIC_OR_SOUNDWIRE,
> - .device = 0x02c8,
> + .device = PCI_DEVICE_ID_INTEL_HDA_CML_LP,
> },
> /* Cometlake-H */
> {
> .flags = FLAG_SOF,
> - .device = 0x06c8,
> + .device = PCI_DEVICE_ID_INTEL_HDA_CML_H,
> .dmi_table = (const struct dmi_system_id []) {
> {
> .matches = {
> @@ -296,12 +296,12 @@ static const struct config_entry config_table[] = {
> },
> {
> .flags = FLAG_SOF,
> - .device = 0x06c8,
> + .device = PCI_DEVICE_ID_INTEL_HDA_CML_H,
> .codec_hid = &essx_83x6,
> },
> {
> .flags = FLAG_SOF | FLAG_SOF_ONLY_IF_DMIC_OR_SOUNDWIRE,
> - .device = 0x06c8,
> + .device = PCI_DEVICE_ID_INTEL_HDA_CML_H,
> },
> #endif
>
> @@ -309,7 +309,7 @@ static const struct config_entry config_table[] = {
> #if IS_ENABLED(CONFIG_SND_SOC_SOF_ICELAKE)
> {
> .flags = FLAG_SOF,
> - .device = 0x34c8,
> + .device = PCI_DEVICE_ID_INTEL_HDA_ICL_LP,
> .dmi_table = (const struct dmi_system_id []) {
> {
> .ident = "Google Chromebooks",
> @@ -322,12 +322,12 @@ static const struct config_entry config_table[] = {
> },
> {
> .flags = FLAG_SOF,
> - .device = 0x34c8,
> + .device = PCI_DEVICE_ID_INTEL_HDA_ICL_LP,
> .codec_hid = &essx_83x6,
> },
> {
> .flags = FLAG_SOF | FLAG_SOF_ONLY_IF_DMIC_OR_SOUNDWIRE,
> - .device = 0x34c8,
> + .device = PCI_DEVICE_ID_INTEL_HDA_ICL_LP,
> },
> #endif
>
> @@ -335,7 +335,7 @@ static const struct config_entry config_table[] = {
> #if IS_ENABLED(CONFIG_SND_SOC_SOF_JASPERLAKE)
> {
> .flags = FLAG_SOF,
> - .device = 0x4dc8,
> + .device = PCI_DEVICE_ID_INTEL_HDA_JSL_N,
> .dmi_table = (const struct dmi_system_id []) {
> {
> .ident = "Google Chromebooks",
> @@ -348,12 +348,12 @@ static const struct config_entry config_table[] = {
> },
> {
> .flags = FLAG_SOF,
> - .device = 0x4dc8,
> + .device = PCI_DEVICE_ID_INTEL_HDA_JSL_N,
> .codec_hid = &essx_83x6,
> },
> {
> .flags = FLAG_SOF | FLAG_SOF_ONLY_IF_DMIC,
> - .device = 0x4dc8,
> + .device = PCI_DEVICE_ID_INTEL_HDA_JSL_N,
> },
> #endif
>
> @@ -361,7 +361,7 @@ static const struct config_entry config_table[] = {
> #if IS_ENABLED(CONFIG_SND_SOC_SOF_TIGERLAKE)
> {
> .flags = FLAG_SOF,
> - .device = 0xa0c8,
> + .device = PCI_DEVICE_ID_INTEL_HDA_TGL_LP,
> .dmi_table = (const struct dmi_system_id []) {
> {
> .ident = "Google Chromebooks",
> @@ -380,16 +380,16 @@ static const struct config_entry config_table[] = {
> },
> {
> .flags = FLAG_SOF,
> - .device = 0xa0c8,
> + .device = PCI_DEVICE_ID_INTEL_HDA_TGL_LP,
> .codec_hid = &essx_83x6,
> },
> {
> .flags = FLAG_SOF | FLAG_SOF_ONLY_IF_DMIC_OR_SOUNDWIRE,
> - .device = 0xa0c8,
> + .device = PCI_DEVICE_ID_INTEL_HDA_TGL_LP,
> },
> {
> .flags = FLAG_SOF | FLAG_SOF_ONLY_IF_DMIC_OR_SOUNDWIRE,
> - .device = 0x43c8,
> + .device = PCI_DEVICE_ID_INTEL_HDA_TGL_H,
> },
> #endif
>
> @@ -397,78 +397,69 @@ static const struct config_entry config_table[] = {
> #if IS_ENABLED(CONFIG_SND_SOC_SOF_ELKHARTLAKE)
> {
> .flags = FLAG_SOF | FLAG_SOF_ONLY_IF_DMIC,
> - .device = 0x4b55,
> + .device = PCI_DEVICE_ID_INTEL_HDA_EHL_0,
> },
> {
> .flags = FLAG_SOF | FLAG_SOF_ONLY_IF_DMIC,
> - .device = 0x4b58,
> + .device = PCI_DEVICE_ID_INTEL_HDA_EHL_3,
> },
> #endif
>
> -/* Alder Lake */
> +/* Alder Lake / Raptor Lake */
> #if IS_ENABLED(CONFIG_SND_SOC_SOF_ALDERLAKE)
> - /* Alderlake-S */
> {
> .flags = FLAG_SOF | FLAG_SOF_ONLY_IF_DMIC_OR_SOUNDWIRE,
> - .device = 0x7ad0,
> + .device = PCI_DEVICE_ID_INTEL_HDA_ADL_S,
> },
> - /* RaptorLake-S */
> {
> .flags = FLAG_SOF | FLAG_SOF_ONLY_IF_DMIC_OR_SOUNDWIRE,
> - .device = 0x7a50,
> + .device = PCI_DEVICE_ID_INTEL_HDA_RPL_S,
> },
> - /* Alderlake-P */
> {
> .flags = FLAG_SOF,
> - .device = 0x51c8,
> + .device = PCI_DEVICE_ID_INTEL_HDA_ADL_P,
> .codec_hid = &essx_83x6,
> },
> {
> .flags = FLAG_SOF | FLAG_SOF_ONLY_IF_DMIC_OR_SOUNDWIRE,
> - .device = 0x51c8,
> + .device = PCI_DEVICE_ID_INTEL_HDA_ADL_P,
> },
> {
> .flags = FLAG_SOF | FLAG_SOF_ONLY_IF_DMIC_OR_SOUNDWIRE,
> - .device = 0x51cd,
> + .device = PCI_DEVICE_ID_INTEL_HDA_ADL_PX,
> },
> - /* Alderlake-PS */
> {
> .flags = FLAG_SOF,
> - .device = 0x51c9,
> + .device = PCI_DEVICE_ID_INTEL_HDA_ADL_PS,
> .codec_hid = &essx_83x6,
> },
> {
> .flags = FLAG_SOF | FLAG_SOF_ONLY_IF_DMIC_OR_SOUNDWIRE,
> - .device = 0x51c9,
> + .device = PCI_DEVICE_ID_INTEL_HDA_ADL_PS,
> },
> - /* Alderlake-M */
> {
> .flags = FLAG_SOF | FLAG_SOF_ONLY_IF_DMIC_OR_SOUNDWIRE,
> - .device = 0x51cc,
> + .device = PCI_DEVICE_ID_INTEL_HDA_ADL_M,
> },
> - /* Alderlake-N */
> {
> .flags = FLAG_SOF | FLAG_SOF_ONLY_IF_DMIC_OR_SOUNDWIRE,
> - .device = 0x54c8,
> + .device = PCI_DEVICE_ID_INTEL_HDA_ADL_N,
> },
> - /* RaptorLake-P */
> {
> .flags = FLAG_SOF | FLAG_SOF_ONLY_IF_DMIC_OR_SOUNDWIRE,
> - .device = 0x51ca,
> + .device = PCI_DEVICE_ID_INTEL_HDA_RPL_P_0,
> },
> {
> .flags = FLAG_SOF | FLAG_SOF_ONLY_IF_DMIC_OR_SOUNDWIRE,
> - .device = 0x51cb,
> + .device = PCI_DEVICE_ID_INTEL_HDA_RPL_P_1,
> },
> - /* RaptorLake-M */
> {
> .flags = FLAG_SOF | FLAG_SOF_ONLY_IF_DMIC_OR_SOUNDWIRE,
> - .device = 0x51ce,
> + .device = PCI_DEVICE_ID_INTEL_HDA_RPL_M,
> },
> - /* RaptorLake-PX */
> {
> .flags = FLAG_SOF | FLAG_SOF_ONLY_IF_DMIC_OR_SOUNDWIRE,
> - .device = 0x51cf,
> + .device = PCI_DEVICE_ID_INTEL_HDA_RPL_PX,
> },
> #endif
>
> @@ -549,7 +540,7 @@ int snd_intel_dsp_driver_probe(struct pci_dev *pci)
> const struct config_entry *cfg;
>
> /* Intel vendor only */
> - if (pci->vendor != 0x8086)
> + if (pci->vendor != PCI_VENDOR_ID_INTEL)
> return SND_INTEL_DSP_DRIVER_ANY;
>
> /*
> @@ -557,12 +548,12 @@ int snd_intel_dsp_driver_probe(struct pci_dev *pci)
> * for HDMI/DP support, ignore kernel parameter
> */
> switch (pci->device) {
> - case 0x160c: /* Broadwell */
> - case 0x0a0c: /* Haswell */
> - case 0x0c0c:
> - case 0x0d0c:
> - case 0x0f04: /* Baytrail */
> - case 0x2284: /* Braswell */
> + case PCI_DEVICE_ID_INTEL_HDA_BDW:
> + case PCI_DEVICE_ID_INTEL_HDA_HSW_0:
> + case PCI_DEVICE_ID_INTEL_HDA_HSW_2:
> + case PCI_DEVICE_ID_INTEL_HDA_HSW_3:
> + case PCI_DEVICE_ID_INTEL_HDA_BYT:
> + case PCI_DEVICE_ID_INTEL_HDA_BSW:
> return SND_INTEL_DSP_DRIVER_ANY;
> }
>
> --
> 2.34.1
>
--
With Best Regards,
Andy Shevchenko
next prev parent reply other threads:[~2023-07-11 14:01 UTC|newest]
Thread overview: 43+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-07-11 12:57 [PATCH 00/13] PCI: Define Intel PCI IDs and use them in drivers Amadeusz Sławiński
2023-07-11 12:57 ` [PATCH 01/13] PCI: Sort Intel PCI IDs by number Amadeusz Sławiński
2023-07-11 13:30 ` Andy Shevchenko
2023-07-11 16:17 ` Bjorn Helgaas
2023-07-11 12:57 ` [PATCH 02/13] PCI: Add Intel Audio DSP devices to pci_ids.h Amadeusz Sławiński
2023-07-11 13:33 ` Andy Shevchenko
2023-07-11 12:57 ` [PATCH 03/13] ALSA: hda: Add controller matching macros Amadeusz Sławiński
2023-07-11 13:36 ` Andy Shevchenko
2023-07-12 10:54 ` Amadeusz Sławiński
2023-07-11 12:57 ` [PATCH 04/13] ALSA: hda: Use global PCI match macro Amadeusz Sławiński
2023-07-11 13:37 ` Andy Shevchenko
2023-07-11 12:57 ` [PATCH 05/13] ALSA: hda/i915: " Amadeusz Sławiński
2023-07-11 13:39 ` Andy Shevchenko
2023-07-11 12:57 ` [PATCH 06/13] ASoC: Intel: Skylake: " Amadeusz Sławiński
2023-07-11 13:41 ` Andy Shevchenko
2023-07-11 12:57 ` [PATCH 07/13] ALSA: intel-dsp-config: Convert to PCI device IDs defines Amadeusz Sławiński
2023-07-11 14:00 ` Andy Shevchenko [this message]
2023-07-11 14:09 ` Amadeusz Sławiński
2023-07-11 14:12 ` Andy Shevchenko
2023-07-11 12:57 ` [PATCH 08/13] ALSA: hda: " Amadeusz Sławiński
2023-07-11 14:07 ` Andy Shevchenko
2023-07-12 11:22 ` Amadeusz Sławiński
2023-07-12 11:28 ` Takashi Iwai
2023-07-11 12:57 ` [PATCH 09/13] ASoC: Intel: avs: " Amadeusz Sławiński
2023-07-11 14:02 ` Andy Shevchenko
2023-07-11 12:57 ` [PATCH 10/13] " Amadeusz Sławiński
2023-07-11 14:09 ` Andy Shevchenko
2023-07-11 14:13 ` Amadeusz Sławiński
2023-07-11 12:57 ` [PATCH 11/13] ASoC: Intel: Skylake: " Amadeusz Sławiński
2023-07-11 14:10 ` Andy Shevchenko
2023-07-11 12:57 ` [PATCH 12/13] ASoC: SOF: Intel: " Amadeusz Sławiński
2023-07-11 14:16 ` Andy Shevchenko
2023-07-12 12:16 ` Amadeusz Sławiński
2023-07-12 15:53 ` Andy Shevchenko
2023-07-11 12:57 ` [PATCH 13/13] ASoC: Intel: sst: " Amadeusz Sławiński
2023-07-11 14:33 ` Andy Shevchenko
2023-07-12 12:19 ` Amadeusz Sławiński
2023-07-12 15:54 ` Andy Shevchenko
2023-07-11 15:24 ` [PATCH 00/13] PCI: Define Intel PCI IDs and use them in drivers Pierre-Louis Bossart
2023-07-11 15:36 ` Mark Brown
2023-07-11 15:42 ` Takashi Iwai
2023-07-11 15:58 ` Mark Brown
2023-07-11 16:19 ` Bjorn Helgaas
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=ZK1gaER7n4JUjIeW@smile.fi.intel.com \
--to=andriy.shevchenko@linux.intel.com \
--cc=alsa-devel@alsa-project.org \
--cc=amadeuszx.slawinski@linux.intel.com \
--cc=bhelgaas@google.com \
--cc=broonie@kernel.org \
--cc=cezary.rojewski@intel.com \
--cc=hdegoede@redhat.com \
--cc=kai.vehmanen@linux.intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=pierre-louis.bossart@linux.intel.com \
--cc=tiwai@suse.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox