From patchwork Fri Jul 14 20:24:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Amadeusz_S=C5=82awi=C5=84ski?= X-Patchwork-Id: 13313657 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 alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id BCBF5C001DD for ; Fri, 14 Jul 2023 12:25:40 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id EDCD8868; Fri, 14 Jul 2023 14:24:47 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz EDCD8868 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1689337538; bh=ctKemUwsoQTlB8hR1k2AtPpg1aFoaPmj0pPJ2qO6D3g=; h=From:To:Cc:Subject:Date:List-Id:List-Archive:List-Help:List-Owner: List-Post:List-Subscribe:List-Unsubscribe:From; b=ZCiDAjtphUDBWzDLZ2Pk2RvvfVUv29lzdGwDZZl0yxkBu24KyNK2w9X8vyk0NRhFF CyOKde/0y9uznFFLyz4aSVxh8gagPraXOBgJCxHSCIB3hpNoJbZVrETsLEseUvQwZb kIVteYq6KM6inUcdHkdxVIaXqRHFZJRVpolq5/Zs= Received: by alsa1.perex.cz (Postfix, from userid 50401) id 686A7F80552; Fri, 14 Jul 2023 14:24:21 +0200 (CEST) Received: from mailman-core.alsa-project.org (mailman-core.alsa-project.org [10.254.200.10]) by alsa1.perex.cz (Postfix) with ESMTP id D9CFDF80551; Fri, 14 Jul 2023 14:24:20 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 029C5F80548; Fri, 14 Jul 2023 14:24:11 +0200 (CEST) Received: from mga06.intel.com (mga06b.intel.com [134.134.136.31]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id 686D7F800D2 for ; Fri, 14 Jul 2023 14:24:02 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 686D7F800D2 Authentication-Results: alsa1.perex.cz; dkim=pass (2048-bit key, unprotected) header.d=intel.com header.i=@intel.com header.a=rsa-sha256 header.s=Intel header.b=FuEdXdlE DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1689337444; x=1720873444; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=ctKemUwsoQTlB8hR1k2AtPpg1aFoaPmj0pPJ2qO6D3g=; b=FuEdXdlElFAtaxBUwlTloLVe58HFfZX/Aacb9L97Q5IPzLi/hKFszEp7 hpPteZMYtkxMf4lewS3MuWSOpYUJ1Wro3BU6FFuPI7LBDrO7BjlvFhQav ghxf5JCNcgFmKLnUfZ+ZO54jgaSqI/gC1lfZ+qZW2oMReKQQkCg+uyWRU 3+XpxttZROO/NTqeG+Nf6xrVoQEenoq0qMREeGAos/R2hglU+Nm0Ss8mY drwCHk/i/bT06z1/+KQpwSN1TjpFUi+D807JSdLbvumz9ItFbewAdgXEh yjSf3QsKt9XVrCkY/Cfcl5831Lfu96DzDSGH8HnH8h8DXjqENwf4dmC62 A==; X-IronPort-AV: E=McAfee;i="6600,9927,10770"; a="429225778" X-IronPort-AV: E=Sophos;i="6.01,205,1684825200"; d="scan'208";a="429225778" 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_S=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_S=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 Message-ID-Hash: MHP56MHCIN6IPDTDTNSHR3QUICTLEDP5 X-Message-ID-Hash: MHP56MHCIN6IPDTDTNSHR3QUICTLEDP5 X-MailFrom: amadeuszx.slawinski@linux.intel.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-alsa-devel.alsa-project.org-0; header-match-alsa-devel.alsa-project.org-1; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.8 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: 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(-) Acked-by: Mark Brown Reviewed-by: Cezary Rojewski