[PATCH 00/13] PCI: Define Intel PCI IDs and use them in drivers

[PATCH 00/13] PCI: Define Intel PCI IDs and use them in drivers

[Amadeusz Sławiński]

PCI IDs for Intel HDA are duplicated across quite a few drivers, due to
various configurations and historical reasons. Currently almost all uses
of HDA PCI IDs have corresponding comment telling which platform it is.
Additionally there are some inconsistencies between drivers about which
ID corresponds to which device.

Simplify things, by adding PCI IDs to global header and make use of them
in drivers. This allows for removal of comments by having IDs themselves
being self explanatory. Additionally it allows for removal of existing
inconsistencies by having one source of truth.

Changes from RFC:
 - Sort Intel PCI IDs before adding new ones
 - Fix ordering of new PCI IDs (Andy)
 - Define all used Intel IDs (Andy)
 - Add macros for controller type detection (Andy/Bjorn)
 - Add set of patches changing to use above macro (Andy/Bjorn)
 - Use PCI_DEVICE_DATA for Intel IDs in sound/pci/hda/hda_intel.c (Andy)
 - Commit message wording (Andy)
 - Remove unnecessary tabs (Andy)

Amadeusz Sławiński (13):
  PCI: Sort Intel PCI IDs by number
  PCI: Add Intel Audio DSP devices to pci_ids.h
  ALSA: hda: Add controller matching macros
  ALSA: hda: Use global PCI match macro
  ALSA: hda/i915:  Use global PCI match macro
  ASoC: Intel: Skylake: Use global PCI match macro
  ALSA: intel-dsp-config: Convert to PCI device IDs defines
  ALSA: hda: Convert to PCI device IDs defines
  ASoC: Intel: avs: Convert to PCI device IDs defines
  ASoC: Intel: avs: Convert to PCI device IDs defines
  ASoC: Intel: Skylake: Convert to PCI device IDs defines
  ASoC: SOF: Intel: Convert to PCI device IDs defines
  ASoC: Intel: sst: Convert to PCI device IDs defines

 include/linux/pci_ids.h                | 104 +++++--
 include/sound/hda_codec.h              |   3 -
 include/sound/hdaudio.h                |  27 ++
 sound/hda/hdac_i915.c                  |   7 +-
 sound/hda/intel-dsp-config.c           | 119 ++++----
 sound/pci/hda/hda_intel.c              | 373 ++++++++++---------------
 sound/soc/intel/atom/sst/sst.c         |   3 +-
 sound/soc/intel/atom/sst/sst.h         |   1 -
 sound/soc/intel/atom/sst/sst_pci.c     |   4 +-
 sound/soc/intel/avs/board_selection.c  |  10 +-
 sound/soc/intel/avs/core.c             |  16 +-
 sound/soc/intel/skylake/skl-messages.c |  16 +-
 sound/soc/intel/skylake/skl-pcm.c      |   3 +-
 sound/soc/intel/skylake/skl.c          |  36 +--
 sound/soc/sof/intel/pci-apl.c          |   9 +-
 sound/soc/sof/intel/pci-cnl.c          |  15 +-
 sound/soc/sof/intel/pci-icl.c          |  12 +-
 sound/soc/sof/intel/pci-mtl.c          |   3 +-
 sound/soc/sof/intel/pci-skl.c          |   6 +-
 sound/soc/sof/intel/pci-tgl.c          |  45 +--
 sound/soc/sof/intel/pci-tng.c          |   3 +-
 21 files changed, 384 insertions(+), 431 deletions(-)

-- 
2.34.1

[PATCH 01/13] PCI: Sort Intel PCI IDs by number

[Amadeusz Sławiński]

Some of the PCI IDs are not sorted correctly, reorder them by growing ID
number.

Signed-off-by: Amadeusz Sławiński <amadeuszx.slawinski@linux.intel.com>
---
 include/linux/pci_ids.h | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index 2dc75df1437f..add7fb6bd844 100644
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -2677,8 +2677,6 @@
 #define PCI_DEVICE_ID_INTEL_82815_MC	0x1130
 #define PCI_DEVICE_ID_INTEL_82815_CGC	0x1132
 #define PCI_DEVICE_ID_INTEL_82092AA_0	0x1221
-#define PCI_DEVICE_ID_INTEL_7505_0	0x2550
-#define PCI_DEVICE_ID_INTEL_7205_0	0x255d
 #define PCI_DEVICE_ID_INTEL_82437	0x122d
 #define PCI_DEVICE_ID_INTEL_82371FB_0	0x122e
 #define PCI_DEVICE_ID_INTEL_82371FB_1	0x1230
@@ -2772,6 +2770,8 @@
 #define PCI_DEVICE_ID_INTEL_82850_HB	0x2530
 #define PCI_DEVICE_ID_INTEL_82860_HB	0x2531
 #define PCI_DEVICE_ID_INTEL_E7501_MCH	0x254c
+#define PCI_DEVICE_ID_INTEL_7505_0	0x2550
+#define PCI_DEVICE_ID_INTEL_7205_0	0x255d
 #define PCI_DEVICE_ID_INTEL_82845G_HB	0x2560
 #define PCI_DEVICE_ID_INTEL_82845G_IG	0x2562
 #define PCI_DEVICE_ID_INTEL_82865_HB	0x2570
@@ -2806,9 +2806,9 @@
 #define PCI_DEVICE_ID_INTEL_3000_HB	0x2778
 #define PCI_DEVICE_ID_INTEL_82945GM_HB	0x27a0
 #define PCI_DEVICE_ID_INTEL_82945GM_IG	0x27a2
+#define PCI_DEVICE_ID_INTEL_ICH7_30	0x27b0
 #define PCI_DEVICE_ID_INTEL_ICH7_0	0x27b8
 #define PCI_DEVICE_ID_INTEL_ICH7_1	0x27b9
-#define PCI_DEVICE_ID_INTEL_ICH7_30	0x27b0
 #define PCI_DEVICE_ID_INTEL_TGP_LPC	0x27bc
 #define PCI_DEVICE_ID_INTEL_ICH7_31	0x27bd
 #define PCI_DEVICE_ID_INTEL_ICH7_17	0x27da
@@ -2824,14 +2824,14 @@
 #define PCI_DEVICE_ID_INTEL_ICH8_6	0x2850
 #define PCI_DEVICE_ID_INTEL_VMD_28C0	0x28c0
 #define PCI_DEVICE_ID_INTEL_ICH9_0	0x2910
-#define PCI_DEVICE_ID_INTEL_ICH9_1	0x2917
 #define PCI_DEVICE_ID_INTEL_ICH9_2	0x2912
 #define PCI_DEVICE_ID_INTEL_ICH9_3	0x2913
 #define PCI_DEVICE_ID_INTEL_ICH9_4	0x2914
-#define PCI_DEVICE_ID_INTEL_ICH9_5	0x2919
-#define PCI_DEVICE_ID_INTEL_ICH9_6	0x2930
 #define PCI_DEVICE_ID_INTEL_ICH9_7	0x2916
+#define PCI_DEVICE_ID_INTEL_ICH9_1	0x2917
 #define PCI_DEVICE_ID_INTEL_ICH9_8	0x2918
+#define PCI_DEVICE_ID_INTEL_ICH9_5	0x2919
+#define PCI_DEVICE_ID_INTEL_ICH9_6	0x2930
 #define PCI_DEVICE_ID_INTEL_I7_MCR	0x2c18
 #define PCI_DEVICE_ID_INTEL_I7_MC_TAD	0x2c19
 #define PCI_DEVICE_ID_INTEL_I7_MC_RAS	0x2c1a
@@ -2848,8 +2848,8 @@
 #define PCI_DEVICE_ID_INTEL_I7_MC_CH2_ADDR  0x2c31
 #define PCI_DEVICE_ID_INTEL_I7_MC_CH2_RANK  0x2c32
 #define PCI_DEVICE_ID_INTEL_I7_MC_CH2_TC    0x2c33
-#define PCI_DEVICE_ID_INTEL_I7_NONCORE	0x2c41
 #define PCI_DEVICE_ID_INTEL_I7_NONCORE_ALT 0x2c40
+#define PCI_DEVICE_ID_INTEL_I7_NONCORE	0x2c41
 #define PCI_DEVICE_ID_INTEL_LYNNFIELD_NONCORE     0x2c50
 #define PCI_DEVICE_ID_INTEL_LYNNFIELD_NONCORE_ALT 0x2c51
 #define PCI_DEVICE_ID_INTEL_LYNNFIELD_NONCORE_REV2 0x2c70
@@ -2895,10 +2895,10 @@
 #define PCI_DEVICE_ID_INTEL_IOAT_TBG3	0x3433
 #define PCI_DEVICE_ID_INTEL_82830_HB	0x3575
 #define PCI_DEVICE_ID_INTEL_82830_CGC	0x3577
-#define PCI_DEVICE_ID_INTEL_82854_HB	0x358c
-#define PCI_DEVICE_ID_INTEL_82854_IG	0x358e
 #define PCI_DEVICE_ID_INTEL_82855GM_HB	0x3580
 #define PCI_DEVICE_ID_INTEL_82855GM_IG	0x3582
+#define PCI_DEVICE_ID_INTEL_82854_HB	0x358c
+#define PCI_DEVICE_ID_INTEL_82854_IG	0x358e
 #define PCI_DEVICE_ID_INTEL_E7520_MCH	0x3590
 #define PCI_DEVICE_ID_INTEL_E7320_MCH	0x3592
 #define PCI_DEVICE_ID_INTEL_MCH_PA	0x3595
@@ -2908,11 +2908,11 @@
 #define PCI_DEVICE_ID_INTEL_MCH_PC	0x3599
 #define PCI_DEVICE_ID_INTEL_MCH_PC1	0x359a
 #define PCI_DEVICE_ID_INTEL_E7525_MCH	0x359e
+#define PCI_DEVICE_ID_INTEL_IOAT_CNB	0x360b
+#define PCI_DEVICE_ID_INTEL_FBD_CNB	0x360c
 #define PCI_DEVICE_ID_INTEL_I7300_MCH_ERR 0x360c
 #define PCI_DEVICE_ID_INTEL_I7300_MCH_FB0 0x360f
 #define PCI_DEVICE_ID_INTEL_I7300_MCH_FB1 0x3610
-#define PCI_DEVICE_ID_INTEL_IOAT_CNB	0x360b
-#define PCI_DEVICE_ID_INTEL_FBD_CNB	0x360c
 #define PCI_DEVICE_ID_INTEL_IOAT_JSF0	0x3710
 #define PCI_DEVICE_ID_INTEL_IOAT_JSF1	0x3711
 #define PCI_DEVICE_ID_INTEL_IOAT_JSF2	0x3712
@@ -2943,16 +2943,12 @@
 #define PCI_DEVICE_ID_INTEL_IOAT_SNB7	0x3c27
 #define PCI_DEVICE_ID_INTEL_IOAT_SNB8	0x3c2e
 #define PCI_DEVICE_ID_INTEL_IOAT_SNB9	0x3c2f
-#define PCI_DEVICE_ID_INTEL_UNC_HA	0x3c46
-#define PCI_DEVICE_ID_INTEL_UNC_IMC0	0x3cb0
-#define PCI_DEVICE_ID_INTEL_UNC_IMC1	0x3cb1
-#define PCI_DEVICE_ID_INTEL_UNC_IMC2	0x3cb4
-#define PCI_DEVICE_ID_INTEL_UNC_IMC3	0x3cb5
 #define PCI_DEVICE_ID_INTEL_UNC_QPI0	0x3c41
 #define PCI_DEVICE_ID_INTEL_UNC_QPI1	0x3c42
 #define PCI_DEVICE_ID_INTEL_UNC_R2PCIE	0x3c43
 #define PCI_DEVICE_ID_INTEL_UNC_R3QPI0	0x3c44
 #define PCI_DEVICE_ID_INTEL_UNC_R3QPI1	0x3c45
+#define PCI_DEVICE_ID_INTEL_UNC_HA	0x3c46
 #define PCI_DEVICE_ID_INTEL_SBRIDGE_IMC_RAS	0x3c71	/* 15.1 */
 #define PCI_DEVICE_ID_INTEL_SBRIDGE_IMC_ERR0	0x3c72	/* 16.2 */
 #define PCI_DEVICE_ID_INTEL_SBRIDGE_IMC_ERR1	0x3c73	/* 16.3 */
@@ -2964,6 +2960,10 @@
 #define PCI_DEVICE_ID_INTEL_SBRIDGE_IMC_TAD1	0x3cab	/* 15.3 */
 #define PCI_DEVICE_ID_INTEL_SBRIDGE_IMC_TAD2	0x3cac	/* 15.4 */
 #define PCI_DEVICE_ID_INTEL_SBRIDGE_IMC_TAD3	0x3cad	/* 15.5 */
+#define PCI_DEVICE_ID_INTEL_UNC_IMC0	0x3cb0
+#define PCI_DEVICE_ID_INTEL_UNC_IMC1	0x3cb1
+#define PCI_DEVICE_ID_INTEL_UNC_IMC2	0x3cb4
+#define PCI_DEVICE_ID_INTEL_UNC_IMC3	0x3cb5
 #define PCI_DEVICE_ID_INTEL_SBRIDGE_IMC_DDRIO	0x3cb8	/* 17.0 */
 #define PCI_DEVICE_ID_INTEL_JAKETOWN_UBOX	0x3ce0
 #define PCI_DEVICE_ID_INTEL_SBRIDGE_SAD0	0x3cf4	/* 12.6 */
-- 
2.34.1

Re: [PATCH 01/13] PCI: Sort Intel PCI IDs by number

[Andy Shevchenko]

On Tue, Jul 11, 2023 at 02:57:14PM +0200, Amadeusz Sławiński wrote:
> Some of the PCI IDs are not sorted correctly, reorder them by growing ID
> number.

Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>

> Signed-off-by: Amadeusz Sławiński <amadeuszx.slawinski@linux.intel.com>
> ---
>  include/linux/pci_ids.h | 32 ++++++++++++++++----------------
>  1 file changed, 16 insertions(+), 16 deletions(-)
> 
> diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
> index 2dc75df1437f..add7fb6bd844 100644
> --- a/include/linux/pci_ids.h
> +++ b/include/linux/pci_ids.h
> @@ -2677,8 +2677,6 @@
>  #define PCI_DEVICE_ID_INTEL_82815_MC	0x1130
>  #define PCI_DEVICE_ID_INTEL_82815_CGC	0x1132
>  #define PCI_DEVICE_ID_INTEL_82092AA_0	0x1221
> -#define PCI_DEVICE_ID_INTEL_7505_0	0x2550
> -#define PCI_DEVICE_ID_INTEL_7205_0	0x255d
>  #define PCI_DEVICE_ID_INTEL_82437	0x122d
>  #define PCI_DEVICE_ID_INTEL_82371FB_0	0x122e
>  #define PCI_DEVICE_ID_INTEL_82371FB_1	0x1230
> @@ -2772,6 +2770,8 @@
>  #define PCI_DEVICE_ID_INTEL_82850_HB	0x2530
>  #define PCI_DEVICE_ID_INTEL_82860_HB	0x2531
>  #define PCI_DEVICE_ID_INTEL_E7501_MCH	0x254c
> +#define PCI_DEVICE_ID_INTEL_7505_0	0x2550
> +#define PCI_DEVICE_ID_INTEL_7205_0	0x255d
>  #define PCI_DEVICE_ID_INTEL_82845G_HB	0x2560
>  #define PCI_DEVICE_ID_INTEL_82845G_IG	0x2562
>  #define PCI_DEVICE_ID_INTEL_82865_HB	0x2570
> @@ -2806,9 +2806,9 @@
>  #define PCI_DEVICE_ID_INTEL_3000_HB	0x2778
>  #define PCI_DEVICE_ID_INTEL_82945GM_HB	0x27a0
>  #define PCI_DEVICE_ID_INTEL_82945GM_IG	0x27a2
> +#define PCI_DEVICE_ID_INTEL_ICH7_30	0x27b0
>  #define PCI_DEVICE_ID_INTEL_ICH7_0	0x27b8
>  #define PCI_DEVICE_ID_INTEL_ICH7_1	0x27b9
> -#define PCI_DEVICE_ID_INTEL_ICH7_30	0x27b0
>  #define PCI_DEVICE_ID_INTEL_TGP_LPC	0x27bc
>  #define PCI_DEVICE_ID_INTEL_ICH7_31	0x27bd
>  #define PCI_DEVICE_ID_INTEL_ICH7_17	0x27da
> @@ -2824,14 +2824,14 @@
>  #define PCI_DEVICE_ID_INTEL_ICH8_6	0x2850
>  #define PCI_DEVICE_ID_INTEL_VMD_28C0	0x28c0
>  #define PCI_DEVICE_ID_INTEL_ICH9_0	0x2910
> -#define PCI_DEVICE_ID_INTEL_ICH9_1	0x2917
>  #define PCI_DEVICE_ID_INTEL_ICH9_2	0x2912
>  #define PCI_DEVICE_ID_INTEL_ICH9_3	0x2913
>  #define PCI_DEVICE_ID_INTEL_ICH9_4	0x2914
> -#define PCI_DEVICE_ID_INTEL_ICH9_5	0x2919
> -#define PCI_DEVICE_ID_INTEL_ICH9_6	0x2930
>  #define PCI_DEVICE_ID_INTEL_ICH9_7	0x2916
> +#define PCI_DEVICE_ID_INTEL_ICH9_1	0x2917
>  #define PCI_DEVICE_ID_INTEL_ICH9_8	0x2918
> +#define PCI_DEVICE_ID_INTEL_ICH9_5	0x2919
> +#define PCI_DEVICE_ID_INTEL_ICH9_6	0x2930
>  #define PCI_DEVICE_ID_INTEL_I7_MCR	0x2c18
>  #define PCI_DEVICE_ID_INTEL_I7_MC_TAD	0x2c19
>  #define PCI_DEVICE_ID_INTEL_I7_MC_RAS	0x2c1a
> @@ -2848,8 +2848,8 @@
>  #define PCI_DEVICE_ID_INTEL_I7_MC_CH2_ADDR  0x2c31
>  #define PCI_DEVICE_ID_INTEL_I7_MC_CH2_RANK  0x2c32
>  #define PCI_DEVICE_ID_INTEL_I7_MC_CH2_TC    0x2c33
> -#define PCI_DEVICE_ID_INTEL_I7_NONCORE	0x2c41
>  #define PCI_DEVICE_ID_INTEL_I7_NONCORE_ALT 0x2c40
> +#define PCI_DEVICE_ID_INTEL_I7_NONCORE	0x2c41
>  #define PCI_DEVICE_ID_INTEL_LYNNFIELD_NONCORE     0x2c50
>  #define PCI_DEVICE_ID_INTEL_LYNNFIELD_NONCORE_ALT 0x2c51
>  #define PCI_DEVICE_ID_INTEL_LYNNFIELD_NONCORE_REV2 0x2c70
> @@ -2895,10 +2895,10 @@
>  #define PCI_DEVICE_ID_INTEL_IOAT_TBG3	0x3433
>  #define PCI_DEVICE_ID_INTEL_82830_HB	0x3575
>  #define PCI_DEVICE_ID_INTEL_82830_CGC	0x3577
> -#define PCI_DEVICE_ID_INTEL_82854_HB	0x358c
> -#define PCI_DEVICE_ID_INTEL_82854_IG	0x358e
>  #define PCI_DEVICE_ID_INTEL_82855GM_HB	0x3580
>  #define PCI_DEVICE_ID_INTEL_82855GM_IG	0x3582
> +#define PCI_DEVICE_ID_INTEL_82854_HB	0x358c
> +#define PCI_DEVICE_ID_INTEL_82854_IG	0x358e
>  #define PCI_DEVICE_ID_INTEL_E7520_MCH	0x3590
>  #define PCI_DEVICE_ID_INTEL_E7320_MCH	0x3592
>  #define PCI_DEVICE_ID_INTEL_MCH_PA	0x3595
> @@ -2908,11 +2908,11 @@
>  #define PCI_DEVICE_ID_INTEL_MCH_PC	0x3599
>  #define PCI_DEVICE_ID_INTEL_MCH_PC1	0x359a
>  #define PCI_DEVICE_ID_INTEL_E7525_MCH	0x359e
> +#define PCI_DEVICE_ID_INTEL_IOAT_CNB	0x360b
> +#define PCI_DEVICE_ID_INTEL_FBD_CNB	0x360c
>  #define PCI_DEVICE_ID_INTEL_I7300_MCH_ERR 0x360c
>  #define PCI_DEVICE_ID_INTEL_I7300_MCH_FB0 0x360f
>  #define PCI_DEVICE_ID_INTEL_I7300_MCH_FB1 0x3610
> -#define PCI_DEVICE_ID_INTEL_IOAT_CNB	0x360b
> -#define PCI_DEVICE_ID_INTEL_FBD_CNB	0x360c
>  #define PCI_DEVICE_ID_INTEL_IOAT_JSF0	0x3710
>  #define PCI_DEVICE_ID_INTEL_IOAT_JSF1	0x3711
>  #define PCI_DEVICE_ID_INTEL_IOAT_JSF2	0x3712
> @@ -2943,16 +2943,12 @@
>  #define PCI_DEVICE_ID_INTEL_IOAT_SNB7	0x3c27
>  #define PCI_DEVICE_ID_INTEL_IOAT_SNB8	0x3c2e
>  #define PCI_DEVICE_ID_INTEL_IOAT_SNB9	0x3c2f
> -#define PCI_DEVICE_ID_INTEL_UNC_HA	0x3c46
> -#define PCI_DEVICE_ID_INTEL_UNC_IMC0	0x3cb0
> -#define PCI_DEVICE_ID_INTEL_UNC_IMC1	0x3cb1
> -#define PCI_DEVICE_ID_INTEL_UNC_IMC2	0x3cb4
> -#define PCI_DEVICE_ID_INTEL_UNC_IMC3	0x3cb5
>  #define PCI_DEVICE_ID_INTEL_UNC_QPI0	0x3c41
>  #define PCI_DEVICE_ID_INTEL_UNC_QPI1	0x3c42
>  #define PCI_DEVICE_ID_INTEL_UNC_R2PCIE	0x3c43
>  #define PCI_DEVICE_ID_INTEL_UNC_R3QPI0	0x3c44
>  #define PCI_DEVICE_ID_INTEL_UNC_R3QPI1	0x3c45
> +#define PCI_DEVICE_ID_INTEL_UNC_HA	0x3c46
>  #define PCI_DEVICE_ID_INTEL_SBRIDGE_IMC_RAS	0x3c71	/* 15.1 */
>  #define PCI_DEVICE_ID_INTEL_SBRIDGE_IMC_ERR0	0x3c72	/* 16.2 */
>  #define PCI_DEVICE_ID_INTEL_SBRIDGE_IMC_ERR1	0x3c73	/* 16.3 */
> @@ -2964,6 +2960,10 @@
>  #define PCI_DEVICE_ID_INTEL_SBRIDGE_IMC_TAD1	0x3cab	/* 15.3 */
>  #define PCI_DEVICE_ID_INTEL_SBRIDGE_IMC_TAD2	0x3cac	/* 15.4 */
>  #define PCI_DEVICE_ID_INTEL_SBRIDGE_IMC_TAD3	0x3cad	/* 15.5 */
> +#define PCI_DEVICE_ID_INTEL_UNC_IMC0	0x3cb0
> +#define PCI_DEVICE_ID_INTEL_UNC_IMC1	0x3cb1
> +#define PCI_DEVICE_ID_INTEL_UNC_IMC2	0x3cb4
> +#define PCI_DEVICE_ID_INTEL_UNC_IMC3	0x3cb5
>  #define PCI_DEVICE_ID_INTEL_SBRIDGE_IMC_DDRIO	0x3cb8	/* 17.0 */
>  #define PCI_DEVICE_ID_INTEL_JAKETOWN_UBOX	0x3ce0
>  #define PCI_DEVICE_ID_INTEL_SBRIDGE_SAD0	0x3cf4	/* 12.6 */
> -- 
> 2.34.1
> 

-- 
With Best Regards,
Andy Shevchenko

Re: [PATCH 01/13] PCI: Sort Intel PCI IDs by number

[Bjorn Helgaas]

On Tue, Jul 11, 2023 at 02:57:14PM +0200, Amadeusz Sławiński wrote:
> Some of the PCI IDs are not sorted correctly, reorder them by growing ID
> number.
> 
> Signed-off-by: Amadeusz Sławiński <amadeuszx.slawinski@linux.intel.com>

Acked-by: Bjorn Helgaas <bhelgaas@google.com>

> ---
>  include/linux/pci_ids.h | 32 ++++++++++++++++----------------
>  1 file changed, 16 insertions(+), 16 deletions(-)
> 
> diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
> index 2dc75df1437f..add7fb6bd844 100644
> --- a/include/linux/pci_ids.h
> +++ b/include/linux/pci_ids.h
> @@ -2677,8 +2677,6 @@
>  #define PCI_DEVICE_ID_INTEL_82815_MC	0x1130
>  #define PCI_DEVICE_ID_INTEL_82815_CGC	0x1132
>  #define PCI_DEVICE_ID_INTEL_82092AA_0	0x1221
> -#define PCI_DEVICE_ID_INTEL_7505_0	0x2550
> -#define PCI_DEVICE_ID_INTEL_7205_0	0x255d
>  #define PCI_DEVICE_ID_INTEL_82437	0x122d
>  #define PCI_DEVICE_ID_INTEL_82371FB_0	0x122e
>  #define PCI_DEVICE_ID_INTEL_82371FB_1	0x1230
> @@ -2772,6 +2770,8 @@
>  #define PCI_DEVICE_ID_INTEL_82850_HB	0x2530
>  #define PCI_DEVICE_ID_INTEL_82860_HB	0x2531
>  #define PCI_DEVICE_ID_INTEL_E7501_MCH	0x254c
> +#define PCI_DEVICE_ID_INTEL_7505_0	0x2550
> +#define PCI_DEVICE_ID_INTEL_7205_0	0x255d
>  #define PCI_DEVICE_ID_INTEL_82845G_HB	0x2560
>  #define PCI_DEVICE_ID_INTEL_82845G_IG	0x2562
>  #define PCI_DEVICE_ID_INTEL_82865_HB	0x2570
> @@ -2806,9 +2806,9 @@
>  #define PCI_DEVICE_ID_INTEL_3000_HB	0x2778
>  #define PCI_DEVICE_ID_INTEL_82945GM_HB	0x27a0
>  #define PCI_DEVICE_ID_INTEL_82945GM_IG	0x27a2
> +#define PCI_DEVICE_ID_INTEL_ICH7_30	0x27b0
>  #define PCI_DEVICE_ID_INTEL_ICH7_0	0x27b8
>  #define PCI_DEVICE_ID_INTEL_ICH7_1	0x27b9
> -#define PCI_DEVICE_ID_INTEL_ICH7_30	0x27b0
>  #define PCI_DEVICE_ID_INTEL_TGP_LPC	0x27bc
>  #define PCI_DEVICE_ID_INTEL_ICH7_31	0x27bd
>  #define PCI_DEVICE_ID_INTEL_ICH7_17	0x27da
> @@ -2824,14 +2824,14 @@
>  #define PCI_DEVICE_ID_INTEL_ICH8_6	0x2850
>  #define PCI_DEVICE_ID_INTEL_VMD_28C0	0x28c0
>  #define PCI_DEVICE_ID_INTEL_ICH9_0	0x2910
> -#define PCI_DEVICE_ID_INTEL_ICH9_1	0x2917
>  #define PCI_DEVICE_ID_INTEL_ICH9_2	0x2912
>  #define PCI_DEVICE_ID_INTEL_ICH9_3	0x2913
>  #define PCI_DEVICE_ID_INTEL_ICH9_4	0x2914
> -#define PCI_DEVICE_ID_INTEL_ICH9_5	0x2919
> -#define PCI_DEVICE_ID_INTEL_ICH9_6	0x2930
>  #define PCI_DEVICE_ID_INTEL_ICH9_7	0x2916
> +#define PCI_DEVICE_ID_INTEL_ICH9_1	0x2917
>  #define PCI_DEVICE_ID_INTEL_ICH9_8	0x2918
> +#define PCI_DEVICE_ID_INTEL_ICH9_5	0x2919
> +#define PCI_DEVICE_ID_INTEL_ICH9_6	0x2930
>  #define PCI_DEVICE_ID_INTEL_I7_MCR	0x2c18
>  #define PCI_DEVICE_ID_INTEL_I7_MC_TAD	0x2c19
>  #define PCI_DEVICE_ID_INTEL_I7_MC_RAS	0x2c1a
> @@ -2848,8 +2848,8 @@
>  #define PCI_DEVICE_ID_INTEL_I7_MC_CH2_ADDR  0x2c31
>  #define PCI_DEVICE_ID_INTEL_I7_MC_CH2_RANK  0x2c32
>  #define PCI_DEVICE_ID_INTEL_I7_MC_CH2_TC    0x2c33
> -#define PCI_DEVICE_ID_INTEL_I7_NONCORE	0x2c41
>  #define PCI_DEVICE_ID_INTEL_I7_NONCORE_ALT 0x2c40
> +#define PCI_DEVICE_ID_INTEL_I7_NONCORE	0x2c41
>  #define PCI_DEVICE_ID_INTEL_LYNNFIELD_NONCORE     0x2c50
>  #define PCI_DEVICE_ID_INTEL_LYNNFIELD_NONCORE_ALT 0x2c51
>  #define PCI_DEVICE_ID_INTEL_LYNNFIELD_NONCORE_REV2 0x2c70
> @@ -2895,10 +2895,10 @@
>  #define PCI_DEVICE_ID_INTEL_IOAT_TBG3	0x3433
>  #define PCI_DEVICE_ID_INTEL_82830_HB	0x3575
>  #define PCI_DEVICE_ID_INTEL_82830_CGC	0x3577
> -#define PCI_DEVICE_ID_INTEL_82854_HB	0x358c
> -#define PCI_DEVICE_ID_INTEL_82854_IG	0x358e
>  #define PCI_DEVICE_ID_INTEL_82855GM_HB	0x3580
>  #define PCI_DEVICE_ID_INTEL_82855GM_IG	0x3582
> +#define PCI_DEVICE_ID_INTEL_82854_HB	0x358c
> +#define PCI_DEVICE_ID_INTEL_82854_IG	0x358e
>  #define PCI_DEVICE_ID_INTEL_E7520_MCH	0x3590
>  #define PCI_DEVICE_ID_INTEL_E7320_MCH	0x3592
>  #define PCI_DEVICE_ID_INTEL_MCH_PA	0x3595
> @@ -2908,11 +2908,11 @@
>  #define PCI_DEVICE_ID_INTEL_MCH_PC	0x3599
>  #define PCI_DEVICE_ID_INTEL_MCH_PC1	0x359a
>  #define PCI_DEVICE_ID_INTEL_E7525_MCH	0x359e
> +#define PCI_DEVICE_ID_INTEL_IOAT_CNB	0x360b
> +#define PCI_DEVICE_ID_INTEL_FBD_CNB	0x360c
>  #define PCI_DEVICE_ID_INTEL_I7300_MCH_ERR 0x360c
>  #define PCI_DEVICE_ID_INTEL_I7300_MCH_FB0 0x360f
>  #define PCI_DEVICE_ID_INTEL_I7300_MCH_FB1 0x3610
> -#define PCI_DEVICE_ID_INTEL_IOAT_CNB	0x360b
> -#define PCI_DEVICE_ID_INTEL_FBD_CNB	0x360c
>  #define PCI_DEVICE_ID_INTEL_IOAT_JSF0	0x3710
>  #define PCI_DEVICE_ID_INTEL_IOAT_JSF1	0x3711
>  #define PCI_DEVICE_ID_INTEL_IOAT_JSF2	0x3712
> @@ -2943,16 +2943,12 @@
>  #define PCI_DEVICE_ID_INTEL_IOAT_SNB7	0x3c27
>  #define PCI_DEVICE_ID_INTEL_IOAT_SNB8	0x3c2e
>  #define PCI_DEVICE_ID_INTEL_IOAT_SNB9	0x3c2f
> -#define PCI_DEVICE_ID_INTEL_UNC_HA	0x3c46
> -#define PCI_DEVICE_ID_INTEL_UNC_IMC0	0x3cb0
> -#define PCI_DEVICE_ID_INTEL_UNC_IMC1	0x3cb1
> -#define PCI_DEVICE_ID_INTEL_UNC_IMC2	0x3cb4
> -#define PCI_DEVICE_ID_INTEL_UNC_IMC3	0x3cb5
>  #define PCI_DEVICE_ID_INTEL_UNC_QPI0	0x3c41
>  #define PCI_DEVICE_ID_INTEL_UNC_QPI1	0x3c42
>  #define PCI_DEVICE_ID_INTEL_UNC_R2PCIE	0x3c43
>  #define PCI_DEVICE_ID_INTEL_UNC_R3QPI0	0x3c44
>  #define PCI_DEVICE_ID_INTEL_UNC_R3QPI1	0x3c45
> +#define PCI_DEVICE_ID_INTEL_UNC_HA	0x3c46
>  #define PCI_DEVICE_ID_INTEL_SBRIDGE_IMC_RAS	0x3c71	/* 15.1 */
>  #define PCI_DEVICE_ID_INTEL_SBRIDGE_IMC_ERR0	0x3c72	/* 16.2 */
>  #define PCI_DEVICE_ID_INTEL_SBRIDGE_IMC_ERR1	0x3c73	/* 16.3 */
> @@ -2964,6 +2960,10 @@
>  #define PCI_DEVICE_ID_INTEL_SBRIDGE_IMC_TAD1	0x3cab	/* 15.3 */
>  #define PCI_DEVICE_ID_INTEL_SBRIDGE_IMC_TAD2	0x3cac	/* 15.4 */
>  #define PCI_DEVICE_ID_INTEL_SBRIDGE_IMC_TAD3	0x3cad	/* 15.5 */
> +#define PCI_DEVICE_ID_INTEL_UNC_IMC0	0x3cb0
> +#define PCI_DEVICE_ID_INTEL_UNC_IMC1	0x3cb1
> +#define PCI_DEVICE_ID_INTEL_UNC_IMC2	0x3cb4
> +#define PCI_DEVICE_ID_INTEL_UNC_IMC3	0x3cb5
>  #define PCI_DEVICE_ID_INTEL_SBRIDGE_IMC_DDRIO	0x3cb8	/* 17.0 */
>  #define PCI_DEVICE_ID_INTEL_JAKETOWN_UBOX	0x3ce0
>  #define PCI_DEVICE_ID_INTEL_SBRIDGE_SAD0	0x3cf4	/* 12.6 */
> -- 
> 2.34.1
> 

