[v3,00/15] PCI: Define Intel PCI IDs and use them in drivers

Message ID	20230714202457.423866-1-amadeuszx.slawinski@linux.intel.com (mailing list archive)
Headers	show Return-Path: <alsa-devel-bounces@alsa-project.org> From: =?utf-8?q?Amadeusz_S=C5=82awi=C5=84ski?= <amadeuszx.slawinski@linux.intel.com> To: Bjorn Helgaas <bhelgaas@google.com>, Mark Brown <broonie@kernel.org>, Takashi Iwai <tiwai@suse.com> Cc: alsa-devel@alsa-project.org, linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, Cezary Rojewski <cezary.rojewski@intel.com>, Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>, Kai Vehmanen <kai.vehmanen@linux.intel.com>, Andy Shevchenko <andriy.shevchenko@intel.com>, Hans de Goede <hdegoede@redhat.com>, =?utf-8?q?Amadeusz_S=C5=82awi=C5=84ski?= <amadeuszx.slawinski@linux.intel.com> Subject: [PATCH v3 00/15] PCI: Define Intel PCI IDs and use them in drivers Date: Fri, 14 Jul 2023 22:24:42 +0200 Message-Id: <20230714202457.423866-1-amadeuszx.slawinski@linux.intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Message-ID-Hash: MHP56MHCIN6IPDTDTNSHR3QUICTLEDP5 Precedence: list Archived-At: <https://mailman.alsa-project.org/hyperkitty/list/alsa-devel@alsa-project.org/message/MHP56MHCIN6IPDTDTNSHR3QUICTLEDP5/>
Series	PCI: Define Intel PCI IDs and use them in drivers \| expand [v3,00/15] PCI: Define Intel PCI IDs and use them in drivers [v3,01/15] PCI: Sort Intel PCI IDs by number [v3,02/15] PCI: Add Intel Audio DSP devices to pci_ids.h [v3,03/15] ASoC: SOF: Remove unused Broxton PCI ID [v3,04/15] ALSA: Remove unused Broxton PCI ID [v3,05/15] ALSA: hda: Add controller matching macros [v3,06/15] ALSA: hda: Use global PCI match macro [v3,07/15] ALSA: hda/i915: Use global PCI match macro [v3,08/15] ASoC: Intel: Skylake: Use global PCI match macro [v3,09/15] ALSA: intel-dsp-config: Convert to PCI device IDs defines [v3,10/15] ALSA: hda: Convert to PCI device IDs defines [v3,11/15] ASoC: Intel: avs: Convert to PCI device IDs defines [v3,12/15] ASoC: Intel: avs: Convert to PCI device IDs defines [v3,13/15] ASoC: Intel: Skylake: Convert to PCI device IDs defines [v3,14/15] ASoC: SOF: Intel: Convert to PCI device IDs defines [v3,15/15] ASoC: Intel: sst: Convert to PCI device IDs defines

Message ID

20230714202457.423866-1-amadeuszx.slawinski@linux.intel.com (mailing list archive)

Headers

From: =?utf-8?q?Amadeusz_S=C5=82awi=C5=84ski?=
 <amadeuszx.slawinski@linux.intel.com>
To: Bjorn Helgaas <bhelgaas@google.com>,
	Mark Brown <broonie@kernel.org>,
	Takashi Iwai <tiwai@suse.com>
Cc: alsa-devel@alsa-project.org, linux-pci@vger.kernel.org,
 linux-kernel@vger.kernel.org, Cezary Rojewski <cezary.rojewski@intel.com>,
 Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>,
 Kai Vehmanen <kai.vehmanen@linux.intel.com>,
 Andy Shevchenko <andriy.shevchenko@intel.com>,
 Hans de Goede <hdegoede@redhat.com>,
 =?utf-8?q?Amadeusz_S=C5=82awi=C5=84ski?= <amadeuszx.slawinski@linux.intel.com>
Subject: [PATCH v3 00/15] PCI: Define Intel PCI IDs and use them in drivers
Date: Fri, 14 Jul 2023 22:24:42 +0200
Message-Id: <20230714202457.423866-1-amadeuszx.slawinski@linux.intel.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Message-ID-Hash: MHP56MHCIN6IPDTDTNSHR3QUICTLEDP5
Precedence: list
Archived-At: 
 <https://mailman.alsa-project.org/hyperkitty/list/alsa-devel@alsa-project.org/message/MHP56MHCIN6IPDTDTNSHR3QUICTLEDP5/>

Series

PCI: Define Intel PCI IDs and use them in drivers | expand

Message

Amadeusz Sławiński July 14, 2023, 8:24 p.m. UTC

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 v2:
 - Change CHV to BSW (Andy)
 - Fix incorrectly rebased patches (Andy)
 - Fix commit message and add suggestions from Andy to SST patch (Andy)
 - Rebased on top of Linus tree commit: 4b810bf037e5

Changes from v1:
 - Remove BXT-T PCI ID as it is not released (Andy)
 - Reorder macros to start from pci_match_id() (Andy)
 - Add comment about BXT->APL name change in commit messages (Andy)
 - Use SST as part of macro name for DSP only devices (Andy)
 - Add PCI IDs for all SST combinations (Andy)

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 (15):
  PCI: Sort Intel PCI IDs by number
  PCI: Add Intel Audio DSP devices to pci_ids.h
  ASoC: SOF: Remove unused Broxton PCI ID
  ALSA: Remove unused Broxton PCI ID
  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                | 105 +++++--
 include/sound/hda_codec.h              |   3 -
 include/sound/hdaudio.h                |  26 ++
 sound/hda/hdac_i915.c                  |   7 +-
 sound/hda/intel-dsp-config.c           | 124 ++++----
 sound/pci/hda/hda_intel.c              | 373 ++++++++++---------------
 sound/soc/intel/atom/sst/sst.c         |   9 +-
 sound/soc/intel/atom/sst/sst.h         |   7 +-
 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          |   8 +-
 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, 386 insertions(+), 445 deletions(-)

Comments

Andy Shevchenko July 14, 2023, 12:36 p.m. UTC | #1

On Fri, Jul 14, 2023 at 10:24:42PM +0200, 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.

> Changes from v2:
>  - Change CHV to BSW (Andy)
>  - Fix incorrectly rebased patches (Andy)
>  - Fix commit message and add suggestions from Andy to SST patch (Andy)
>  - Rebased on top of Linus tree commit: 4b810bf037e5

Use --base parameter, it will help CIs as well to test your changes against
correct base.

Mark Brown July 14, 2023, 1:09 p.m. UTC | #2

On Fri, Jul 14, 2023 at 10:24:42PM +0200, 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.

Acked-by: Mark Brown <broonie@kernel.org>

Cezary Rojewski July 14, 2023, 7:03 p.m. UTC | #3

On 2023-07-14 10:24 PM, 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.

...

> Amadeusz Sławiński (15):
>    PCI: Sort Intel PCI IDs by number
>    PCI: Add Intel Audio DSP devices to pci_ids.h
>    ASoC: SOF: Remove unused Broxton PCI ID
>    ALSA: Remove unused Broxton PCI ID
>    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

Given the amount of talks we have had internally regarding this subject, 
to my best knowledge series looks good:

Reviewed-by: Cezary Rojewski <cezary.rojewski@intel.com>

Great initiative Amadeo and, good job.