From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 469E2C001B0 for ; Fri, 14 Jul 2023 12:23:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235778AbjGNMXr (ORCPT ); Fri, 14 Jul 2023 08:23:47 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35722 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235220AbjGNMXo (ORCPT ); Fri, 14 Jul 2023 08:23:44 -0400 Received: from mga06.intel.com (mga06b.intel.com [134.134.136.31]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 133F4269D; Fri, 14 Jul 2023 05:23:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1689337423; x=1720873423; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=ctKemUwsoQTlB8hR1k2AtPpg1aFoaPmj0pPJ2qO6D3g=; b=bZMzCPonpy3h921NLjU0oKMhG+1Q6FxGx1ylLMNPJ2YCooH0QlevxA+b Xbo7d8ZLtzK0D7a4OtuhbW+toNBvU7cZfrcZDYOhW4hpZVGNRgnqQj0ol Ib7t2iHC50+kH8fR/KDgZTYDh/MOcmdIn++/qg1beHfEuqrLe9SoOOzTt kjL3rZF9ssfhBTz2hJzgwyXsLUaulLFGzhB8gvrwGkYfhxo0tpUEn1Hfc LjTCoyfbOjSYN8ZBHhPDUJ/q7nuL7R4W2RrcjjFFicCOn7NYFA/rLqOLd niNnnIS+GsjMDcgBJhmdTcvI+xf/gZtPWCAex0w9k0NHmPVm/nnEEarH7 w==; X-IronPort-AV: E=McAfee;i="6600,9927,10770"; a="429225773" X-IronPort-AV: E=Sophos;i="6.01,205,1684825200"; d="scan'208";a="429225773" Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Jul 2023 05:23:42 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10770"; a="1053034846" X-IronPort-AV: E=Sophos;i="6.01,205,1684825200"; d="scan'208";a="1053034846" Received: from dev2 (HELO DEV2.igk.intel.com) ([10.237.148.94]) by fmsmga005.fm.intel.com with ESMTP; 14 Jul 2023 05:23:39 -0700 From: =?UTF-8?q?Amadeusz=20S=C5=82awi=C5=84ski?= To: Bjorn Helgaas , Mark Brown , Takashi Iwai Cc: alsa-devel@alsa-project.org, linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, Cezary Rojewski , Pierre-Louis Bossart , Kai Vehmanen , Andy Shevchenko , Hans de Goede , =?UTF-8?q?Amadeusz=20S=C5=82awi=C5=84ski?= 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> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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(-) -- 2.34.1