[PATCH 02/13] PCI: Add Intel Audio DSP devices to pci_ids.h

[Amadeusz Sławiński]

Those IDs are mostly sprinkled between HDA, Skylake, SOF and avs drivers.
Almost every use contains additional comments to identify to which
platform those IDs refer to. Add those IDs to pci_ids.h header, so that
there is one place which defines those names.

Acked-by: Mark Brown <broonie@kernel.org>
Acked-by: Bjorn Helgaas <bhelgaas@google.com>
Signed-off-by: Amadeusz Sławiński <amadeuszx.slawinski@linux.intel.com>
---
 include/linux/pci_ids.h | 72 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 72 insertions(+)

diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index add7fb6bd844..76e686a94c64 100644
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -2644,6 +2644,7 @@
 
 #define PCI_VENDOR_ID_INTEL		0x8086
 #define PCI_DEVICE_ID_INTEL_EESSC	0x0008
+#define PCI_DEVICE_ID_INTEL_HDA_CML_LP	0x02c8
 #define PCI_DEVICE_ID_INTEL_PXHD_0	0x0320
 #define PCI_DEVICE_ID_INTEL_PXHD_1	0x0321
 #define PCI_DEVICE_ID_INTEL_PXH_0	0x0329
@@ -2659,8 +2660,10 @@
 #define PCI_DEVICE_ID_INTEL_82424	0x0483
 #define PCI_DEVICE_ID_INTEL_82378	0x0484
 #define PCI_DEVICE_ID_INTEL_82425	0x0486
+#define PCI_DEVICE_ID_INTEL_HDA_CML_H	0x06c8
 #define PCI_DEVICE_ID_INTEL_MRST_SD0	0x0807
 #define PCI_DEVICE_ID_INTEL_MRST_SD1	0x0808
+#define PCI_DEVICE_ID_INTEL_HDA_OAKTRAIL	0x080a
 #define PCI_DEVICE_ID_INTEL_MFD_SD	0x0820
 #define PCI_DEVICE_ID_INTEL_MFD_SDIO1	0x0821
 #define PCI_DEVICE_ID_INTEL_MFD_SDIO2	0x0822
@@ -2670,12 +2673,17 @@
 #define PCI_DEVICE_ID_INTEL_QUARK_X1000_ILB	0x095e
 #define PCI_DEVICE_ID_INTEL_I960	0x0960
 #define PCI_DEVICE_ID_INTEL_I960RM	0x0962
+#define PCI_DEVICE_ID_INTEL_HDA_HSW_0	0x0a0c
+#define PCI_DEVICE_ID_INTEL_HDA_HSW_2	0x0c0c
 #define PCI_DEVICE_ID_INTEL_CENTERTON_ILB	0x0c60
+#define PCI_DEVICE_ID_INTEL_HDA_HSW_3	0x0d0c
+#define PCI_DEVICE_ID_INTEL_HDA_BYT	0x0f04
 #define PCI_DEVICE_ID_INTEL_8257X_SOL	0x1062
 #define PCI_DEVICE_ID_INTEL_82573E_SOL	0x1085
 #define PCI_DEVICE_ID_INTEL_82573L_SOL	0x108f
 #define PCI_DEVICE_ID_INTEL_82815_MC	0x1130
 #define PCI_DEVICE_ID_INTEL_82815_CGC	0x1132
+#define PCI_DEVICE_ID_INTEL_ADSP_TNG	0x119a
 #define PCI_DEVICE_ID_INTEL_82092AA_0	0x1221
 #define PCI_DEVICE_ID_INTEL_82437	0x122d
 #define PCI_DEVICE_ID_INTEL_82371FB_0	0x122e
@@ -2702,20 +2710,26 @@
 #define PCI_DEVICE_ID_INTEL_ALPINE_RIDGE_2C_BRIDGE  0x1576
 #define PCI_DEVICE_ID_INTEL_ALPINE_RIDGE_4C_NHI     0x1577
 #define PCI_DEVICE_ID_INTEL_ALPINE_RIDGE_4C_BRIDGE  0x1578
+#define PCI_DEVICE_ID_INTEL_HDA_BDW	0x160c
 #define PCI_DEVICE_ID_INTEL_80960_RP	0x1960
 #define PCI_DEVICE_ID_INTEL_QAT_C3XXX	0x19e2
 #define PCI_DEVICE_ID_INTEL_QAT_C3XXX_VF	0x19e3
 #define PCI_DEVICE_ID_INTEL_82840_HB	0x1a21
 #define PCI_DEVICE_ID_INTEL_82845_HB	0x1a30
 #define PCI_DEVICE_ID_INTEL_IOAT	0x1a38
+#define PCI_DEVICE_ID_INTEL_HDA_APL_T	0x1a98
+#define PCI_DEVICE_ID_INTEL_HDA_CPT	0x1c20
 #define PCI_DEVICE_ID_INTEL_COUGARPOINT_LPC_MIN	0x1c41
 #define PCI_DEVICE_ID_INTEL_COUGARPOINT_LPC_MAX	0x1c5f
+#define PCI_DEVICE_ID_INTEL_HDA_PBG	0x1d20
 #define PCI_DEVICE_ID_INTEL_PATSBURG_LPC_0	0x1d40
 #define PCI_DEVICE_ID_INTEL_PATSBURG_LPC_1	0x1d41
+#define PCI_DEVICE_ID_INTEL_HDA_PPT	0x1e20
 #define PCI_DEVICE_ID_INTEL_PANTHERPOINT_XHCI	0x1e31
 #define PCI_DEVICE_ID_INTEL_PANTHERPOINT_LPC_MIN	0x1e40
 #define PCI_DEVICE_ID_INTEL_PANTHERPOINT_LPC_MAX	0x1e5f
 #define PCI_DEVICE_ID_INTEL_VMD_201D	0x201d
+#define PCI_DEVICE_ID_INTEL_HDA_BSW	0x2284
 #define PCI_DEVICE_ID_INTEL_DH89XXCC_LPC_MIN	0x2310
 #define PCI_DEVICE_ID_INTEL_DH89XXCC_LPC_MAX	0x231f
 #define PCI_DEVICE_ID_INTEL_82801AA_0	0x2410
@@ -2793,12 +2807,14 @@
 #define PCI_DEVICE_ID_INTEL_ICH6_0	0x2640
 #define PCI_DEVICE_ID_INTEL_ICH6_1	0x2641
 #define PCI_DEVICE_ID_INTEL_ICH6_2	0x2642
+#define PCI_DEVICE_ID_INTEL_HDA_ICH6	0x2668
 #define PCI_DEVICE_ID_INTEL_ICH6_16	0x266a
 #define PCI_DEVICE_ID_INTEL_ICH6_17	0x266d
 #define PCI_DEVICE_ID_INTEL_ICH6_18	0x266e
 #define PCI_DEVICE_ID_INTEL_ICH6_19	0x266f
 #define PCI_DEVICE_ID_INTEL_ESB2_0	0x2670
 #define PCI_DEVICE_ID_INTEL_ESB2_14	0x2698
+#define PCI_DEVICE_ID_INTEL_HDA_ESB2	0x269a
 #define PCI_DEVICE_ID_INTEL_ESB2_17	0x269b
 #define PCI_DEVICE_ID_INTEL_ESB2_18	0x269e
 #define PCI_DEVICE_ID_INTEL_82945G_HB	0x2770
@@ -2811,6 +2827,7 @@
 #define PCI_DEVICE_ID_INTEL_ICH7_1	0x27b9
 #define PCI_DEVICE_ID_INTEL_TGP_LPC	0x27bc
 #define PCI_DEVICE_ID_INTEL_ICH7_31	0x27bd
+#define PCI_DEVICE_ID_INTEL_HDA_ICH7	0x27d8
 #define PCI_DEVICE_ID_INTEL_ICH7_17	0x27da
 #define PCI_DEVICE_ID_INTEL_ICH7_19	0x27dd
 #define PCI_DEVICE_ID_INTEL_ICH7_20	0x27de
@@ -2821,6 +2838,7 @@
 #define PCI_DEVICE_ID_INTEL_ICH8_3	0x2814
 #define PCI_DEVICE_ID_INTEL_ICH8_4	0x2815
 #define PCI_DEVICE_ID_INTEL_ICH8_5	0x283e
+#define PCI_DEVICE_ID_INTEL_HDA_ICH8	0x284b
 #define PCI_DEVICE_ID_INTEL_ICH8_6	0x2850
 #define PCI_DEVICE_ID_INTEL_VMD_28C0	0x28c0
 #define PCI_DEVICE_ID_INTEL_ICH9_0	0x2910
@@ -2832,6 +2850,8 @@
 #define PCI_DEVICE_ID_INTEL_ICH9_8	0x2918
 #define PCI_DEVICE_ID_INTEL_ICH9_5	0x2919
 #define PCI_DEVICE_ID_INTEL_ICH9_6	0x2930
+#define PCI_DEVICE_ID_INTEL_HDA_ICH9_0	0x293e
+#define PCI_DEVICE_ID_INTEL_HDA_ICH9_1	0x293f
 #define PCI_DEVICE_ID_INTEL_I7_MCR	0x2c18
 #define PCI_DEVICE_ID_INTEL_I7_MC_TAD	0x2c19
 #define PCI_DEVICE_ID_INTEL_I7_MC_RAS	0x2c1a
@@ -2883,6 +2903,7 @@
 #define PCI_DEVICE_ID_INTEL_LYNNFIELD_MC_CH2_ADDR_REV2  0x2db1
 #define PCI_DEVICE_ID_INTEL_LYNNFIELD_MC_CH2_RANK_REV2  0x2db2
 #define PCI_DEVICE_ID_INTEL_LYNNFIELD_MC_CH2_TC_REV2    0x2db3
+#define PCI_DEVICE_ID_INTEL_HDA_GML	0x3198
 #define PCI_DEVICE_ID_INTEL_82855PM_HB	0x3340
 #define PCI_DEVICE_ID_INTEL_IOAT_TBG4	0x3429
 #define PCI_DEVICE_ID_INTEL_IOAT_TBG5	0x342a
@@ -2893,6 +2914,7 @@
 #define PCI_DEVICE_ID_INTEL_IOAT_TBG1	0x3431
 #define PCI_DEVICE_ID_INTEL_IOAT_TBG2	0x3432
 #define PCI_DEVICE_ID_INTEL_IOAT_TBG3	0x3433
+#define PCI_DEVICE_ID_INTEL_HDA_ICL_LP	0x34c8
 #define PCI_DEVICE_ID_INTEL_82830_HB	0x3575
 #define PCI_DEVICE_ID_INTEL_82830_CGC	0x3577
 #define PCI_DEVICE_ID_INTEL_82855GM_HB	0x3580
@@ -2925,14 +2947,19 @@
 #define PCI_DEVICE_ID_INTEL_IOAT_JSF9	0x3719
 #define PCI_DEVICE_ID_INTEL_QAT_C62X	0x37c8
 #define PCI_DEVICE_ID_INTEL_QAT_C62X_VF	0x37c9
+#define PCI_DEVICE_ID_INTEL_HDA_ICL_N	0x38c8
 #define PCI_DEVICE_ID_INTEL_ICH10_0	0x3a14
 #define PCI_DEVICE_ID_INTEL_ICH10_1	0x3a16
 #define PCI_DEVICE_ID_INTEL_ICH10_2	0x3a18
 #define PCI_DEVICE_ID_INTEL_ICH10_3	0x3a1a
 #define PCI_DEVICE_ID_INTEL_ICH10_4	0x3a30
+#define PCI_DEVICE_ID_INTEL_HDA_ICH10_0	0x3a3e
 #define PCI_DEVICE_ID_INTEL_ICH10_5	0x3a60
+#define PCI_DEVICE_ID_INTEL_HDA_ICH10_1 0x3a6e
 #define PCI_DEVICE_ID_INTEL_5_3400_SERIES_LPC_MIN	0x3b00
 #define PCI_DEVICE_ID_INTEL_5_3400_SERIES_LPC_MAX	0x3b1f
+#define PCI_DEVICE_ID_INTEL_HDA_5_3400_SERIES_0	0x3b56
+#define PCI_DEVICE_ID_INTEL_HDA_5_3400_SERIES_1	0x3b57
 #define PCI_DEVICE_ID_INTEL_IOAT_SNB0	0x3c20
 #define PCI_DEVICE_ID_INTEL_IOAT_SNB1	0x3c21
 #define PCI_DEVICE_ID_INTEL_IOAT_SNB2	0x3c22
@@ -2969,12 +2996,31 @@
 #define PCI_DEVICE_ID_INTEL_SBRIDGE_SAD0	0x3cf4	/* 12.6 */
 #define PCI_DEVICE_ID_INTEL_SBRIDGE_BR		0x3cf5	/* 13.6 */
 #define PCI_DEVICE_ID_INTEL_SBRIDGE_SAD1	0x3cf6	/* 12.7 */
+#define PCI_DEVICE_ID_INTEL_HDA_ICL_H	0x3dc8
 #define PCI_DEVICE_ID_INTEL_IOAT_SNB	0x402f
 #define PCI_DEVICE_ID_INTEL_5400_ERR	0x4030
 #define PCI_DEVICE_ID_INTEL_5400_FBD0	0x4035
 #define PCI_DEVICE_ID_INTEL_5400_FBD1	0x4036
+#define PCI_DEVICE_ID_INTEL_HDA_TGL_H	0x43c8
+#define PCI_DEVICE_ID_INTEL_HDA_DG1	0x490d
+#define PCI_DEVICE_ID_INTEL_HDA_EHL_0	0x4b55
+#define PCI_DEVICE_ID_INTEL_HDA_EHL_3	0x4b58
+#define PCI_DEVICE_ID_INTEL_HDA_JSL_N	0x4dc8
+#define PCI_DEVICE_ID_INTEL_HDA_DG2_0	0x4f90
+#define PCI_DEVICE_ID_INTEL_HDA_DG2_1	0x4f91
+#define PCI_DEVICE_ID_INTEL_HDA_DG2_2	0x4f92
 #define PCI_DEVICE_ID_INTEL_EP80579_0	0x5031
 #define PCI_DEVICE_ID_INTEL_EP80579_1	0x5032
+#define PCI_DEVICE_ID_INTEL_HDA_ADL_P	0x51c8
+#define PCI_DEVICE_ID_INTEL_HDA_ADL_PS	0x51c9
+#define PCI_DEVICE_ID_INTEL_HDA_RPL_P_0	0x51ca
+#define PCI_DEVICE_ID_INTEL_HDA_RPL_P_1	0x51cb
+#define PCI_DEVICE_ID_INTEL_HDA_ADL_M	0x51cc
+#define PCI_DEVICE_ID_INTEL_HDA_ADL_PX	0x51cd
+#define PCI_DEVICE_ID_INTEL_HDA_RPL_M	0x51ce
+#define PCI_DEVICE_ID_INTEL_HDA_RPL_PX	0x51cf
+#define PCI_DEVICE_ID_INTEL_HDA_ADL_N	0x54c8
+#define PCI_DEVICE_ID_INTEL_HDA_APL	0x5a98
 #define PCI_DEVICE_ID_INTEL_5100_16	0x65f0
 #define PCI_DEVICE_ID_INTEL_5100_19	0x65f3
 #define PCI_DEVICE_ID_INTEL_5100_21	0x65f5
@@ -3008,8 +3054,12 @@
 #define PCI_DEVICE_ID_INTEL_82443GX_0	0x71a0
 #define PCI_DEVICE_ID_INTEL_82443GX_2	0x71a2
 #define PCI_DEVICE_ID_INTEL_82372FB_1	0x7601
+#define PCI_DEVICE_ID_INTEL_HDA_RPL_S	0x7a50
+#define PCI_DEVICE_ID_INTEL_HDA_ADL_S	0x7ad0
+#define PCI_DEVICE_ID_INTEL_HDA_MTL	0x7e28
 #define PCI_DEVICE_ID_INTEL_SCH_LPC	0x8119
 #define PCI_DEVICE_ID_INTEL_SCH_IDE	0x811a
+#define PCI_DEVICE_ID_INTEL_HDA_POULSBO	0x811b
 #define PCI_DEVICE_ID_INTEL_E6XX_CU	0x8183
 #define PCI_DEVICE_ID_INTEL_ITC_LPC	0x8186
 #define PCI_DEVICE_ID_INTEL_82454GX	0x84c4
@@ -3018,9 +3068,31 @@
 #define PCI_DEVICE_ID_INTEL_82454NX     0x84cb
 #define PCI_DEVICE_ID_INTEL_84460GX	0x84ea
 #define PCI_DEVICE_ID_INTEL_IXP4XX	0x8500
+#define PCI_DEVICE_ID_INTEL_HDA_LPT	0x8c20
+#define PCI_DEVICE_ID_INTEL_HDA_9_SERIES	0x8ca0
+#define PCI_DEVICE_ID_INTEL_HDA_WBG_0	0x8d20
+#define PCI_DEVICE_ID_INTEL_HDA_WBG_1	0x8d21
 #define PCI_DEVICE_ID_INTEL_IXP2800	0x9004
+#define PCI_DEVICE_ID_INTEL_HDA_LKF	0x98c8
 #define PCI_DEVICE_ID_INTEL_VMD_9A0B	0x9a0b
+#define PCI_DEVICE_ID_INTEL_HDA_LPT_LP_0	0x9c20
+#define PCI_DEVICE_ID_INTEL_HDA_LPT_LP_1	0x9c21
+#define PCI_DEVICE_ID_INTEL_HDA_WPT_LP	0x9ca0
+#define PCI_DEVICE_ID_INTEL_HDA_SKL_LP	0x9d70
+#define PCI_DEVICE_ID_INTEL_HDA_KBL_LP	0x9d71
+#define PCI_DEVICE_ID_INTEL_HDA_CNL_LP	0x9dc8
+#define PCI_DEVICE_ID_INTEL_HDA_TGL_LP	0xa0c8
+#define PCI_DEVICE_ID_INTEL_HDA_SKL	0xa170
+#define PCI_DEVICE_ID_INTEL_HDA_KBL	0xa171
+#define PCI_DEVICE_ID_INTEL_HDA_LBG_0	0xa1f0
+#define PCI_DEVICE_ID_INTEL_HDA_LBG_1	0xa270
+#define PCI_DEVICE_ID_INTEL_HDA_KBL_H	0xa2f0
+#define PCI_DEVICE_ID_INTEL_HDA_CNL_H	0xa348
+#define PCI_DEVICE_ID_INTEL_HDA_CML_S	0xa3f0
+#define PCI_DEVICE_ID_INTEL_HDA_LNL_P	0xa828
 #define PCI_DEVICE_ID_INTEL_S21152BB	0xb152
+#define PCI_DEVICE_ID_INTEL_HDA_CML_R	0xf0c8
+#define PCI_DEVICE_ID_INTEL_HDA_RKL_S	0xf1c8
 
 #define PCI_VENDOR_ID_WANGXUN		0x8088
 
-- 
2.34.1

Re: [PATCH 02/13] PCI: Add Intel Audio DSP devices to pci_ids.h

[Andy Shevchenko]

On Tue, Jul 11, 2023 at 02:57:15PM +0200, Amadeusz Sławiński wrote:
> Those IDs are mostly sprinkled between HDA, Skylake, SOF and avs drivers.
> Almost every use contains additional comments to identify to which
> platform those IDs refer to. Add those IDs to pci_ids.h header, so that
> there is one place which defines those names.

From style looks good to me, but I think somebody from ASoC/sound needs to
carefully check HDA/non-HDA/etc.

Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> # for the Intel Tangier ID

> Acked-by: Mark Brown <broonie@kernel.org>
> Acked-by: Bjorn Helgaas <bhelgaas@google.com>
> Signed-off-by: Amadeusz Sławiński <amadeuszx.slawinski@linux.intel.com>

-- 
With Best Regards,
Andy Shevchenko

[PATCH 03/13] ALSA: hda: Add controller matching macros

[Amadeusz Sławiński]

Some HDA controllers require additional handling, so there are macros to
match them, however those are spread across multiple files. Add them all
in one place, so they can be reused.

Signed-off-by: Amadeusz Sławiński <amadeuszx.slawinski@linux.intel.com>
---
 include/sound/hdaudio.h | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/include/sound/hdaudio.h b/include/sound/hdaudio.h
index 2ffdf58bd6d4..aacacca456d5 100644
--- a/include/sound/hdaudio.h
+++ b/include/sound/hdaudio.h
@@ -11,6 +11,7 @@
 #include <linux/io.h>
 #include <linux/io-64-nonatomic-lo-hi.h>
 #include <linux/iopoll.h>
+#include <linux/pci.h>
 #include <linux/pm_runtime.h>
 #include <linux/timecounter.h>
 #include <sound/core.h>
@@ -704,4 +705,30 @@ static inline unsigned int snd_array_index(struct snd_array *array, void *ptr)
 	for ((idx) = 0, (ptr) = (array)->list; (idx) < (array)->used; \
 	     (ptr) = snd_array_elem(array, ++(idx)))
 
+/*
+ * Device matching
+ */
+
+#define HDA_CONTROLLER_IS_HSW(pci) (pci_match_id((struct pci_device_id []){ \
+			{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_HDA_HSW_0) }, \
+			{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_HDA_HSW_2) }, \
+			{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_HDA_HSW_3) }, \
+			{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_HDA_BDW) }, \
+			{ } \
+		}, pci))
+
+#define HDA_CONTROLLER_IS_APL(pci) (pci_match_id((struct pci_device_id []){ \
+			{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_HDA_APL) }, \
+			{ } \
+		}, pci))
+
+#define HDA_CONTROLLER_IN_GPU(pci) (HDA_CONTROLLER_IS_HSW(pci) || \
+		pci_match_id((struct pci_device_id []){ \
+			{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_HDA_DG1) }, \
+			{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_HDA_DG2_0) }, \
+			{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_HDA_DG2_1) }, \
+			{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_HDA_DG2_2) }, \
+			{ } \
+		}, pci))
+
 #endif /* __SOUND_HDAUDIO_H */
-- 
2.34.1

Re: [PATCH 03/13] ALSA: hda: Add controller matching macros

[Andy Shevchenko]

On Tue, Jul 11, 2023 at 02:57:16PM +0200, Amadeusz Sławiński wrote:
> Some HDA controllers require additional handling, so there are macros to
> match them, however those are spread across multiple files. Add them all
> in one place, so they can be reused.

FWIW,
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>

One nit-pick below.

> Signed-off-by: Amadeusz Sławiński <amadeuszx.slawinski@linux.intel.com>
> ---
>  include/sound/hdaudio.h | 27 +++++++++++++++++++++++++++
>  1 file changed, 27 insertions(+)
> 
> diff --git a/include/sound/hdaudio.h b/include/sound/hdaudio.h
> index 2ffdf58bd6d4..aacacca456d5 100644
> --- a/include/sound/hdaudio.h
> +++ b/include/sound/hdaudio.h
> @@ -11,6 +11,7 @@
>  #include <linux/io.h>
>  #include <linux/io-64-nonatomic-lo-hi.h>
>  #include <linux/iopoll.h>
> +#include <linux/pci.h>
>  #include <linux/pm_runtime.h>
>  #include <linux/timecounter.h>
>  #include <sound/core.h>
> @@ -704,4 +705,30 @@ static inline unsigned int snd_array_index(struct snd_array *array, void *ptr)
>  	for ((idx) = 0, (ptr) = (array)->list; (idx) < (array)->used; \
>  	     (ptr) = snd_array_elem(array, ++(idx)))
>  
> +/*
> + * Device matching
> + */
> +
> +#define HDA_CONTROLLER_IS_HSW(pci) (pci_match_id((struct pci_device_id []){ \
> +			{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_HDA_HSW_0) }, \
> +			{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_HDA_HSW_2) }, \
> +			{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_HDA_HSW_3) }, \
> +			{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_HDA_BDW) }, \
> +			{ } \
> +		}, pci))
> +
> +#define HDA_CONTROLLER_IS_APL(pci) (pci_match_id((struct pci_device_id []){ \
> +			{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_HDA_APL) }, \
> +			{ } \
> +		}, pci))
> +
> +#define HDA_CONTROLLER_IN_GPU(pci) (HDA_CONTROLLER_IS_HSW(pci) || \
> +		pci_match_id((struct pci_device_id []){ \

I think if you start with pci_match_id() and move HDA_CONTROLLER_IS_HSW() at
the end it will make this macro aligned with the rest, so easier to get them
all at once.

> +			{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_HDA_DG1) }, \
> +			{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_HDA_DG2_0) }, \
> +			{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_HDA_DG2_1) }, \
> +			{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_HDA_DG2_2) }, \
> +			{ } \
> +		}, pci))

-- 
With Best Regards,
Andy Shevchenko

Re: [PATCH 03/13] ALSA: hda: Add controller matching macros

[Amadeusz Sławiński]

