From patchwork Fri Feb 23 11:46:23 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cezary Rojewski X-Patchwork-Id: 775176 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 3149CC54798 for ; Fri, 23 Feb 2024 11:45:54 +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 4A7F9B60; Fri, 23 Feb 2024 12:45:42 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 4A7F9B60 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1708688752; bh=w5f6RNhBhSo4LkceK82xzJNTTn3aKecVjCjLlcA0HqI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=O+CecWUji9zp64bBETKBN047JCKdUSolzQ6cp7BNvQVSTk9zMxSzpBk8MYsoxiAc3 hwrZdgkdvZCrz0ldQurWhWEFHXqVIGxWG82p6/I3D343joHqwyitRNdrPp8iAHNULZ QGguTHfTZp/3JgUUXhYkfo+X1NFhXKTs8pHHfJn8= Received: by alsa1.perex.cz (Postfix, from userid 50401) id 94C5BF805D8; Fri, 23 Feb 2024 12:45:08 +0100 (CET) Received: from mailman-core.alsa-project.org (mailman-core.alsa-project.org [10.254.200.10]) by alsa1.perex.cz (Postfix) with ESMTP id C6205F805B6; Fri, 23 Feb 2024 12:45:07 +0100 (CET) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 65884F804B0; Fri, 23 Feb 2024 12:45:01 +0100 (CET) Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.16]) (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 2A2D0F80104 for ; Fri, 23 Feb 2024 12:44:54 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 2A2D0F80104 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=jTWFan12 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1708688696; x=1740224696; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=w5f6RNhBhSo4LkceK82xzJNTTn3aKecVjCjLlcA0HqI=; b=jTWFan12VWfzBF9wfjhV9+n9GBy4mdPoT9YAMjLDLrozPROs+kc6ipeM hdwo8Nll3msW/O5H8CNNAw/vt+5MHc2zXE8uVTinCJLyu3EYSUsTX6Yrl IjuEAo852/qyPDHz5jA5ao5rE8qSGZt9CkaTilI21Tbq7+S0fzp/dyV3Z CRYSSmg+dPX14UVRdiBAzvJbQxhjYzReUMkLJ8NAi/Icou3+XJabO5gmP 38C+KBJR9yO4tNbpp+f4/FjzsweribYxbWH+lGVn4m33/0KXWvitwNCZu el/iTTGv32nxd15ofTc46+PWOuOEKaT8HjxD6pix6gg6/KVfmhGtEQ0tp w==; X-IronPort-AV: E=McAfee;i="6600,9927,10992"; a="3504599" X-IronPort-AV: E=Sophos;i="6.06,179,1705392000"; d="scan'208";a="3504599" Received: from fmviesa006.fm.intel.com ([10.60.135.146]) by fmvoesa110.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Feb 2024 03:44:54 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.06,179,1705392000"; d="scan'208";a="6092896" Received: from crojewsk-ctrl.igk.intel.com ([10.102.9.28]) by fmviesa006.fm.intel.com with ESMTP; 23 Feb 2024 03:44:51 -0800 From: Cezary Rojewski To: broonie@kernel.org Cc: alsa-devel@alsa-project.org, linux-sound@vger.kernel.org, tiwai@suse.com, perex@perex.cz, jani.nikula@linux.intel.com, joonas.lahtinen@linux.intel.com, rodrigo.vivi@intel.com, tvrtko.ursulin@linux.intel.com, intel-gfx@lists.freedesktop.org, amadeuszx.slawinski@linux.intel.com, pierre-louis.bossart@linux.intel.com, hdegoede@redhat.com, Cezary Rojewski Subject: [PATCH v2 1/4] ALSA: hda: Skip i915 initialization on CNL/LKF-based platforms Date: Fri, 23 Feb 2024 12:46:23 +0100 Message-Id: <20240223114626.1052784-2-cezary.rojewski@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240223114626.1052784-1-cezary.rojewski@intel.com> References: <20240223114626.1052784-1-cezary.rojewski@intel.com> MIME-Version: 1.0 Message-ID-Hash: DLT7AZ7R2ERP3WBJRBF37BUIBLPUXCEW X-Message-ID-Hash: DLT7AZ7R2ERP3WBJRBF37BUIBLPUXCEW X-MailFrom: cezary.rojewski@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.9 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: Commit 78f613ba1efb ("drm/i915: finish removal of CNL") and its friends removed support for i915 for all CNL-based platforms. HDAudio library, however, still treats such platforms as valid candidates for i915 binding. Update query mechanism to reflect changes made in drm tree. At the same time, i915 support for LKF-based platforms has not been provided so remove them from valid binding candidates. Link: https://lore.kernel.org/all/20210728215946.1573015-1-lucas.demarchi@intel.com/ Signed-off-by: Cezary Rojewski --- sound/hda/hdac_i915.c | 32 +++++++++++++++++++++++++++++--- 1 file changed, 29 insertions(+), 3 deletions(-) diff --git a/sound/hda/hdac_i915.c b/sound/hda/hdac_i915.c index 365c36fdf205..afee87bd0f2e 100644 --- a/sound/hda/hdac_i915.c +++ b/sound/hda/hdac_i915.c @@ -127,15 +127,41 @@ static int i915_component_master_match(struct device *dev, int subcomponent, /* check whether Intel graphics is present and reachable */ static int i915_gfx_present(struct pci_dev *hdac_pci) { + /* List of known platforms with no i915 support. */ + static struct pci_device_id denylist[] = { + /* CNL */ + { PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x5a40), 0x030000, 0xff0000 }, + { PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x5a41), 0x030000, 0xff0000 }, + { PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x5a42), 0x030000, 0xff0000 }, + { PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x5a44), 0x030000, 0xff0000 }, + { PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x5a49), 0x030000, 0xff0000 }, + { PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x5a4a), 0x030000, 0xff0000 }, + { PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x5a4c), 0x030000, 0xff0000 }, + { PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x5a50), 0x030000, 0xff0000 }, + { PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x5a51), 0x030000, 0xff0000 }, + { PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x5a52), 0x030000, 0xff0000 }, + { PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x5a54), 0x030000, 0xff0000 }, + { PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x5a59), 0x030000, 0xff0000 }, + { PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x5a5a), 0x030000, 0xff0000 }, + { PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x5a5c), 0x030000, 0xff0000 }, + /* LKF */ + { PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x9840), 0x030000, 0xff0000 }, + { 0 } + }; struct pci_dev *display_dev = NULL; if (!gpu_bind || (gpu_bind < 0 && video_firmware_drivers_only())) return false; for_each_pci_dev(display_dev) { - if (display_dev->vendor == PCI_VENDOR_ID_INTEL && - (display_dev->class >> 16) == PCI_BASE_CLASS_DISPLAY && - connectivity_check(display_dev, hdac_pci)) { + if (display_dev->vendor != PCI_VENDOR_ID_INTEL || + (display_dev->class >> 16) != PCI_BASE_CLASS_DISPLAY) + continue; + + if (pci_match_id(denylist, display_dev)) + continue; + + if (connectivity_check(display_dev, hdac_pci)) { pci_dev_put(display_dev); return true; } From patchwork Fri Feb 23 11:46:24 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cezary Rojewski X-Patchwork-Id: 775545 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 D4070C5478C for ; Fri, 23 Feb 2024 11:46:10 +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 32B44825; Fri, 23 Feb 2024 12:45:59 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 32B44825 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1708688769; bh=ZmPygFGWtyXY/k7V0UYpP1keYvjjSFA7st8mQ7lnUbE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=oHcRqeAqTFzCOMHpigv7OQml9JC2j3l3PJWmHFsdiN8FN8dEr4vsStg13LbpjtwGu Ck1AiCuskogW2gvarXYP55yO5vkSug4If8ZmLW42VrPVJw3zhwAUft7XiClytccahs +Xzj4aFj+O54tiO9+k2p7N5yyv/ePDM4mZPB4oKc= Received: by alsa1.perex.cz (Postfix, from userid 50401) id DE5CEF805F6; Fri, 23 Feb 2024 12:45:10 +0100 (CET) Received: from mailman-core.alsa-project.org (mailman-core.alsa-project.org [10.254.200.10]) by alsa1.perex.cz (Postfix) with ESMTP id 21A49F805ED; Fri, 23 Feb 2024 12:45:10 +0100 (CET) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 581A7F805A8; Fri, 23 Feb 2024 12:45:04 +0100 (CET) Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.16]) (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 33004F8047D for ; Fri, 23 Feb 2024 12:44:59 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 33004F8047D 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=YZTsX3ua DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1708688700; x=1740224700; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=ZmPygFGWtyXY/k7V0UYpP1keYvjjSFA7st8mQ7lnUbE=; b=YZTsX3ualXnYV860BcUc6L+uq2U6wW9A6j+sJl2L1EIrNby5k1T4e/t2 FYUO0dDxsEW2l7Q57tQVRt21F1UDwVzCjbl3Jy+kvfJN1Ya8ZnHjihoEM HA+DbrOW9kqwlhb5HN3IzqLXNx01j94ouYFdOzQ74MXi5r33gh1ESIeFr 0Qp1yxZ+TNWjT+mL2+soNFZyZrigeZG2FsgURRf6Uz2uRlKbz93eEd2sZ a6Vdi2HIMSptzbTycaNTV+OtaRXIv/7vPhuZNF1TXxgRrvZEc8jXOMJDZ jJI4GhSqZ1ao4EvRt5KFpBz7nNNKy2K/CLBbk/+UZ/dtcGuC3Ps/7V2+I w==; X-IronPort-AV: E=McAfee;i="6600,9927,10992"; a="3504606" X-IronPort-AV: E=Sophos;i="6.06,179,1705392000"; d="scan'208";a="3504606" Received: from fmviesa006.fm.intel.com ([10.60.135.146]) by fmvoesa110.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Feb 2024 03:44:57 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.06,179,1705392000"; d="scan'208";a="6092905" Received: from crojewsk-ctrl.igk.intel.com ([10.102.9.28]) by fmviesa006.fm.intel.com with ESMTP; 23 Feb 2024 03:44:54 -0800 From: Cezary Rojewski To: broonie@kernel.org Cc: alsa-devel@alsa-project.org, linux-sound@vger.kernel.org, tiwai@suse.com, perex@perex.cz, jani.nikula@linux.intel.com, joonas.lahtinen@linux.intel.com, rodrigo.vivi@intel.com, tvrtko.ursulin@linux.intel.com, intel-gfx@lists.freedesktop.org, amadeuszx.slawinski@linux.intel.com, pierre-louis.bossart@linux.intel.com, hdegoede@redhat.com, Cezary Rojewski Subject: [PATCH v2 2/4] ASoC: codecs: hda: Skip HDMI/DP registration if i915 is missing Date: Fri, 23 Feb 2024 12:46:24 +0100 Message-Id: <20240223114626.1052784-3-cezary.rojewski@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240223114626.1052784-1-cezary.rojewski@intel.com> References: <20240223114626.1052784-1-cezary.rojewski@intel.com> MIME-Version: 1.0 Message-ID-Hash: IANY3AEXI6ZXZO2KPWRHPAB5KUWQDN3V X-Message-ID-Hash: IANY3AEXI6ZXZO2KPWRHPAB5KUWQDN3V X-MailFrom: cezary.rojewski@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.9 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: If i915 does not support given platform but the hardware i.e.: HDAudio codec is still there, the codec-probing procedure will succeed for such device but the follow up initialization will always end up with -ENODEV. While bus could filter out address '2' which Intel's HDMI/DP codecs always enumerate on, more robust approach is to check for i915 presence before registering display codecs. Signed-off-by: Cezary Rojewski --- sound/soc/codecs/hda.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/sound/soc/codecs/hda.c b/sound/soc/codecs/hda.c index d2117e36ddd1..d9e7cd8aada2 100644 --- a/sound/soc/codecs/hda.c +++ b/sound/soc/codecs/hda.c @@ -350,6 +350,11 @@ static int hda_hdev_attach(struct hdac_device *hdev) struct hda_codec *codec = dev_to_hda_codec(&hdev->dev); struct snd_soc_component_driver *comp_drv; + if (hda_codec_is_display(codec) && !hdev->bus->audio_component) { + dev_dbg(&hdev->dev, "no i915, skip registration for 0x%08x\n", hdev->vendor_id); + return 0; + } + comp_drv = devm_kzalloc(&hdev->dev, sizeof(*comp_drv), GFP_KERNEL); if (!comp_drv) return -ENOMEM; From patchwork Fri Feb 23 11:46:25 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cezary Rojewski X-Patchwork-Id: 775175 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 287E0C54E49 for ; Fri, 23 Feb 2024 11:46:30 +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 4A268210; Fri, 23 Feb 2024 12:46:18 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 4A268210 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1708688788; bh=qOmiPs34pCUiDLhuSNi0Chuyh6/urNG1iNBP3mIBQVU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=aSuuDQapftoys6tZJRIqynR8bkZ03L1XBH6y10iR4ODOExChX6GicW6fcTY+pP8qA QM1KeTuWsrrvRePmEfwIKrMClfRZCxc9km3DfNwY4wOIaQQi/fHQl0McCM3mSPylg/ wyenlAwxlDz4cPnzGqpzO3gBAyp6qtO41aTn9cOM= Received: by alsa1.perex.cz (Postfix, from userid 50401) id 2128FF8062D; Fri, 23 Feb 2024 12:45:13 +0100 (CET) Received: from mailman-core.alsa-project.org (mailman-core.alsa-project.org [10.254.200.10]) by alsa1.perex.cz (Postfix) with ESMTP id BF362F8060F; Fri, 23 Feb 2024 12:45:12 +0100 (CET) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 10632F805B0; Fri, 23 Feb 2024 12:45:05 +0100 (CET) Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.16]) (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 3144AF800EE for ; Fri, 23 Feb 2024 12:45:00 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 3144AF800EE 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=SWmqW3Xl DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1708688702; x=1740224702; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=qOmiPs34pCUiDLhuSNi0Chuyh6/urNG1iNBP3mIBQVU=; b=SWmqW3XlePzbdXrgdLAlcOKChs4jUYovfEVqasMCzg13CRcb6mfERP7z dEYo3Rx5mOVBhJfK/6UB9J44d16WByReO/RMFmqiMqESJjPCKC0ZTCKpP y0jnAafF/6MmXcRTvC4j31QccJvbD2e5qqTsBYX19bXdI8SJrXbihgveP 7U948RPGGNBXxzjDPTNXDhVpkRglQXy9HTLJofUoL1jdbaUkgkxhLeOdW 2twdoY8h+Jd4xKN0XfYpF+FPj7WJoq2nZt+z8kR0cUeS+zWvdTdo51rOX O6fGpyk4+E+MFYo2cIEJlSOlcBcemLTq1fP/TlBUlLlpZBpLEx2f8weIo w==; X-IronPort-AV: E=McAfee;i="6600,9927,10992"; a="3504615" X-IronPort-AV: E=Sophos;i="6.06,179,1705392000"; d="scan'208";a="3504615" Received: from fmviesa006.fm.intel.com ([10.60.135.146]) by fmvoesa110.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Feb 2024 03:45:00 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.06,179,1705392000"; d="scan'208";a="6092915" Received: from crojewsk-ctrl.igk.intel.com ([10.102.9.28]) by fmviesa006.fm.intel.com with ESMTP; 23 Feb 2024 03:44:57 -0800 From: Cezary Rojewski To: broonie@kernel.org Cc: alsa-devel@alsa-project.org, linux-sound@vger.kernel.org, tiwai@suse.com, perex@perex.cz, jani.nikula@linux.intel.com, joonas.lahtinen@linux.intel.com, rodrigo.vivi@intel.com, tvrtko.ursulin@linux.intel.com, intel-gfx@lists.freedesktop.org, amadeuszx.slawinski@linux.intel.com, pierre-louis.bossart@linux.intel.com, hdegoede@redhat.com, Cezary Rojewski Subject: [PATCH v2 3/4] ASoC: codecs: hda: Cleanup error messages Date: Fri, 23 Feb 2024 12:46:25 +0100 Message-Id: <20240223114626.1052784-4-cezary.rojewski@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240223114626.1052784-1-cezary.rojewski@intel.com> References: <20240223114626.1052784-1-cezary.rojewski@intel.com> MIME-Version: 1.0 Message-ID-Hash: YPBA7YFYCY3QWNTOE2BH4AXUMIMG6AQF X-Message-ID-Hash: YPBA7YFYCY3QWNTOE2BH4AXUMIMG6AQF X-MailFrom: cezary.rojewski@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.9 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: Be cohesive and use same pattern in each error message. Signed-off-by: Cezary Rojewski --- sound/soc/codecs/hda.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/sound/soc/codecs/hda.c b/sound/soc/codecs/hda.c index d9e7cd8aada2..8a9d0674555e 100644 --- a/sound/soc/codecs/hda.c +++ b/sound/soc/codecs/hda.c @@ -198,19 +198,19 @@ static int hda_codec_probe(struct snd_soc_component *component) ret = snd_hda_codec_device_new(codec->bus, component->card->snd_card, hdev->addr, codec, false); if (ret < 0) { - dev_err(&hdev->dev, "create hda codec failed: %d\n", ret); + dev_err(&hdev->dev, "codec create failed: %d\n", ret); goto device_new_err; } ret = snd_hda_codec_set_name(codec, codec->preset->name); if (ret < 0) { - dev_err(&hdev->dev, "name failed %s\n", codec->preset->name); + dev_err(&hdev->dev, "set name: %s failed: %d\n", codec->preset->name, ret); goto err; } ret = snd_hdac_regmap_init(&codec->core); if (ret < 0) { - dev_err(&hdev->dev, "regmap init failed\n"); + dev_err(&hdev->dev, "regmap init failed: %d\n", ret); goto err; } @@ -223,13 +223,13 @@ static int hda_codec_probe(struct snd_soc_component *component) ret = patch(codec); if (ret < 0) { - dev_err(&hdev->dev, "patch failed %d\n", ret); + dev_err(&hdev->dev, "codec init failed: %d\n", ret); goto err; } ret = snd_hda_codec_parse_pcms(codec); if (ret < 0) { - dev_err(&hdev->dev, "unable to map pcms to dai %d\n", ret); + dev_err(&hdev->dev, "unable to map pcms to dai: %d\n", ret); goto parse_pcms_err; } From patchwork Fri Feb 23 11:46:26 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cezary Rojewski X-Patchwork-Id: 775544 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 85F3AC5478C for ; Fri, 23 Feb 2024 11:46:39 +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 DF65CEC7; Fri, 23 Feb 2024 12:46:27 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz DF65CEC7 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1708688797; bh=cewHMOUP9XE8f1iBRQp0XY/AtymJk2wyw8t26geqAWQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=JIuhIZJujY7nWRvOyLLVLq0wSd786hsw7pWiBGXdEKGKjsrKEUy3zT7l47azK0TCe YcDg7l7RbW9TaTfJ3G0qLuBNLcQQpG8NudRFGb/7SIc3z51XnP3GQtjDZnJn7ZGgd+ ipxxnKvERrWB77laSUqgY+FroDHIgPRvlpQoWQJg= Received: by alsa1.perex.cz (Postfix, from userid 50401) id C1851F80637; Fri, 23 Feb 2024 12:45:15 +0100 (CET) Received: from mailman-core.alsa-project.org (mailman-core.alsa-project.org [10.254.200.10]) by alsa1.perex.cz (Postfix) with ESMTP id B2864F80636; Fri, 23 Feb 2024 12:45:14 +0100 (CET) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 3E6C5F805E4; Fri, 23 Feb 2024 12:45:09 +0100 (CET) Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.16]) (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 28E7DF805C5 for ; Fri, 23 Feb 2024 12:45:05 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 28E7DF805C5 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=IbzbLFud DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1708688707; x=1740224707; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=cewHMOUP9XE8f1iBRQp0XY/AtymJk2wyw8t26geqAWQ=; b=IbzbLFudXFoYQCioB77t8IEZcB5qQmkkHnFqJbuaSI7sonPKjjAnuVed JEKasXKQtiCfvac7IEezsKGW/Bya0a+1qDbBJO64LLehaEp3VqaVknZDT 5tpYYvF6tcigNfMbQwwIzjDLqetkrUrKJs42OhF0hHj7r8HXWShxXykt+ DmuQYAQ06Z9QKEh9ndW/bJzmInQAgxpvyXbk6fakS6e9tArEv4jmoKnCQ as+8qwZ2NbqJgPDcbttBiojYXiU7APcSL5y7hldhmN5rSBqp8sAuKgmkU iAHfzIXfWrKsgPU4LTDza8PaXMyCXqJbNlqRRnrYdgGT0ROoklK4Ru77c w==; X-IronPort-AV: E=McAfee;i="6600,9927,10992"; a="3504622" X-IronPort-AV: E=Sophos;i="6.06,179,1705392000"; d="scan'208";a="3504622" Received: from fmviesa006.fm.intel.com ([10.60.135.146]) by fmvoesa110.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Feb 2024 03:45:04 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.06,179,1705392000"; d="scan'208";a="6092942" Received: from crojewsk-ctrl.igk.intel.com ([10.102.9.28]) by fmviesa006.fm.intel.com with ESMTP; 23 Feb 2024 03:45:00 -0800 From: Cezary Rojewski To: broonie@kernel.org Cc: alsa-devel@alsa-project.org, linux-sound@vger.kernel.org, tiwai@suse.com, perex@perex.cz, jani.nikula@linux.intel.com, joonas.lahtinen@linux.intel.com, rodrigo.vivi@intel.com, tvrtko.ursulin@linux.intel.com, intel-gfx@lists.freedesktop.org, amadeuszx.slawinski@linux.intel.com, pierre-louis.bossart@linux.intel.com, hdegoede@redhat.com, Cezary Rojewski Subject: [PATCH v2 4/4] ALSA: hda: Reuse for_each_pcm_streams() Date: Fri, 23 Feb 2024 12:46:26 +0100 Message-Id: <20240223114626.1052784-5-cezary.rojewski@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240223114626.1052784-1-cezary.rojewski@intel.com> References: <20240223114626.1052784-1-cezary.rojewski@intel.com> MIME-Version: 1.0 Message-ID-Hash: 36RFMQ2WNXX6YGBBFW5Q7QHO4EJKN6KI X-Message-ID-Hash: 36RFMQ2WNXX6YGBBFW5Q7QHO4EJKN6KI X-MailFrom: cezary.rojewski@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.9 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: Use the macro to improve readability. Signed-off-by: Cezary Rojewski --- sound/pci/hda/hda_codec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c index 12f02cdc9659..2cac337f5263 100644 --- a/sound/pci/hda/hda_codec.c +++ b/sound/pci/hda/hda_codec.c @@ -3313,7 +3313,7 @@ int snd_hda_codec_parse_pcms(struct hda_codec *codec) list_for_each_entry(cpcm, &codec->pcm_list_head, list) { int stream; - for (stream = 0; stream < 2; stream++) { + for_each_pcm_streams(stream) { struct hda_pcm_stream *info = &cpcm->stream[stream]; if (!info->substreams)