From patchwork Mon Apr 8 19:41:45 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Pierre-Louis Bossart X-Patchwork-Id: 786968 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 E60EECD1292 for ; Mon, 8 Apr 2024 19:43:03 +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 EB6532BA9; Mon, 8 Apr 2024 21:42:51 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz EB6532BA9 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1712605382; bh=5VYQbJzHtePmAsZ7fybcYiPbcVVJUhOwXJpqC9isW64=; 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=e2MZqOicDKO/PJpPk1hy5wChSRpqvaGNW+yi5SwRhsVdVUe2RuNj+d7fjSEn3qKxY 2OsMWghFijBd10WfW2drGLpUI7SAeWDkPKULFLY1REeBPy0NjrS3R7B19l/c3INHl7 anktZU6/ijl94TkW7k5Tqy2o36+M2jt1DJStnNHY= Received: by alsa1.perex.cz (Postfix, from userid 50401) id B86B2F805CA; Mon, 8 Apr 2024 21:42:20 +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 E0567F805D2; Mon, 8 Apr 2024 21:42:19 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 47608F8026D; Mon, 8 Apr 2024 21:42:12 +0200 (CEST) Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.9]) (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 E09D1F800C9 for ; Mon, 8 Apr 2024 21:42:03 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz E09D1F800C9 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=I9Q7BFZ2 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1712605325; x=1744141325; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=5VYQbJzHtePmAsZ7fybcYiPbcVVJUhOwXJpqC9isW64=; b=I9Q7BFZ2O0mIoEjHtF0CJHd26WmmjEZ4AXqVE0aGds1ALWm2JYW1sWOd G4pkELKlYYtEGRdbDHDfrVkgy2mP1O+Uv5w1RTFICBl4PUaRNp2COclMe eYE4M5kptmTacajyyBrToV+oizSBIEN35fU6xdD40FOdxwSHImMKypHil ZaJNrVH+aqGVaIdid6ZZKrOSE4t9VWYVlXrHjniY0NX+lZpRGfVhBrXtg g7Hg59eQDfVetrujtDZEq1C5UYRwuMfmsp4gRKz73H4EqAhfYkHR64JKU xrSd6FXEWQTKg/60cFvMCC0qOLi3/MBQnghBguPbda3pk6yNn+jFveLLD A==; X-CSE-ConnectionGUID: vJyUI6spR0OHUx0G8dJMOA== X-CSE-MsgGUID: vkAcpWOKTRaECBU6oaMOuA== X-IronPort-AV: E=McAfee;i="6600,9927,11038"; a="30390455" X-IronPort-AV: E=Sophos;i="6.07,187,1708416000"; d="scan'208";a="30390455" Received: from orviesa005.jf.intel.com ([10.64.159.145]) by orvoesa101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Apr 2024 12:41:57 -0700 X-CSE-ConnectionGUID: Q+7yzZQBSk6uKTX5XEmz9A== X-CSE-MsgGUID: vauK4FXEQjWVkabfMbP5Bg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.07,187,1708416000"; d="scan'208";a="24776958" Received: from aikuseru-mobl1.amr.corp.intel.com (HELO pbossart-mobl6.lan) ([10.212.40.188]) by orviesa005-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Apr 2024 12:41:57 -0700 From: Pierre-Louis Bossart To: linux-sound@vger.kernel.org Cc: alsa-devel@alsa-project.org, tiwai@suse.de, broonie@kernel.org, Pierre-Louis Bossart , =?utf-8?q?P?= =?utf-8?q?=C3=A9ter_Ujfalusi?= , Bard Liao Subject: [PATCH 1/3] ASoC: SOF: Intel: add default firmware library path for LNL Date: Mon, 8 Apr 2024 14:41:45 -0500 Message-Id: <20240408194147.28919-2-pierre-louis.bossart@linux.intel.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20240408194147.28919-1-pierre-louis.bossart@linux.intel.com> References: <20240408194147.28919-1-pierre-louis.bossart@linux.intel.com> MIME-Version: 1.0 Message-ID-Hash: BIEHC3NVKLUU3LO6IXAPNALLN3RTGWRG X-Message-ID-Hash: BIEHC3NVKLUU3LO6IXAPNALLN3RTGWRG X-MailFrom: pierre-louis.bossart@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.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: The commit cd6f2a2e6346 ("ASoC: SOF: Intel: Set the default firmware library path for IPC4") added the default_lib_path field for all platforms, but this was missed when LunarLake was later introduced. Fixes: 64a63d9914a5 ("ASoC: SOF: Intel: LNL: Add support for Lunarlake platform") Signed-off-by: Pierre-Louis Bossart Reviewed-by: Péter Ujfalusi Reviewed-by: Bard Liao --- sound/soc/sof/intel/pci-lnl.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sound/soc/sof/intel/pci-lnl.c b/sound/soc/sof/intel/pci-lnl.c index b26ffe767fab..b14e508f1f31 100644 --- a/sound/soc/sof/intel/pci-lnl.c +++ b/sound/soc/sof/intel/pci-lnl.c @@ -35,6 +35,9 @@ static const struct sof_dev_desc lnl_desc = { .default_fw_path = { [SOF_IPC_TYPE_4] = "intel/sof-ipc4/lnl", }, + .default_lib_path = { + [SOF_IPC_TYPE_4] = "intel/sof-ipc4-lib/lnl", + }, .default_tplg_path = { [SOF_IPC_TYPE_4] = "intel/sof-ipc4-tplg", }, From patchwork Mon Apr 8 19:41:47 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Pierre-Louis Bossart X-Patchwork-Id: 786967 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 67B82CD1292 for ; Mon, 8 Apr 2024 19:43:46 +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 767AB27AA; Mon, 8 Apr 2024 21:43:34 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 767AB27AA DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1712605424; bh=4qtLV05lDjmjdiMZgc2NNyc/kZf7iepOU2DsqdEnfJY=; 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=gJreuErWWJxaStVgt5jhZ+Vbmi/IJMKJtLDze2KSRWl3LRYT43SEctZQAKj8DklfQ d1wwflVzm2f8v08Dl/cfILOj5R19i1SUUSzFbRu+93UpTpakrTpaWDWwtz9XnOJ52i lgGdu6Y2t0Rt9O4TEnf8Bj5LFsVoWifOsFTiqxHs= Received: by alsa1.perex.cz (Postfix, from userid 50401) id 71058F8061D; Mon, 8 Apr 2024 21:42:27 +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 774CAF805E3; Mon, 8 Apr 2024 21:42:27 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 14B39F8028B; Mon, 8 Apr 2024 21:42:21 +0200 (CEST) Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.9]) (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 04F84F8028B for ; Mon, 8 Apr 2024 21:42:05 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 04F84F8028B 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=NhWweSwl DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1712605327; x=1744141327; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=4qtLV05lDjmjdiMZgc2NNyc/kZf7iepOU2DsqdEnfJY=; b=NhWweSwl2dZJVOMWxYVfVgzihTX2x3yieqpQ8ZIyfXG6hojqnTFskyaA yI9P7YHes39OqpKV0uOIHwzkyU9DuBcJvGK1Ff1zrfzn6adTIC3PsUqVv QG7hbqN3S6sIRxnTF0k4W8dZD5mKnTX58uMPLWXlnRe1rsx1hxG+eR1dT MYOGJSUizPTrKxt7Nes81B8wBkfYfIpEARxYs7TGEm294/IKzhCsL97ek hti7/wb2vNI7gzfWEkE/lZ8NOztYDBWD3z6W+asJSNg5z4v5RnWQcekap tozaqaXperevzcqdhj5cfN7VhuIkVmnqcFHMCIbGZE6940kIKw4V9y62V g==; X-CSE-ConnectionGUID: YJMX/YHeROGrk1khlAXa4g== X-CSE-MsgGUID: I79A4Y7bR7+Sfzqie6Rtsg== X-IronPort-AV: E=McAfee;i="6600,9927,11038"; a="30390465" X-IronPort-AV: E=Sophos;i="6.07,187,1708416000"; d="scan'208";a="30390465" Received: from orviesa005.jf.intel.com ([10.64.159.145]) by orvoesa101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Apr 2024 12:41:58 -0700 X-CSE-ConnectionGUID: 5E3flx/pQbmZhNtM84gctg== X-CSE-MsgGUID: ZN/MqZMzTjegvfrnUmxRjA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.07,187,1708416000"; d="scan'208";a="24776971" Received: from aikuseru-mobl1.amr.corp.intel.com (HELO pbossart-mobl6.lan) ([10.212.40.188]) by orviesa005-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Apr 2024 12:41:58 -0700 From: Pierre-Louis Bossart To: linux-sound@vger.kernel.org Cc: alsa-devel@alsa-project.org, tiwai@suse.de, broonie@kernel.org, Pierre-Louis Bossart , =?utf-8?q?P?= =?utf-8?q?=C3=A9ter_Ujfalusi?= , Bard Liao Subject: [PATCH 3/3] ASoC: SOF: debug: show firmware/topology prefix/names Date: Mon, 8 Apr 2024 14:41:47 -0500 Message-Id: <20240408194147.28919-4-pierre-louis.bossart@linux.intel.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20240408194147.28919-1-pierre-louis.bossart@linux.intel.com> References: <20240408194147.28919-1-pierre-louis.bossart@linux.intel.com> MIME-Version: 1.0 Message-ID-Hash: M7QF3QTNV5OD2N3FGLJ545I4NNJESVPT X-Message-ID-Hash: M7QF3QTNV5OD2N3FGLJ545I4NNJESVPT X-MailFrom: pierre-louis.bossart@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.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: The SOF driver has multiple profiles to select firmware/topology prefix/names depending on the platform and ipc_type, and each of those fields can be overridden with kernel parameters. This results in some cases in confusion on what configuration is actually used in a given test. We currently log the firmware and topology names in the kernel logs, but there's been an ask to add the information in debugfs to simplify test scripts used by developers and CI. This isn't meant to be a stable ABI used by apps, changes will be allowed as needed. Closes: https://github.com/thesofproject/linux/issues/3867 Signed-off-by: Pierre-Louis Bossart Reviewed-by: Péter Ujfalusi Reviewed-by: Bard Liao --- sound/soc/sof/debug.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/sound/soc/sof/debug.c b/sound/soc/sof/debug.c index 937e51b02a24..cf282c8b18af 100644 --- a/sound/soc/sof/debug.c +++ b/sound/soc/sof/debug.c @@ -311,14 +311,32 @@ EXPORT_SYMBOL_GPL(snd_sof_dbg_memory_info_init); int snd_sof_dbg_init(struct snd_sof_dev *sdev) { + struct snd_sof_pdata *plat_data = sdev->pdata; struct snd_sof_dsp_ops *ops = sof_ops(sdev); const struct snd_sof_debugfs_map *map; + struct dentry *fw_profile; int i; int err; /* use "sof" as top level debugFS dir */ sdev->debugfs_root = debugfs_create_dir("sof", NULL); + /* expose firmware/topology prefix/names for test purposes */ + fw_profile = debugfs_create_dir("fw_profile", sdev->debugfs_root); + + debugfs_create_str("fw_path", 0444, fw_profile, + (char **)&plat_data->fw_filename_prefix); + debugfs_create_str("fw_lib_path", 0444, fw_profile, + (char **)&plat_data->fw_lib_prefix); + debugfs_create_str("tplg_path", 0444, fw_profile, + (char **)&plat_data->tplg_filename_prefix); + debugfs_create_str("fw_name", 0444, fw_profile, + (char **)&plat_data->fw_filename); + debugfs_create_str("tplg_name", 0444, fw_profile, + (char **)&plat_data->tplg_filename); + debugfs_create_u32("ipc_type", 0444, fw_profile, + (u32 *)&plat_data->ipc_type); + /* init dfsentry list */ INIT_LIST_HEAD(&sdev->dfsentry_list);