From patchwork Mon Jul 17 11:44:56 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: 12128 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c923:0:b0:3e4:2afc:c1 with SMTP id j3csp1061585vqt; Mon, 17 Jul 2023 05:00:20 -0700 (PDT) X-Google-Smtp-Source: APBJJlF0gEC4EUfOBeVaSGCDgxFLc3lOqHy8+o7P7dWeI5Y5HZSRaL3LMZ0dXEqpCsLr6U8oaMVr X-Received: by 2002:a2e:9bcb:0:b0:2b6:dec9:2813 with SMTP id w11-20020a2e9bcb000000b002b6dec92813mr8816067ljj.29.1689595219959; Mon, 17 Jul 2023 05:00:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689595219; cv=none; d=google.com; s=arc-20160816; b=WUxXhPl65EQqzCSbYXTSNGKiu7V9F9N30apDIQJtlQNr+FUOfWfbvYaRZJ5ADcXeNq 0R77/Fq26lkYifsSsf5AMvHp95ea8Dw0BS/xCLhcPCKrAntrQyu8kiN6iO8l28KA6QBL wtPK4BX4UhK7iFLrDI9Df6JP21wNZAcnwp+EmsFI592g/ypGoBawvoWIKKrmQVEWrUKf +gMOMvnANEoXMabzC1Yi2CZMg+5n6T+tBg92yNBlHBjnsFI+Sgk9j0vpPWHV3S3IWTsu o+Y3Ad2/UO/M8oYDfbKg7aRVEFakrlG+Rsw5O1s9uG1pqZWaDqk43gTIYubwxO2ow3Ee U1Tw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=Pz6qp8x970PUukXsvsNswcQg5oxg/MpWyIKvl8hU/Io=; fh=upuSX/BSWWL1LUFvT63P6+KVqgjCEdo3pXemvhRiJ4Q=; b=X4DbOh5njc/YR521DCF26hTpR01iSXsOEkGs2nYj/U6rRiusZAg/qXpKCsB+89OqGG JPwRVhbU/MTz5Gh/d6pykGQcVflQWFG0mr0QEukOrMG0kp6YUEXgkPPR1sft5IFJwatk bWWVUE7KLYVbUhSej2zJ14NDEFUorgZbiM5ZR8uyUVu7/gkrMAt9jm/4bknMvDYkzj6V hX/hvPpe1Mw1BFT2/OKZKaEA2rafWno/e25pytOdnZDeq8z+kgiCHAO3hShSzORzEOZA C+tas1s2wxgidNwIlGXYurddBenhAT8CjUomjiTzzWERQjckZJwF4rsI3Cv9t8jSna1m Jrcg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=Jx30VsZL; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id gt16-20020a170906f21000b00987a947bfa1si13270117ejb.483.2023.07.17.04.59.55; Mon, 17 Jul 2023 05:00:19 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=Jx30VsZL; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230024AbjGQLpY (ORCPT + 99 others); Mon, 17 Jul 2023 07:45:24 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52152 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229621AbjGQLpX (ORCPT ); Mon, 17 Jul 2023 07:45:23 -0400 Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 33A46BF; Mon, 17 Jul 2023 04:45:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1689594322; x=1721130322; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=2MHPO+iHuYgAyGNlqYAFRPStgolKWt3w3Dm0eTHpGD4=; b=Jx30VsZLJMMaX2PWgrBAhH63xXVjMsRAnndeBerLxSswM+nNG+USAEMH 4Kd3ZPLWp2ZtU36nuOeQQzjA+pkTFehWnpQOBCbUdTGEteMvF1hJfppCK HjJ+we3qp5eW9waH/TldRyj11Tqq6il4Z2QtGolS1gyyT+WxwUq7sc+C/ sWOjOV2K9inKQnGOboe5Q5tLHAHxPe7S5marGQVFI110tSRowD2nrrfDU FTVOWwg6sWlo9eOD0jETw+z1k7KJiCJGSXcHllcSX5meJIgegZymgAhBp Ld/hlk0wLk1x7dyGrzjtrmISiGCwE1aiHlXO3EkDPlX8OTOih7xAI6UtW Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10773"; a="363372705" X-IronPort-AV: E=Sophos;i="6.01,211,1684825200"; d="scan'208";a="363372705" Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Jul 2023 04:45:21 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10773"; a="969856460" X-IronPort-AV: E=Sophos;i="6.01,211,1684825200"; d="scan'208";a="969856460" Received: from dev2 (HELO DEV2.igk.intel.com) ([10.237.148.94]) by fmsmga006.fm.intel.com with ESMTP; 17 Jul 2023 04:45:18 -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 , =?utf-8?q?Ilpo_J=C3=A4rvinen?= , Hans de Goede , =?utf-8?q?Amadeusz_S=C5=82awi=C5=84ski?= Subject: [PATCH v4 00/15] PCI: Define Intel PCI IDs and use them in drivers Date: Mon, 17 Jul 2023 13:44:56 +0200 Message-Id: <20230717114511.484999-1-amadeuszx.slawinski@linux.intel.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, SPF_HELO_NONE,SPF_NONE,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1771668997056698340 X-GMAIL-MSGID: 1771668997056698340 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 v3: - Fix double space in commit message title (Ilpo) - Comment ACPI/PCI ID handling in Atom SST driver (Andy) - Rebased once again and used --base this time (Andy) 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 | 14 +- 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, 391 insertions(+), 445 deletions(-) base-commit: fdf0eaf11452d72945af31804e2a1048ee1b574c