On 7/11/2023 3:36 PM, Andy Shevchenko wrote:
>> +#define HDA_CONTROLLER_IN_GPU(pci) (HDA_CONTROLLER_IS_HSW(pci) || \
>> +		pci_match_id((struct pci_device_id []){ \
> I think if you start with pci_match_id() and move HDA_CONTROLLER_IS_HSW() at
> the end it will make this macro aligned with the rest, so easier to get them
> all at once.
> 

Ack.

[PATCH 04/13] ALSA: hda: Use global PCI match macro

[Amadeusz Sławiński]

Instead of using local macro to match PCI device, use global one.

Signed-off-by: Amadeusz Sławiński <amadeuszx.slawinski@linux.intel.com>
---
 sound/pci/hda/hda_intel.c | 20 ++++----------------
 1 file changed, 4 insertions(+), 16 deletions(-)

diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
index ef831770ca7d..143efa54b9bf 100644
--- a/sound/pci/hda/hda_intel.c
+++ b/sound/pci/hda/hda_intel.c
@@ -330,18 +330,6 @@ enum {
 #define needs_eld_notify_link(chip)	false
 #endif
 
-#define CONTROLLER_IN_GPU(pci) (((pci)->vendor == 0x8086) &&         \
-				       (((pci)->device == 0x0a0c) || \
-					((pci)->device == 0x0c0c) || \
-					((pci)->device == 0x0d0c) || \
-					((pci)->device == 0x160c) || \
-					((pci)->device == 0x490d) || \
-					((pci)->device == 0x4f90) || \
-					((pci)->device == 0x4f91) || \
-					((pci)->device == 0x4f92)))
-
-#define IS_BXT(pci) ((pci)->vendor == 0x8086 && (pci)->device == 0x5a98)
-
 static const char * const driver_short_names[] = {
 	[AZX_DRIVER_ICH] = "HDA Intel",
 	[AZX_DRIVER_PCH] = "HDA Intel PCH",
@@ -573,7 +561,7 @@ static void hda_intel_init_chip(struct azx *chip, bool full_reset)
 	snd_hdac_set_codec_wakeup(bus, false);
 
 	/* reduce dma latency to avoid noise */
-	if (IS_BXT(pci))
+	if (HDA_CONTROLLER_IS_APL(pci))
 		bxt_reduce_dma_latency(chip);
 
 	if (bus->mlcap != NULL)
@@ -2175,7 +2163,7 @@ static int azx_probe(struct pci_dev *pci,
 #endif /* CONFIG_SND_HDA_PATCH_LOADER */
 
 #ifndef CONFIG_SND_HDA_I915
-	if (CONTROLLER_IN_GPU(pci))
+	if (HDA_CONTROLLER_IN_GPU(pci))
 		dev_err(card->dev, "Haswell/Broadwell HDMI/DP must build in CONFIG_SND_HDA_I915\n");
 #endif
 
@@ -2283,7 +2271,7 @@ static int azx_probe_continue(struct azx *chip)
 			 * for other chips, still continue probing as other
 			 * codecs can be on the same link.
 			 */
-			if (CONTROLLER_IN_GPU(pci)) {
+			if (HDA_CONTROLLER_IN_GPU(pci)) {
 				dev_err(chip->card->dev,
 					"HSW/BDW HD-audio HDMI/DP requires binding with gfx driver\n");
 				goto out_free;
@@ -2294,7 +2282,7 @@ static int azx_probe_continue(struct azx *chip)
 		}
 
 		/* HSW/BDW controllers need this power */
-		if (CONTROLLER_IN_GPU(pci))
+		if (HDA_CONTROLLER_IN_GPU(pci))
 			hda->need_i915_power = true;
 	}
 
-- 
2.34.1

Re: [PATCH 04/13] ALSA: hda: Use global PCI match macro

[Andy Shevchenko]

On Tue, Jul 11, 2023 at 02:57:17PM +0200, Amadeusz Sławiński wrote:
> Instead of using local macro to match PCI device, use global one.

I believe from the previous discussion that this one needs a couple of words
w.r.t. BXT --> APL change.

Otherwise, FWIW,
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>

> Signed-off-by: Amadeusz Sławiński <amadeuszx.slawinski@linux.intel.com>
> ---
>  sound/pci/hda/hda_intel.c | 20 ++++----------------
>  1 file changed, 4 insertions(+), 16 deletions(-)
> 
> diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
> index ef831770ca7d..143efa54b9bf 100644
> --- a/sound/pci/hda/hda_intel.c
> +++ b/sound/pci/hda/hda_intel.c
> @@ -330,18 +330,6 @@ enum {
>  #define needs_eld_notify_link(chip)	false
>  #endif
>  
> -#define CONTROLLER_IN_GPU(pci) (((pci)->vendor == 0x8086) &&         \
> -				       (((pci)->device == 0x0a0c) || \
> -					((pci)->device == 0x0c0c) || \
> -					((pci)->device == 0x0d0c) || \
> -					((pci)->device == 0x160c) || \
> -					((pci)->device == 0x490d) || \
> -					((pci)->device == 0x4f90) || \
> -					((pci)->device == 0x4f91) || \
> -					((pci)->device == 0x4f92)))
> -
> -#define IS_BXT(pci) ((pci)->vendor == 0x8086 && (pci)->device == 0x5a98)
> -
>  static const char * const driver_short_names[] = {
>  	[AZX_DRIVER_ICH] = "HDA Intel",
>  	[AZX_DRIVER_PCH] = "HDA Intel PCH",
> @@ -573,7 +561,7 @@ static void hda_intel_init_chip(struct azx *chip, bool full_reset)
>  	snd_hdac_set_codec_wakeup(bus, false);
>  
>  	/* reduce dma latency to avoid noise */
> -	if (IS_BXT(pci))
> +	if (HDA_CONTROLLER_IS_APL(pci))
>  		bxt_reduce_dma_latency(chip);
>  
>  	if (bus->mlcap != NULL)
> @@ -2175,7 +2163,7 @@ static int azx_probe(struct pci_dev *pci,
>  #endif /* CONFIG_SND_HDA_PATCH_LOADER */
>  
>  #ifndef CONFIG_SND_HDA_I915
> -	if (CONTROLLER_IN_GPU(pci))
> +	if (HDA_CONTROLLER_IN_GPU(pci))
>  		dev_err(card->dev, "Haswell/Broadwell HDMI/DP must build in CONFIG_SND_HDA_I915\n");
>  #endif
>  
> @@ -2283,7 +2271,7 @@ static int azx_probe_continue(struct azx *chip)
>  			 * for other chips, still continue probing as other
>  			 * codecs can be on the same link.
>  			 */
> -			if (CONTROLLER_IN_GPU(pci)) {
> +			if (HDA_CONTROLLER_IN_GPU(pci)) {
>  				dev_err(chip->card->dev,
>  					"HSW/BDW HD-audio HDMI/DP requires binding with gfx driver\n");
>  				goto out_free;
> @@ -2294,7 +2282,7 @@ static int azx_probe_continue(struct azx *chip)
>  		}
>  
>  		/* HSW/BDW controllers need this power */
> -		if (CONTROLLER_IN_GPU(pci))
> +		if (HDA_CONTROLLER_IN_GPU(pci))
>  			hda->need_i915_power = true;
>  	}
>  
> -- 
> 2.34.1
> 

-- 
With Best Regards,
Andy Shevchenko

[PATCH 05/13] ALSA: hda/i915: Use global PCI match macro

[Amadeusz Sławiński]

Instead of using local macro to match PCI device, use global one.

Signed-off-by: Amadeusz Sławiński <amadeuszx.slawinski@linux.intel.com>
---
 sound/hda/hdac_i915.c | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/sound/hda/hdac_i915.c b/sound/hda/hdac_i915.c
index 161a9711cd63..2a451ff4fe6a 100644
--- a/sound/hda/hdac_i915.c
+++ b/sound/hda/hdac_i915.c
@@ -11,11 +11,6 @@
 #include <sound/hda_i915.h>
 #include <sound/hda_register.h>
 
-#define IS_HSW_CONTROLLER(pci) (((pci)->device == 0x0a0c) || \
-				((pci)->device == 0x0c0c) || \
-				((pci)->device == 0x0d0c) || \
-				((pci)->device == 0x160c))
-
 /**
  * snd_hdac_i915_set_bclk - Reprogram BCLK for HSW/BDW
  * @bus: HDA core bus
@@ -39,7 +34,7 @@ void snd_hdac_i915_set_bclk(struct hdac_bus *bus)
 
 	if (!acomp || !acomp->ops || !acomp->ops->get_cdclk_freq)
 		return; /* only for i915 binding */
-	if (!IS_HSW_CONTROLLER(pci))
+	if (!HDA_CONTROLLER_IS_HSW(pci))
 		return; /* only HSW/BDW */
 
 	cdclk_freq = acomp->ops->get_cdclk_freq(acomp->dev);
-- 
2.34.1

Re: [PATCH 05/13] ALSA: hda/i915: Use global PCI match macro

[Andy Shevchenko]

On Tue, Jul 11, 2023 at 02:57:18PM +0200, Amadeusz Sławiński wrote:
> Instead of using local macro to match PCI device, use global one.

FWIW,

Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>

> Signed-off-by: Amadeusz Sławiński <amadeuszx.slawinski@linux.intel.com>
> ---
>  sound/hda/hdac_i915.c | 7 +------
>  1 file changed, 1 insertion(+), 6 deletions(-)
> 
> diff --git a/sound/hda/hdac_i915.c b/sound/hda/hdac_i915.c
> index 161a9711cd63..2a451ff4fe6a 100644
> --- a/sound/hda/hdac_i915.c
> +++ b/sound/hda/hdac_i915.c
> @@ -11,11 +11,6 @@
>  #include <sound/hda_i915.h>
>  #include <sound/hda_register.h>
>  
> -#define IS_HSW_CONTROLLER(pci) (((pci)->device == 0x0a0c) || \
> -				((pci)->device == 0x0c0c) || \
> -				((pci)->device == 0x0d0c) || \
> -				((pci)->device == 0x160c))
> -
>  /**
>   * snd_hdac_i915_set_bclk - Reprogram BCLK for HSW/BDW
>   * @bus: HDA core bus
> @@ -39,7 +34,7 @@ void snd_hdac_i915_set_bclk(struct hdac_bus *bus)
>  
>  	if (!acomp || !acomp->ops || !acomp->ops->get_cdclk_freq)
>  		return; /* only for i915 binding */
> -	if (!IS_HSW_CONTROLLER(pci))
> +	if (!HDA_CONTROLLER_IS_HSW(pci))
>  		return; /* only HSW/BDW */
>  
>  	cdclk_freq = acomp->ops->get_cdclk_freq(acomp->dev);
> -- 
> 2.34.1
> 

-- 
With Best Regards,
Andy Shevchenko

[PATCH 06/13] ASoC: Intel: Skylake: Use global PCI match macro

[Amadeusz Sławiński]

Instead of using local macro to match PCI device, use global one.

Acked-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Amadeusz Sławiński <amadeuszx.slawinski@linux.intel.com>
---
 include/sound/hda_codec.h         | 3 ---
 sound/soc/intel/skylake/skl-pcm.c | 3 ++-
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/include/sound/hda_codec.h b/include/sound/hda_codec.h
index bbb7805e85d8..5497dc9c396a 100644
--- a/include/sound/hda_codec.h
+++ b/include/sound/hda_codec.h
@@ -18,9 +18,6 @@
 #include <sound/hda_verbs.h>
 #include <sound/hda_regmap.h>
 
-#define IS_BXT(pci) ((pci)->vendor == 0x8086 && (pci)->device == 0x5a98)
-#define IS_CFL(pci) ((pci)->vendor == 0x8086 && (pci)->device == 0xa348)
-
 /*
  * Structures
  */
diff --git a/sound/soc/intel/skylake/skl-pcm.c b/sound/soc/intel/skylake/skl-pcm.c
index a4209d88b0c6..ac3dc8c63c26 100644
--- a/sound/soc/intel/skylake/skl-pcm.c
+++ b/sound/soc/intel/skylake/skl-pcm.c
@@ -13,6 +13,7 @@
 #include <linux/pci.h>
 #include <linux/pm_runtime.h>
 #include <linux/delay.h>
+#include <sound/hdaudio.h>
 #include <sound/pcm_params.h>
 #include <sound/soc.h>
 #include "skl.h"
@@ -152,7 +153,7 @@ int skl_pcm_host_dma_prepare(struct device *dev, struct skl_pipe_params *params)
 	 * The recommended SDxFMT programming sequence for BXT
 	 * platforms is to couple the stream before writing the format
 	 */
-	if (IS_BXT(skl->pci)) {
+	if (HDA_CONTROLLER_IS_APL(skl->pci)) {
 		snd_hdac_ext_stream_decouple(bus, stream, false);
 		err = snd_hdac_stream_setup(hdac_stream(stream));
 		snd_hdac_ext_stream_decouple(bus, stream, true);
-- 
2.34.1

Re: [PATCH 06/13] ASoC: Intel: Skylake: Use global PCI match macro

[Andy Shevchenko]

On Tue, Jul 11, 2023 at 02:57:19PM +0200, Amadeusz Sławiński wrote:
> Instead of using local macro to match PCI device, use global one.

Same comment as per another patch, i.e. explain CFL/BXT --> APL (*).
With that,
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>

*) I think it's something like "the BXT/APL/CFL line of SoCs has the same
(compatible?) HDA IP blablabla".

> Acked-by: Mark Brown <broonie@kernel.org>
> Signed-off-by: Amadeusz Sławiński <amadeuszx.slawinski@linux.intel.com>
> ---
>  include/sound/hda_codec.h         | 3 ---
>  sound/soc/intel/skylake/skl-pcm.c | 3 ++-
>  2 files changed, 2 insertions(+), 4 deletions(-)
> 
> diff --git a/include/sound/hda_codec.h b/include/sound/hda_codec.h
> index bbb7805e85d8..5497dc9c396a 100644
> --- a/include/sound/hda_codec.h
> +++ b/include/sound/hda_codec.h
> @@ -18,9 +18,6 @@
>  #include <sound/hda_verbs.h>
>  #include <sound/hda_regmap.h>
>  
> -#define IS_BXT(pci) ((pci)->vendor == 0x8086 && (pci)->device == 0x5a98)
> -#define IS_CFL(pci) ((pci)->vendor == 0x8086 && (pci)->device == 0xa348)
> -
>  /*
>   * Structures
>   */
> diff --git a/sound/soc/intel/skylake/skl-pcm.c b/sound/soc/intel/skylake/skl-pcm.c
> index a4209d88b0c6..ac3dc8c63c26 100644
> --- a/sound/soc/intel/skylake/skl-pcm.c
> +++ b/sound/soc/intel/skylake/skl-pcm.c
> @@ -13,6 +13,7 @@
>  #include <linux/pci.h>
>  #include <linux/pm_runtime.h>
>  #include <linux/delay.h>
> +#include <sound/hdaudio.h>
>  #include <sound/pcm_params.h>
>  #include <sound/soc.h>
>  #include "skl.h"
> @@ -152,7 +153,7 @@ int skl_pcm_host_dma_prepare(struct device *dev, struct skl_pipe_params *params)
>  	 * The recommended SDxFMT programming sequence for BXT
>  	 * platforms is to couple the stream before writing the format
>  	 */
> -	if (IS_BXT(skl->pci)) {
> +	if (HDA_CONTROLLER_IS_APL(skl->pci)) {
>  		snd_hdac_ext_stream_decouple(bus, stream, false);
>  		err = snd_hdac_stream_setup(hdac_stream(stream));
>  		snd_hdac_ext_stream_decouple(bus, stream, true);
> -- 
> 2.34.1
> 

-- 
With Best Regards,
Andy Shevchenko

[PATCH 07/13] ALSA: intel-dsp-config: Convert to PCI device IDs defines

[Amadeusz Sławiński]

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.

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,
 	},
 #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

Re: [PATCH 07/13] ALSA: intel-dsp-config: Convert to PCI device IDs defines

[Andy Shevchenko]

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

Re: [PATCH 07/13] ALSA: intel-dsp-config: Convert to PCI device IDs defines

[Amadeusz Sławiński]

On 7/11/2023 4:00 PM, Andy Shevchenko wrote:
> 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.
> 

There were few early devices where DSP was separate unit:
Haswell, Broadwell - where we use ACPI to load (SND_SOC_INTEL_CATPT) 
audio driver, Tangier/Merrifield - where ACPI or PCI is used to load 
(SND_SST_ATOM_HIFI2_PLATFORM_PCI) audio driver.
All further generations are HDA devices with integrated DSP. This causes 
all the weirdness ;)

Re: [PATCH 07/13] ALSA: intel-dsp-config: Convert to PCI device IDs defines

[Andy Shevchenko]

On Tue, Jul 11, 2023 at 04:09:42PM +0200, Amadeusz Sławiński wrote:
> On 7/11/2023 4:00 PM, Andy Shevchenko wrote:
> > On Tue, Jul 11, 2023 at 02:57:20PM +0200, Amadeusz Sławiński wrote:

...

> > > -		.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.
> > 
> 
> There were few early devices where DSP was separate unit:
> Haswell, Broadwell - where we use ACPI to load (SND_SOC_INTEL_CATPT) audio
> driver, Tangier/Merrifield - where ACPI or PCI is used to load
> (SND_SST_ATOM_HIFI2_PLATFORM_PCI) audio driver.
> All further generations are HDA devices with integrated DSP. This causes all
> the weirdness ;)

Maybe we should stick with SST in the name? At least that's how Tangier TRM
titles it.

-- 
With Best Regards,
Andy Shevchenko

[PATCH 08/13] ALSA: hda: Convert to PCI device IDs defines

[Amadeusz Sławiński]

Use PCI device IDs from pci_ids.h header and while at it to simplify
declarations change to using PCI_DEVICE_DATA() macro for Intel IDs and
PCI_VDEVICE() for all other that have defined vendor.

Acked-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Amadeusz Sławiński <amadeuszx.slawinski@linux.intel.com>
---
 sound/pci/hda/hda_intel.c | 353 +++++++++++++++-----------------------
 1 file changed, 141 insertions(+), 212 deletions(-)

diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
index 143efa54b9bf..4a162f27b46e 100644
--- a/sound/pci/hda/hda_intel.c
+++ b/sound/pci/hda/hda_intel.c
@@ -2416,333 +2416,262 @@ static void azx_shutdown(struct pci_dev *pci)
 /* PCI IDs */
 static const struct pci_device_id azx_ids[] = {
 	/* CPT */
-	{ PCI_DEVICE(0x8086, 0x1c20),
-	  .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH_NOPM },
+	{ PCI_DEVICE_DATA(INTEL, HDA_CPT, AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH_NOPM) },
 	/* PBG */
-	{ PCI_DEVICE(0x8086, 0x1d20),
-	  .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH_NOPM },
+	{ PCI_DEVICE_DATA(INTEL, HDA_PBG, AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH_NOPM) },
 	/* Panther Point */
-	{ PCI_DEVICE(0x8086, 0x1e20),
-	  .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH_NOPM },
+	{ PCI_DEVICE_DATA(INTEL, HDA_PPT, AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH_NOPM) },
 	/* Lynx Point */
-	{ PCI_DEVICE(0x8086, 0x8c20),
-	  .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH },
+	{ PCI_DEVICE_DATA(INTEL, HDA_LPT, AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH) },
 	/* 9 Series */
-	{ PCI_DEVICE(0x8086, 0x8ca0),
-	  .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH },
+	{ PCI_DEVICE_DATA(INTEL, HDA_9_SERIES, AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH) },
 	/* Wellsburg */
-	{ PCI_DEVICE(0x8086, 0x8d20),
-	  .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH },
-	{ PCI_DEVICE(0x8086, 0x8d21),
-	  .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH },
+	{ PCI_DEVICE_DATA(INTEL, HDA_WBG_0, AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH) },
+	{ PCI_DEVICE_DATA(INTEL, HDA_WBG_1, AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH) },
 	/* Lewisburg */
-	{ PCI_DEVICE(0x8086, 0xa1f0),
-	  .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_SKYLAKE },
-	{ PCI_DEVICE(0x8086, 0xa270),
-	  .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_SKYLAKE },
+	{ PCI_DEVICE_DATA(INTEL, HDA_LBG_0, AZX_DRIVER_PCH | AZX_DCAPS_INTEL_SKYLAKE) },
+	{ PCI_DEVICE_DATA(INTEL, HDA_LBG_1, AZX_DRIVER_PCH | AZX_DCAPS_INTEL_SKYLAKE) },
 	/* Lynx Point-LP */
-	{ PCI_DEVICE(0x8086, 0x9c20),
-	  .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH },
+	{ PCI_DEVICE_DATA(INTEL, HDA_LPT_LP_0, AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH) },
 	/* Lynx Point-LP */
-	{ PCI_DEVICE(0x8086, 0x9c21),
-	  .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH },
+	{ PCI_DEVICE_DATA(INTEL, HDA_LPT_LP_1, AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH) },
 	/* Wildcat Point-LP */
-	{ PCI_DEVICE(0x8086, 0x9ca0),
-	  .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH },
-	/* Sunrise Point */
-	{ PCI_DEVICE(0x8086, 0xa170),
-	  .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE },
-	/* Sunrise Point-LP */
-	{ PCI_DEVICE(0x8086, 0x9d70),
-	  .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE },
+	{ PCI_DEVICE_DATA(INTEL, HDA_WPT_LP, AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH) },
+	/* Skylake (Sunrise Point) */
+	{ PCI_DEVICE_DATA(INTEL, HDA_SKL, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
+	/* Skylake-LP (Sunrise Point-LP) */
+	{ PCI_DEVICE_DATA(INTEL, HDA_SKL_LP, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
 	/* Kabylake */
-	{ PCI_DEVICE(0x8086, 0xa171),
-	  .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE },
+	{ PCI_DEVICE_DATA(INTEL, HDA_KBL, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
 	/* Kabylake-LP */
-	{ PCI_DEVICE(0x8086, 0x9d71),
-	  .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE },
+	{ PCI_DEVICE_DATA(INTEL, HDA_KBL_LP, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
 	/* Kabylake-H */
-	{ PCI_DEVICE(0x8086, 0xa2f0),
-	  .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE },
+	{ PCI_DEVICE_DATA(INTEL, HDA_KBL_H, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
 	/* Coffelake */
-	{ PCI_DEVICE(0x8086, 0xa348),
-	  .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
+	{ PCI_DEVICE_DATA(INTEL, HDA_CNL_H, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
 	/* Cannonlake */
-	{ PCI_DEVICE(0x8086, 0x9dc8),
-	  .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
+	{ PCI_DEVICE_DATA(INTEL, HDA_CNL_LP, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
 	/* CometLake-LP */
-	{ PCI_DEVICE(0x8086, 0x02C8),
-	  .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
+	{ PCI_DEVICE_DATA(INTEL, HDA_CML_LP, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
 	/* CometLake-H */
-	{ PCI_DEVICE(0x8086, 0x06C8),
-	  .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
-	{ PCI_DEVICE(0x8086, 0xf1c8),
-	  .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
+	{ PCI_DEVICE_DATA(INTEL, HDA_CML_H, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
+	{ PCI_DEVICE_DATA(INTEL, HDA_RKL_S, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
 	/* CometLake-S */
-	{ PCI_DEVICE(0x8086, 0xa3f0),
-	  .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
+	{ PCI_DEVICE_DATA(INTEL, HDA_CML_S, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
 	/* CometLake-R */
-	{ PCI_DEVICE(0x8086, 0xf0c8),
-	  .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
+	{ PCI_DEVICE_DATA(INTEL, HDA_CML_R, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
 	/* Icelake */
-	{ PCI_DEVICE(0x8086, 0x34c8),
-	  .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
+	{ PCI_DEVICE_DATA(INTEL, HDA_ICL_LP, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
 	/* Icelake-H */
-	{ PCI_DEVICE(0x8086, 0x3dc8),
-	  .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
+	{ PCI_DEVICE_DATA(INTEL, HDA_ICL_H, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
 	/* Jasperlake */
-	{ PCI_DEVICE(0x8086, 0x38c8),
-	  .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
-	{ PCI_DEVICE(0x8086, 0x4dc8),
-	  .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
+	{ PCI_DEVICE_DATA(INTEL, HDA_ICL_N, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
+	{ PCI_DEVICE_DATA(INTEL, HDA_JSL_N, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
 	/* Tigerlake */
-	{ PCI_DEVICE(0x8086, 0xa0c8),
-	  .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
+	{ PCI_DEVICE_DATA(INTEL, HDA_TGL_LP, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
 	/* Tigerlake-H */
-	{ PCI_DEVICE(0x8086, 0x43c8),
-	  .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
+	{ PCI_DEVICE_DATA(INTEL, HDA_TGL_H, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
 	/* DG1 */
-	{ PCI_DEVICE(0x8086, 0x490d),
-	  .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
+	{ PCI_DEVICE_DATA(INTEL, HDA_DG1, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
 	/* DG2 */
-	{ PCI_DEVICE(0x8086, 0x4f90),
-	  .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
-	{ PCI_DEVICE(0x8086, 0x4f91),
-	  .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
-	{ PCI_DEVICE(0x8086, 0x4f92),
-	  .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
+	{ PCI_DEVICE_DATA(INTEL, HDA_DG2_0, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
+	{ PCI_DEVICE_DATA(INTEL, HDA_DG2_1, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
+	{ PCI_DEVICE_DATA(INTEL, HDA_DG2_2, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
 	/* Alderlake-S */
-	{ PCI_DEVICE(0x8086, 0x7ad0),
-	  .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
+	{ PCI_DEVICE_DATA(INTEL, HDA_ADL_S, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
 	/* Alderlake-P */
-	{ PCI_DEVICE(0x8086, 0x51c8),
-	  .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
-	{ PCI_DEVICE(0x8086, 0x51c9),
-	  .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
-	{ PCI_DEVICE(0x8086, 0x51cd),
-	  .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
+	{ PCI_DEVICE_DATA(INTEL, HDA_ADL_P, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
+	{ PCI_DEVICE_DATA(INTEL, HDA_ADL_PS, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
+	{ PCI_DEVICE_DATA(INTEL, HDA_ADL_PX, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
 	/* Alderlake-M */
-	{ PCI_DEVICE(0x8086, 0x51cc),
-	  .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
+	{ PCI_DEVICE_DATA(INTEL, HDA_ADL_M, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
 	/* Alderlake-N */
-	{ PCI_DEVICE(0x8086, 0x54c8),
-	  .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
+	{ PCI_DEVICE_DATA(INTEL, HDA_ADL_N, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
 	/* Elkhart Lake */
-	{ PCI_DEVICE(0x8086, 0x4b55),
-	  .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
-	{ PCI_DEVICE(0x8086, 0x4b58),
-	  .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
+	{ PCI_DEVICE_DATA(INTEL, HDA_EHL_0, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
+	{ PCI_DEVICE_DATA(INTEL, HDA_EHL_3, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
 	/* Raptor Lake */
-	{ PCI_DEVICE(0x8086, 0x7a50),
-	  .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
-	{ PCI_DEVICE(0x8086, 0x51ca),
-	  .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
-	{ PCI_DEVICE(0x8086, 0x51cb),
-	  .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
-	{ PCI_DEVICE(0x8086, 0x51ce),
-	  .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
-	{ PCI_DEVICE(0x8086, 0x51cf),
-	  .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
-	/* Meteorlake-P */
-	{ PCI_DEVICE(0x8086, 0x7e28),
-	  .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
+	{ PCI_DEVICE_DATA(INTEL, HDA_RPL_S, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
+	{ PCI_DEVICE_DATA(INTEL, HDA_RPL_P_0, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
+	{ PCI_DEVICE_DATA(INTEL, HDA_RPL_P_1, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
+	{ PCI_DEVICE_DATA(INTEL, HDA_RPL_M, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
+	{ PCI_DEVICE_DATA(INTEL, HDA_RPL_PX, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
+	{ PCI_DEVICE_DATA(INTEL, HDA_MTL, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
 	/* Lunarlake-P */
-	{ PCI_DEVICE(0x8086, 0xa828),
-	  .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
-	/* Broxton-P(Apollolake) */
-	{ PCI_DEVICE(0x8086, 0x5a98),
-	  .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_BROXTON },
+	{ PCI_DEVICE_DATA(INTEL, HDA_LNL_P, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
+	/* Apollolake (Broxton-P) */
+	{ PCI_DEVICE_DATA(INTEL, HDA_APL, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_BROXTON) },
 	/* Broxton-T */
-	{ PCI_DEVICE(0x8086, 0x1a98),
-	  .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_BROXTON },
+	{ PCI_DEVICE_DATA(INTEL, HDA_APL_T, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_BROXTON) },
 	/* Gemini-Lake */
-	{ PCI_DEVICE(0x8086, 0x3198),
-	  .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_BROXTON },
+	{ PCI_DEVICE_DATA(INTEL, HDA_GML, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_BROXTON) },
 	/* Haswell */
-	{ PCI_DEVICE(0x8086, 0x0a0c),
-	  .driver_data = AZX_DRIVER_HDMI | AZX_DCAPS_INTEL_HASWELL },
-	{ PCI_DEVICE(0x8086, 0x0c0c),
-	  .driver_data = AZX_DRIVER_HDMI | AZX_DCAPS_INTEL_HASWELL },
-	{ PCI_DEVICE(0x8086, 0x0d0c),
-	  .driver_data = AZX_DRIVER_HDMI | AZX_DCAPS_INTEL_HASWELL },
+	{ PCI_DEVICE_DATA(INTEL, HDA_HSW_0, AZX_DRIVER_HDMI | AZX_DCAPS_INTEL_HASWELL) },
+	{ PCI_DEVICE_DATA(INTEL, HDA_HSW_2, AZX_DRIVER_HDMI | AZX_DCAPS_INTEL_HASWELL) },
+	{ PCI_DEVICE_DATA(INTEL, HDA_HSW_3, AZX_DRIVER_HDMI | AZX_DCAPS_INTEL_HASWELL) },
 	/* Broadwell */
-	{ PCI_DEVICE(0x8086, 0x160c),
-	  .driver_data = AZX_DRIVER_HDMI | AZX_DCAPS_INTEL_BROADWELL },
+	{ PCI_DEVICE_DATA(INTEL, HDA_BDW, AZX_DRIVER_HDMI | AZX_DCAPS_INTEL_BROADWELL) },
 	/* 5 Series/3400 */
-	{ PCI_DEVICE(0x8086, 0x3b56),
-	  .driver_data = AZX_DRIVER_SCH | AZX_DCAPS_INTEL_PCH_NOPM },
-	{ PCI_DEVICE(0x8086, 0x3b57),
-	  .driver_data = AZX_DRIVER_SCH | AZX_DCAPS_INTEL_PCH_NOPM },
+	{ PCI_DEVICE_DATA(INTEL, HDA_5_3400_SERIES_0, AZX_DRIVER_SCH | AZX_DCAPS_INTEL_PCH_NOPM) },
+	{ PCI_DEVICE_DATA(INTEL, HDA_5_3400_SERIES_1, AZX_DRIVER_SCH | AZX_DCAPS_INTEL_PCH_NOPM) },
 	/* Poulsbo */
-	{ PCI_DEVICE(0x8086, 0x811b),
-	  .driver_data = AZX_DRIVER_SCH | AZX_DCAPS_INTEL_PCH_BASE |
-	  AZX_DCAPS_POSFIX_LPIB },
+	{ PCI_DEVICE_DATA(INTEL, HDA_POULSBO, AZX_DRIVER_SCH | AZX_DCAPS_INTEL_PCH_BASE |
+	  AZX_DCAPS_POSFIX_LPIB) },
 	/* Oaktrail */
-	{ PCI_DEVICE(0x8086, 0x080a),
-	  .driver_data = AZX_DRIVER_SCH | AZX_DCAPS_INTEL_PCH_BASE },
+	{ PCI_DEVICE_DATA(INTEL, HDA_OAKTRAIL, AZX_DRIVER_SCH | AZX_DCAPS_INTEL_PCH_BASE) },
 	/* BayTrail */
-	{ PCI_DEVICE(0x8086, 0x0f04),
-	  .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_BAYTRAIL },
+	{ PCI_DEVICE_DATA(INTEL, HDA_BYT, AZX_DRIVER_PCH | AZX_DCAPS_INTEL_BAYTRAIL) },
 	/* Braswell */
-	{ PCI_DEVICE(0x8086, 0x2284),
-	  .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_BRASWELL },
+	{ PCI_DEVICE_DATA(INTEL, HDA_BSW, AZX_DRIVER_PCH | AZX_DCAPS_INTEL_BRASWELL) },
 	/* ICH6 */
-	{ PCI_DEVICE(0x8086, 0x2668),
-	  .driver_data = AZX_DRIVER_ICH | AZX_DCAPS_INTEL_ICH },
+	{ PCI_DEVICE_DATA(INTEL, HDA_ICH6, AZX_DRIVER_ICH | AZX_DCAPS_INTEL_ICH) },
 	/* ICH7 */
-	{ PCI_DEVICE(0x8086, 0x27d8),
-	  .driver_data = AZX_DRIVER_ICH | AZX_DCAPS_INTEL_ICH },
+	{ PCI_DEVICE_DATA(INTEL, HDA_ICH7, AZX_DRIVER_ICH | AZX_DCAPS_INTEL_ICH) },
 	/* ESB2 */
-	{ PCI_DEVICE(0x8086, 0x269a),
-	  .driver_data = AZX_DRIVER_ICH | AZX_DCAPS_INTEL_ICH },
+	{ PCI_DEVICE_DATA(INTEL, HDA_ESB2, AZX_DRIVER_ICH | AZX_DCAPS_INTEL_ICH) },
 	/* ICH8 */
-	{ PCI_DEVICE(0x8086, 0x284b),
-	  .driver_data = AZX_DRIVER_ICH | AZX_DCAPS_INTEL_ICH },
+	{ PCI_DEVICE_DATA(INTEL, HDA_ICH8, AZX_DRIVER_ICH | AZX_DCAPS_INTEL_ICH) },
 	/* ICH9 */
-	{ PCI_DEVICE(0x8086, 0x293e),
-	  .driver_data = AZX_DRIVER_ICH | AZX_DCAPS_INTEL_ICH },
+	{ PCI_DEVICE_DATA(INTEL, HDA_ICH9_0, AZX_DRIVER_ICH | AZX_DCAPS_INTEL_ICH) },
 	/* ICH9 */
-	{ PCI_DEVICE(0x8086, 0x293f),
-	  .driver_data = AZX_DRIVER_ICH | AZX_DCAPS_INTEL_ICH },
+	{ PCI_DEVICE_DATA(INTEL, HDA_ICH9_1, AZX_DRIVER_ICH | AZX_DCAPS_INTEL_ICH) },
 	/* ICH10 */
-	{ PCI_DEVICE(0x8086, 0x3a3e),
-	  .driver_data = AZX_DRIVER_ICH | AZX_DCAPS_INTEL_ICH },
+	{ PCI_DEVICE_DATA(INTEL, HDA_ICH10_0, AZX_DRIVER_ICH | AZX_DCAPS_INTEL_ICH) },
 	/* ICH10 */
-	{ PCI_DEVICE(0x8086, 0x3a6e),
-	  .driver_data = AZX_DRIVER_ICH | AZX_DCAPS_INTEL_ICH },
+	{ PCI_DEVICE_DATA(INTEL, HDA_ICH10_1, AZX_DRIVER_ICH | AZX_DCAPS_INTEL_ICH) },
 	/* Generic Intel */
 	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_ANY_ID),
 	  .class = PCI_CLASS_MULTIMEDIA_HD_AUDIO << 8,
 	  .class_mask = 0xffffff,
 	  .driver_data = AZX_DRIVER_ICH | AZX_DCAPS_NO_ALIGN_BUFSIZE },
 	/* ATI SB 450/600/700/800/900 */
-	{ PCI_DEVICE(0x1002, 0x437b),
+	{ PCI_VDEVICE(ATI, 0x437b),
 	  .driver_data = AZX_DRIVER_ATI | AZX_DCAPS_PRESET_ATI_SB },
-	{ PCI_DEVICE(0x1002, 0x4383),
+	{ PCI_VDEVICE(ATI, 0x4383),
 	  .driver_data = AZX_DRIVER_ATI | AZX_DCAPS_PRESET_ATI_SB },
 	/* AMD Hudson */
-	{ PCI_DEVICE(0x1022, 0x780d),
+	{ PCI_VDEVICE(AMD, 0x780d),
 	  .driver_data = AZX_DRIVER_GENERIC | AZX_DCAPS_PRESET_ATI_SB },
 	/* AMD, X370 & co */
-	{ PCI_DEVICE(0x1022, 0x1457),
+	{ PCI_VDEVICE(AMD, 0x1457),
 	  .driver_data = AZX_DRIVER_GENERIC | AZX_DCAPS_PRESET_AMD_SB },
 	/* AMD, X570 & co */
-	{ PCI_DEVICE(0x1022, 0x1487),
+	{ PCI_VDEVICE(AMD, 0x1487),
 	  .driver_data = AZX_DRIVER_GENERIC | AZX_DCAPS_PRESET_AMD_SB },
 	/* AMD Stoney */
-	{ PCI_DEVICE(0x1022, 0x157a),
+	{ PCI_VDEVICE(AMD, 0x157a),
 	  .driver_data = AZX_DRIVER_GENERIC | AZX_DCAPS_PRESET_ATI_SB |
 			 AZX_DCAPS_PM_RUNTIME },
 	/* AMD Raven */
-	{ PCI_DEVICE(0x1022, 0x15e3),
+	{ PCI_VDEVICE(AMD, 0x15e3),
 	  .driver_data = AZX_DRIVER_GENERIC | AZX_DCAPS_PRESET_AMD_SB },
 	/* ATI HDMI */
-	{ PCI_DEVICE(0x1002, 0x0002),
+	{ PCI_VDEVICE(ATI, 0x0002),
 	  .driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS |
 	  AZX_DCAPS_PM_RUNTIME },
-	{ PCI_DEVICE(0x1002, 0x1308),
+	{ PCI_VDEVICE(ATI, 0x1308),
 	  .driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS },
-	{ PCI_DEVICE(0x1002, 0x157a),
+	{ PCI_VDEVICE(ATI, 0x157a),
 	  .driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS },
-	{ PCI_DEVICE(0x1002, 0x15b3),
+	{ PCI_VDEVICE(ATI, 0x15b3),
 	  .driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS },
-	{ PCI_DEVICE(0x1002, 0x793b),
+	{ PCI_VDEVICE(ATI, 0x793b),
 	  .driver_data = AZX_DRIVER_ATIHDMI | AZX_DCAPS_PRESET_ATI_HDMI },
-	{ PCI_DEVICE(0x1002, 0x7919),
+	{ PCI_VDEVICE(ATI, 0x7919),
 	  .driver_data = AZX_DRIVER_ATIHDMI | AZX_DCAPS_PRESET_ATI_HDMI },
-	{ PCI_DEVICE(0x1002, 0x960f),
+	{ PCI_VDEVICE(ATI, 0x960f),
 	  .driver_data = AZX_DRIVER_ATIHDMI | AZX_DCAPS_PRESET_ATI_HDMI },
-	{ PCI_DEVICE(0x1002, 0x970f),
+	{ PCI_VDEVICE(ATI, 0x970f),
 	  .driver_data = AZX_DRIVER_ATIHDMI | AZX_DCAPS_PRESET_ATI_HDMI },
-	{ PCI_DEVICE(0x1002, 0x9840),
+	{ PCI_VDEVICE(ATI, 0x9840),
 	  .driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS },
-	{ PCI_DEVICE(0x1002, 0xaa00),
+	{ PCI_VDEVICE(ATI, 0xaa00),
 	  .driver_data = AZX_DRIVER_ATIHDMI | AZX_DCAPS_PRESET_ATI_HDMI },
-	{ PCI_DEVICE(0x1002, 0xaa08),
+	{ PCI_VDEVICE(ATI, 0xaa08),
 	  .driver_data = AZX_DRIVER_ATIHDMI | AZX_DCAPS_PRESET_ATI_HDMI },
-	{ PCI_DEVICE(0x1002, 0xaa10),
+	{ PCI_VDEVICE(ATI, 0xaa10),
 	  .driver_data = AZX_DRIVER_ATIHDMI | AZX_DCAPS_PRESET_ATI_HDMI },
-	{ PCI_DEVICE(0x1002, 0xaa18),
+	{ PCI_VDEVICE(ATI, 0xaa18),
 	  .driver_data = AZX_DRIVER_ATIHDMI | AZX_DCAPS_PRESET_ATI_HDMI },
-	{ PCI_DEVICE(0x1002, 0xaa20),
+	{ PCI_VDEVICE(ATI, 0xaa20),
 	  .driver_data = AZX_DRIVER_ATIHDMI | AZX_DCAPS_PRESET_ATI_HDMI },
-	{ PCI_DEVICE(0x1002, 0xaa28),
+	{ PCI_VDEVICE(ATI, 0xaa28),
 	  .driver_data = AZX_DRIVER_ATIHDMI | AZX_DCAPS_PRESET_ATI_HDMI },
-	{ PCI_DEVICE(0x1002, 0xaa30),
+	{ PCI_VDEVICE(ATI, 0xaa30),
 	  .driver_data = AZX_DRIVER_ATIHDMI | AZX_DCAPS_PRESET_ATI_HDMI },
-	{ PCI_DEVICE(0x1002, 0xaa38),
+	{ PCI_VDEVICE(ATI, 0xaa38),
 	  .driver_data = AZX_DRIVER_ATIHDMI | AZX_DCAPS_PRESET_ATI_HDMI },
-	{ PCI_DEVICE(0x1002, 0xaa40),
+	{ PCI_VDEVICE(ATI, 0xaa40),
 	  .driver_data = AZX_DRIVER_ATIHDMI | AZX_DCAPS_PRESET_ATI_HDMI },
-	{ PCI_DEVICE(0x1002, 0xaa48),
+	{ PCI_VDEVICE(ATI, 0xaa48),
 	  .driver_data = AZX_DRIVER_ATIHDMI | AZX_DCAPS_PRESET_ATI_HDMI },
-	{ PCI_DEVICE(0x1002, 0xaa50),
+	{ PCI_VDEVICE(ATI, 0xaa50),
 	  .driver_data = AZX_DRIVER_ATIHDMI | AZX_DCAPS_PRESET_ATI_HDMI },
-	{ PCI_DEVICE(0x1002, 0xaa58),
+	{ PCI_VDEVICE(ATI, 0xaa58),
 	  .driver_data = AZX_DRIVER_ATIHDMI | AZX_DCAPS_PRESET_ATI_HDMI },
-	{ PCI_DEVICE(0x1002, 0xaa60),
+	{ PCI_VDEVICE(ATI, 0xaa60),
 	  .driver_data = AZX_DRIVER_ATIHDMI | AZX_DCAPS_PRESET_ATI_HDMI },
-	{ PCI_DEVICE(0x1002, 0xaa68),
+	{ PCI_VDEVICE(ATI, 0xaa68),
 	  .driver_data = AZX_DRIVER_ATIHDMI | AZX_DCAPS_PRESET_ATI_HDMI },
-	{ PCI_DEVICE(0x1002, 0xaa80),
+	{ PCI_VDEVICE(ATI, 0xaa80),
 	  .driver_data = AZX_DRIVER_ATIHDMI | AZX_DCAPS_PRESET_ATI_HDMI },
-	{ PCI_DEVICE(0x1002, 0xaa88),
+	{ PCI_VDEVICE(ATI, 0xaa88),
 	  .driver_data = AZX_DRIVER_ATIHDMI | AZX_DCAPS_PRESET_ATI_HDMI },
-	{ PCI_DEVICE(0x1002, 0xaa90),
+	{ PCI_VDEVICE(ATI, 0xaa90),
 	  .driver_data = AZX_DRIVER_ATIHDMI | AZX_DCAPS_PRESET_ATI_HDMI },
-	{ PCI_DEVICE(0x1002, 0xaa98),
+	{ PCI_VDEVICE(ATI, 0xaa98),
 	  .driver_data = AZX_DRIVER_ATIHDMI | AZX_DCAPS_PRESET_ATI_HDMI },
-	{ PCI_DEVICE(0x1002, 0x9902),
+	{ PCI_VDEVICE(ATI, 0x9902),
 	  .driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS },
-	{ PCI_DEVICE(0x1002, 0xaaa0),
+	{ PCI_VDEVICE(ATI, 0xaaa0),
 	  .driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS },
-	{ PCI_DEVICE(0x1002, 0xaaa8),
+	{ PCI_VDEVICE(ATI, 0xaaa8),
 	  .driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS },
-	{ PCI_DEVICE(0x1002, 0xaab0),
+	{ PCI_VDEVICE(ATI, 0xaab0),
 	  .driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS },
-	{ PCI_DEVICE(0x1002, 0xaac0),
+	{ PCI_VDEVICE(ATI, 0xaac0),
 	  .driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS |
 	  AZX_DCAPS_PM_RUNTIME },
-	{ PCI_DEVICE(0x1002, 0xaac8),
+	{ PCI_VDEVICE(ATI, 0xaac8),
 	  .driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS |
 	  AZX_DCAPS_PM_RUNTIME },
-	{ PCI_DEVICE(0x1002, 0xaad8),
+	{ PCI_VDEVICE(ATI, 0xaad8),
 	  .driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS |
 	  AZX_DCAPS_PM_RUNTIME },
-	{ PCI_DEVICE(0x1002, 0xaae0),
+	{ PCI_VDEVICE(ATI, 0xaae0),
 	  .driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS |
 	  AZX_DCAPS_PM_RUNTIME },
-	{ PCI_DEVICE(0x1002, 0xaae8),
+	{ PCI_VDEVICE(ATI, 0xaae8),
 	  .driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS |
 	  AZX_DCAPS_PM_RUNTIME },
-	{ PCI_DEVICE(0x1002, 0xaaf0),
+	{ PCI_VDEVICE(ATI, 0xaaf0),
 	  .driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS |
 	  AZX_DCAPS_PM_RUNTIME },
-	{ PCI_DEVICE(0x1002, 0xaaf8),
+	{ PCI_VDEVICE(ATI, 0xaaf8),
 	  .driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS |
 	  AZX_DCAPS_PM_RUNTIME },
-	{ PCI_DEVICE(0x1002, 0xab00),
+	{ PCI_VDEVICE(ATI, 0xab00),
 	  .driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS |
 	  AZX_DCAPS_PM_RUNTIME },
-	{ PCI_DEVICE(0x1002, 0xab08),
+	{ PCI_VDEVICE(ATI, 0xab08),
 	  .driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS |
 	  AZX_DCAPS_PM_RUNTIME },
-	{ PCI_DEVICE(0x1002, 0xab10),
+	{ PCI_VDEVICE(ATI, 0xab10),
 	  .driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS |
 	  AZX_DCAPS_PM_RUNTIME },
-	{ PCI_DEVICE(0x1002, 0xab18),
+	{ PCI_VDEVICE(ATI, 0xab18),
 	  .driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS |
 	  AZX_DCAPS_PM_RUNTIME },
-	{ PCI_DEVICE(0x1002, 0xab20),
+	{ PCI_VDEVICE(ATI, 0xab20),
 	  .driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS |
 	  AZX_DCAPS_PM_RUNTIME },
-	{ PCI_DEVICE(0x1002, 0xab28),
+	{ PCI_VDEVICE(ATI, 0xab28),
 	  .driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS |
 	  AZX_DCAPS_PM_RUNTIME },
-	{ PCI_DEVICE(0x1002, 0xab30),
+	{ PCI_VDEVICE(ATI, 0xab30),
 	  .driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS |
 	  AZX_DCAPS_PM_RUNTIME },
-	{ PCI_DEVICE(0x1002, 0xab38),
+	{ PCI_VDEVICE(ATI, 0xab38),
 	  .driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS |
 	  AZX_DCAPS_PM_RUNTIME },
 	/* GLENFLY */
@@ -2752,15 +2681,15 @@ static const struct pci_device_id azx_ids[] = {
 	  .driver_data = AZX_DRIVER_GFHDMI | AZX_DCAPS_POSFIX_LPIB |
 	  AZX_DCAPS_NO_MSI | AZX_DCAPS_NO_64BIT },
 	/* VIA VT8251/VT8237A */
-	{ PCI_DEVICE(0x1106, 0x3288), .driver_data = AZX_DRIVER_VIA },
+	{ PCI_VDEVICE(VIA, 0x3288), .driver_data = AZX_DRIVER_VIA },
 	/* VIA GFX VT7122/VX900 */
-	{ PCI_DEVICE(0x1106, 0x9170), .driver_data = AZX_DRIVER_GENERIC },
+	{ PCI_VDEVICE(VIA, 0x9170), .driver_data = AZX_DRIVER_GENERIC },
 	/* VIA GFX VT6122/VX11 */
-	{ PCI_DEVICE(0x1106, 0x9140), .driver_data = AZX_DRIVER_GENERIC },
+	{ PCI_VDEVICE(VIA, 0x9140), .driver_data = AZX_DRIVER_GENERIC },
 	/* SIS966 */
-	{ PCI_DEVICE(0x1039, 0x7502), .driver_data = AZX_DRIVER_SIS },
+	{ PCI_VDEVICE(SI, 0x7502), .driver_data = AZX_DRIVER_SIS },
 	/* ULI M5461 */
-	{ PCI_DEVICE(0x10b9, 0x5461), .driver_data = AZX_DRIVER_ULI },
+	{ PCI_VDEVICE(AL, 0x5461), .driver_data = AZX_DRIVER_ULI },
 	/* NVIDIA MCP */
 	{ PCI_DEVICE(PCI_VENDOR_ID_NVIDIA, PCI_ANY_ID),
 	  .class = PCI_CLASS_MULTIMEDIA_HD_AUDIO << 8,
@@ -2773,9 +2702,9 @@ static const struct pci_device_id azx_ids[] = {
 	  .driver_data = AZX_DRIVER_TERA | AZX_DCAPS_NO_64BIT },
 	/* Creative X-Fi (CA0110-IBG) */
 	/* CTHDA chips */
-	{ PCI_DEVICE(0x1102, 0x0010),
+	{ PCI_VDEVICE(CREATIVE, 0x0010),
 	  .driver_data = AZX_DRIVER_CTHDA | AZX_DCAPS_PRESET_CTHDA },
-	{ PCI_DEVICE(0x1102, 0x0012),
+	{ PCI_VDEVICE(CREATIVE, 0x0012),
 	  .driver_data = AZX_DRIVER_CTHDA | AZX_DCAPS_PRESET_CTHDA },
 #if !IS_ENABLED(CONFIG_SND_CTXFI)
 	/* the following entry conflicts with snd-ctxfi driver,
@@ -2789,18 +2718,18 @@ static const struct pci_device_id azx_ids[] = {
 	  AZX_DCAPS_NO_64BIT | AZX_DCAPS_POSFIX_LPIB },
 #else
 	/* this entry seems still valid -- i.e. without emu20kx chip */
-	{ PCI_DEVICE(0x1102, 0x0009),
+	{ PCI_VDEVICE(CREATIVE, 0x0009),
 	  .driver_data = AZX_DRIVER_CTX | AZX_DCAPS_CTX_WORKAROUND |
 	  AZX_DCAPS_NO_64BIT | AZX_DCAPS_POSFIX_LPIB },
 #endif
 	/* CM8888 */
-	{ PCI_DEVICE(0x13f6, 0x5011),
+	{ PCI_VDEVICE(CMEDIA, 0x5011),
 	  .driver_data = AZX_DRIVER_CMEDIA |
 	  AZX_DCAPS_NO_MSI | AZX_DCAPS_POSFIX_LPIB | AZX_DCAPS_SNOOP_OFF },
 	/* Vortex86MX */
-	{ PCI_DEVICE(0x17f3, 0x3010), .driver_data = AZX_DRIVER_GENERIC },
+	{ PCI_VDEVICE(RDC, 0x3010), .driver_data = AZX_DRIVER_GENERIC },
 	/* VMware HDAudio */
-	{ PCI_DEVICE(0x15ad, 0x1977), .driver_data = AZX_DRIVER_GENERIC },
+	{ PCI_VDEVICE(VMWARE, 0x1977), .driver_data = AZX_DRIVER_GENERIC },
 	/* AMD/ATI Generic, PCI class code and Vendor ID for HD Audio */
 	{ PCI_DEVICE(PCI_VENDOR_ID_ATI, PCI_ANY_ID),
 	  .class = PCI_CLASS_MULTIMEDIA_HD_AUDIO << 8,
@@ -2811,11 +2740,11 @@ static const struct pci_device_id azx_ids[] = {
 	  .class_mask = 0xffffff,
 	  .driver_data = AZX_DRIVER_GENERIC | AZX_DCAPS_PRESET_ATI_HDMI },
 	/* Zhaoxin */
-	{ PCI_DEVICE(0x1d17, 0x3288), .driver_data = AZX_DRIVER_ZHAOXIN },
+	{ PCI_VDEVICE(ZHAOXIN, 0x3288), .driver_data = AZX_DRIVER_ZHAOXIN },
 	/* Loongson HDAudio*/
-	{PCI_DEVICE(PCI_VENDOR_ID_LOONGSON, PCI_DEVICE_ID_LOONGSON_HDA),
+	{ PCI_VDEVICE(LOONGSON, PCI_DEVICE_ID_LOONGSON_HDA),
 	  .driver_data = AZX_DRIVER_LOONGSON },
-	{PCI_DEVICE(PCI_VENDOR_ID_LOONGSON, PCI_DEVICE_ID_LOONGSON_HDMI),
+	{ PCI_VDEVICE(LOONGSON, PCI_DEVICE_ID_LOONGSON_HDMI),
 	  .driver_data = AZX_DRIVER_LOONGSON },
 	{ 0, }
 };
-- 
2.34.1

Re: [PATCH 08/13] ALSA: hda: Convert to PCI device IDs defines

[Andy Shevchenko]

On Tue, Jul 11, 2023 at 02:57:21PM +0200, Amadeusz Sławiński wrote:
> Use PCI device IDs from pci_ids.h header and while at it to simplify
> declarations change to using PCI_DEVICE_DATA() macro for Intel IDs and
> PCI_VDEVICE() for all other that have defined vendor.

FWIW,
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
See nit-pick below.

> Acked-by: Mark Brown <broonie@kernel.org>
> Signed-off-by: Amadeusz Sławiński <amadeuszx.slawinski@linux.intel.com>
> ---
>  sound/pci/hda/hda_intel.c | 353 +++++++++++++++-----------------------
>  1 file changed, 141 insertions(+), 212 deletions(-)
> 
> diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
> index 143efa54b9bf..4a162f27b46e 100644
> --- a/sound/pci/hda/hda_intel.c
> +++ b/sound/pci/hda/hda_intel.c
> @@ -2416,333 +2416,262 @@ static void azx_shutdown(struct pci_dev *pci)
>  /* PCI IDs */
>  static const struct pci_device_id azx_ids[] = {
>  	/* CPT */
> -	{ PCI_DEVICE(0x8086, 0x1c20),
> -	  .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH_NOPM },
> +	{ PCI_DEVICE_DATA(INTEL, HDA_CPT, AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH_NOPM) },
>  	/* PBG */
> -	{ PCI_DEVICE(0x8086, 0x1d20),
> -	  .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH_NOPM },
> +	{ PCI_DEVICE_DATA(INTEL, HDA_PBG, AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH_NOPM) },
>  	/* Panther Point */
> -	{ PCI_DEVICE(0x8086, 0x1e20),
> -	  .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH_NOPM },
> +	{ PCI_DEVICE_DATA(INTEL, HDA_PPT, AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH_NOPM) },
>  	/* Lynx Point */
> -	{ PCI_DEVICE(0x8086, 0x8c20),
> -	  .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH },
> +	{ PCI_DEVICE_DATA(INTEL, HDA_LPT, AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH) },
>  	/* 9 Series */
> -	{ PCI_DEVICE(0x8086, 0x8ca0),
> -	  .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH },
> +	{ PCI_DEVICE_DATA(INTEL, HDA_9_SERIES, AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH) },
>  	/* Wellsburg */
> -	{ PCI_DEVICE(0x8086, 0x8d20),
> -	  .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH },
> -	{ PCI_DEVICE(0x8086, 0x8d21),
> -	  .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH },
> +	{ PCI_DEVICE_DATA(INTEL, HDA_WBG_0, AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH) },
> +	{ PCI_DEVICE_DATA(INTEL, HDA_WBG_1, AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH) },
>  	/* Lewisburg */
> -	{ PCI_DEVICE(0x8086, 0xa1f0),
> -	  .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_SKYLAKE },
> -	{ PCI_DEVICE(0x8086, 0xa270),
> -	  .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_SKYLAKE },
> +	{ PCI_DEVICE_DATA(INTEL, HDA_LBG_0, AZX_DRIVER_PCH | AZX_DCAPS_INTEL_SKYLAKE) },
> +	{ PCI_DEVICE_DATA(INTEL, HDA_LBG_1, AZX_DRIVER_PCH | AZX_DCAPS_INTEL_SKYLAKE) },
>  	/* Lynx Point-LP */
> -	{ PCI_DEVICE(0x8086, 0x9c20),
> -	  .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH },
> +	{ PCI_DEVICE_DATA(INTEL, HDA_LPT_LP_0, AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH) },
>  	/* Lynx Point-LP */
> -	{ PCI_DEVICE(0x8086, 0x9c21),
> -	  .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH },
> +	{ PCI_DEVICE_DATA(INTEL, HDA_LPT_LP_1, AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH) },
>  	/* Wildcat Point-LP */
> -	{ PCI_DEVICE(0x8086, 0x9ca0),
> -	  .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH },
> -	/* Sunrise Point */
> -	{ PCI_DEVICE(0x8086, 0xa170),
> -	  .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE },
> -	/* Sunrise Point-LP */
> -	{ PCI_DEVICE(0x8086, 0x9d70),
> -	  .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE },
> +	{ PCI_DEVICE_DATA(INTEL, HDA_WPT_LP, AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH) },
> +	/* Skylake (Sunrise Point) */
> +	{ PCI_DEVICE_DATA(INTEL, HDA_SKL, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
> +	/* Skylake-LP (Sunrise Point-LP) */
> +	{ PCI_DEVICE_DATA(INTEL, HDA_SKL_LP, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
>  	/* Kabylake */
> -	{ PCI_DEVICE(0x8086, 0xa171),
> -	  .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE },
> +	{ PCI_DEVICE_DATA(INTEL, HDA_KBL, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
>  	/* Kabylake-LP */
> -	{ PCI_DEVICE(0x8086, 0x9d71),
> -	  .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE },
> +	{ PCI_DEVICE_DATA(INTEL, HDA_KBL_LP, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
>  	/* Kabylake-H */
> -	{ PCI_DEVICE(0x8086, 0xa2f0),
> -	  .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE },
> +	{ PCI_DEVICE_DATA(INTEL, HDA_KBL_H, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
>  	/* Coffelake */
> -	{ PCI_DEVICE(0x8086, 0xa348),
> -	  .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
> +	{ PCI_DEVICE_DATA(INTEL, HDA_CNL_H, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
>  	/* Cannonlake */
> -	{ PCI_DEVICE(0x8086, 0x9dc8),
> -	  .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
> +	{ PCI_DEVICE_DATA(INTEL, HDA_CNL_LP, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
>  	/* CometLake-LP */
> -	{ PCI_DEVICE(0x8086, 0x02C8),
> -	  .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
> +	{ PCI_DEVICE_DATA(INTEL, HDA_CML_LP, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
>  	/* CometLake-H */
> -	{ PCI_DEVICE(0x8086, 0x06C8),
> -	  .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
> -	{ PCI_DEVICE(0x8086, 0xf1c8),
> -	  .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
> +	{ PCI_DEVICE_DATA(INTEL, HDA_CML_H, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
> +	{ PCI_DEVICE_DATA(INTEL, HDA_RKL_S, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
>  	/* CometLake-S */
> -	{ PCI_DEVICE(0x8086, 0xa3f0),
> -	  .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
> +	{ PCI_DEVICE_DATA(INTEL, HDA_CML_S, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
>  	/* CometLake-R */
> -	{ PCI_DEVICE(0x8086, 0xf0c8),
> -	  .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
> +	{ PCI_DEVICE_DATA(INTEL, HDA_CML_R, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
>  	/* Icelake */
> -	{ PCI_DEVICE(0x8086, 0x34c8),
> -	  .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
> +	{ PCI_DEVICE_DATA(INTEL, HDA_ICL_LP, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
>  	/* Icelake-H */
> -	{ PCI_DEVICE(0x8086, 0x3dc8),
> -	  .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
> +	{ PCI_DEVICE_DATA(INTEL, HDA_ICL_H, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
>  	/* Jasperlake */
> -	{ PCI_DEVICE(0x8086, 0x38c8),
> -	  .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
> -	{ PCI_DEVICE(0x8086, 0x4dc8),
> -	  .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
> +	{ PCI_DEVICE_DATA(INTEL, HDA_ICL_N, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
> +	{ PCI_DEVICE_DATA(INTEL, HDA_JSL_N, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
>  	/* Tigerlake */
> -	{ PCI_DEVICE(0x8086, 0xa0c8),
> -	  .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
> +	{ PCI_DEVICE_DATA(INTEL, HDA_TGL_LP, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
>  	/* Tigerlake-H */
> -	{ PCI_DEVICE(0x8086, 0x43c8),
> -	  .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
> +	{ PCI_DEVICE_DATA(INTEL, HDA_TGL_H, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
>  	/* DG1 */
> -	{ PCI_DEVICE(0x8086, 0x490d),
> -	  .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
> +	{ PCI_DEVICE_DATA(INTEL, HDA_DG1, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
>  	/* DG2 */
> -	{ PCI_DEVICE(0x8086, 0x4f90),
> -	  .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
> -	{ PCI_DEVICE(0x8086, 0x4f91),
> -	  .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
> -	{ PCI_DEVICE(0x8086, 0x4f92),
> -	  .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
> +	{ PCI_DEVICE_DATA(INTEL, HDA_DG2_0, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
> +	{ PCI_DEVICE_DATA(INTEL, HDA_DG2_1, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
> +	{ PCI_DEVICE_DATA(INTEL, HDA_DG2_2, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
>  	/* Alderlake-S */
> -	{ PCI_DEVICE(0x8086, 0x7ad0),
> -	  .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
> +	{ PCI_DEVICE_DATA(INTEL, HDA_ADL_S, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
>  	/* Alderlake-P */
> -	{ PCI_DEVICE(0x8086, 0x51c8),
> -	  .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
> -	{ PCI_DEVICE(0x8086, 0x51c9),
> -	  .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
> -	{ PCI_DEVICE(0x8086, 0x51cd),
> -	  .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
> +	{ PCI_DEVICE_DATA(INTEL, HDA_ADL_P, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
> +	{ PCI_DEVICE_DATA(INTEL, HDA_ADL_PS, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
> +	{ PCI_DEVICE_DATA(INTEL, HDA_ADL_PX, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
>  	/* Alderlake-M */
> -	{ PCI_DEVICE(0x8086, 0x51cc),
> -	  .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
> +	{ PCI_DEVICE_DATA(INTEL, HDA_ADL_M, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
>  	/* Alderlake-N */
> -	{ PCI_DEVICE(0x8086, 0x54c8),
> -	  .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
> +	{ PCI_DEVICE_DATA(INTEL, HDA_ADL_N, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
>  	/* Elkhart Lake */
> -	{ PCI_DEVICE(0x8086, 0x4b55),
> -	  .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
> -	{ PCI_DEVICE(0x8086, 0x4b58),
> -	  .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
> +	{ PCI_DEVICE_DATA(INTEL, HDA_EHL_0, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
> +	{ PCI_DEVICE_DATA(INTEL, HDA_EHL_3, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
>  	/* Raptor Lake */
> -	{ PCI_DEVICE(0x8086, 0x7a50),
> -	  .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
> -	{ PCI_DEVICE(0x8086, 0x51ca),
> -	  .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
> -	{ PCI_DEVICE(0x8086, 0x51cb),
> -	  .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
> -	{ PCI_DEVICE(0x8086, 0x51ce),
> -	  .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
> -	{ PCI_DEVICE(0x8086, 0x51cf),
> -	  .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
> -	/* Meteorlake-P */
> -	{ PCI_DEVICE(0x8086, 0x7e28),
> -	  .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
> +	{ PCI_DEVICE_DATA(INTEL, HDA_RPL_S, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
> +	{ PCI_DEVICE_DATA(INTEL, HDA_RPL_P_0, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
> +	{ PCI_DEVICE_DATA(INTEL, HDA_RPL_P_1, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
> +	{ PCI_DEVICE_DATA(INTEL, HDA_RPL_M, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
> +	{ PCI_DEVICE_DATA(INTEL, HDA_RPL_PX, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
> +	{ PCI_DEVICE_DATA(INTEL, HDA_MTL, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
>  	/* Lunarlake-P */
> -	{ PCI_DEVICE(0x8086, 0xa828),
> -	  .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
> -	/* Broxton-P(Apollolake) */
> -	{ PCI_DEVICE(0x8086, 0x5a98),
> -	  .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_BROXTON },
> +	{ PCI_DEVICE_DATA(INTEL, HDA_LNL_P, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
> +	/* Apollolake (Broxton-P) */
> +	{ PCI_DEVICE_DATA(INTEL, HDA_APL, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_BROXTON) },
>  	/* Broxton-T */
> -	{ PCI_DEVICE(0x8086, 0x1a98),
> -	  .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_BROXTON },
> +	{ PCI_DEVICE_DATA(INTEL, HDA_APL_T, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_BROXTON) },
>  	/* Gemini-Lake */
> -	{ PCI_DEVICE(0x8086, 0x3198),
> -	  .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_BROXTON },
> +	{ PCI_DEVICE_DATA(INTEL, HDA_GML, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_BROXTON) },
>  	/* Haswell */
> -	{ PCI_DEVICE(0x8086, 0x0a0c),
> -	  .driver_data = AZX_DRIVER_HDMI | AZX_DCAPS_INTEL_HASWELL },
> -	{ PCI_DEVICE(0x8086, 0x0c0c),
> -	  .driver_data = AZX_DRIVER_HDMI | AZX_DCAPS_INTEL_HASWELL },
> -	{ PCI_DEVICE(0x8086, 0x0d0c),
> -	  .driver_data = AZX_DRIVER_HDMI | AZX_DCAPS_INTEL_HASWELL },
> +	{ PCI_DEVICE_DATA(INTEL, HDA_HSW_0, AZX_DRIVER_HDMI | AZX_DCAPS_INTEL_HASWELL) },
> +	{ PCI_DEVICE_DATA(INTEL, HDA_HSW_2, AZX_DRIVER_HDMI | AZX_DCAPS_INTEL_HASWELL) },
> +	{ PCI_DEVICE_DATA(INTEL, HDA_HSW_3, AZX_DRIVER_HDMI | AZX_DCAPS_INTEL_HASWELL) },
>  	/* Broadwell */
> -	{ PCI_DEVICE(0x8086, 0x160c),
> -	  .driver_data = AZX_DRIVER_HDMI | AZX_DCAPS_INTEL_BROADWELL },
> +	{ PCI_DEVICE_DATA(INTEL, HDA_BDW, AZX_DRIVER_HDMI | AZX_DCAPS_INTEL_BROADWELL) },
>  	/* 5 Series/3400 */
> -	{ PCI_DEVICE(0x8086, 0x3b56),
> -	  .driver_data = AZX_DRIVER_SCH | AZX_DCAPS_INTEL_PCH_NOPM },
> -	{ PCI_DEVICE(0x8086, 0x3b57),
> -	  .driver_data = AZX_DRIVER_SCH | AZX_DCAPS_INTEL_PCH_NOPM },
> +	{ PCI_DEVICE_DATA(INTEL, HDA_5_3400_SERIES_0, AZX_DRIVER_SCH | AZX_DCAPS_INTEL_PCH_NOPM) },
> +	{ PCI_DEVICE_DATA(INTEL, HDA_5_3400_SERIES_1, AZX_DRIVER_SCH | AZX_DCAPS_INTEL_PCH_NOPM) },
>  	/* Poulsbo */
> -	{ PCI_DEVICE(0x8086, 0x811b),
> -	  .driver_data = AZX_DRIVER_SCH | AZX_DCAPS_INTEL_PCH_BASE |
> -	  AZX_DCAPS_POSFIX_LPIB },
> +	{ PCI_DEVICE_DATA(INTEL, HDA_POULSBO, AZX_DRIVER_SCH | AZX_DCAPS_INTEL_PCH_BASE |
> +	  AZX_DCAPS_POSFIX_LPIB) },
>  	/* Oaktrail */
> -	{ PCI_DEVICE(0x8086, 0x080a),
> -	  .driver_data = AZX_DRIVER_SCH | AZX_DCAPS_INTEL_PCH_BASE },
> +	{ PCI_DEVICE_DATA(INTEL, HDA_OAKTRAIL, AZX_DRIVER_SCH | AZX_DCAPS_INTEL_PCH_BASE) },
>  	/* BayTrail */
> -	{ PCI_DEVICE(0x8086, 0x0f04),
> -	  .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_BAYTRAIL },
> +	{ PCI_DEVICE_DATA(INTEL, HDA_BYT, AZX_DRIVER_PCH | AZX_DCAPS_INTEL_BAYTRAIL) },
>  	/* Braswell */
> -	{ PCI_DEVICE(0x8086, 0x2284),
> -	  .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_BRASWELL },
> +	{ PCI_DEVICE_DATA(INTEL, HDA_BSW, AZX_DRIVER_PCH | AZX_DCAPS_INTEL_BRASWELL) },
>  	/* ICH6 */
> -	{ PCI_DEVICE(0x8086, 0x2668),
> -	  .driver_data = AZX_DRIVER_ICH | AZX_DCAPS_INTEL_ICH },
> +	{ PCI_DEVICE_DATA(INTEL, HDA_ICH6, AZX_DRIVER_ICH | AZX_DCAPS_INTEL_ICH) },
>  	/* ICH7 */
> -	{ PCI_DEVICE(0x8086, 0x27d8),
> -	  .driver_data = AZX_DRIVER_ICH | AZX_DCAPS_INTEL_ICH },
> +	{ PCI_DEVICE_DATA(INTEL, HDA_ICH7, AZX_DRIVER_ICH | AZX_DCAPS_INTEL_ICH) },
>  	/* ESB2 */
> -	{ PCI_DEVICE(0x8086, 0x269a),
> -	  .driver_data = AZX_DRIVER_ICH | AZX_DCAPS_INTEL_ICH },
> +	{ PCI_DEVICE_DATA(INTEL, HDA_ESB2, AZX_DRIVER_ICH | AZX_DCAPS_INTEL_ICH) },
>  	/* ICH8 */
> -	{ PCI_DEVICE(0x8086, 0x284b),
> -	  .driver_data = AZX_DRIVER_ICH | AZX_DCAPS_INTEL_ICH },
> +	{ PCI_DEVICE_DATA(INTEL, HDA_ICH8, AZX_DRIVER_ICH | AZX_DCAPS_INTEL_ICH) },
>  	/* ICH9 */
> -	{ PCI_DEVICE(0x8086, 0x293e),
> -	  .driver_data = AZX_DRIVER_ICH | AZX_DCAPS_INTEL_ICH },
> +	{ PCI_DEVICE_DATA(INTEL, HDA_ICH9_0, AZX_DRIVER_ICH | AZX_DCAPS_INTEL_ICH) },
>  	/* ICH9 */
> -	{ PCI_DEVICE(0x8086, 0x293f),
> -	  .driver_data = AZX_DRIVER_ICH | AZX_DCAPS_INTEL_ICH },
> +	{ PCI_DEVICE_DATA(INTEL, HDA_ICH9_1, AZX_DRIVER_ICH | AZX_DCAPS_INTEL_ICH) },
>  	/* ICH10 */
> -	{ PCI_DEVICE(0x8086, 0x3a3e),
> -	  .driver_data = AZX_DRIVER_ICH | AZX_DCAPS_INTEL_ICH },
> +	{ PCI_DEVICE_DATA(INTEL, HDA_ICH10_0, AZX_DRIVER_ICH | AZX_DCAPS_INTEL_ICH) },
>  	/* ICH10 */
> -	{ PCI_DEVICE(0x8086, 0x3a6e),
> -	  .driver_data = AZX_DRIVER_ICH | AZX_DCAPS_INTEL_ICH },
> +	{ PCI_DEVICE_DATA(INTEL, HDA_ICH10_1, AZX_DRIVER_ICH | AZX_DCAPS_INTEL_ICH) },
>  	/* Generic Intel */
>  	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_ANY_ID),
>  	  .class = PCI_CLASS_MULTIMEDIA_HD_AUDIO << 8,
>  	  .class_mask = 0xffffff,
>  	  .driver_data = AZX_DRIVER_ICH | AZX_DCAPS_NO_ALIGN_BUFSIZE },

>  	/* ATI SB 450/600/700/800/900 */
> -	{ PCI_DEVICE(0x1002, 0x437b),
> +	{ PCI_VDEVICE(ATI, 0x437b),
>  	  .driver_data = AZX_DRIVER_ATI | AZX_DCAPS_PRESET_ATI_SB },
> -	{ PCI_DEVICE(0x1002, 0x4383),
> +	{ PCI_VDEVICE(ATI, 0x4383),
>  	  .driver_data = AZX_DRIVER_ATI | AZX_DCAPS_PRESET_ATI_SB },

I know that AMD owns ATI, but wouldn't make sense to group by company?
Maybe as a separate (preparatory?) patch.

>  	/* AMD Hudson */
> -	{ PCI_DEVICE(0x1022, 0x780d),
> +	{ PCI_VDEVICE(AMD, 0x780d),
>  	  .driver_data = AZX_DRIVER_GENERIC | AZX_DCAPS_PRESET_ATI_SB },
>  	/* AMD, X370 & co */
> -	{ PCI_DEVICE(0x1022, 0x1457),
> +	{ PCI_VDEVICE(AMD, 0x1457),
>  	  .driver_data = AZX_DRIVER_GENERIC | AZX_DCAPS_PRESET_AMD_SB },
>  	/* AMD, X570 & co */
> -	{ PCI_DEVICE(0x1022, 0x1487),
> +	{ PCI_VDEVICE(AMD, 0x1487),
>  	  .driver_data = AZX_DRIVER_GENERIC | AZX_DCAPS_PRESET_AMD_SB },
>  	/* AMD Stoney */
> -	{ PCI_DEVICE(0x1022, 0x157a),
> +	{ PCI_VDEVICE(AMD, 0x157a),
>  	  .driver_data = AZX_DRIVER_GENERIC | AZX_DCAPS_PRESET_ATI_SB |
>  			 AZX_DCAPS_PM_RUNTIME },
>  	/* AMD Raven */
> -	{ PCI_DEVICE(0x1022, 0x15e3),
> +	{ PCI_VDEVICE(AMD, 0x15e3),
>  	  .driver_data = AZX_DRIVER_GENERIC | AZX_DCAPS_PRESET_AMD_SB },
>  	/* ATI HDMI */
> -	{ PCI_DEVICE(0x1002, 0x0002),
> +	{ PCI_VDEVICE(ATI, 0x0002),
>  	  .driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS |
>  	  AZX_DCAPS_PM_RUNTIME },
> -	{ PCI_DEVICE(0x1002, 0x1308),
> +	{ PCI_VDEVICE(ATI, 0x1308),
>  	  .driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS },
> -	{ PCI_DEVICE(0x1002, 0x157a),
> +	{ PCI_VDEVICE(ATI, 0x157a),
>  	  .driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS },
> -	{ PCI_DEVICE(0x1002, 0x15b3),
> +	{ PCI_VDEVICE(ATI, 0x15b3),
>  	  .driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS },
> -	{ PCI_DEVICE(0x1002, 0x793b),
> +	{ PCI_VDEVICE(ATI, 0x793b),
>  	  .driver_data = AZX_DRIVER_ATIHDMI | AZX_DCAPS_PRESET_ATI_HDMI },
> -	{ PCI_DEVICE(0x1002, 0x7919),
> +	{ PCI_VDEVICE(ATI, 0x7919),
>  	  .driver_data = AZX_DRIVER_ATIHDMI | AZX_DCAPS_PRESET_ATI_HDMI },
> -	{ PCI_DEVICE(0x1002, 0x960f),
> +	{ PCI_VDEVICE(ATI, 0x960f),
>  	  .driver_data = AZX_DRIVER_ATIHDMI | AZX_DCAPS_PRESET_ATI_HDMI },
> -	{ PCI_DEVICE(0x1002, 0x970f),
> +	{ PCI_VDEVICE(ATI, 0x970f),
>  	  .driver_data = AZX_DRIVER_ATIHDMI | AZX_DCAPS_PRESET_ATI_HDMI },
> -	{ PCI_DEVICE(0x1002, 0x9840),
> +	{ PCI_VDEVICE(ATI, 0x9840),
>  	  .driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS },
> -	{ PCI_DEVICE(0x1002, 0xaa00),
> +	{ PCI_VDEVICE(ATI, 0xaa00),
>  	  .driver_data = AZX_DRIVER_ATIHDMI | AZX_DCAPS_PRESET_ATI_HDMI },
> -	{ PCI_DEVICE(0x1002, 0xaa08),
> +	{ PCI_VDEVICE(ATI, 0xaa08),
>  	  .driver_data = AZX_DRIVER_ATIHDMI | AZX_DCAPS_PRESET_ATI_HDMI },
> -	{ PCI_DEVICE(0x1002, 0xaa10),
> +	{ PCI_VDEVICE(ATI, 0xaa10),
>  	  .driver_data = AZX_DRIVER_ATIHDMI | AZX_DCAPS_PRESET_ATI_HDMI },
> -	{ PCI_DEVICE(0x1002, 0xaa18),
> +	{ PCI_VDEVICE(ATI, 0xaa18),
>  	  .driver_data = AZX_DRIVER_ATIHDMI | AZX_DCAPS_PRESET_ATI_HDMI },
> -	{ PCI_DEVICE(0x1002, 0xaa20),
> +	{ PCI_VDEVICE(ATI, 0xaa20),
>  	  .driver_data = AZX_DRIVER_ATIHDMI | AZX_DCAPS_PRESET_ATI_HDMI },
> -	{ PCI_DEVICE(0x1002, 0xaa28),
> +	{ PCI_VDEVICE(ATI, 0xaa28),
>  	  .driver_data = AZX_DRIVER_ATIHDMI | AZX_DCAPS_PRESET_ATI_HDMI },
> -	{ PCI_DEVICE(0x1002, 0xaa30),
> +	{ PCI_VDEVICE(ATI, 0xaa30),
>  	  .driver_data = AZX_DRIVER_ATIHDMI | AZX_DCAPS_PRESET_ATI_HDMI },
> -	{ PCI_DEVICE(0x1002, 0xaa38),
> +	{ PCI_VDEVICE(ATI, 0xaa38),
>  	  .driver_data = AZX_DRIVER_ATIHDMI | AZX_DCAPS_PRESET_ATI_HDMI },
> -	{ PCI_DEVICE(0x1002, 0xaa40),
> +	{ PCI_VDEVICE(ATI, 0xaa40),
>  	  .driver_data = AZX_DRIVER_ATIHDMI | AZX_DCAPS_PRESET_ATI_HDMI },
> -	{ PCI_DEVICE(0x1002, 0xaa48),
> +	{ PCI_VDEVICE(ATI, 0xaa48),
>  	  .driver_data = AZX_DRIVER_ATIHDMI | AZX_DCAPS_PRESET_ATI_HDMI },
> -	{ PCI_DEVICE(0x1002, 0xaa50),
> +	{ PCI_VDEVICE(ATI, 0xaa50),
>  	  .driver_data = AZX_DRIVER_ATIHDMI | AZX_DCAPS_PRESET_ATI_HDMI },
> -	{ PCI_DEVICE(0x1002, 0xaa58),
> +	{ PCI_VDEVICE(ATI, 0xaa58),
>  	  .driver_data = AZX_DRIVER_ATIHDMI | AZX_DCAPS_PRESET_ATI_HDMI },
> -	{ PCI_DEVICE(0x1002, 0xaa60),
> +	{ PCI_VDEVICE(ATI, 0xaa60),
>  	  .driver_data = AZX_DRIVER_ATIHDMI | AZX_DCAPS_PRESET_ATI_HDMI },
> -	{ PCI_DEVICE(0x1002, 0xaa68),
> +	{ PCI_VDEVICE(ATI, 0xaa68),
>  	  .driver_data = AZX_DRIVER_ATIHDMI | AZX_DCAPS_PRESET_ATI_HDMI },
> -	{ PCI_DEVICE(0x1002, 0xaa80),
> +	{ PCI_VDEVICE(ATI, 0xaa80),
>  	  .driver_data = AZX_DRIVER_ATIHDMI | AZX_DCAPS_PRESET_ATI_HDMI },
> -	{ PCI_DEVICE(0x1002, 0xaa88),
> +	{ PCI_VDEVICE(ATI, 0xaa88),
>  	  .driver_data = AZX_DRIVER_ATIHDMI | AZX_DCAPS_PRESET_ATI_HDMI },
> -	{ PCI_DEVICE(0x1002, 0xaa90),
> +	{ PCI_VDEVICE(ATI, 0xaa90),
>  	  .driver_data = AZX_DRIVER_ATIHDMI | AZX_DCAPS_PRESET_ATI_HDMI },
> -	{ PCI_DEVICE(0x1002, 0xaa98),
> +	{ PCI_VDEVICE(ATI, 0xaa98),
>  	  .driver_data = AZX_DRIVER_ATIHDMI | AZX_DCAPS_PRESET_ATI_HDMI },
> -	{ PCI_DEVICE(0x1002, 0x9902),
> +	{ PCI_VDEVICE(ATI, 0x9902),
>  	  .driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS },
> -	{ PCI_DEVICE(0x1002, 0xaaa0),
> +	{ PCI_VDEVICE(ATI, 0xaaa0),
>  	  .driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS },
> -	{ PCI_DEVICE(0x1002, 0xaaa8),
> +	{ PCI_VDEVICE(ATI, 0xaaa8),
>  	  .driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS },
> -	{ PCI_DEVICE(0x1002, 0xaab0),
> +	{ PCI_VDEVICE(ATI, 0xaab0),
>  	  .driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS },
> -	{ PCI_DEVICE(0x1002, 0xaac0),
> +	{ PCI_VDEVICE(ATI, 0xaac0),
>  	  .driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS |
>  	  AZX_DCAPS_PM_RUNTIME },
> -	{ PCI_DEVICE(0x1002, 0xaac8),
> +	{ PCI_VDEVICE(ATI, 0xaac8),
>  	  .driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS |
>  	  AZX_DCAPS_PM_RUNTIME },
> -	{ PCI_DEVICE(0x1002, 0xaad8),
> +	{ PCI_VDEVICE(ATI, 0xaad8),
>  	  .driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS |
>  	  AZX_DCAPS_PM_RUNTIME },
> -	{ PCI_DEVICE(0x1002, 0xaae0),
> +	{ PCI_VDEVICE(ATI, 0xaae0),
>  	  .driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS |
>  	  AZX_DCAPS_PM_RUNTIME },
> -	{ PCI_DEVICE(0x1002, 0xaae8),
> +	{ PCI_VDEVICE(ATI, 0xaae8),
>  	  .driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS |
>  	  AZX_DCAPS_PM_RUNTIME },
> -	{ PCI_DEVICE(0x1002, 0xaaf0),
> +	{ PCI_VDEVICE(ATI, 0xaaf0),
>  	  .driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS |
>  	  AZX_DCAPS_PM_RUNTIME },
> -	{ PCI_DEVICE(0x1002, 0xaaf8),
> +	{ PCI_VDEVICE(ATI, 0xaaf8),
>  	  .driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS |
>  	  AZX_DCAPS_PM_RUNTIME },
> -	{ PCI_DEVICE(0x1002, 0xab00),
> +	{ PCI_VDEVICE(ATI, 0xab00),
>  	  .driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS |
>  	  AZX_DCAPS_PM_RUNTIME },
> -	{ PCI_DEVICE(0x1002, 0xab08),
> +	{ PCI_VDEVICE(ATI, 0xab08),
>  	  .driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS |
>  	  AZX_DCAPS_PM_RUNTIME },
> -	{ PCI_DEVICE(0x1002, 0xab10),
> +	{ PCI_VDEVICE(ATI, 0xab10),
>  	  .driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS |
>  	  AZX_DCAPS_PM_RUNTIME },
> -	{ PCI_DEVICE(0x1002, 0xab18),
> +	{ PCI_VDEVICE(ATI, 0xab18),
>  	  .driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS |
>  	  AZX_DCAPS_PM_RUNTIME },
> -	{ PCI_DEVICE(0x1002, 0xab20),
> +	{ PCI_VDEVICE(ATI, 0xab20),
>  	  .driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS |
>  	  AZX_DCAPS_PM_RUNTIME },
> -	{ PCI_DEVICE(0x1002, 0xab28),
> +	{ PCI_VDEVICE(ATI, 0xab28),
>  	  .driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS |
>  	  AZX_DCAPS_PM_RUNTIME },
> -	{ PCI_DEVICE(0x1002, 0xab30),
> +	{ PCI_VDEVICE(ATI, 0xab30),
>  	  .driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS |
>  	  AZX_DCAPS_PM_RUNTIME },
> -	{ PCI_DEVICE(0x1002, 0xab38),
> +	{ PCI_VDEVICE(ATI, 0xab38),
>  	  .driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS |
>  	  AZX_DCAPS_PM_RUNTIME },
>  	/* GLENFLY */
> @@ -2752,15 +2681,15 @@ static const struct pci_device_id azx_ids[] = {
>  	  .driver_data = AZX_DRIVER_GFHDMI | AZX_DCAPS_POSFIX_LPIB |
>  	  AZX_DCAPS_NO_MSI | AZX_DCAPS_NO_64BIT },
>  	/* VIA VT8251/VT8237A */
> -	{ PCI_DEVICE(0x1106, 0x3288), .driver_data = AZX_DRIVER_VIA },
> +	{ PCI_VDEVICE(VIA, 0x3288), .driver_data = AZX_DRIVER_VIA },
>  	/* VIA GFX VT7122/VX900 */
> -	{ PCI_DEVICE(0x1106, 0x9170), .driver_data = AZX_DRIVER_GENERIC },
> +	{ PCI_VDEVICE(VIA, 0x9170), .driver_data = AZX_DRIVER_GENERIC },
>  	/* VIA GFX VT6122/VX11 */
> -	{ PCI_DEVICE(0x1106, 0x9140), .driver_data = AZX_DRIVER_GENERIC },
> +	{ PCI_VDEVICE(VIA, 0x9140), .driver_data = AZX_DRIVER_GENERIC },
>  	/* SIS966 */
> -	{ PCI_DEVICE(0x1039, 0x7502), .driver_data = AZX_DRIVER_SIS },
> +	{ PCI_VDEVICE(SI, 0x7502), .driver_data = AZX_DRIVER_SIS },
>  	/* ULI M5461 */
> -	{ PCI_DEVICE(0x10b9, 0x5461), .driver_data = AZX_DRIVER_ULI },
> +	{ PCI_VDEVICE(AL, 0x5461), .driver_data = AZX_DRIVER_ULI },
>  	/* NVIDIA MCP */
>  	{ PCI_DEVICE(PCI_VENDOR_ID_NVIDIA, PCI_ANY_ID),
>  	  .class = PCI_CLASS_MULTIMEDIA_HD_AUDIO << 8,
> @@ -2773,9 +2702,9 @@ static const struct pci_device_id azx_ids[] = {
>  	  .driver_data = AZX_DRIVER_TERA | AZX_DCAPS_NO_64BIT },
>  	/* Creative X-Fi (CA0110-IBG) */
>  	/* CTHDA chips */
> -	{ PCI_DEVICE(0x1102, 0x0010),
> +	{ PCI_VDEVICE(CREATIVE, 0x0010),
>  	  .driver_data = AZX_DRIVER_CTHDA | AZX_DCAPS_PRESET_CTHDA },
> -	{ PCI_DEVICE(0x1102, 0x0012),
> +	{ PCI_VDEVICE(CREATIVE, 0x0012),
>  	  .driver_data = AZX_DRIVER_CTHDA | AZX_DCAPS_PRESET_CTHDA },
>  #if !IS_ENABLED(CONFIG_SND_CTXFI)
>  	/* the following entry conflicts with snd-ctxfi driver,
> @@ -2789,18 +2718,18 @@ static const struct pci_device_id azx_ids[] = {
>  	  AZX_DCAPS_NO_64BIT | AZX_DCAPS_POSFIX_LPIB },
>  #else
>  	/* this entry seems still valid -- i.e. without emu20kx chip */
> -	{ PCI_DEVICE(0x1102, 0x0009),
> +	{ PCI_VDEVICE(CREATIVE, 0x0009),
>  	  .driver_data = AZX_DRIVER_CTX | AZX_DCAPS_CTX_WORKAROUND |
>  	  AZX_DCAPS_NO_64BIT | AZX_DCAPS_POSFIX_LPIB },
>  #endif
>  	/* CM8888 */
> -	{ PCI_DEVICE(0x13f6, 0x5011),
> +	{ PCI_VDEVICE(CMEDIA, 0x5011),
>  	  .driver_data = AZX_DRIVER_CMEDIA |
>  	  AZX_DCAPS_NO_MSI | AZX_DCAPS_POSFIX_LPIB | AZX_DCAPS_SNOOP_OFF },
>  	/* Vortex86MX */
> -	{ PCI_DEVICE(0x17f3, 0x3010), .driver_data = AZX_DRIVER_GENERIC },
> +	{ PCI_VDEVICE(RDC, 0x3010), .driver_data = AZX_DRIVER_GENERIC },
>  	/* VMware HDAudio */
> -	{ PCI_DEVICE(0x15ad, 0x1977), .driver_data = AZX_DRIVER_GENERIC },
> +	{ PCI_VDEVICE(VMWARE, 0x1977), .driver_data = AZX_DRIVER_GENERIC },
>  	/* AMD/ATI Generic, PCI class code and Vendor ID for HD Audio */
>  	{ PCI_DEVICE(PCI_VENDOR_ID_ATI, PCI_ANY_ID),
>  	  .class = PCI_CLASS_MULTIMEDIA_HD_AUDIO << 8,
> @@ -2811,11 +2740,11 @@ static const struct pci_device_id azx_ids[] = {
>  	  .class_mask = 0xffffff,
>  	  .driver_data = AZX_DRIVER_GENERIC | AZX_DCAPS_PRESET_ATI_HDMI },
>  	/* Zhaoxin */
> -	{ PCI_DEVICE(0x1d17, 0x3288), .driver_data = AZX_DRIVER_ZHAOXIN },
> +	{ PCI_VDEVICE(ZHAOXIN, 0x3288), .driver_data = AZX_DRIVER_ZHAOXIN },
>  	/* Loongson HDAudio*/
> -	{PCI_DEVICE(PCI_VENDOR_ID_LOONGSON, PCI_DEVICE_ID_LOONGSON_HDA),
> +	{ PCI_VDEVICE(LOONGSON, PCI_DEVICE_ID_LOONGSON_HDA),
>  	  .driver_data = AZX_DRIVER_LOONGSON },
> -	{PCI_DEVICE(PCI_VENDOR_ID_LOONGSON, PCI_DEVICE_ID_LOONGSON_HDMI),
> +	{ PCI_VDEVICE(LOONGSON, PCI_DEVICE_ID_LOONGSON_HDMI),
>  	  .driver_data = AZX_DRIVER_LOONGSON },
>  	{ 0, }
>  };
> -- 
> 2.34.1
> 

-- 
With Best Regards,
Andy Shevchenko

Re: [PATCH 08/13] ALSA: hda: Convert to PCI device IDs defines

[Amadeusz Sławiński]

On 7/11/2023 4:07 PM, Andy Shevchenko wrote:
> On Tue, Jul 11, 2023 at 02:57:21PM +0200, Amadeusz Sławiński wrote:
>> Use PCI device IDs from pci_ids.h header and while at it to simplify
>> declarations change to using PCI_DEVICE_DATA() macro for Intel IDs and
>> PCI_VDEVICE() for all other that have defined vendor.
> 
> FWIW,
> Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
> See nit-pick below.
> 
>> Acked-by: Mark Brown <broonie@kernel.org>
>> Signed-off-by: Amadeusz Sławiński <amadeuszx.slawinski@linux.intel.com>
>> ---
>>   sound/pci/hda/hda_intel.c | 353 +++++++++++++++-----------------------
>>   1 file changed, 141 insertions(+), 212 deletions(-)
>>
>> diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
>> index 143efa54b9bf..4a162f27b46e 100644
>> --- a/sound/pci/hda/hda_intel.c
>> +++ b/sound/pci/hda/hda_intel.c
>> @@ -2416,333 +2416,262 @@ static void azx_shutdown(struct pci_dev *pci)
>>   /* PCI IDs */
>>   static const struct pci_device_id azx_ids[] = {
>>   	/* CPT */
>> -	{ PCI_DEVICE(0x8086, 0x1c20),
>> -	  .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH_NOPM },
>> +	{ PCI_DEVICE_DATA(INTEL, HDA_CPT, AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH_NOPM) },
>>   	/* PBG */
>> -	{ PCI_DEVICE(0x8086, 0x1d20),
>> -	  .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH_NOPM },
>> +	{ PCI_DEVICE_DATA(INTEL, HDA_PBG, AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH_NOPM) },
>>   	/* Panther Point */
>> -	{ PCI_DEVICE(0x8086, 0x1e20),
>> -	  .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH_NOPM },
>> +	{ PCI_DEVICE_DATA(INTEL, HDA_PPT, AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH_NOPM) },
>>   	/* Lynx Point */
>> -	{ PCI_DEVICE(0x8086, 0x8c20),
>> -	  .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH },
>> +	{ PCI_DEVICE_DATA(INTEL, HDA_LPT, AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH) },
>>   	/* 9 Series */
>> -	{ PCI_DEVICE(0x8086, 0x8ca0),
>> -	  .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH },
>> +	{ PCI_DEVICE_DATA(INTEL, HDA_9_SERIES, AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH) },
>>   	/* Wellsburg */
>> -	{ PCI_DEVICE(0x8086, 0x8d20),
>> -	  .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH },
>> -	{ PCI_DEVICE(0x8086, 0x8d21),
>> -	  .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH },
>> +	{ PCI_DEVICE_DATA(INTEL, HDA_WBG_0, AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH) },
>> +	{ PCI_DEVICE_DATA(INTEL, HDA_WBG_1, AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH) },
>>   	/* Lewisburg */
>> -	{ PCI_DEVICE(0x8086, 0xa1f0),
>> -	  .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_SKYLAKE },
>> -	{ PCI_DEVICE(0x8086, 0xa270),
>> -	  .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_SKYLAKE },
>> +	{ PCI_DEVICE_DATA(INTEL, HDA_LBG_0, AZX_DRIVER_PCH | AZX_DCAPS_INTEL_SKYLAKE) },
>> +	{ PCI_DEVICE_DATA(INTEL, HDA_LBG_1, AZX_DRIVER_PCH | AZX_DCAPS_INTEL_SKYLAKE) },
>>   	/* Lynx Point-LP */
>> -	{ PCI_DEVICE(0x8086, 0x9c20),
>> -	  .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH },
>> +	{ PCI_DEVICE_DATA(INTEL, HDA_LPT_LP_0, AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH) },
>>   	/* Lynx Point-LP */
>> -	{ PCI_DEVICE(0x8086, 0x9c21),
>> -	  .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH },
>> +	{ PCI_DEVICE_DATA(INTEL, HDA_LPT_LP_1, AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH) },
>>   	/* Wildcat Point-LP */
>> -	{ PCI_DEVICE(0x8086, 0x9ca0),
>> -	  .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH },
>> -	/* Sunrise Point */
>> -	{ PCI_DEVICE(0x8086, 0xa170),
>> -	  .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE },
>> -	/* Sunrise Point-LP */
>> -	{ PCI_DEVICE(0x8086, 0x9d70),
>> -	  .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE },
>> +	{ PCI_DEVICE_DATA(INTEL, HDA_WPT_LP, AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH) },
>> +	/* Skylake (Sunrise Point) */
>> +	{ PCI_DEVICE_DATA(INTEL, HDA_SKL, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
>> +	/* Skylake-LP (Sunrise Point-LP) */
>> +	{ PCI_DEVICE_DATA(INTEL, HDA_SKL_LP, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
>>   	/* Kabylake */
>> -	{ PCI_DEVICE(0x8086, 0xa171),
>> -	  .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE },
>> +	{ PCI_DEVICE_DATA(INTEL, HDA_KBL, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
>>   	/* Kabylake-LP */
>> -	{ PCI_DEVICE(0x8086, 0x9d71),
>> -	  .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE },
>> +	{ PCI_DEVICE_DATA(INTEL, HDA_KBL_LP, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
>>   	/* Kabylake-H */
>> -	{ PCI_DEVICE(0x8086, 0xa2f0),
>> -	  .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE },
>> +	{ PCI_DEVICE_DATA(INTEL, HDA_KBL_H, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
>>   	/* Coffelake */
>> -	{ PCI_DEVICE(0x8086, 0xa348),
>> -	  .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
>> +	{ PCI_DEVICE_DATA(INTEL, HDA_CNL_H, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
>>   	/* Cannonlake */
>> -	{ PCI_DEVICE(0x8086, 0x9dc8),
>> -	  .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
>> +	{ PCI_DEVICE_DATA(INTEL, HDA_CNL_LP, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
>>   	/* CometLake-LP */
>> -	{ PCI_DEVICE(0x8086, 0x02C8),
>> -	  .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
>> +	{ PCI_DEVICE_DATA(INTEL, HDA_CML_LP, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
>>   	/* CometLake-H */
>> -	{ PCI_DEVICE(0x8086, 0x06C8),
>> -	  .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
>> -	{ PCI_DEVICE(0x8086, 0xf1c8),
>> -	  .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
>> +	{ PCI_DEVICE_DATA(INTEL, HDA_CML_H, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
>> +	{ PCI_DEVICE_DATA(INTEL, HDA_RKL_S, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
>>   	/* CometLake-S */
>> -	{ PCI_DEVICE(0x8086, 0xa3f0),
>> -	  .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
>> +	{ PCI_DEVICE_DATA(INTEL, HDA_CML_S, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
>>   	/* CometLake-R */
>> -	{ PCI_DEVICE(0x8086, 0xf0c8),
>> -	  .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
>> +	{ PCI_DEVICE_DATA(INTEL, HDA_CML_R, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
>>   	/* Icelake */
>> -	{ PCI_DEVICE(0x8086, 0x34c8),
>> -	  .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
>> +	{ PCI_DEVICE_DATA(INTEL, HDA_ICL_LP, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
>>   	/* Icelake-H */
>> -	{ PCI_DEVICE(0x8086, 0x3dc8),
>> -	  .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
>> +	{ PCI_DEVICE_DATA(INTEL, HDA_ICL_H, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
>>   	/* Jasperlake */
>> -	{ PCI_DEVICE(0x8086, 0x38c8),
>> -	  .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
>> -	{ PCI_DEVICE(0x8086, 0x4dc8),
>> -	  .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
>> +	{ PCI_DEVICE_DATA(INTEL, HDA_ICL_N, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
>> +	{ PCI_DEVICE_DATA(INTEL, HDA_JSL_N, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
>>   	/* Tigerlake */
>> -	{ PCI_DEVICE(0x8086, 0xa0c8),
>> -	  .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
>> +	{ PCI_DEVICE_DATA(INTEL, HDA_TGL_LP, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
>>   	/* Tigerlake-H */
>> -	{ PCI_DEVICE(0x8086, 0x43c8),
>> -	  .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
>> +	{ PCI_DEVICE_DATA(INTEL, HDA_TGL_H, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
>>   	/* DG1 */
>> -	{ PCI_DEVICE(0x8086, 0x490d),
>> -	  .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
>> +	{ PCI_DEVICE_DATA(INTEL, HDA_DG1, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
>>   	/* DG2 */
>> -	{ PCI_DEVICE(0x8086, 0x4f90),
>> -	  .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
>> -	{ PCI_DEVICE(0x8086, 0x4f91),
>> -	  .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
>> -	{ PCI_DEVICE(0x8086, 0x4f92),
>> -	  .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
>> +	{ PCI_DEVICE_DATA(INTEL, HDA_DG2_0, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
>> +	{ PCI_DEVICE_DATA(INTEL, HDA_DG2_1, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
>> +	{ PCI_DEVICE_DATA(INTEL, HDA_DG2_2, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
>>   	/* Alderlake-S */
>> -	{ PCI_DEVICE(0x8086, 0x7ad0),
>> -	  .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
>> +	{ PCI_DEVICE_DATA(INTEL, HDA_ADL_S, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
>>   	/* Alderlake-P */
>> -	{ PCI_DEVICE(0x8086, 0x51c8),
>> -	  .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
>> -	{ PCI_DEVICE(0x8086, 0x51c9),
>> -	  .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
>> -	{ PCI_DEVICE(0x8086, 0x51cd),
>> -	  .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
>> +	{ PCI_DEVICE_DATA(INTEL, HDA_ADL_P, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
>> +	{ PCI_DEVICE_DATA(INTEL, HDA_ADL_PS, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
>> +	{ PCI_DEVICE_DATA(INTEL, HDA_ADL_PX, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
>>   	/* Alderlake-M */
>> -	{ PCI_DEVICE(0x8086, 0x51cc),
>> -	  .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
>> +	{ PCI_DEVICE_DATA(INTEL, HDA_ADL_M, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
>>   	/* Alderlake-N */
>> -	{ PCI_DEVICE(0x8086, 0x54c8),
>> -	  .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
>> +	{ PCI_DEVICE_DATA(INTEL, HDA_ADL_N, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
>>   	/* Elkhart Lake */
>> -	{ PCI_DEVICE(0x8086, 0x4b55),
>> -	  .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
>> -	{ PCI_DEVICE(0x8086, 0x4b58),
>> -	  .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
>> +	{ PCI_DEVICE_DATA(INTEL, HDA_EHL_0, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
>> +	{ PCI_DEVICE_DATA(INTEL, HDA_EHL_3, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
>>   	/* Raptor Lake */
>> -	{ PCI_DEVICE(0x8086, 0x7a50),
>> -	  .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
>> -	{ PCI_DEVICE(0x8086, 0x51ca),
>> -	  .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
>> -	{ PCI_DEVICE(0x8086, 0x51cb),
>> -	  .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
>> -	{ PCI_DEVICE(0x8086, 0x51ce),
>> -	  .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
>> -	{ PCI_DEVICE(0x8086, 0x51cf),
>> -	  .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
>> -	/* Meteorlake-P */
>> -	{ PCI_DEVICE(0x8086, 0x7e28),
>> -	  .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
>> +	{ PCI_DEVICE_DATA(INTEL, HDA_RPL_S, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
>> +	{ PCI_DEVICE_DATA(INTEL, HDA_RPL_P_0, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
>> +	{ PCI_DEVICE_DATA(INTEL, HDA_RPL_P_1, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
>> +	{ PCI_DEVICE_DATA(INTEL, HDA_RPL_M, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
>> +	{ PCI_DEVICE_DATA(INTEL, HDA_RPL_PX, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
>> +	{ PCI_DEVICE_DATA(INTEL, HDA_MTL, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
>>   	/* Lunarlake-P */
>> -	{ PCI_DEVICE(0x8086, 0xa828),
>> -	  .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
>> -	/* Broxton-P(Apollolake) */
>> -	{ PCI_DEVICE(0x8086, 0x5a98),
>> -	  .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_BROXTON },
>> +	{ PCI_DEVICE_DATA(INTEL, HDA_LNL_P, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },
>> +	/* Apollolake (Broxton-P) */
>> +	{ PCI_DEVICE_DATA(INTEL, HDA_APL, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_BROXTON) },
>>   	/* Broxton-T */
>> -	{ PCI_DEVICE(0x8086, 0x1a98),
>> -	  .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_BROXTON },
>> +	{ PCI_DEVICE_DATA(INTEL, HDA_APL_T, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_BROXTON) },
>>   	/* Gemini-Lake */
>> -	{ PCI_DEVICE(0x8086, 0x3198),
>> -	  .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_BROXTON },
>> +	{ PCI_DEVICE_DATA(INTEL, HDA_GML, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_BROXTON) },
>>   	/* Haswell */
>> -	{ PCI_DEVICE(0x8086, 0x0a0c),
>> -	  .driver_data = AZX_DRIVER_HDMI | AZX_DCAPS_INTEL_HASWELL },
>> -	{ PCI_DEVICE(0x8086, 0x0c0c),
>> -	  .driver_data = AZX_DRIVER_HDMI | AZX_DCAPS_INTEL_HASWELL },
>> -	{ PCI_DEVICE(0x8086, 0x0d0c),
>> -	  .driver_data = AZX_DRIVER_HDMI | AZX_DCAPS_INTEL_HASWELL },
>> +	{ PCI_DEVICE_DATA(INTEL, HDA_HSW_0, AZX_DRIVER_HDMI | AZX_DCAPS_INTEL_HASWELL) },
>> +	{ PCI_DEVICE_DATA(INTEL, HDA_HSW_2, AZX_DRIVER_HDMI | AZX_DCAPS_INTEL_HASWELL) },
>> +	{ PCI_DEVICE_DATA(INTEL, HDA_HSW_3, AZX_DRIVER_HDMI | AZX_DCAPS_INTEL_HASWELL) },
>>   	/* Broadwell */
>> -	{ PCI_DEVICE(0x8086, 0x160c),
>> -	  .driver_data = AZX_DRIVER_HDMI | AZX_DCAPS_INTEL_BROADWELL },
>> +	{ PCI_DEVICE_DATA(INTEL, HDA_BDW, AZX_DRIVER_HDMI | AZX_DCAPS_INTEL_BROADWELL) },
>>   	/* 5 Series/3400 */
>> -	{ PCI_DEVICE(0x8086, 0x3b56),
>> -	  .driver_data = AZX_DRIVER_SCH | AZX_DCAPS_INTEL_PCH_NOPM },
>> -	{ PCI_DEVICE(0x8086, 0x3b57),
>> -	  .driver_data = AZX_DRIVER_SCH | AZX_DCAPS_INTEL_PCH_NOPM },
>> +	{ PCI_DEVICE_DATA(INTEL, HDA_5_3400_SERIES_0, AZX_DRIVER_SCH | AZX_DCAPS_INTEL_PCH_NOPM) },
>> +	{ PCI_DEVICE_DATA(INTEL, HDA_5_3400_SERIES_1, AZX_DRIVER_SCH | AZX_DCAPS_INTEL_PCH_NOPM) },
>>   	/* Poulsbo */
>> -	{ PCI_DEVICE(0x8086, 0x811b),
>> -	  .driver_data = AZX_DRIVER_SCH | AZX_DCAPS_INTEL_PCH_BASE |
>> -	  AZX_DCAPS_POSFIX_LPIB },
>> +	{ PCI_DEVICE_DATA(INTEL, HDA_POULSBO, AZX_DRIVER_SCH | AZX_DCAPS_INTEL_PCH_BASE |
>> +	  AZX_DCAPS_POSFIX_LPIB) },
>>   	/* Oaktrail */
>> -	{ PCI_DEVICE(0x8086, 0x080a),
>> -	  .driver_data = AZX_DRIVER_SCH | AZX_DCAPS_INTEL_PCH_BASE },
>> +	{ PCI_DEVICE_DATA(INTEL, HDA_OAKTRAIL, AZX_DRIVER_SCH | AZX_DCAPS_INTEL_PCH_BASE) },
>>   	/* BayTrail */
>> -	{ PCI_DEVICE(0x8086, 0x0f04),
>> -	  .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_BAYTRAIL },
>> +	{ PCI_DEVICE_DATA(INTEL, HDA_BYT, AZX_DRIVER_PCH | AZX_DCAPS_INTEL_BAYTRAIL) },
>>   	/* Braswell */
>> -	{ PCI_DEVICE(0x8086, 0x2284),
>> -	  .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_BRASWELL },
>> +	{ PCI_DEVICE_DATA(INTEL, HDA_BSW, AZX_DRIVER_PCH | AZX_DCAPS_INTEL_BRASWELL) },
>>   	/* ICH6 */
>> -	{ PCI_DEVICE(0x8086, 0x2668),
>> -	  .driver_data = AZX_DRIVER_ICH | AZX_DCAPS_INTEL_ICH },
>> +	{ PCI_DEVICE_DATA(INTEL, HDA_ICH6, AZX_DRIVER_ICH | AZX_DCAPS_INTEL_ICH) },
>>   	/* ICH7 */
>> -	{ PCI_DEVICE(0x8086, 0x27d8),
>> -	  .driver_data = AZX_DRIVER_ICH | AZX_DCAPS_INTEL_ICH },
>> +	{ PCI_DEVICE_DATA(INTEL, HDA_ICH7, AZX_DRIVER_ICH | AZX_DCAPS_INTEL_ICH) },
>>   	/* ESB2 */
>> -	{ PCI_DEVICE(0x8086, 0x269a),
>> -	  .driver_data = AZX_DRIVER_ICH | AZX_DCAPS_INTEL_ICH },
>> +	{ PCI_DEVICE_DATA(INTEL, HDA_ESB2, AZX_DRIVER_ICH | AZX_DCAPS_INTEL_ICH) },
>>   	/* ICH8 */
>> -	{ PCI_DEVICE(0x8086, 0x284b),
>> -	  .driver_data = AZX_DRIVER_ICH | AZX_DCAPS_INTEL_ICH },
>> +	{ PCI_DEVICE_DATA(INTEL, HDA_ICH8, AZX_DRIVER_ICH | AZX_DCAPS_INTEL_ICH) },
>>   	/* ICH9 */
>> -	{ PCI_DEVICE(0x8086, 0x293e),
>> -	  .driver_data = AZX_DRIVER_ICH | AZX_DCAPS_INTEL_ICH },
>> +	{ PCI_DEVICE_DATA(INTEL, HDA_ICH9_0, AZX_DRIVER_ICH | AZX_DCAPS_INTEL_ICH) },
>>   	/* ICH9 */
>> -	{ PCI_DEVICE(0x8086, 0x293f),
>> -	  .driver_data = AZX_DRIVER_ICH | AZX_DCAPS_INTEL_ICH },
>> +	{ PCI_DEVICE_DATA(INTEL, HDA_ICH9_1, AZX_DRIVER_ICH | AZX_DCAPS_INTEL_ICH) },
>>   	/* ICH10 */
>> -	{ PCI_DEVICE(0x8086, 0x3a3e),
>> -	  .driver_data = AZX_DRIVER_ICH | AZX_DCAPS_INTEL_ICH },
>> +	{ PCI_DEVICE_DATA(INTEL, HDA_ICH10_0, AZX_DRIVER_ICH | AZX_DCAPS_INTEL_ICH) },
>>   	/* ICH10 */
>> -	{ PCI_DEVICE(0x8086, 0x3a6e),
>> -	  .driver_data = AZX_DRIVER_ICH | AZX_DCAPS_INTEL_ICH },
>> +	{ PCI_DEVICE_DATA(INTEL, HDA_ICH10_1, AZX_DRIVER_ICH | AZX_DCAPS_INTEL_ICH) },
>>   	/* Generic Intel */
>>   	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_ANY_ID),
>>   	  .class = PCI_CLASS_MULTIMEDIA_HD_AUDIO << 8,
>>   	  .class_mask = 0xffffff,
>>   	  .driver_data = AZX_DRIVER_ICH | AZX_DCAPS_NO_ALIGN_BUFSIZE },
> 
>>   	/* ATI SB 450/600/700/800/900 */
>> -	{ PCI_DEVICE(0x1002, 0x437b),
>> +	{ PCI_VDEVICE(ATI, 0x437b),
>>   	  .driver_data = AZX_DRIVER_ATI | AZX_DCAPS_PRESET_ATI_SB },
>> -	{ PCI_DEVICE(0x1002, 0x4383),
>> +	{ PCI_VDEVICE(ATI, 0x4383),
>>   	  .driver_data = AZX_DRIVER_ATI | AZX_DCAPS_PRESET_ATI_SB },
> 
> I know that AMD owns ATI, but wouldn't make sense to group by company?
> Maybe as a separate (preparatory?) patch.
> 

It seems to be sorted this way because first are Generic ATI and AMD HDA 
cards, followed by ATI HDMI ones. I would just leave it as it is unless 
Takashi also prefers it to be reordered?

>>   	/* AMD Hudson */
>> -	{ PCI_DEVICE(0x1022, 0x780d),
>> +	{ PCI_VDEVICE(AMD, 0x780d),
>>   	  .driver_data = AZX_DRIVER_GENERIC | AZX_DCAPS_PRESET_ATI_SB },
>>   	/* AMD, X370 & co */
>> -	{ PCI_DEVICE(0x1022, 0x1457),
>> +	{ PCI_VDEVICE(AMD, 0x1457),
>>   	  .driver_data = AZX_DRIVER_GENERIC | AZX_DCAPS_PRESET_AMD_SB },
>>   	/* AMD, X570 & co */
>> -	{ PCI_DEVICE(0x1022, 0x1487),
>> +	{ PCI_VDEVICE(AMD, 0x1487),
>>   	  .driver_data = AZX_DRIVER_GENERIC | AZX_DCAPS_PRESET_AMD_SB },
>>   	/* AMD Stoney */
>> -	{ PCI_DEVICE(0x1022, 0x157a),
>> +	{ PCI_VDEVICE(AMD, 0x157a),
>>   	  .driver_data = AZX_DRIVER_GENERIC | AZX_DCAPS_PRESET_ATI_SB |
>>   			 AZX_DCAPS_PM_RUNTIME },
>>   	/* AMD Raven */
>> -	{ PCI_DEVICE(0x1022, 0x15e3),
>> +	{ PCI_VDEVICE(AMD, 0x15e3),
>>   	  .driver_data = AZX_DRIVER_GENERIC | AZX_DCAPS_PRESET_AMD_SB },
>>   	/* ATI HDMI */
>> -	{ PCI_DEVICE(0x1002, 0x0002),
>> +	{ PCI_VDEVICE(ATI, 0x0002),
>>   	  .driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS |
>>   	  AZX_DCAPS_PM_RUNTIME },
>> -	{ PCI_DEVICE(0x1002, 0x1308),
>> +	{ PCI_VDEVICE(ATI, 0x1308),
>>   	  .driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS },
>> -	{ PCI_DEVICE(0x1002, 0x157a),
>> +	{ PCI_VDEVICE(ATI, 0x157a),
>>   	  .driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS },
>> -	{ PCI_DEVICE(0x1002, 0x15b3),
>> +	{ PCI_VDEVICE(ATI, 0x15b3),
>>   	  .driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS },
>> -	{ PCI_DEVICE(0x1002, 0x793b),
>> +	{ PCI_VDEVICE(ATI, 0x793b),
>>   	  .driver_data = AZX_DRIVER_ATIHDMI | AZX_DCAPS_PRESET_ATI_HDMI },
>> -	{ PCI_DEVICE(0x1002, 0x7919),
>> +	{ PCI_VDEVICE(ATI, 0x7919),
>>   	  .driver_data = AZX_DRIVER_ATIHDMI | AZX_DCAPS_PRESET_ATI_HDMI },
>> -	{ PCI_DEVICE(0x1002, 0x960f),
>> +	{ PCI_VDEVICE(ATI, 0x960f),
>>   	  .driver_data = AZX_DRIVER_ATIHDMI | AZX_DCAPS_PRESET_ATI_HDMI },
>> -	{ PCI_DEVICE(0x1002, 0x970f),
>> +	{ PCI_VDEVICE(ATI, 0x970f),
>>   	  .driver_data = AZX_DRIVER_ATIHDMI | AZX_DCAPS_PRESET_ATI_HDMI },
>> -	{ PCI_DEVICE(0x1002, 0x9840),
>> +	{ PCI_VDEVICE(ATI, 0x9840),
>>   	  .driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS },
>> -	{ PCI_DEVICE(0x1002, 0xaa00),
>> +	{ PCI_VDEVICE(ATI, 0xaa00),
>>   	  .driver_data = AZX_DRIVER_ATIHDMI | AZX_DCAPS_PRESET_ATI_HDMI },
>> -	{ PCI_DEVICE(0x1002, 0xaa08),
>> +	{ PCI_VDEVICE(ATI, 0xaa08),
>>   	  .driver_data = AZX_DRIVER_ATIHDMI | AZX_DCAPS_PRESET_ATI_HDMI },
>> -	{ PCI_DEVICE(0x1002, 0xaa10),
>> +	{ PCI_VDEVICE(ATI, 0xaa10),
>>   	  .driver_data = AZX_DRIVER_ATIHDMI | AZX_DCAPS_PRESET_ATI_HDMI },
>> -	{ PCI_DEVICE(0x1002, 0xaa18),
>> +	{ PCI_VDEVICE(ATI, 0xaa18),
>>   	  .driver_data = AZX_DRIVER_ATIHDMI | AZX_DCAPS_PRESET_ATI_HDMI },
>> -	{ PCI_DEVICE(0x1002, 0xaa20),
>> +	{ PCI_VDEVICE(ATI, 0xaa20),
>>   	  .driver_data = AZX_DRIVER_ATIHDMI | AZX_DCAPS_PRESET_ATI_HDMI },
>> -	{ PCI_DEVICE(0x1002, 0xaa28),
>> +	{ PCI_VDEVICE(ATI, 0xaa28),
>>   	  .driver_data = AZX_DRIVER_ATIHDMI | AZX_DCAPS_PRESET_ATI_HDMI },
>> -	{ PCI_DEVICE(0x1002, 0xaa30),
>> +	{ PCI_VDEVICE(ATI, 0xaa30),
>>   	  .driver_data = AZX_DRIVER_ATIHDMI | AZX_DCAPS_PRESET_ATI_HDMI },
>> -	{ PCI_DEVICE(0x1002, 0xaa38),
>> +	{ PCI_VDEVICE(ATI, 0xaa38),
>>   	  .driver_data = AZX_DRIVER_ATIHDMI | AZX_DCAPS_PRESET_ATI_HDMI },
>> -	{ PCI_DEVICE(0x1002, 0xaa40),
>> +	{ PCI_VDEVICE(ATI, 0xaa40),
>>   	  .driver_data = AZX_DRIVER_ATIHDMI | AZX_DCAPS_PRESET_ATI_HDMI },
>> -	{ PCI_DEVICE(0x1002, 0xaa48),
>> +	{ PCI_VDEVICE(ATI, 0xaa48),
>>   	  .driver_data = AZX_DRIVER_ATIHDMI | AZX_DCAPS_PRESET_ATI_HDMI },
>> -	{ PCI_DEVICE(0x1002, 0xaa50),
>> +	{ PCI_VDEVICE(ATI, 0xaa50),
>>   	  .driver_data = AZX_DRIVER_ATIHDMI | AZX_DCAPS_PRESET_ATI_HDMI },
>> -	{ PCI_DEVICE(0x1002, 0xaa58),
>> +	{ PCI_VDEVICE(ATI, 0xaa58),
>>   	  .driver_data = AZX_DRIVER_ATIHDMI | AZX_DCAPS_PRESET_ATI_HDMI },
>> -	{ PCI_DEVICE(0x1002, 0xaa60),
>> +	{ PCI_VDEVICE(ATI, 0xaa60),
>>   	  .driver_data = AZX_DRIVER_ATIHDMI | AZX_DCAPS_PRESET_ATI_HDMI },
>> -	{ PCI_DEVICE(0x1002, 0xaa68),
>> +	{ PCI_VDEVICE(ATI, 0xaa68),
>>   	  .driver_data = AZX_DRIVER_ATIHDMI | AZX_DCAPS_PRESET_ATI_HDMI },
>> -	{ PCI_DEVICE(0x1002, 0xaa80),
>> +	{ PCI_VDEVICE(ATI, 0xaa80),
>>   	  .driver_data = AZX_DRIVER_ATIHDMI | AZX_DCAPS_PRESET_ATI_HDMI },
>> -	{ PCI_DEVICE(0x1002, 0xaa88),
>> +	{ PCI_VDEVICE(ATI, 0xaa88),
>>   	  .driver_data = AZX_DRIVER_ATIHDMI | AZX_DCAPS_PRESET_ATI_HDMI },
>> -	{ PCI_DEVICE(0x1002, 0xaa90),
>> +	{ PCI_VDEVICE(ATI, 0xaa90),
>>   	  .driver_data = AZX_DRIVER_ATIHDMI | AZX_DCAPS_PRESET_ATI_HDMI },
>> -	{ PCI_DEVICE(0x1002, 0xaa98),
>> +	{ PCI_VDEVICE(ATI, 0xaa98),
>>   	  .driver_data = AZX_DRIVER_ATIHDMI | AZX_DCAPS_PRESET_ATI_HDMI },
>> -	{ PCI_DEVICE(0x1002, 0x9902),
>> +	{ PCI_VDEVICE(ATI, 0x9902),
>>   	  .driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS },
>> -	{ PCI_DEVICE(0x1002, 0xaaa0),
>> +	{ PCI_VDEVICE(ATI, 0xaaa0),
>>   	  .driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS },
>> -	{ PCI_DEVICE(0x1002, 0xaaa8),
>> +	{ PCI_VDEVICE(ATI, 0xaaa8),
>>   	  .driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS },
>> -	{ PCI_DEVICE(0x1002, 0xaab0),
>> +	{ PCI_VDEVICE(ATI, 0xaab0),
>>   	  .driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS },
>> -	{ PCI_DEVICE(0x1002, 0xaac0),
>> +	{ PCI_VDEVICE(ATI, 0xaac0),
>>   	  .driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS |
>>   	  AZX_DCAPS_PM_RUNTIME },
>> -	{ PCI_DEVICE(0x1002, 0xaac8),
>> +	{ PCI_VDEVICE(ATI, 0xaac8),
>>   	  .driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS |
>>   	  AZX_DCAPS_PM_RUNTIME },
>> -	{ PCI_DEVICE(0x1002, 0xaad8),
>> +	{ PCI_VDEVICE(ATI, 0xaad8),
>>   	  .driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS |
>>   	  AZX_DCAPS_PM_RUNTIME },
>> -	{ PCI_DEVICE(0x1002, 0xaae0),
>> +	{ PCI_VDEVICE(ATI, 0xaae0),
>>   	  .driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS |
>>   	  AZX_DCAPS_PM_RUNTIME },
>> -	{ PCI_DEVICE(0x1002, 0xaae8),
>> +	{ PCI_VDEVICE(ATI, 0xaae8),
>>   	  .driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS |
>>   	  AZX_DCAPS_PM_RUNTIME },
>> -	{ PCI_DEVICE(0x1002, 0xaaf0),
>> +	{ PCI_VDEVICE(ATI, 0xaaf0),
>>   	  .driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS |
>>   	  AZX_DCAPS_PM_RUNTIME },
>> -	{ PCI_DEVICE(0x1002, 0xaaf8),
>> +	{ PCI_VDEVICE(ATI, 0xaaf8),
>>   	  .driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS |
>>   	  AZX_DCAPS_PM_RUNTIME },
>> -	{ PCI_DEVICE(0x1002, 0xab00),
>> +	{ PCI_VDEVICE(ATI, 0xab00),
>>   	  .driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS |
>>   	  AZX_DCAPS_PM_RUNTIME },
>> -	{ PCI_DEVICE(0x1002, 0xab08),
>> +	{ PCI_VDEVICE(ATI, 0xab08),
>>   	  .driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS |
>>   	  AZX_DCAPS_PM_RUNTIME },
>> -	{ PCI_DEVICE(0x1002, 0xab10),
>> +	{ PCI_VDEVICE(ATI, 0xab10),
>>   	  .driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS |
>>   	  AZX_DCAPS_PM_RUNTIME },
>> -	{ PCI_DEVICE(0x1002, 0xab18),
>> +	{ PCI_VDEVICE(ATI, 0xab18),
>>   	  .driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS |
>>   	  AZX_DCAPS_PM_RUNTIME },
>> -	{ PCI_DEVICE(0x1002, 0xab20),
>> +	{ PCI_VDEVICE(ATI, 0xab20),
>>   	  .driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS |
>>   	  AZX_DCAPS_PM_RUNTIME },
>> -	{ PCI_DEVICE(0x1002, 0xab28),
>> +	{ PCI_VDEVICE(ATI, 0xab28),
>>   	  .driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS |
>>   	  AZX_DCAPS_PM_RUNTIME },
>> -	{ PCI_DEVICE(0x1002, 0xab30),
>> +	{ PCI_VDEVICE(ATI, 0xab30),
>>   	  .driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS |
>>   	  AZX_DCAPS_PM_RUNTIME },
>> -	{ PCI_DEVICE(0x1002, 0xab38),
>> +	{ PCI_VDEVICE(ATI, 0xab38),
>>   	  .driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS |
>>   	  AZX_DCAPS_PM_RUNTIME },
>>   	/* GLENFLY */
>> @@ -2752,15 +2681,15 @@ static const struct pci_device_id azx_ids[] = {
>>   	  .driver_data = AZX_DRIVER_GFHDMI | AZX_DCAPS_POSFIX_LPIB |
>>   	  AZX_DCAPS_NO_MSI | AZX_DCAPS_NO_64BIT },
>>   	/* VIA VT8251/VT8237A */
>> -	{ PCI_DEVICE(0x1106, 0x3288), .driver_data = AZX_DRIVER_VIA },
>> +	{ PCI_VDEVICE(VIA, 0x3288), .driver_data = AZX_DRIVER_VIA },
>>   	/* VIA GFX VT7122/VX900 */
>> -	{ PCI_DEVICE(0x1106, 0x9170), .driver_data = AZX_DRIVER_GENERIC },
>> +	{ PCI_VDEVICE(VIA, 0x9170), .driver_data = AZX_DRIVER_GENERIC },
>>   	/* VIA GFX VT6122/VX11 */
>> -	{ PCI_DEVICE(0x1106, 0x9140), .driver_data = AZX_DRIVER_GENERIC },
>> +	{ PCI_VDEVICE(VIA, 0x9140), .driver_data = AZX_DRIVER_GENERIC },
>>   	/* SIS966 */
>> -	{ PCI_DEVICE(0x1039, 0x7502), .driver_data = AZX_DRIVER_SIS },
>> +	{ PCI_VDEVICE(SI, 0x7502), .driver_data = AZX_DRIVER_SIS },
>>   	/* ULI M5461 */
>> -	{ PCI_DEVICE(0x10b9, 0x5461), .driver_data = AZX_DRIVER_ULI },
>> +	{ PCI_VDEVICE(AL, 0x5461), .driver_data = AZX_DRIVER_ULI },
>>   	/* NVIDIA MCP */
>>   	{ PCI_DEVICE(PCI_VENDOR_ID_NVIDIA, PCI_ANY_ID),
>>   	  .class = PCI_CLASS_MULTIMEDIA_HD_AUDIO << 8,
>> @@ -2773,9 +2702,9 @@ static const struct pci_device_id azx_ids[] = {
>>   	  .driver_data = AZX_DRIVER_TERA | AZX_DCAPS_NO_64BIT },
>>   	/* Creative X-Fi (CA0110-IBG) */
>>   	/* CTHDA chips */
>> -	{ PCI_DEVICE(0x1102, 0x0010),
>> +	{ PCI_VDEVICE(CREATIVE, 0x0010),
>>   	  .driver_data = AZX_DRIVER_CTHDA | AZX_DCAPS_PRESET_CTHDA },
>> -	{ PCI_DEVICE(0x1102, 0x0012),
>> +	{ PCI_VDEVICE(CREATIVE, 0x0012),
>>   	  .driver_data = AZX_DRIVER_CTHDA | AZX_DCAPS_PRESET_CTHDA },
>>   #if !IS_ENABLED(CONFIG_SND_CTXFI)
>>   	/* the following entry conflicts with snd-ctxfi driver,
>> @@ -2789,18 +2718,18 @@ static const struct pci_device_id azx_ids[] = {
>>   	  AZX_DCAPS_NO_64BIT | AZX_DCAPS_POSFIX_LPIB },
>>   #else
>>   	/* this entry seems still valid -- i.e. without emu20kx chip */
>> -	{ PCI_DEVICE(0x1102, 0x0009),
>> +	{ PCI_VDEVICE(CREATIVE, 0x0009),
>>   	  .driver_data = AZX_DRIVER_CTX | AZX_DCAPS_CTX_WORKAROUND |
>>   	  AZX_DCAPS_NO_64BIT | AZX_DCAPS_POSFIX_LPIB },
>>   #endif
>>   	/* CM8888 */
>> -	{ PCI_DEVICE(0x13f6, 0x5011),
>> +	{ PCI_VDEVICE(CMEDIA, 0x5011),
>>   	  .driver_data = AZX_DRIVER_CMEDIA |
>>   	  AZX_DCAPS_NO_MSI | AZX_DCAPS_POSFIX_LPIB | AZX_DCAPS_SNOOP_OFF },
>>   	/* Vortex86MX */
>> -	{ PCI_DEVICE(0x17f3, 0x3010), .driver_data = AZX_DRIVER_GENERIC },
>> +	{ PCI_VDEVICE(RDC, 0x3010), .driver_data = AZX_DRIVER_GENERIC },
>>   	/* VMware HDAudio */
>> -	{ PCI_DEVICE(0x15ad, 0x1977), .driver_data = AZX_DRIVER_GENERIC },
>> +	{ PCI_VDEVICE(VMWARE, 0x1977), .driver_data = AZX_DRIVER_GENERIC },
>>   	/* AMD/ATI Generic, PCI class code and Vendor ID for HD Audio */
>>   	{ PCI_DEVICE(PCI_VENDOR_ID_ATI, PCI_ANY_ID),
>>   	  .class = PCI_CLASS_MULTIMEDIA_HD_AUDIO << 8,
>> @@ -2811,11 +2740,11 @@ static const struct pci_device_id azx_ids[] = {
>>   	  .class_mask = 0xffffff,
>>   	  .driver_data = AZX_DRIVER_GENERIC | AZX_DCAPS_PRESET_ATI_HDMI },
>>   	/* Zhaoxin */
>> -	{ PCI_DEVICE(0x1d17, 0x3288), .driver_data = AZX_DRIVER_ZHAOXIN },
>> +	{ PCI_VDEVICE(ZHAOXIN, 0x3288), .driver_data = AZX_DRIVER_ZHAOXIN },
>>   	/* Loongson HDAudio*/
>> -	{PCI_DEVICE(PCI_VENDOR_ID_LOONGSON, PCI_DEVICE_ID_LOONGSON_HDA),
>> +	{ PCI_VDEVICE(LOONGSON, PCI_DEVICE_ID_LOONGSON_HDA),
>>   	  .driver_data = AZX_DRIVER_LOONGSON },
>> -	{PCI_DEVICE(PCI_VENDOR_ID_LOONGSON, PCI_DEVICE_ID_LOONGSON_HDMI),
>> +	{ PCI_VDEVICE(LOONGSON, PCI_DEVICE_ID_LOONGSON_HDMI),
>>   	  .driver_data = AZX_DRIVER_LOONGSON },
>>   	{ 0, }
>>   };
>> -- 
>> 2.34.1
>>
> 

Re: [PATCH 08/13] ALSA: hda: Convert to PCI device IDs defines

[Takashi Iwai]

On Wed, 12 Jul 2023 13:22:22 +0200,
Amadeusz Sławiński wrote:
> 
> On 7/11/2023 4:07 PM, Andy Shevchenko wrote:
> > I know that AMD owns ATI, but wouldn't make sense to group by company?
> > Maybe as a separate (preparatory?) patch.
> > 
> 
> It seems to be sorted this way because first are Generic ATI and AMD
> HDA cards, followed by ATI HDMI ones. I would just leave it as it is
> unless Takashi also prefers it to be reordered?

Yes, these are some logical grouping :)

We may want to sort differently in future, but let's do it after all
things settle down.


thanks,

Takashi

[PATCH 09/13] ASoC: Intel: avs: Convert to PCI device IDs defines

[Amadeusz Sławiński]

Use PCI device IDs from pci_ids.h header and while at it change to using
PCI_DEVICE_DATA() macro, to simplify declarations.

Acked-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Amadeusz Sławiński <amadeuszx.slawinski@linux.intel.com>
---
 sound/soc/intel/avs/core.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/sound/soc/intel/avs/core.c b/sound/soc/intel/avs/core.c
index 637501850728..859b217fc761 100644
--- a/sound/soc/intel/avs/core.c
+++ b/sound/soc/intel/avs/core.c
@@ -745,14 +745,14 @@ static const struct avs_spec apl_desc = {
 };
 
 static const struct pci_device_id avs_ids[] = {
-	{ PCI_VDEVICE(INTEL, 0x9d70), (unsigned long)&skl_desc }, /* SKL */
-	{ PCI_VDEVICE(INTEL, 0xa170), (unsigned long)&skl_desc }, /* SKL-H */
-	{ PCI_VDEVICE(INTEL, 0x9d71), (unsigned long)&skl_desc }, /* KBL */
-	{ PCI_VDEVICE(INTEL, 0xa171), (unsigned long)&skl_desc }, /* KBL-H */
-	{ PCI_VDEVICE(INTEL, 0xa2f0), (unsigned long)&skl_desc }, /* KBL-S */
-	{ PCI_VDEVICE(INTEL, 0xa3f0), (unsigned long)&skl_desc }, /* CML-V */
-	{ PCI_VDEVICE(INTEL, 0x5a98), (unsigned long)&apl_desc }, /* APL */
-	{ PCI_VDEVICE(INTEL, 0x3198), (unsigned long)&apl_desc }, /* GML */
+	{ PCI_DEVICE_DATA(INTEL, HDA_SKL_LP, &skl_desc) },
+	{ PCI_DEVICE_DATA(INTEL, HDA_SKL, &skl_desc) },
+	{ PCI_DEVICE_DATA(INTEL, HDA_KBL_LP, &skl_desc) },
+	{ PCI_DEVICE_DATA(INTEL, HDA_KBL, &skl_desc) },
+	{ PCI_DEVICE_DATA(INTEL, HDA_KBL_H, &skl_desc) },
+	{ PCI_DEVICE_DATA(INTEL, HDA_CML_S, &skl_desc) },
+	{ PCI_DEVICE_DATA(INTEL, HDA_APL, &apl_desc) },
+	{ PCI_DEVICE_DATA(INTEL, HDA_GML, &apl_desc) },
 	{ 0 }
 };
 MODULE_DEVICE_TABLE(pci, avs_ids);
-- 
2.34.1

Re: [PATCH 09/13] ASoC: Intel: avs: Convert to PCI device IDs defines

[Andy Shevchenko]

On Tue, Jul 11, 2023 at 02:57:22PM +0200, Amadeusz Sławiński wrote:
> Use PCI device IDs from pci_ids.h header and while at it change to using
> PCI_DEVICE_DATA() macro, to simplify declarations.

FWIW,
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>

> Acked-by: Mark Brown <broonie@kernel.org>
> Signed-off-by: Amadeusz Sławiński <amadeuszx.slawinski@linux.intel.com>
> ---
>  sound/soc/intel/avs/core.c | 16 ++++++++--------
>  1 file changed, 8 insertions(+), 8 deletions(-)
> 
> diff --git a/sound/soc/intel/avs/core.c b/sound/soc/intel/avs/core.c
> index 637501850728..859b217fc761 100644
> --- a/sound/soc/intel/avs/core.c
> +++ b/sound/soc/intel/avs/core.c
> @@ -745,14 +745,14 @@ static const struct avs_spec apl_desc = {
>  };
>  
>  static const struct pci_device_id avs_ids[] = {
> -	{ PCI_VDEVICE(INTEL, 0x9d70), (unsigned long)&skl_desc }, /* SKL */
> -	{ PCI_VDEVICE(INTEL, 0xa170), (unsigned long)&skl_desc }, /* SKL-H */
> -	{ PCI_VDEVICE(INTEL, 0x9d71), (unsigned long)&skl_desc }, /* KBL */
> -	{ PCI_VDEVICE(INTEL, 0xa171), (unsigned long)&skl_desc }, /* KBL-H */
> -	{ PCI_VDEVICE(INTEL, 0xa2f0), (unsigned long)&skl_desc }, /* KBL-S */
> -	{ PCI_VDEVICE(INTEL, 0xa3f0), (unsigned long)&skl_desc }, /* CML-V */
> -	{ PCI_VDEVICE(INTEL, 0x5a98), (unsigned long)&apl_desc }, /* APL */
> -	{ PCI_VDEVICE(INTEL, 0x3198), (unsigned long)&apl_desc }, /* GML */
> +	{ PCI_DEVICE_DATA(INTEL, HDA_SKL_LP, &skl_desc) },
> +	{ PCI_DEVICE_DATA(INTEL, HDA_SKL, &skl_desc) },
> +	{ PCI_DEVICE_DATA(INTEL, HDA_KBL_LP, &skl_desc) },
> +	{ PCI_DEVICE_DATA(INTEL, HDA_KBL, &skl_desc) },
> +	{ PCI_DEVICE_DATA(INTEL, HDA_KBL_H, &skl_desc) },
> +	{ PCI_DEVICE_DATA(INTEL, HDA_CML_S, &skl_desc) },
> +	{ PCI_DEVICE_DATA(INTEL, HDA_APL, &apl_desc) },
> +	{ PCI_DEVICE_DATA(INTEL, HDA_GML, &apl_desc) },
>  	{ 0 }
>  };
>  MODULE_DEVICE_TABLE(pci, avs_ids);
> -- 
> 2.34.1
> 

-- 
With Best Regards,
Andy Shevchenko

[PATCH 10/13] ASoC: Intel: avs: Convert to PCI device IDs defines

[Amadeusz Sławiński]

Use PCI device IDs from pci_ids.h header. Adjust AVS_MACH_ENTRY() macro,
so device ID can be provided in short form.

Acked-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Amadeusz Sławiński <amadeuszx.slawinski@linux.intel.com>
---
 sound/soc/intel/avs/board_selection.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/sound/soc/intel/avs/board_selection.c b/sound/soc/intel/avs/board_selection.c
index 60f8fb0bff95..b32e02940e30 100644
--- a/sound/soc/intel/avs/board_selection.c
+++ b/sound/soc/intel/avs/board_selection.c
@@ -263,14 +263,14 @@ struct avs_acpi_boards {
 };
 
 #define AVS_MACH_ENTRY(_id, _mach) \
-	{ .id = (_id), .machs = (_mach), }
+	{ .id = PCI_DEVICE_ID_INTEL_##_id, .machs = (_mach), }
 
 /* supported I2S boards per platform */
 static const struct avs_acpi_boards i2s_boards[] = {
-	AVS_MACH_ENTRY(0x9d70, avs_skl_i2s_machines), /* SKL */
-	AVS_MACH_ENTRY(0x9d71, avs_kbl_i2s_machines), /* KBL */
-	AVS_MACH_ENTRY(0x5a98, avs_apl_i2s_machines), /* APL */
-	AVS_MACH_ENTRY(0x3198, avs_gml_i2s_machines), /* GML */
+	AVS_MACH_ENTRY(HDA_SKL_LP, avs_skl_i2s_machines),
+	AVS_MACH_ENTRY(HDA_KBL_LP, avs_kbl_i2s_machines),
+	AVS_MACH_ENTRY(HDA_APL, avs_apl_i2s_machines),
+	AVS_MACH_ENTRY(HDA_GML, avs_gml_i2s_machines),
 	{},
 };
 
-- 
2.34.1

Re: [PATCH 10/13] ASoC: Intel: avs: Convert to PCI device IDs defines

[Andy Shevchenko]

On Tue, Jul 11, 2023 at 02:57:23PM +0200, Amadeusz Sławiński wrote:
> Use PCI device IDs from pci_ids.h header. Adjust AVS_MACH_ENTRY() macro,
> so device ID can be provided in short form.

FWIW,
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>

> Acked-by: Mark Brown <broonie@kernel.org>
> Signed-off-by: Amadeusz Sławiński <amadeuszx.slawinski@linux.intel.com>
> ---
>  sound/soc/intel/avs/board_selection.c | 10 +++++-----
>  1 file changed, 5 insertions(+), 5 deletions(-)
> 
> diff --git a/sound/soc/intel/avs/board_selection.c b/sound/soc/intel/avs/board_selection.c
> index 60f8fb0bff95..b32e02940e30 100644
> --- a/sound/soc/intel/avs/board_selection.c
> +++ b/sound/soc/intel/avs/board_selection.c
> @@ -263,14 +263,14 @@ struct avs_acpi_boards {
>  };
>  
>  #define AVS_MACH_ENTRY(_id, _mach) \
> -	{ .id = (_id), .machs = (_mach), }
> +	{ .id = PCI_DEVICE_ID_INTEL_##_id, .machs = (_mach), }
>  
>  /* supported I2S boards per platform */
>  static const struct avs_acpi_boards i2s_boards[] = {
> -	AVS_MACH_ENTRY(0x9d70, avs_skl_i2s_machines), /* SKL */
> -	AVS_MACH_ENTRY(0x9d71, avs_kbl_i2s_machines), /* KBL */
> -	AVS_MACH_ENTRY(0x5a98, avs_apl_i2s_machines), /* APL */
> -	AVS_MACH_ENTRY(0x3198, avs_gml_i2s_machines), /* GML */
> +	AVS_MACH_ENTRY(HDA_SKL_LP, avs_skl_i2s_machines),
> +	AVS_MACH_ENTRY(HDA_KBL_LP, avs_kbl_i2s_machines),
> +	AVS_MACH_ENTRY(HDA_APL, avs_apl_i2s_machines),
> +	AVS_MACH_ENTRY(HDA_GML, avs_gml_i2s_machines),

Maybe sort them by name?

>  	{},
>  };
>  
> -- 
> 2.34.1
> 

-- 
With Best Regards,
Andy Shevchenko

Re: [PATCH 10/13] ASoC: Intel: avs: Convert to PCI device IDs defines

[Amadeusz Sławiński]

On 7/11/2023 4:09 PM, Andy Shevchenko wrote:
> On Tue, Jul 11, 2023 at 02:57:23PM +0200, Amadeusz Sławiński wrote:
>> Use PCI device IDs from pci_ids.h header. Adjust AVS_MACH_ENTRY() macro,
>> so device ID can be provided in short form.
> 
> FWIW,
> Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
> 
>> Acked-by: Mark Brown <broonie@kernel.org>
>> Signed-off-by: Amadeusz Sławiński <amadeuszx.slawinski@linux.intel.com>
>> ---
>>   sound/soc/intel/avs/board_selection.c | 10 +++++-----
>>   1 file changed, 5 insertions(+), 5 deletions(-)
>>
>> diff --git a/sound/soc/intel/avs/board_selection.c b/sound/soc/intel/avs/board_selection.c
>> index 60f8fb0bff95..b32e02940e30 100644
>> --- a/sound/soc/intel/avs/board_selection.c
>> +++ b/sound/soc/intel/avs/board_selection.c
>> @@ -263,14 +263,14 @@ struct avs_acpi_boards {
>>   };
>>   
>>   #define AVS_MACH_ENTRY(_id, _mach) \
>> -	{ .id = (_id), .machs = (_mach), }
>> +	{ .id = PCI_DEVICE_ID_INTEL_##_id, .machs = (_mach), }
>>   
>>   /* supported I2S boards per platform */
>>   static const struct avs_acpi_boards i2s_boards[] = {
>> -	AVS_MACH_ENTRY(0x9d70, avs_skl_i2s_machines), /* SKL */
>> -	AVS_MACH_ENTRY(0x9d71, avs_kbl_i2s_machines), /* KBL */
>> -	AVS_MACH_ENTRY(0x5a98, avs_apl_i2s_machines), /* APL */
>> -	AVS_MACH_ENTRY(0x3198, avs_gml_i2s_machines), /* GML */
>> +	AVS_MACH_ENTRY(HDA_SKL_LP, avs_skl_i2s_machines),
>> +	AVS_MACH_ENTRY(HDA_KBL_LP, avs_kbl_i2s_machines),
>> +	AVS_MACH_ENTRY(HDA_APL, avs_apl_i2s_machines),
>> +	AVS_MACH_ENTRY(HDA_GML, avs_gml_i2s_machines),
> 
> Maybe sort them by name?

They are sorted by generation.

[PATCH 11/13] ASoC: Intel: Skylake: Convert to PCI device IDs defines

[Amadeusz Sławiński]

Use PCI device IDs from pci_ids.h header and while at it change to using
PCI_DEVICE_DATA() macro, to simplify declarations.

Acked-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Amadeusz Sławiński <amadeuszx.slawinski@linux.intel.com>
---
 sound/soc/intel/skylake/skl-messages.c | 16 ++++++------
 sound/soc/intel/skylake/skl.c          | 36 +++++++-------------------
 2 files changed, 18 insertions(+), 34 deletions(-)

diff --git a/sound/soc/intel/skylake/skl-messages.c b/sound/soc/intel/skylake/skl-messages.c
index d31509298a0a..fc2eb04da172 100644
--- a/sound/soc/intel/skylake/skl-messages.c
+++ b/sound/soc/intel/skylake/skl-messages.c
@@ -169,7 +169,7 @@ static struct skl_dsp_loader_ops bxt_get_loader_ops(void)
 
 static const struct skl_dsp_ops dsp_ops[] = {
 	{
-		.id = 0x9d70,
+		.id = PCI_DEVICE_ID_INTEL_HDA_SKL_LP,
 		.num_cores = 2,
 		.loader_ops = skl_get_loader_ops,
 		.init = skl_sst_dsp_init,
@@ -177,7 +177,7 @@ static const struct skl_dsp_ops dsp_ops[] = {
 		.cleanup = skl_sst_dsp_cleanup
 	},
 	{
-		.id = 0x9d71,
+		.id = PCI_DEVICE_ID_INTEL_HDA_KBL_LP,
 		.num_cores = 2,
 		.loader_ops = skl_get_loader_ops,
 		.init = skl_sst_dsp_init,
@@ -185,7 +185,7 @@ static const struct skl_dsp_ops dsp_ops[] = {
 		.cleanup = skl_sst_dsp_cleanup
 	},
 	{
-		.id = 0x5a98,
+		.id = PCI_DEVICE_ID_INTEL_HDA_APL,
 		.num_cores = 2,
 		.loader_ops = bxt_get_loader_ops,
 		.init = bxt_sst_dsp_init,
@@ -193,7 +193,7 @@ static const struct skl_dsp_ops dsp_ops[] = {
 		.cleanup = bxt_sst_dsp_cleanup
 	},
 	{
-		.id = 0x3198,
+		.id = PCI_DEVICE_ID_INTEL_HDA_GML,
 		.num_cores = 2,
 		.loader_ops = bxt_get_loader_ops,
 		.init = bxt_sst_dsp_init,
@@ -201,7 +201,7 @@ static const struct skl_dsp_ops dsp_ops[] = {
 		.cleanup = bxt_sst_dsp_cleanup
 	},
 	{
-		.id = 0x9dc8,
+		.id = PCI_DEVICE_ID_INTEL_HDA_CNL_LP,
 		.num_cores = 4,
 		.loader_ops = bxt_get_loader_ops,
 		.init = cnl_sst_dsp_init,
@@ -209,7 +209,7 @@ static const struct skl_dsp_ops dsp_ops[] = {
 		.cleanup = cnl_sst_dsp_cleanup
 	},
 	{
-		.id = 0xa348,
+		.id = PCI_DEVICE_ID_INTEL_HDA_CNL_H,
 		.num_cores = 4,
 		.loader_ops = bxt_get_loader_ops,
 		.init = cnl_sst_dsp_init,
@@ -217,7 +217,7 @@ static const struct skl_dsp_ops dsp_ops[] = {
 		.cleanup = cnl_sst_dsp_cleanup
 	},
 	{
-		.id = 0x02c8,
+		.id = PCI_DEVICE_ID_INTEL_HDA_CML_LP,
 		.num_cores = 4,
 		.loader_ops = bxt_get_loader_ops,
 		.init = cnl_sst_dsp_init,
@@ -225,7 +225,7 @@ static const struct skl_dsp_ops dsp_ops[] = {
 		.cleanup = cnl_sst_dsp_cleanup
 	},
 	{
-		.id = 0x06c8,
+		.id = PCI_DEVICE_ID_INTEL_HDA_CML_H,
 		.num_cores = 4,
 		.loader_ops = bxt_get_loader_ops,
 		.init = cnl_sst_dsp_init,
diff --git a/sound/soc/intel/skylake/skl.c b/sound/soc/intel/skylake/skl.c
index 998bd0232cf1..77408a981b97 100644
--- a/sound/soc/intel/skylake/skl.c
+++ b/sound/soc/intel/skylake/skl.c
@@ -608,8 +608,8 @@ struct skl_clk_parent_src *skl_get_parent_clk(u8 clk_id)
 static void init_skl_xtal_rate(int pci_id)
 {
 	switch (pci_id) {
-	case 0x9d70:
-	case 0x9d71:
+	case PCI_DEVICE_ID_INTEL_HDA_SKL_LP:
+	case PCI_DEVICE_ID_INTEL_HDA_KBL_LP:
 		skl_clk_src[0].rate = 24000000;
 		return;
 
@@ -1145,44 +1145,28 @@ static void skl_remove(struct pci_dev *pci)
 /* PCI IDs */
 static const struct pci_device_id skl_ids[] = {
 #if IS_ENABLED(CONFIG_SND_SOC_INTEL_SKL)
-	/* Sunrise Point-LP */
-	{ PCI_DEVICE(0x8086, 0x9d70),
-		.driver_data = (unsigned long)&snd_soc_acpi_intel_skl_machines},
+	{ PCI_DEVICE_DATA(INTEL, HDA_SKL_LP, &snd_soc_acpi_intel_skl_machines) },
 #endif
 #if IS_ENABLED(CONFIG_SND_SOC_INTEL_APL)
-	/* BXT-P */
-	{ PCI_DEVICE(0x8086, 0x5a98),
-		.driver_data = (unsigned long)&snd_soc_acpi_intel_bxt_machines},
+	{ PCI_DEVICE_DATA(INTEL, HDA_APL, &snd_soc_acpi_intel_bxt_machines) },
 #endif
 #if IS_ENABLED(CONFIG_SND_SOC_INTEL_KBL)
-	/* KBL */
-	{ PCI_DEVICE(0x8086, 0x9D71),
-		.driver_data = (unsigned long)&snd_soc_acpi_intel_kbl_machines},
+	{ PCI_DEVICE_DATA(INTEL, HDA_KBL_LP, &snd_soc_acpi_intel_kbl_machines) },
 #endif
 #if IS_ENABLED(CONFIG_SND_SOC_INTEL_GLK)
-	/* GLK */
-	{ PCI_DEVICE(0x8086, 0x3198),
-		.driver_data = (unsigned long)&snd_soc_acpi_intel_glk_machines},
+	{ PCI_DEVICE_DATA(INTEL, HDA_GML, &snd_soc_acpi_intel_glk_machines) },
 #endif
 #if IS_ENABLED(CONFIG_SND_SOC_INTEL_CNL)
-	/* CNL */
-	{ PCI_DEVICE(0x8086, 0x9dc8),
-		.driver_data = (unsigned long)&snd_soc_acpi_intel_cnl_machines},
+	{ PCI_DEVICE_DATA(INTEL, HDA_CNL_LP, &snd_soc_acpi_intel_cnl_machines) },
 #endif
 #if IS_ENABLED(CONFIG_SND_SOC_INTEL_CFL)
-	/* CFL */
-	{ PCI_DEVICE(0x8086, 0xa348),
-		.driver_data = (unsigned long)&snd_soc_acpi_intel_cnl_machines},
+	{ PCI_DEVICE_DATA(INTEL, HDA_CNL_H, &snd_soc_acpi_intel_cnl_machines) },
 #endif
 #if IS_ENABLED(CONFIG_SND_SOC_INTEL_CML_LP)
-	/* CML-LP */
-	{ PCI_DEVICE(0x8086, 0x02c8),
-		.driver_data = (unsigned long)&snd_soc_acpi_intel_cnl_machines},
+	{ PCI_DEVICE_DATA(INTEL, HDA_CML_LP, &snd_soc_acpi_intel_cnl_machines) },
 #endif
 #if IS_ENABLED(CONFIG_SND_SOC_INTEL_CML_H)
-	/* CML-H */
-	{ PCI_DEVICE(0x8086, 0x06c8),
-		.driver_data = (unsigned long)&snd_soc_acpi_intel_cnl_machines},
+	{ PCI_DEVICE_DATA(INTEL, HDA_CML_H, &snd_soc_acpi_intel_cnl_machines) },
 #endif
 	{ 0, }
 };
-- 
2.34.1

Re: [PATCH 11/13] ASoC: Intel: Skylake: Convert to PCI device IDs defines

[Andy Shevchenko]

On Tue, Jul 11, 2023 at 02:57:24PM +0200, Amadeusz Sławiński wrote:
> Use PCI device IDs from pci_ids.h header and while at it change to using
> PCI_DEVICE_DATA() macro, to simplify declarations.

FWIW,
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>

BXT --> APL ?

> Acked-by: Mark Brown <broonie@kernel.org>
> Signed-off-by: Amadeusz Sławiński <amadeuszx.slawinski@linux.intel.com>
> ---
>  sound/soc/intel/skylake/skl-messages.c | 16 ++++++------
>  sound/soc/intel/skylake/skl.c          | 36 +++++++-------------------
>  2 files changed, 18 insertions(+), 34 deletions(-)
> 
> diff --git a/sound/soc/intel/skylake/skl-messages.c b/sound/soc/intel/skylake/skl-messages.c
> index d31509298a0a..fc2eb04da172 100644
> --- a/sound/soc/intel/skylake/skl-messages.c
> +++ b/sound/soc/intel/skylake/skl-messages.c
> @@ -169,7 +169,7 @@ static struct skl_dsp_loader_ops bxt_get_loader_ops(void)
>  
>  static const struct skl_dsp_ops dsp_ops[] = {
>  	{
> -		.id = 0x9d70,
> +		.id = PCI_DEVICE_ID_INTEL_HDA_SKL_LP,
>  		.num_cores = 2,
>  		.loader_ops = skl_get_loader_ops,
>  		.init = skl_sst_dsp_init,
> @@ -177,7 +177,7 @@ static const struct skl_dsp_ops dsp_ops[] = {
>  		.cleanup = skl_sst_dsp_cleanup
>  	},
>  	{
> -		.id = 0x9d71,
> +		.id = PCI_DEVICE_ID_INTEL_HDA_KBL_LP,
>  		.num_cores = 2,
>  		.loader_ops = skl_get_loader_ops,
>  		.init = skl_sst_dsp_init,
> @@ -185,7 +185,7 @@ static const struct skl_dsp_ops dsp_ops[] = {
>  		.cleanup = skl_sst_dsp_cleanup
>  	},
>  	{
> -		.id = 0x5a98,
> +		.id = PCI_DEVICE_ID_INTEL_HDA_APL,
>  		.num_cores = 2,
>  		.loader_ops = bxt_get_loader_ops,
>  		.init = bxt_sst_dsp_init,
> @@ -193,7 +193,7 @@ static const struct skl_dsp_ops dsp_ops[] = {
>  		.cleanup = bxt_sst_dsp_cleanup
>  	},
>  	{
> -		.id = 0x3198,
> +		.id = PCI_DEVICE_ID_INTEL_HDA_GML,
>  		.num_cores = 2,
>  		.loader_ops = bxt_get_loader_ops,
>  		.init = bxt_sst_dsp_init,
> @@ -201,7 +201,7 @@ static const struct skl_dsp_ops dsp_ops[] = {
>  		.cleanup = bxt_sst_dsp_cleanup
>  	},
>  	{
> -		.id = 0x9dc8,
> +		.id = PCI_DEVICE_ID_INTEL_HDA_CNL_LP,
>  		.num_cores = 4,
>  		.loader_ops = bxt_get_loader_ops,
>  		.init = cnl_sst_dsp_init,
> @@ -209,7 +209,7 @@ static const struct skl_dsp_ops dsp_ops[] = {
>  		.cleanup = cnl_sst_dsp_cleanup
>  	},
>  	{
> -		.id = 0xa348,
> +		.id = PCI_DEVICE_ID_INTEL_HDA_CNL_H,
>  		.num_cores = 4,
>  		.loader_ops = bxt_get_loader_ops,
>  		.init = cnl_sst_dsp_init,
> @@ -217,7 +217,7 @@ static const struct skl_dsp_ops dsp_ops[] = {
>  		.cleanup = cnl_sst_dsp_cleanup
>  	},
>  	{
> -		.id = 0x02c8,
> +		.id = PCI_DEVICE_ID_INTEL_HDA_CML_LP,
>  		.num_cores = 4,
>  		.loader_ops = bxt_get_loader_ops,
>  		.init = cnl_sst_dsp_init,
> @@ -225,7 +225,7 @@ static const struct skl_dsp_ops dsp_ops[] = {
>  		.cleanup = cnl_sst_dsp_cleanup
>  	},
>  	{
> -		.id = 0x06c8,
> +		.id = PCI_DEVICE_ID_INTEL_HDA_CML_H,
>  		.num_cores = 4,
>  		.loader_ops = bxt_get_loader_ops,
>  		.init = cnl_sst_dsp_init,
> diff --git a/sound/soc/intel/skylake/skl.c b/sound/soc/intel/skylake/skl.c
> index 998bd0232cf1..77408a981b97 100644
> --- a/sound/soc/intel/skylake/skl.c
> +++ b/sound/soc/intel/skylake/skl.c
> @@ -608,8 +608,8 @@ struct skl_clk_parent_src *skl_get_parent_clk(u8 clk_id)
>  static void init_skl_xtal_rate(int pci_id)
>  {
>  	switch (pci_id) {
> -	case 0x9d70:
> -	case 0x9d71:
> +	case PCI_DEVICE_ID_INTEL_HDA_SKL_LP:
> +	case PCI_DEVICE_ID_INTEL_HDA_KBL_LP:
>  		skl_clk_src[0].rate = 24000000;
>  		return;
>  
> @@ -1145,44 +1145,28 @@ static void skl_remove(struct pci_dev *pci)
>  /* PCI IDs */
>  static const struct pci_device_id skl_ids[] = {
>  #if IS_ENABLED(CONFIG_SND_SOC_INTEL_SKL)
> -	/* Sunrise Point-LP */
> -	{ PCI_DEVICE(0x8086, 0x9d70),
> -		.driver_data = (unsigned long)&snd_soc_acpi_intel_skl_machines},
> +	{ PCI_DEVICE_DATA(INTEL, HDA_SKL_LP, &snd_soc_acpi_intel_skl_machines) },
>  #endif
>  #if IS_ENABLED(CONFIG_SND_SOC_INTEL_APL)
> -	/* BXT-P */
> -	{ PCI_DEVICE(0x8086, 0x5a98),
> -		.driver_data = (unsigned long)&snd_soc_acpi_intel_bxt_machines},
> +	{ PCI_DEVICE_DATA(INTEL, HDA_APL, &snd_soc_acpi_intel_bxt_machines) },
>  #endif
>  #if IS_ENABLED(CONFIG_SND_SOC_INTEL_KBL)
> -	/* KBL */
> -	{ PCI_DEVICE(0x8086, 0x9D71),
> -		.driver_data = (unsigned long)&snd_soc_acpi_intel_kbl_machines},
> +	{ PCI_DEVICE_DATA(INTEL, HDA_KBL_LP, &snd_soc_acpi_intel_kbl_machines) },
>  #endif
>  #if IS_ENABLED(CONFIG_SND_SOC_INTEL_GLK)
> -	/* GLK */
> -	{ PCI_DEVICE(0x8086, 0x3198),
> -		.driver_data = (unsigned long)&snd_soc_acpi_intel_glk_machines},
> +	{ PCI_DEVICE_DATA(INTEL, HDA_GML, &snd_soc_acpi_intel_glk_machines) },
>  #endif
>  #if IS_ENABLED(CONFIG_SND_SOC_INTEL_CNL)
> -	/* CNL */
> -	{ PCI_DEVICE(0x8086, 0x9dc8),
> -		.driver_data = (unsigned long)&snd_soc_acpi_intel_cnl_machines},
> +	{ PCI_DEVICE_DATA(INTEL, HDA_CNL_LP, &snd_soc_acpi_intel_cnl_machines) },
>  #endif
>  #if IS_ENABLED(CONFIG_SND_SOC_INTEL_CFL)
> -	/* CFL */
> -	{ PCI_DEVICE(0x8086, 0xa348),
> -		.driver_data = (unsigned long)&snd_soc_acpi_intel_cnl_machines},
> +	{ PCI_DEVICE_DATA(INTEL, HDA_CNL_H, &snd_soc_acpi_intel_cnl_machines) },
>  #endif
>  #if IS_ENABLED(CONFIG_SND_SOC_INTEL_CML_LP)
> -	/* CML-LP */
> -	{ PCI_DEVICE(0x8086, 0x02c8),
> -		.driver_data = (unsigned long)&snd_soc_acpi_intel_cnl_machines},
> +	{ PCI_DEVICE_DATA(INTEL, HDA_CML_LP, &snd_soc_acpi_intel_cnl_machines) },
>  #endif
>  #if IS_ENABLED(CONFIG_SND_SOC_INTEL_CML_H)
> -	/* CML-H */
> -	{ PCI_DEVICE(0x8086, 0x06c8),
> -		.driver_data = (unsigned long)&snd_soc_acpi_intel_cnl_machines},
> +	{ PCI_DEVICE_DATA(INTEL, HDA_CML_H, &snd_soc_acpi_intel_cnl_machines) },
>  #endif
>  	{ 0, }
>  };
> -- 
> 2.34.1
> 

-- 
With Best Regards,
Andy Shevchenko

[PATCH 12/13] ASoC: SOF: Intel: Convert to PCI device IDs defines

[Amadeusz Sławiński]

Use PCI device IDs from pci_ids.h header and while at it change to using
PCI_DEVICE_DATA() macro, to simplify declarations.

Acked-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Amadeusz Sławiński <amadeuszx.slawinski@linux.intel.com>
---
 sound/soc/sof/intel/pci-apl.c |  9 +++----
 sound/soc/sof/intel/pci-cnl.c | 15 ++++--------
 sound/soc/sof/intel/pci-icl.c | 12 ++++------
 sound/soc/sof/intel/pci-mtl.c |  3 +--
 sound/soc/sof/intel/pci-skl.c |  6 ++---
 sound/soc/sof/intel/pci-tgl.c | 45 ++++++++++++-----------------------
 sound/soc/sof/intel/pci-tng.c |  3 +--
 7 files changed, 31 insertions(+), 62 deletions(-)

diff --git a/sound/soc/sof/intel/pci-apl.c b/sound/soc/sof/intel/pci-apl.c
index 69cad5a6bc72..083659ddfe6b 100644
--- a/sound/soc/sof/intel/pci-apl.c
+++ b/sound/soc/sof/intel/pci-apl.c
@@ -85,12 +85,9 @@ static const struct sof_dev_desc glk_desc = {
 
 /* PCI IDs */
 static const struct pci_device_id sof_pci_ids[] = {
-	{ PCI_DEVICE(0x8086, 0x5a98), /* BXT-P (ApolloLake) */
-		.driver_data = (unsigned long)&bxt_desc},
-	{ PCI_DEVICE(0x8086, 0x1a98),/* BXT-T */
-		.driver_data = (unsigned long)&bxt_desc},
-	{ PCI_DEVICE(0x8086, 0x3198), /* GeminiLake */
-		.driver_data = (unsigned long)&glk_desc},
+	{ PCI_DEVICE_DATA(INTEL, HDA_APL, &bxt_desc) },
+	{ PCI_DEVICE_DATA(INTEL, HDA_APL_T, &bxt_desc) },
+	{ PCI_DEVICE_DATA(INTEL, HDA_GML, &glk_desc) },
 	{ 0, }
 };
 MODULE_DEVICE_TABLE(pci, sof_pci_ids);
diff --git a/sound/soc/sof/intel/pci-cnl.c b/sound/soc/sof/intel/pci-cnl.c
index 8895508a0be6..e2c50e7b0aa7 100644
--- a/sound/soc/sof/intel/pci-cnl.c
+++ b/sound/soc/sof/intel/pci-cnl.c
@@ -120,16 +120,11 @@ static const struct sof_dev_desc cml_desc = {
 
 /* PCI IDs */
 static const struct pci_device_id sof_pci_ids[] = {
-	{ PCI_DEVICE(0x8086, 0x9dc8), /* CNL-LP */
-		.driver_data = (unsigned long)&cnl_desc},
-	{ PCI_DEVICE(0x8086, 0xa348), /* CNL-H */
-		.driver_data = (unsigned long)&cfl_desc},
-	{ PCI_DEVICE(0x8086, 0x02c8), /* CML-LP */
-		.driver_data = (unsigned long)&cml_desc},
-	{ PCI_DEVICE(0x8086, 0x06c8), /* CML-H */
-		.driver_data = (unsigned long)&cml_desc},
-	{ PCI_DEVICE(0x8086, 0xa3f0), /* CML-S */
-		.driver_data = (unsigned long)&cml_desc},
+	{ PCI_DEVICE_DATA(INTEL, HDA_CNL_LP, &cnl_desc) },
+	{ PCI_DEVICE_DATA(INTEL, HDA_CNL_H, &cfl_desc) },
+	{ PCI_DEVICE_DATA(INTEL, HDA_CML_LP, &cml_desc) },
+	{ PCI_DEVICE_DATA(INTEL, HDA_CML_H, &cml_desc) },
+	{ PCI_DEVICE_DATA(INTEL, HDA_CML_S, &cml_desc) },
 	{ 0, }
 };
 MODULE_DEVICE_TABLE(pci, sof_pci_ids);
diff --git a/sound/soc/sof/intel/pci-icl.c b/sound/soc/sof/intel/pci-icl.c
index 5fb5a820693e..0a65df3ed9e2 100644
--- a/sound/soc/sof/intel/pci-icl.c
+++ b/sound/soc/sof/intel/pci-icl.c
@@ -86,14 +86,10 @@ static const struct sof_dev_desc jsl_desc = {
 
 /* PCI IDs */
 static const struct pci_device_id sof_pci_ids[] = {
-	{ PCI_DEVICE(0x8086, 0x34C8), /* ICL-LP */
-		.driver_data = (unsigned long)&icl_desc},
-	{ PCI_DEVICE(0x8086, 0x3dc8), /* ICL-H */
-		.driver_data = (unsigned long)&icl_desc},
-	{ PCI_DEVICE(0x8086, 0x38c8), /* ICL-N */
-		.driver_data = (unsigned long)&jsl_desc},
-	{ PCI_DEVICE(0x8086, 0x4dc8), /* JSL-N */
-		.driver_data = (unsigned long)&jsl_desc},
+	{ PCI_DEVICE_DATA(INTEL, HDA_ICL_LP, &icl_desc) },
+	{ PCI_DEVICE_DATA(INTEL, HDA_ICL_H, &icl_desc) },
+	{ PCI_DEVICE_DATA(INTEL, HDA_ICL_N, &jsl_desc) },
+	{ PCI_DEVICE_DATA(INTEL, HDA_JSL_N, &jsl_desc) },
 	{ 0, }
 };
 MODULE_DEVICE_TABLE(pci, sof_pci_ids);
diff --git a/sound/soc/sof/intel/pci-mtl.c b/sound/soc/sof/intel/pci-mtl.c
index e276e1e37fed..7868b0827e84 100644
--- a/sound/soc/sof/intel/pci-mtl.c
+++ b/sound/soc/sof/intel/pci-mtl.c
@@ -52,8 +52,7 @@ static const struct sof_dev_desc mtl_desc = {
 
 /* PCI IDs */
 static const struct pci_device_id sof_pci_ids[] = {
-	{ PCI_DEVICE(0x8086, 0x7E28), /* MTL */
-		.driver_data = (unsigned long)&mtl_desc},
+	{ PCI_DEVICE_DATA(INTEL, HDA_MTL, &mtl_desc) },
 	{ 0, }
 };
 MODULE_DEVICE_TABLE(pci, sof_pci_ids);
diff --git a/sound/soc/sof/intel/pci-skl.c b/sound/soc/sof/intel/pci-skl.c
index 5e69af6eed34..a6588b138a8c 100644
--- a/sound/soc/sof/intel/pci-skl.c
+++ b/sound/soc/sof/intel/pci-skl.c
@@ -69,10 +69,8 @@ static struct sof_dev_desc kbl_desc = {
 
 /* PCI IDs */
 static const struct pci_device_id sof_pci_ids[] = {
-	/* Sunrise Point-LP */
-	{ PCI_DEVICE(0x8086, 0x9d70), .driver_data = (unsigned long)&skl_desc},
-	/* KBL */
-	{ PCI_DEVICE(0x8086, 0x9d71), .driver_data = (unsigned long)&kbl_desc},
+	{ PCI_DEVICE_DATA(INTEL, HDA_SKL_LP, &skl_desc) },
+	{ PCI_DEVICE_DATA(INTEL, HDA_KBL_LP, &kbl_desc) },
 	{ 0, }
 };
 MODULE_DEVICE_TABLE(pci, sof_pci_ids);
diff --git a/sound/soc/sof/intel/pci-tgl.c b/sound/soc/sof/intel/pci-tgl.c
index ca37ff1bbd2a..d688f9373fb2 100644
--- a/sound/soc/sof/intel/pci-tgl.c
+++ b/sound/soc/sof/intel/pci-tgl.c
@@ -284,36 +284,21 @@ static const struct sof_dev_desc rpl_desc = {
 
 /* PCI IDs */
 static const struct pci_device_id sof_pci_ids[] = {
-	{ PCI_DEVICE(0x8086, 0xa0c8), /* TGL-LP */
-		.driver_data = (unsigned long)&tgl_desc},
-	{ PCI_DEVICE(0x8086, 0x43c8), /* TGL-H */
-		.driver_data = (unsigned long)&tglh_desc},
-	{ PCI_DEVICE(0x8086, 0x4b55), /* EHL */
-		.driver_data = (unsigned long)&ehl_desc},
-	{ PCI_DEVICE(0x8086, 0x4b58), /* EHL */
-		.driver_data = (unsigned long)&ehl_desc},
-	{ PCI_DEVICE(0x8086, 0x7ad0), /* ADL-S */
-		.driver_data = (unsigned long)&adls_desc},
-	{ PCI_DEVICE(0x8086, 0x7a50), /* RPL-S */
-		.driver_data = (unsigned long)&rpls_desc},
-	{ PCI_DEVICE(0x8086, 0x51c8), /* ADL-P */
-		.driver_data = (unsigned long)&adl_desc},
-	{ PCI_DEVICE(0x8086, 0x51c9), /* ADL-PS */
-		.driver_data = (unsigned long)&adl_desc},
-	{ PCI_DEVICE(0x8086, 0x51ca), /* RPL-P */
-		.driver_data = (unsigned long)&rpl_desc},
-	{ PCI_DEVICE(0x8086, 0x51cb), /* RPL-P */
-		.driver_data = (unsigned long)&rpl_desc},
-	{ PCI_DEVICE(0x8086, 0x51cc), /* ADL-M */
-		.driver_data = (unsigned long)&adl_desc},
-	{ PCI_DEVICE(0x8086, 0x51cd), /* ADL-P */
-		.driver_data = (unsigned long)&adl_desc},
-	{ PCI_DEVICE(0x8086, 0x51ce), /* RPL-M */
-		.driver_data = (unsigned long)&rpl_desc},
-	{ PCI_DEVICE(0x8086, 0x51cf), /* RPL-PX */
-		.driver_data = (unsigned long)&rpl_desc},
-	{ PCI_DEVICE(0x8086, 0x54c8), /* ADL-N */
-		.driver_data = (unsigned long)&adl_n_desc},
+	{ PCI_DEVICE_DATA(INTEL, HDA_TGL_LP, &tgl_desc) },
+	{ PCI_DEVICE_DATA(INTEL, HDA_TGL_H, &tglh_desc) },
+	{ PCI_DEVICE_DATA(INTEL, HDA_EHL_0, &ehl_desc) },
+	{ PCI_DEVICE_DATA(INTEL, HDA_EHL_3, &ehl_desc) },
+	{ PCI_DEVICE_DATA(INTEL, HDA_ADL_S, &adls_desc) },
+	{ PCI_DEVICE_DATA(INTEL, HDA_RPL_S, &rpls_desc) },
+	{ PCI_DEVICE_DATA(INTEL, HDA_ADL_P, &adl_desc) },
+	{ PCI_DEVICE_DATA(INTEL, HDA_ADL_PS, &adl_desc) },
+	{ PCI_DEVICE_DATA(INTEL, HDA_RPL_P_0, &rpl_desc) },
+	{ PCI_DEVICE_DATA(INTEL, HDA_RPL_P_1, &rpl_desc) },
+	{ PCI_DEVICE_DATA(INTEL, HDA_ADL_M, &adl_desc) },
+	{ PCI_DEVICE_DATA(INTEL, HDA_ADL_PX, &adl_desc) },
+	{ PCI_DEVICE_DATA(INTEL, HDA_RPL_M, &rpl_desc) },
+	{ PCI_DEVICE_DATA(INTEL, HDA_RPL_PX, &rpl_desc) },
+	{ PCI_DEVICE_DATA(INTEL, HDA_ADL_N, &adl_n_desc) },
 	{ 0, }
 };
 MODULE_DEVICE_TABLE(pci, sof_pci_ids);
diff --git a/sound/soc/sof/intel/pci-tng.c b/sound/soc/sof/intel/pci-tng.c
index 8c22a00266c0..12e81456a80c 100644
--- a/sound/soc/sof/intel/pci-tng.c
+++ b/sound/soc/sof/intel/pci-tng.c
@@ -225,8 +225,7 @@ static const struct sof_dev_desc tng_desc = {
 
 /* PCI IDs */
 static const struct pci_device_id sof_pci_ids[] = {
-	{ PCI_DEVICE(0x8086, 0x119a),
-		.driver_data = (unsigned long)&tng_desc},
+	{ PCI_DEVICE_DATA(INTEL, ADSP_TNG, &tng_desc) },
 	{ 0, }
 };
 MODULE_DEVICE_TABLE(pci, sof_pci_ids);
-- 
2.34.1

Re: [PATCH 12/13] ASoC: SOF: Intel: Convert to PCI device IDs defines

[Andy Shevchenko]

On Tue, Jul 11, 2023 at 02:57:25PM +0200, Amadeusz Sławiński wrote:
> Use PCI device IDs from pci_ids.h header and while at it change to using
> PCI_DEVICE_DATA() macro, to simplify declarations.

FWIW,
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Oh, additional remark below.

> Acked-by: Mark Brown <broonie@kernel.org>
> Signed-off-by: Amadeusz Sławiński <amadeuszx.slawinski@linux.intel.com>
> ---
>  sound/soc/sof/intel/pci-apl.c |  9 +++----
>  sound/soc/sof/intel/pci-cnl.c | 15 ++++--------
>  sound/soc/sof/intel/pci-icl.c | 12 ++++------
>  sound/soc/sof/intel/pci-mtl.c |  3 +--
>  sound/soc/sof/intel/pci-skl.c |  6 ++---
>  sound/soc/sof/intel/pci-tgl.c | 45 ++++++++++++-----------------------
>  sound/soc/sof/intel/pci-tng.c |  3 +--
>  7 files changed, 31 insertions(+), 62 deletions(-)
> 
> diff --git a/sound/soc/sof/intel/pci-apl.c b/sound/soc/sof/intel/pci-apl.c
> index 69cad5a6bc72..083659ddfe6b 100644
> --- a/sound/soc/sof/intel/pci-apl.c
> +++ b/sound/soc/sof/intel/pci-apl.c
> @@ -85,12 +85,9 @@ static const struct sof_dev_desc glk_desc = {
>  
>  /* PCI IDs */
>  static const struct pci_device_id sof_pci_ids[] = {
> -	{ PCI_DEVICE(0x8086, 0x5a98), /* BXT-P (ApolloLake) */
> -		.driver_data = (unsigned long)&bxt_desc},
> -	{ PCI_DEVICE(0x8086, 0x1a98),/* BXT-T */
> -		.driver_data = (unsigned long)&bxt_desc},
> -	{ PCI_DEVICE(0x8086, 0x3198), /* GeminiLake */
> -		.driver_data = (unsigned long)&glk_desc},
> +	{ PCI_DEVICE_DATA(INTEL, HDA_APL, &bxt_desc) },
> +	{ PCI_DEVICE_DATA(INTEL, HDA_APL_T, &bxt_desc) },

Have we ever had APL-T? What is that? I remember that we have had two or
three BXTs inside, and then products become for Broxton and Apollo Lake
SoC codenames. I never have heard about -T...

> +	{ PCI_DEVICE_DATA(INTEL, HDA_GML, &glk_desc) },
>  	{ 0, }
>  };
>  MODULE_DEVICE_TABLE(pci, sof_pci_ids);
> diff --git a/sound/soc/sof/intel/pci-cnl.c b/sound/soc/sof/intel/pci-cnl.c
> index 8895508a0be6..e2c50e7b0aa7 100644
> --- a/sound/soc/sof/intel/pci-cnl.c
> +++ b/sound/soc/sof/intel/pci-cnl.c
> @@ -120,16 +120,11 @@ static const struct sof_dev_desc cml_desc = {
>  
>  /* PCI IDs */
>  static const struct pci_device_id sof_pci_ids[] = {
> -	{ PCI_DEVICE(0x8086, 0x9dc8), /* CNL-LP */
> -		.driver_data = (unsigned long)&cnl_desc},
> -	{ PCI_DEVICE(0x8086, 0xa348), /* CNL-H */
> -		.driver_data = (unsigned long)&cfl_desc},
> -	{ PCI_DEVICE(0x8086, 0x02c8), /* CML-LP */
> -		.driver_data = (unsigned long)&cml_desc},
> -	{ PCI_DEVICE(0x8086, 0x06c8), /* CML-H */
> -		.driver_data = (unsigned long)&cml_desc},
> -	{ PCI_DEVICE(0x8086, 0xa3f0), /* CML-S */
> -		.driver_data = (unsigned long)&cml_desc},
> +	{ PCI_DEVICE_DATA(INTEL, HDA_CNL_LP, &cnl_desc) },
> +	{ PCI_DEVICE_DATA(INTEL, HDA_CNL_H, &cfl_desc) },
> +	{ PCI_DEVICE_DATA(INTEL, HDA_CML_LP, &cml_desc) },
> +	{ PCI_DEVICE_DATA(INTEL, HDA_CML_H, &cml_desc) },
> +	{ PCI_DEVICE_DATA(INTEL, HDA_CML_S, &cml_desc) },
>  	{ 0, }
>  };
>  MODULE_DEVICE_TABLE(pci, sof_pci_ids);
> diff --git a/sound/soc/sof/intel/pci-icl.c b/sound/soc/sof/intel/pci-icl.c
> index 5fb5a820693e..0a65df3ed9e2 100644
> --- a/sound/soc/sof/intel/pci-icl.c
> +++ b/sound/soc/sof/intel/pci-icl.c
> @@ -86,14 +86,10 @@ static const struct sof_dev_desc jsl_desc = {
>  
>  /* PCI IDs */
>  static const struct pci_device_id sof_pci_ids[] = {
> -	{ PCI_DEVICE(0x8086, 0x34C8), /* ICL-LP */
> -		.driver_data = (unsigned long)&icl_desc},
> -	{ PCI_DEVICE(0x8086, 0x3dc8), /* ICL-H */
> -		.driver_data = (unsigned long)&icl_desc},
> -	{ PCI_DEVICE(0x8086, 0x38c8), /* ICL-N */
> -		.driver_data = (unsigned long)&jsl_desc},
> -	{ PCI_DEVICE(0x8086, 0x4dc8), /* JSL-N */
> -		.driver_data = (unsigned long)&jsl_desc},
> +	{ PCI_DEVICE_DATA(INTEL, HDA_ICL_LP, &icl_desc) },
> +	{ PCI_DEVICE_DATA(INTEL, HDA_ICL_H, &icl_desc) },
> +	{ PCI_DEVICE_DATA(INTEL, HDA_ICL_N, &jsl_desc) },
> +	{ PCI_DEVICE_DATA(INTEL, HDA_JSL_N, &jsl_desc) },
>  	{ 0, }
>  };
>  MODULE_DEVICE_TABLE(pci, sof_pci_ids);
> diff --git a/sound/soc/sof/intel/pci-mtl.c b/sound/soc/sof/intel/pci-mtl.c
> index e276e1e37fed..7868b0827e84 100644
> --- a/sound/soc/sof/intel/pci-mtl.c
> +++ b/sound/soc/sof/intel/pci-mtl.c
> @@ -52,8 +52,7 @@ static const struct sof_dev_desc mtl_desc = {
>  
>  /* PCI IDs */
>  static const struct pci_device_id sof_pci_ids[] = {
> -	{ PCI_DEVICE(0x8086, 0x7E28), /* MTL */
> -		.driver_data = (unsigned long)&mtl_desc},
> +	{ PCI_DEVICE_DATA(INTEL, HDA_MTL, &mtl_desc) },
>  	{ 0, }
>  };
>  MODULE_DEVICE_TABLE(pci, sof_pci_ids);
> diff --git a/sound/soc/sof/intel/pci-skl.c b/sound/soc/sof/intel/pci-skl.c
> index 5e69af6eed34..a6588b138a8c 100644
> --- a/sound/soc/sof/intel/pci-skl.c
> +++ b/sound/soc/sof/intel/pci-skl.c
> @@ -69,10 +69,8 @@ static struct sof_dev_desc kbl_desc = {
>  
>  /* PCI IDs */
>  static const struct pci_device_id sof_pci_ids[] = {
> -	/* Sunrise Point-LP */
> -	{ PCI_DEVICE(0x8086, 0x9d70), .driver_data = (unsigned long)&skl_desc},
> -	/* KBL */
> -	{ PCI_DEVICE(0x8086, 0x9d71), .driver_data = (unsigned long)&kbl_desc},
> +	{ PCI_DEVICE_DATA(INTEL, HDA_SKL_LP, &skl_desc) },
> +	{ PCI_DEVICE_DATA(INTEL, HDA_KBL_LP, &kbl_desc) },
>  	{ 0, }
>  };
>  MODULE_DEVICE_TABLE(pci, sof_pci_ids);
> diff --git a/sound/soc/sof/intel/pci-tgl.c b/sound/soc/sof/intel/pci-tgl.c
> index ca37ff1bbd2a..d688f9373fb2 100644
> --- a/sound/soc/sof/intel/pci-tgl.c
> +++ b/sound/soc/sof/intel/pci-tgl.c
> @@ -284,36 +284,21 @@ static const struct sof_dev_desc rpl_desc = {
>  
>  /* PCI IDs */
>  static const struct pci_device_id sof_pci_ids[] = {
> -	{ PCI_DEVICE(0x8086, 0xa0c8), /* TGL-LP */
> -		.driver_data = (unsigned long)&tgl_desc},
> -	{ PCI_DEVICE(0x8086, 0x43c8), /* TGL-H */
> -		.driver_data = (unsigned long)&tglh_desc},
> -	{ PCI_DEVICE(0x8086, 0x4b55), /* EHL */
> -		.driver_data = (unsigned long)&ehl_desc},
> -	{ PCI_DEVICE(0x8086, 0x4b58), /* EHL */
> -		.driver_data = (unsigned long)&ehl_desc},
> -	{ PCI_DEVICE(0x8086, 0x7ad0), /* ADL-S */
> -		.driver_data = (unsigned long)&adls_desc},
> -	{ PCI_DEVICE(0x8086, 0x7a50), /* RPL-S */
> -		.driver_data = (unsigned long)&rpls_desc},
> -	{ PCI_DEVICE(0x8086, 0x51c8), /* ADL-P */
> -		.driver_data = (unsigned long)&adl_desc},
> -	{ PCI_DEVICE(0x8086, 0x51c9), /* ADL-PS */
> -		.driver_data = (unsigned long)&adl_desc},
> -	{ PCI_DEVICE(0x8086, 0x51ca), /* RPL-P */
> -		.driver_data = (unsigned long)&rpl_desc},
> -	{ PCI_DEVICE(0x8086, 0x51cb), /* RPL-P */
> -		.driver_data = (unsigned long)&rpl_desc},
> -	{ PCI_DEVICE(0x8086, 0x51cc), /* ADL-M */
> -		.driver_data = (unsigned long)&adl_desc},
> -	{ PCI_DEVICE(0x8086, 0x51cd), /* ADL-P */
> -		.driver_data = (unsigned long)&adl_desc},
> -	{ PCI_DEVICE(0x8086, 0x51ce), /* RPL-M */
> -		.driver_data = (unsigned long)&rpl_desc},
> -	{ PCI_DEVICE(0x8086, 0x51cf), /* RPL-PX */
> -		.driver_data = (unsigned long)&rpl_desc},
> -	{ PCI_DEVICE(0x8086, 0x54c8), /* ADL-N */
> -		.driver_data = (unsigned long)&adl_n_desc},
> +	{ PCI_DEVICE_DATA(INTEL, HDA_TGL_LP, &tgl_desc) },
> +	{ PCI_DEVICE_DATA(INTEL, HDA_TGL_H, &tglh_desc) },
> +	{ PCI_DEVICE_DATA(INTEL, HDA_EHL_0, &ehl_desc) },
> +	{ PCI_DEVICE_DATA(INTEL, HDA_EHL_3, &ehl_desc) },
> +	{ PCI_DEVICE_DATA(INTEL, HDA_ADL_S, &adls_desc) },
> +	{ PCI_DEVICE_DATA(INTEL, HDA_RPL_S, &rpls_desc) },
> +	{ PCI_DEVICE_DATA(INTEL, HDA_ADL_P, &adl_desc) },
> +	{ PCI_DEVICE_DATA(INTEL, HDA_ADL_PS, &adl_desc) },
> +	{ PCI_DEVICE_DATA(INTEL, HDA_RPL_P_0, &rpl_desc) },
> +	{ PCI_DEVICE_DATA(INTEL, HDA_RPL_P_1, &rpl_desc) },
> +	{ PCI_DEVICE_DATA(INTEL, HDA_ADL_M, &adl_desc) },
> +	{ PCI_DEVICE_DATA(INTEL, HDA_ADL_PX, &adl_desc) },
> +	{ PCI_DEVICE_DATA(INTEL, HDA_RPL_M, &rpl_desc) },
> +	{ PCI_DEVICE_DATA(INTEL, HDA_RPL_PX, &rpl_desc) },
> +	{ PCI_DEVICE_DATA(INTEL, HDA_ADL_N, &adl_n_desc) },
>  	{ 0, }
>  };
>  MODULE_DEVICE_TABLE(pci, sof_pci_ids);
> diff --git a/sound/soc/sof/intel/pci-tng.c b/sound/soc/sof/intel/pci-tng.c
> index 8c22a00266c0..12e81456a80c 100644
> --- a/sound/soc/sof/intel/pci-tng.c
> +++ b/sound/soc/sof/intel/pci-tng.c
> @@ -225,8 +225,7 @@ static const struct sof_dev_desc tng_desc = {
>  
>  /* PCI IDs */
>  static const struct pci_device_id sof_pci_ids[] = {
> -	{ PCI_DEVICE(0x8086, 0x119a),
> -		.driver_data = (unsigned long)&tng_desc},
> +	{ PCI_DEVICE_DATA(INTEL, ADSP_TNG, &tng_desc) },
>  	{ 0, }
>  };
>  MODULE_DEVICE_TABLE(pci, sof_pci_ids);
> -- 
> 2.34.1
> 

-- 
With Best Regards,
Andy Shevchenko

Re: [PATCH 12/13] ASoC: SOF: Intel: Convert to PCI device IDs defines

[Amadeusz Sławiński]

On 7/11/2023 4:16 PM, Andy Shevchenko wrote:
> On Tue, Jul 11, 2023 at 02:57:25PM +0200, Amadeusz Sławiński wrote:
>> Use PCI device IDs from pci_ids.h header and while at it change to using
>> PCI_DEVICE_DATA() macro, to simplify declarations.
> 
> FWIW,
> Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
> Oh, additional remark below.
> 
>> Acked-by: Mark Brown <broonie@kernel.org>
>> Signed-off-by: Amadeusz Sławiński <amadeuszx.slawinski@linux.intel.com>
>> ---
>>   sound/soc/sof/intel/pci-apl.c |  9 +++----
>>   sound/soc/sof/intel/pci-cnl.c | 15 ++++--------
>>   sound/soc/sof/intel/pci-icl.c | 12 ++++------
>>   sound/soc/sof/intel/pci-mtl.c |  3 +--
>>   sound/soc/sof/intel/pci-skl.c |  6 ++---
>>   sound/soc/sof/intel/pci-tgl.c | 45 ++++++++++++-----------------------
>>   sound/soc/sof/intel/pci-tng.c |  3 +--
>>   7 files changed, 31 insertions(+), 62 deletions(-)
>>
>> diff --git a/sound/soc/sof/intel/pci-apl.c b/sound/soc/sof/intel/pci-apl.c
>> index 69cad5a6bc72..083659ddfe6b 100644
>> --- a/sound/soc/sof/intel/pci-apl.c
>> +++ b/sound/soc/sof/intel/pci-apl.c
>> @@ -85,12 +85,9 @@ static const struct sof_dev_desc glk_desc = {
>>   
>>   /* PCI IDs */
>>   static const struct pci_device_id sof_pci_ids[] = {
>> -	{ PCI_DEVICE(0x8086, 0x5a98), /* BXT-P (ApolloLake) */
>> -		.driver_data = (unsigned long)&bxt_desc},
>> -	{ PCI_DEVICE(0x8086, 0x1a98),/* BXT-T */
>> -		.driver_data = (unsigned long)&bxt_desc},
>> -	{ PCI_DEVICE(0x8086, 0x3198), /* GeminiLake */
>> -		.driver_data = (unsigned long)&glk_desc},
>> +	{ PCI_DEVICE_DATA(INTEL, HDA_APL, &bxt_desc) },
>> +	{ PCI_DEVICE_DATA(INTEL, HDA_APL_T, &bxt_desc) },
> 
> Have we ever had APL-T? What is that? I remember that we have had two or
> three BXTs inside, and then products become for Broxton and Apollo Lake
> SoC codenames. I never have heard about -T...
> 

I've talked a bit with Cezary and it seems that 0x1a98 is BXT-M (not -T) 
and it's an RVP, BXT-M B0 to be specific. From what we know no BXT is 
available on market. Perhaps we can just remove it?

Re: [PATCH 12/13] ASoC: SOF: Intel: Convert to PCI device IDs defines

[Andy Shevchenko]

On Wed, Jul 12, 2023 at 02:16:17PM +0200, Amadeusz Sławiński wrote:
> On 7/11/2023 4:16 PM, Andy Shevchenko wrote:
> > On Tue, Jul 11, 2023 at 02:57:25PM +0200, Amadeusz Sławiński wrote:

...

> > Oh, additional remark below.

> > > +	{ PCI_DEVICE_DATA(INTEL, HDA_APL, &bxt_desc) },
> > > +	{ PCI_DEVICE_DATA(INTEL, HDA_APL_T, &bxt_desc) },
> > 
> > Have we ever had APL-T? What is that? I remember that we have had two or
> > three BXTs inside, and then products become for Broxton and Apollo Lake
> > SoC codenames. I never have heard about -T...
> 
> I've talked a bit with Cezary and it seems that 0x1a98 is BXT-M (not -T) and
> it's an RVP, BXT-M B0 to be specific. From what we know no BXT is available
> on market. Perhaps we can just remove it?

If you go this way, it should be in a separate patch and it seems it has
already pre-cooked commit message (as per previous paragraph) :-)

-- 
With Best Regards,
Andy Shevchenko

[PATCH 13/13] ASoC: Intel: sst: Convert to PCI device IDs defines

[Amadeusz Sławiński]

Use PCI device IDs from pci_ids.h header.

Signed-off-by: Amadeusz Sławiński <amadeuszx.slawinski@linux.intel.com>
---
 sound/soc/intel/atom/sst/sst.c     | 3 ++-
 sound/soc/intel/atom/sst/sst.h     | 1 -
 sound/soc/intel/atom/sst/sst_pci.c | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/sound/soc/intel/atom/sst/sst.c b/sound/soc/intel/atom/sst/sst.c
index a0d29510d2bc..f582e0737778 100644
--- a/sound/soc/intel/atom/sst/sst.c
+++ b/sound/soc/intel/atom/sst/sst.c
@@ -16,6 +16,7 @@
 #include <linux/interrupt.h>
 #include <linux/io.h>
 #include <linux/firmware.h>
+#include <linux/pci.h>
 #include <linux/pm_runtime.h>
 #include <linux/pm_qos.h>
 #include <linux/async.h>
@@ -174,7 +175,7 @@ int sst_driver_ops(struct intel_sst_drv *sst)
 {
 
 	switch (sst->dev_id) {
-	case SST_MRFLD_PCI_ID:
+	case PCI_DEVICE_ID_INTEL_ADSP_TNG:
 	case SST_BYT_ACPI_ID:
 	case SST_CHV_ACPI_ID:
 		sst->tstamp = SST_TIME_STAMP_MRFLD;
diff --git a/sound/soc/intel/atom/sst/sst.h b/sound/soc/intel/atom/sst/sst.h
index 4d37d39fd8f4..6670aaf9aca4 100644
--- a/sound/soc/intel/atom/sst/sst.h
+++ b/sound/soc/intel/atom/sst/sst.h
@@ -20,7 +20,6 @@
 
 /* driver names */
 #define SST_DRV_NAME "intel_sst_driver"
-#define SST_MRFLD_PCI_ID 0x119A
 #define SST_BYT_ACPI_ID	0x80860F28
 #define SST_CHV_ACPI_ID	0x808622A8
 
diff --git a/sound/soc/intel/atom/sst/sst_pci.c b/sound/soc/intel/atom/sst/sst_pci.c
index 4058b4f80a0c..9098076d6c72 100644
--- a/sound/soc/intel/atom/sst/sst_pci.c
+++ b/sound/soc/intel/atom/sst/sst_pci.c
@@ -32,7 +32,7 @@ static int sst_platform_get_resources(struct intel_sst_drv *ctx)
 
 	/* map registers */
 	/* DDR base */
-	if (ctx->dev_id == SST_MRFLD_PCI_ID) {
+	if (ctx->dev_id == PCI_DEVICE_ID_INTEL_ADSP_TNG) {
 		ctx->ddr_base = pci_resource_start(pci, 0);
 		/* check that the relocated IMR base matches with FW Binary */
 		ddr_base = relocate_imr_addr_mrfld(ctx->ddr_base);
@@ -173,7 +173,7 @@ static void intel_sst_remove(struct pci_dev *pci)
 
 /* PCI Routines */
 static const struct pci_device_id intel_sst_ids[] = {
-	{ PCI_VDEVICE(INTEL, SST_MRFLD_PCI_ID), 0},
+	{ PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_ADSP_TNG), 0},
 	{ 0, }
 };
 
-- 
2.34.1

Re: [PATCH 13/13] ASoC: Intel: sst: Convert to PCI device IDs defines

[Andy Shevchenko]

On Tue, Jul 11, 2023 at 02:57:26PM +0200, Amadeusz Sławiński wrote:
> Use PCI device IDs from pci_ids.h header.

...

>  	switch (sst->dev_id) {
> -	case SST_MRFLD_PCI_ID:
> +	case PCI_DEVICE_ID_INTEL_ADSP_TNG:
>  	case SST_BYT_ACPI_ID:
>  	case SST_CHV_ACPI_ID:

I think this needs a bit more, i.e. replacing the rest with respective PCI IDs.

All three will be defined with SST prefix, which makes sense to me.

ACPI here is a bit misleading, but correct. The ACPI specification assumes that
respective part of the ID space covers 100% of PCI ID space.

I have briefly checked the code and it seems that ID is used externally only
for PCI case, so we may simply use the lower 16 bits of the ACPI _HID for the
context.

diff --git a/sound/soc/intel/atom/sst/sst.c b/sound/soc/intel/atom/sst/sst.c
index a0d29510d2bc..b1f59604d825 100644
--- a/sound/soc/intel/atom/sst/sst.c
+++ b/sound/soc/intel/atom/sst/sst.c
@@ -222,7 +222,7 @@ static void sst_init_locks(struct intel_sst_drv *ctx)
 }
 
 int sst_alloc_drv_context(struct intel_sst_drv **ctx,
-		struct device *dev, unsigned int dev_id)
+		struct device *dev, unsigned short dev_id)
 {
 	*ctx = devm_kzalloc(dev, sizeof(struct intel_sst_drv), GFP_KERNEL);
 	if (!(*ctx))
diff --git a/sound/soc/intel/atom/sst/sst.h b/sound/soc/intel/atom/sst/sst.h
index 4d37d39fd8f4..c04f033e1d5f 100644
--- a/sound/soc/intel/atom/sst/sst.h
+++ b/sound/soc/intel/atom/sst/sst.h
@@ -358,7 +358,7 @@ struct sst_fw_save {
 struct intel_sst_drv {
 	int			sst_state;
 	int			irq_num;
-	unsigned int		dev_id;
+	unsigned short		dev_id;
 	void __iomem		*ddr;
 	void __iomem		*shim;
 	void __iomem		*mailbox;
@@ -523,7 +523,7 @@ int sst_register(struct device *);
 int sst_unregister(struct device *);
 
 int sst_alloc_drv_context(struct intel_sst_drv **ctx,
-		struct device *dev, unsigned int dev_id);
+		struct device *dev, unsigned short dev_id);
 int sst_context_init(struct intel_sst_drv *ctx);
 void sst_context_cleanup(struct intel_sst_drv *ctx);
 void sst_configure_runtime_pm(struct intel_sst_drv *ctx);

...

>  /* driver names */
>  #define SST_DRV_NAME "intel_sst_driver"

> -#define SST_MRFLD_PCI_ID 0x119A
>  #define SST_BYT_ACPI_ID	0x80860F28
>  #define SST_CHV_ACPI_ID	0x808622A8

And kill all three!

-- 
With Best Regards,
Andy Shevchenko

Re: [PATCH 13/13] ASoC: Intel: sst: Convert to PCI device IDs defines

[Amadeusz Sławiński]

On 7/11/2023 4:33 PM, Andy Shevchenko wrote:
> On Tue, Jul 11, 2023 at 02:57:26PM +0200, Amadeusz Sławiński wrote:
>> Use PCI device IDs from pci_ids.h header.
> 
> ...
> 
>>   	switch (sst->dev_id) {
>> -	case SST_MRFLD_PCI_ID:
>> +	case PCI_DEVICE_ID_INTEL_ADSP_TNG:
>>   	case SST_BYT_ACPI_ID:
>>   	case SST_CHV_ACPI_ID:
> 
> I think this needs a bit more, i.e. replacing the rest with respective PCI IDs.
> 
> All three will be defined with SST prefix, which makes sense to me.
> 
> ACPI here is a bit misleading, but correct. The ACPI specification assumes that
> respective part of the ID space covers 100% of PCI ID space.
> 
> I have briefly checked the code and it seems that ID is used externally only
> for PCI case, so we may simply use the lower 16 bits of the ACPI _HID for the
> context.
> 

Do I understand correctly that I should just do:
#define PCI_DEVICE_ID_INTEL_SST_BYT	0x0F28
#define PCI_DEVICE_ID_INTEL_SST_CHV	0x22A8
and use those IDs instead?

> diff --git a/sound/soc/intel/atom/sst/sst.c b/sound/soc/intel/atom/sst/sst.c
> index a0d29510d2bc..b1f59604d825 100644
> --- a/sound/soc/intel/atom/sst/sst.c
> +++ b/sound/soc/intel/atom/sst/sst.c
> @@ -222,7 +222,7 @@ static void sst_init_locks(struct intel_sst_drv *ctx)
>   }
>   
>   int sst_alloc_drv_context(struct intel_sst_drv **ctx,
> -		struct device *dev, unsigned int dev_id)
> +		struct device *dev, unsigned short dev_id)
>   {
>   	*ctx = devm_kzalloc(dev, sizeof(struct intel_sst_drv), GFP_KERNEL);
>   	if (!(*ctx))
> diff --git a/sound/soc/intel/atom/sst/sst.h b/sound/soc/intel/atom/sst/sst.h
> index 4d37d39fd8f4..c04f033e1d5f 100644
> --- a/sound/soc/intel/atom/sst/sst.h
> +++ b/sound/soc/intel/atom/sst/sst.h
> @@ -358,7 +358,7 @@ struct sst_fw_save {
>   struct intel_sst_drv {
>   	int			sst_state;
>   	int			irq_num;
> -	unsigned int		dev_id;
> +	unsigned short		dev_id;
>   	void __iomem		*ddr;
>   	void __iomem		*shim;
>   	void __iomem		*mailbox;
> @@ -523,7 +523,7 @@ int sst_register(struct device *);
>   int sst_unregister(struct device *);
>   
>   int sst_alloc_drv_context(struct intel_sst_drv **ctx,
> -		struct device *dev, unsigned int dev_id);
> +		struct device *dev, unsigned short dev_id);
>   int sst_context_init(struct intel_sst_drv *ctx);
>   void sst_context_cleanup(struct intel_sst_drv *ctx);
>   void sst_configure_runtime_pm(struct intel_sst_drv *ctx);
> 
> ...
> 
>>   /* driver names */
>>   #define SST_DRV_NAME "intel_sst_driver"
> 
>> -#define SST_MRFLD_PCI_ID 0x119A
>>   #define SST_BYT_ACPI_ID	0x80860F28
>>   #define SST_CHV_ACPI_ID	0x808622A8
> 
> And kill all three!
> 

Re: [PATCH 13/13] ASoC: Intel: sst: Convert to PCI device IDs defines

[Andy Shevchenko]

On Wed, Jul 12, 2023 at 02:19:47PM +0200, Amadeusz Sławiński wrote:
> On 7/11/2023 4:33 PM, Andy Shevchenko wrote:
> > On Tue, Jul 11, 2023 at 02:57:26PM +0200, Amadeusz Sławiński wrote:
> > > Use PCI device IDs from pci_ids.h header.

...

> > >   	switch (sst->dev_id) {
> > > -	case SST_MRFLD_PCI_ID:
> > > +	case PCI_DEVICE_ID_INTEL_ADSP_TNG:
> > >   	case SST_BYT_ACPI_ID:
> > >   	case SST_CHV_ACPI_ID:
> > 
> > I think this needs a bit more, i.e. replacing the rest with respective PCI IDs.
> > 
> > All three will be defined with SST prefix, which makes sense to me.
> > 
> > ACPI here is a bit misleading, but correct. The ACPI specification assumes that
> > respective part of the ID space covers 100% of PCI ID space.
> > 
> > I have briefly checked the code and it seems that ID is used externally only
> > for PCI case, so we may simply use the lower 16 bits of the ACPI _HID for the
> > context.
> 
> Do I understand correctly that I should just do:
> #define PCI_DEVICE_ID_INTEL_SST_BYT	0x0F28
> #define PCI_DEVICE_ID_INTEL_SST_CHV	0x22A8
> and use those IDs instead?

Correct!

-- 
With Best Regards,
Andy Shevchenko

Re: [PATCH 00/13] PCI: Define Intel PCI IDs and use them in drivers

[Pierre-Louis Bossart]

On 7/11/23 14:57, Amadeusz Sławiński wrote:
> PCI IDs for Intel HDA are duplicated across quite a few drivers, due to
> various configurations and historical reasons. Currently almost all uses
> of HDA PCI IDs have corresponding comment telling which platform it is.
> Additionally there are some inconsistencies between drivers about which
> ID corresponds to which device.
> 
> Simplify things, by adding PCI IDs to global header and make use of them
> in drivers. This allows for removal of comments by having IDs themselves
> being self explanatory. Additionally it allows for removal of existing
> inconsistencies by having one source of truth.

I'd like to hear from Takashi and Mark on how this would work, we have
to provide new PCI IDs for both trees using a common 'pci_ids.h' file.

It's not science fiction, we have new PCI IDs for ArrowLake and LunarLake:

https://github.com/thesofproject/linux/pull/4437
https://github.com/thesofproject/linux/pull/4425

> Changes from RFC:
>  - Sort Intel PCI IDs before adding new ones
>  - Fix ordering of new PCI IDs (Andy)
>  - Define all used Intel IDs (Andy)
>  - Add macros for controller type detection (Andy/Bjorn)
>  - Add set of patches changing to use above macro (Andy/Bjorn)
>  - Use PCI_DEVICE_DATA for Intel IDs in sound/pci/hda/hda_intel.c (Andy)
>  - Commit message wording (Andy)
>  - Remove unnecessary tabs (Andy)
> 
> Amadeusz Sławiński (13):
>   PCI: Sort Intel PCI IDs by number
>   PCI: Add Intel Audio DSP devices to pci_ids.h
>   ALSA: hda: Add controller matching macros
>   ALSA: hda: Use global PCI match macro
>   ALSA: hda/i915:  Use global PCI match macro
>   ASoC: Intel: Skylake: Use global PCI match macro
>   ALSA: intel-dsp-config: Convert to PCI device IDs defines
>   ALSA: hda: Convert to PCI device IDs defines
>   ASoC: Intel: avs: Convert to PCI device IDs defines
>   ASoC: Intel: avs: Convert to PCI device IDs defines
>   ASoC: Intel: Skylake: Convert to PCI device IDs defines
>   ASoC: SOF: Intel: Convert to PCI device IDs defines
>   ASoC: Intel: sst: Convert to PCI device IDs defines
> 
>  include/linux/pci_ids.h                | 104 +++++--
>  include/sound/hda_codec.h              |   3 -
>  include/sound/hdaudio.h                |  27 ++
>  sound/hda/hdac_i915.c                  |   7 +-
>  sound/hda/intel-dsp-config.c           | 119 ++++----
>  sound/pci/hda/hda_intel.c              | 373 ++++++++++---------------
>  sound/soc/intel/atom/sst/sst.c         |   3 +-
>  sound/soc/intel/atom/sst/sst.h         |   1 -
>  sound/soc/intel/atom/sst/sst_pci.c     |   4 +-
>  sound/soc/intel/avs/board_selection.c  |  10 +-
>  sound/soc/intel/avs/core.c             |  16 +-
>  sound/soc/intel/skylake/skl-messages.c |  16 +-
>  sound/soc/intel/skylake/skl-pcm.c      |   3 +-
>  sound/soc/intel/skylake/skl.c          |  36 +--
>  sound/soc/sof/intel/pci-apl.c          |   9 +-
>  sound/soc/sof/intel/pci-cnl.c          |  15 +-
>  sound/soc/sof/intel/pci-icl.c          |  12 +-
>  sound/soc/sof/intel/pci-mtl.c          |   3 +-
>  sound/soc/sof/intel/pci-skl.c          |   6 +-
>  sound/soc/sof/intel/pci-tgl.c          |  45 +--
>  sound/soc/sof/intel/pci-tng.c          |   3 +-
>  21 files changed, 384 insertions(+), 431 deletions(-)
> 

Re: [PATCH 00/13] PCI: Define Intel PCI IDs and use them in drivers

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 700 bytes --]

On Tue, Jul 11, 2023 at 05:24:07PM +0200, Pierre-Louis Bossart wrote:
> On 7/11/23 14:57, Amadeusz Sławiński wrote:

> > Simplify things, by adding PCI IDs to global header and make use of them
> > in drivers. This allows for removal of comments by having IDs themselves
> > being self explanatory. Additionally it allows for removal of existing
> > inconsistencies by having one source of truth.

> I'd like to hear from Takashi and Mark on how this would work, we have
> to provide new PCI IDs for both trees using a common 'pci_ids.h' file.

We can probably just agree on a tree to apply things and work from
there.  It does make for a bit more friction though, you're right there.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: [PATCH 00/13] PCI: Define Intel PCI IDs and use them in drivers

[Takashi Iwai]

On Tue, 11 Jul 2023 17:36:20 +0200,
Mark Brown wrote:
> 
> On Tue, Jul 11, 2023 at 05:24:07PM +0200, Pierre-Louis Bossart wrote:
> > On 7/11/23 14:57, Amadeusz Sławiński wrote:
> 
> > > Simplify things, by adding PCI IDs to global header and make use of them
> > > in drivers. This allows for removal of comments by having IDs themselves
> > > being self explanatory. Additionally it allows for removal of existing
> > > inconsistencies by having one source of truth.
> 
> > I'd like to hear from Takashi and Mark on how this would work, we have
> > to provide new PCI IDs for both trees using a common 'pci_ids.h' file.
> 
> We can probably just agree on a tree to apply things and work from
> there.

Yes, simply apply on top of 6.5-rc1 or such a stable point and tag it.
Then other trees can merging it.

I can do it if both Bjorn and Mark agree (after all patches get
reviewed and no objection comes up).


Takashi

Re: [PATCH 00/13] PCI: Define Intel PCI IDs and use them in drivers

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 260 bytes --]

On Tue, Jul 11, 2023 at 05:42:13PM +0200, Takashi Iwai wrote:

> I can do it if both Bjorn and Mark agree (after all patches get
> reviewed and no objection comes up).

Fine by me, I acked on the basis that it probably makes more sense in
someone else's tree.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: [PATCH 00/13] PCI: Define Intel PCI IDs and use them in drivers

[Bjorn Helgaas]

On Tue, Jul 11, 2023 at 05:42:13PM +0200, Takashi Iwai wrote:
> On Tue, 11 Jul 2023 17:36:20 +0200, Mark Brown wrote:
> > On Tue, Jul 11, 2023 at 05:24:07PM +0200, Pierre-Louis Bossart wrote:
> > > On 7/11/23 14:57, Amadeusz Sławiński wrote:
> > 
> > > > Simplify things, by adding PCI IDs to global header and make use of them
> > > > in drivers. This allows for removal of comments by having IDs themselves
> > > > being self explanatory. Additionally it allows for removal of existing
> > > > inconsistencies by having one source of truth.
> > 
> > > I'd like to hear from Takashi and Mark on how this would work, we have
> > > to provide new PCI IDs for both trees using a common 'pci_ids.h' file.
> > 
> > We can probably just agree on a tree to apply things and work from
> > there.
> 
> Yes, simply apply on top of 6.5-rc1 or such a stable point and tag it.
> Then other trees can merging it.
> 
> I can do it if both Bjorn and Mark agree (after all patches get
> reviewed and no objection comes up).

Sure.  I acked the PCI ones, so you can merge these via whatever tree
makes the most sense.  We might have minor conflicts during the merge
window, but they should be easy to fix.

Bjorn