From patchwork Wed Aug 2 15:01:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre-Louis Bossart X-Patchwork-Id: 13338326 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 A51C6C04E69 for ; Wed, 2 Aug 2023 15:12:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233564AbjHBPMj (ORCPT ); Wed, 2 Aug 2023 11:12:39 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35616 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231788AbjHBPMj (ORCPT ); Wed, 2 Aug 2023 11:12:39 -0400 Received: from mgamail.intel.com (unknown [192.55.52.115]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 64A732130 for ; Wed, 2 Aug 2023 08:12:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1690989155; x=1722525155; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=YTpU3YPygDX+4cqxAGZDUye/uEWEAh28w5ZEcpcqEhE=; b=Q8XxTYKZ4WJZnpzHp7tb8iXcdvaUPKBA7KsTts8R1UsQZWCvqDRcyvOc iqCSigNutD8OYEmTHD465LX7w6GOjHkzXXdPYOAWl+Ajt0IqiHrKkojHC DghaEM17OLDeaYA+r59+CmYZHJhGqr+0vTcHTFvpXuuMAaGPQ6jLtA6ud b/wwqXmdFz03yzfvPZxxk07cE0gnlJqsXWpZqJY8Epycj0+LAgaUJg2M6 xMNeTvsvQ4wseRm7ZkR5hUEMxfdCUnR+xXaCyuATuIWmNaJEkS6qvdAji NBal9hxcr8y3dRfThh5DPRzb/I+IpRYgbsKsxf5a0sQN2PQUs37/ROObL w==; X-IronPort-AV: E=McAfee;i="6600,9927,10790"; a="369607251" X-IronPort-AV: E=Sophos;i="6.01,249,1684825200"; d="scan'208";a="369607251" Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 02 Aug 2023 08:01:14 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10790"; a="732428672" X-IronPort-AV: E=Sophos;i="6.01,249,1684825200"; d="scan'208";a="732428672" Received: from rickylop-mobl1.amr.corp.intel.com (HELO pbossart-mobl3.intel.com) ([10.212.125.114]) by fmsmga007-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 02 Aug 2023 08:01:13 -0700 From: Pierre-Louis Bossart To: alsa-devel@alsa-project.org Cc: tiwai@suse.de, broonie@kernel.org, Bjorn Helgaas , linux-pci@vger.kernel.org, Pierre-Louis Bossart , Ranjani Sridharan , Bard Liao Subject: [PATCH 1/5] PCI: add ArrowLake-S PCI ID for Intel HDAudio subsystem. Date: Wed, 2 Aug 2023 10:01:01 -0500 Message-Id: <20230802150105.24604-2-pierre-louis.bossart@linux.intel.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230802150105.24604-1-pierre-louis.bossart@linux.intel.com> References: <20230802150105.24604-1-pierre-louis.bossart@linux.intel.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org Add part ID to common include file Signed-off-by: Pierre-Louis Bossart Reviewed-by: Ranjani Sridharan Reviewed-by: Bard Liao --- include/linux/pci_ids.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h index 3066660cd39b..a6411aa4c331 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h @@ -3058,6 +3058,7 @@ #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_HDA_ARL_S 0x7f50 #define PCI_DEVICE_ID_INTEL_SCH_LPC 0x8119 #define PCI_DEVICE_ID_INTEL_SCH_IDE 0x811a #define PCI_DEVICE_ID_INTEL_HDA_POULSBO 0x811b From patchwork Wed Aug 2 15:01:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre-Louis Bossart X-Patchwork-Id: 13338329 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 2CDB5C04A6A for ; Wed, 2 Aug 2023 15:12:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234125AbjHBPMo (ORCPT ); Wed, 2 Aug 2023 11:12:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35858 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233212AbjHBPMl (ORCPT ); Wed, 2 Aug 2023 11:12:41 -0400 Received: from mgamail.intel.com (unknown [192.55.52.115]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7E3352130 for ; Wed, 2 Aug 2023 08:12:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1690989159; x=1722525159; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=9bjYS8EbcpbOLglUOTbR7e45YjiztEBMTDXiB90OGkM=; b=WDo1TNvgLYeMvudoX/hL0rZQ9v/1za8KnMnuf8KRUcVPnPxFO2+V4lbC 17tHBm4S83VPB4OkHRZH2Cq3yLhDSYRk4xo2T+a5ABTmBQGJZSkrXeLTX U+Y16/sfuu+3AGI+dgKgjgsITfWyW+pvKuEuQ8Ms+C7gFMhhCtrJKgC1n WAe4b4XBWZqfcVorerN7//rN4EkstJok2Ssf32itGdNlOr7M0dtx1AEN3 ubYSDV1+Vy1Vi7Gox4ZINv1jboSy+mPb59WuzsGOzfxTJBb5eEXq2uoPV d7bgyILjOVkdIiGsvrsSAaS/725p7eQ+LCaLyXbeHmYF4DduYNqj8irmf w==; X-IronPort-AV: E=McAfee;i="6600,9927,10790"; a="369607261" X-IronPort-AV: E=Sophos;i="6.01,249,1684825200"; d="scan'208";a="369607261" Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 02 Aug 2023 08:01:15 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10790"; a="732428680" X-IronPort-AV: E=Sophos;i="6.01,249,1684825200"; d="scan'208";a="732428680" Received: from rickylop-mobl1.amr.corp.intel.com (HELO pbossart-mobl3.intel.com) ([10.212.125.114]) by fmsmga007-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 02 Aug 2023 08:01:14 -0700 From: Pierre-Louis Bossart To: alsa-devel@alsa-project.org Cc: tiwai@suse.de, broonie@kernel.org, Bjorn Helgaas , linux-pci@vger.kernel.org, Kai Vehmanen , Ranjani Sridharan , Bard Liao , Pierre-Louis Bossart Subject: [PATCH 2/5] ALSA: hda: add HD Audio PCI ID for Intel Arrow Lake-S Date: Wed, 2 Aug 2023 10:01:02 -0500 Message-Id: <20230802150105.24604-3-pierre-louis.bossart@linux.intel.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230802150105.24604-1-pierre-louis.bossart@linux.intel.com> References: <20230802150105.24604-1-pierre-louis.bossart@linux.intel.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org From: Kai Vehmanen Add HD Audio PCI ID for Intel Arrow Lake-S platform. Reviewed-by: Ranjani Sridharan Reviewed-by: Bard Liao Signed-off-by: Kai Vehmanen Signed-off-by: Pierre-Louis Bossart --- sound/pci/hda/hda_intel.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c index 176567f0d0e0..765d95e79861 100644 --- a/sound/pci/hda/hda_intel.c +++ b/sound/pci/hda/hda_intel.c @@ -2499,6 +2499,8 @@ static const struct pci_device_id azx_ids[] = { { PCI_DEVICE_DATA(INTEL, HDA_MTL, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) }, /* Lunarlake-P */ { PCI_DEVICE_DATA(INTEL, HDA_LNL_P, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) }, + /* Arrow Lake-S */ + { PCI_DEVICE_DATA(INTEL, HDA_ARL_S, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) }, /* Apollolake (Broxton-P) */ { PCI_DEVICE_DATA(INTEL, HDA_APL, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_BROXTON) }, /* Gemini-Lake */ From patchwork Wed Aug 2 15:01:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre-Louis Bossart X-Patchwork-Id: 13338328 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 E147DC04E69 for ; Wed, 2 Aug 2023 15:12:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233834AbjHBPMl (ORCPT ); Wed, 2 Aug 2023 11:12:41 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35658 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233847AbjHBPMl (ORCPT ); Wed, 2 Aug 2023 11:12:41 -0400 Received: from mgamail.intel.com (unknown [192.55.52.115]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 38C1726AB for ; Wed, 2 Aug 2023 08:12:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1690989159; x=1722525159; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=BuzkKf/B/48DR4bVThwdqAiUG/Lv68wDwSaqjsCi8YE=; b=m5avBPplLIrt5Gi2BUkW1PUf8G+4FN2doTu6Fh2qm8TZtAuVpXanUpvM jjC9XiCsrJovX0R0Ve0og6gpWcq1RNlmmfSKLgkieIt2p1BE2i0WxoAy7 1ybvTXWJIDAfb89AxISJOiboQ44qNDMTiW1pn/HNr/g78Pf/4MpHamsu8 cVIoVu+FBwRJx0uQ24hAJrT0Gau16czgVGiJftfnsCRa07hj3GT9XGojC 0mEV3MAjdJClZGKMrXYtpOUKLyXGLT0CSxyOwEl7IDxmf19WFCCUSEAvD qRDuevP3OntROXK1ezShq/OxQ4GxMeQoRB53hY6PUFOqHWhfoUrnNRaNC g==; X-IronPort-AV: E=McAfee;i="6600,9927,10790"; a="369607266" X-IronPort-AV: E=Sophos;i="6.01,249,1684825200"; d="scan'208";a="369607266" Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 02 Aug 2023 08:01:15 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10790"; a="732428683" X-IronPort-AV: E=Sophos;i="6.01,249,1684825200"; d="scan'208";a="732428683" Received: from rickylop-mobl1.amr.corp.intel.com (HELO pbossart-mobl3.intel.com) ([10.212.125.114]) by fmsmga007-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 02 Aug 2023 08:01:14 -0700 From: Pierre-Louis Bossart To: alsa-devel@alsa-project.org Cc: tiwai@suse.de, broonie@kernel.org, Bjorn Helgaas , linux-pci@vger.kernel.org, Pierre-Louis Bossart , Ranjani Sridharan , Bard Liao Subject: [PATCH 3/5] ALSA: hda: intel-dsp-cfg: use common include for MeteorLake Date: Wed, 2 Aug 2023 10:01:03 -0500 Message-Id: <20230802150105.24604-4-pierre-louis.bossart@linux.intel.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230802150105.24604-1-pierre-louis.bossart@linux.intel.com> References: <20230802150105.24604-1-pierre-louis.bossart@linux.intel.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org This was not updated in Commit 0cd0a7c2c599 ("ALSA: intel-dsp-config: Convert to PCI device IDs defines") Signed-off-by: Pierre-Louis Bossart Reviewed-by: Ranjani Sridharan Reviewed-by: Bard Liao --- sound/hda/intel-dsp-config.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/hda/intel-dsp-config.c b/sound/hda/intel-dsp-config.c index 48bd1fb06f26..1abe65f0ba1b 100644 --- a/sound/hda/intel-dsp-config.c +++ b/sound/hda/intel-dsp-config.c @@ -461,7 +461,7 @@ static const struct config_entry config_table[] = { /* Meteorlake-P */ { .flags = FLAG_SOF | FLAG_SOF_ONLY_IF_DMIC_OR_SOUNDWIRE, - .device = 0x7e28, + .device = PCI_DEVICE_ID_INTEL_HDA_MTL, }, #endif From patchwork Wed Aug 2 15:01:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre-Louis Bossart X-Patchwork-Id: 13338330 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 F0990C001DF for ; Wed, 2 Aug 2023 15:12:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234160AbjHBPMq (ORCPT ); Wed, 2 Aug 2023 11:12:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35616 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233840AbjHBPMm (ORCPT ); Wed, 2 Aug 2023 11:12:42 -0400 Received: from mgamail.intel.com (unknown [192.55.52.115]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 355452704 for ; Wed, 2 Aug 2023 08:12:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1690989160; x=1722525160; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=AUNY4fOKGSINjHCvUnG98cy9TPxbQGOZ0uRCfqLy5bE=; b=ZN+3zy8vFXMIA8Vp2j/D/lDBzKeNRm1SeUWfkyzrhcz/x34IZXa9f4ZQ d8rmpNLiJIef6fh43EninT5RsdnQdToNySDtntPFaETvLnWK1F4hsvU+i 8mBjgCmovceAlpRYGpR/C7YG4aR4KbOE15zhv6LzpAu+stckyjc360Mb4 vwNncxexFH1sbeBIWECxkNRNo+KW8pMDcRoCqUbJRpqw+0+gpMOF/sqxv Of5HNDPyqF1KN19B/+E5ZV2p3SZdSZEmzhJXmvoZfEOVxx7AwPlL84vaW UVUFTZHggu/oBOyO76XU9wQNLXNJnjIKqVajtyIaCaaHihygpVhMu5KEl g==; X-IronPort-AV: E=McAfee;i="6600,9927,10790"; a="369607274" X-IronPort-AV: E=Sophos;i="6.01,249,1684825200"; d="scan'208";a="369607274" Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 02 Aug 2023 08:01:16 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10790"; a="732428688" X-IronPort-AV: E=Sophos;i="6.01,249,1684825200"; d="scan'208";a="732428688" Received: from rickylop-mobl1.amr.corp.intel.com (HELO pbossart-mobl3.intel.com) ([10.212.125.114]) by fmsmga007-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 02 Aug 2023 08:01:15 -0700 From: Pierre-Louis Bossart To: alsa-devel@alsa-project.org Cc: tiwai@suse.de, broonie@kernel.org, Bjorn Helgaas , linux-pci@vger.kernel.org, Pierre-Louis Bossart , Ranjani Sridharan , Bard Liao Subject: [PATCH 4/5] ALSA: hda: intel-dsp-cfg: add LunarLake support Date: Wed, 2 Aug 2023 10:01:04 -0500 Message-Id: <20230802150105.24604-5-pierre-louis.bossart@linux.intel.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230802150105.24604-1-pierre-louis.bossart@linux.intel.com> References: <20230802150105.24604-1-pierre-louis.bossart@linux.intel.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org One more PCI ID for the road. Signed-off-by: Pierre-Louis Bossart Reviewed-by: Ranjani Sridharan Reviewed-by: Bard Liao --- sound/hda/intel-dsp-config.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/sound/hda/intel-dsp-config.c b/sound/hda/intel-dsp-config.c index 1abe65f0ba1b..dcf2453138a5 100644 --- a/sound/hda/intel-dsp-config.c +++ b/sound/hda/intel-dsp-config.c @@ -465,6 +465,14 @@ static const struct config_entry config_table[] = { }, #endif +/* Lunar Lake */ +#if IS_ENABLED(CONFIG_SND_SOC_SOF_LUNARLAKE) + /* Lunarlake-P */ + { + .flags = FLAG_SOF | FLAG_SOF_ONLY_IF_DMIC_OR_SOUNDWIRE, + .device = PCI_DEVICE_ID_INTEL_HDA_LNL_P, + }, +#endif }; static const struct config_entry *snd_intel_dsp_find_config From patchwork Wed Aug 2 15:01:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre-Louis Bossart X-Patchwork-Id: 13338331 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 A82ECC001DF for ; Wed, 2 Aug 2023 15:12:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234219AbjHBPMv (ORCPT ); Wed, 2 Aug 2023 11:12:51 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36002 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234034AbjHBPMm (ORCPT ); Wed, 2 Aug 2023 11:12:42 -0400 Received: from mgamail.intel.com (unknown [192.55.52.115]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 297122690 for ; Wed, 2 Aug 2023 08:12:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1690989161; x=1722525161; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=znXh8jhk50KTy9cQHFdBDmGE/L6ZUCXCnIswbewkii8=; b=XmGqMrjP+vkgmsnacGQa1/lxWaq9Xkjt21z9cJ963JY5TGjfcCbSsOJi eAputgOxZ1tCSqXZWEb6ulfBou+sT/n6uSn6jiRVgdJvimf+je0irYScx 2FCKxEglmAFMlQsB6nZyF91ntLHg98E+ZQHA+1uHpU/jhM967wbRNgioJ VgzoiP1aNg7P0FZNq7CIRWAm/Ump1HD3sS49y6DcFKof6vn0SAZApRVPE lif279xJWRBzobUfgUVv9170Usz+knzHppr6tuI/xC4kgVWZq9UdEhnrX wkCbfQx2SuZlil25opMtGCt6VQpZPiaIlHaFLz8RoNkzN2j5wE+YiNbjZ g==; X-IronPort-AV: E=McAfee;i="6600,9927,10790"; a="369607282" X-IronPort-AV: E=Sophos;i="6.01,249,1684825200"; d="scan'208";a="369607282" Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 02 Aug 2023 08:01:16 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10790"; a="732428698" X-IronPort-AV: E=Sophos;i="6.01,249,1684825200"; d="scan'208";a="732428698" Received: from rickylop-mobl1.amr.corp.intel.com (HELO pbossart-mobl3.intel.com) ([10.212.125.114]) by fmsmga007-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 02 Aug 2023 08:01:16 -0700 From: Pierre-Louis Bossart To: alsa-devel@alsa-project.org Cc: tiwai@suse.de, broonie@kernel.org, Bjorn Helgaas , linux-pci@vger.kernel.org, Kai Vehmanen , Bard Liao , "T, Arun" , Pierre-Louis Bossart Subject: [PATCH 5/5] ALSA: hda/i915: extend connectivity check to cover Intel ARL Date: Wed, 2 Aug 2023 10:01:05 -0500 Message-Id: <20230802150105.24604-6-pierre-louis.bossart@linux.intel.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230802150105.24604-1-pierre-louis.bossart@linux.intel.com> References: <20230802150105.24604-1-pierre-louis.bossart@linux.intel.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org From: Kai Vehmanen Expand the HDA/I915 connectivity check to correctly handle the PCI topology used in some Intel Arrow Lake products. Reviewed-by: Bard Liao Tested-by: "T, Arun" Signed-off-by: Kai Vehmanen Signed-off-by: Pierre-Louis Bossart --- sound/hda/hdac_i915.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/sound/hda/hdac_i915.c b/sound/hda/hdac_i915.c index 2a451ff4fe6a..b428537f284c 100644 --- a/sound/hda/hdac_i915.c +++ b/sound/hda/hdac_i915.c @@ -75,16 +75,22 @@ static bool connectivity_check(struct pci_dev *i915, struct pci_dev *hdac) if (bus_a == bus_b) return true; + bus_a = bus_a->parent; + bus_b = bus_b->parent; + + /* connected via parent bus (may be NULL!) */ + if (bus_a == bus_b) + return true; + + if (!bus_a || !bus_b) + return false; + /* * on i915 discrete GPUs with embedded HDA audio, the two * devices are connected via 2nd level PCI bridge */ bus_a = bus_a->parent; bus_b = bus_b->parent; - if (!bus_a || !bus_b) - return false; - bus_a = bus_a->parent; - bus_b = bus_b->parent; if (bus_a && bus_a == bus_b) return true;