From: "Amadeusz Sławiński" <amadeuszx.slawinski@linux.intel.com>
To: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>,
lgirdwood@gmail.com, broonie@kernel.org
Cc: Cezary Rojewski <cezary.rojewski@intel.com>,
kai.vehmanen@linux.intel.com, alsa-devel@alsa-project.org,
pierre-louis.bossart@linux.intel.com,
ranjani.sridharan@linux.intel.com, chao.song@intel.com
Subject: Re: [PATCH 12/19] ASoC: SOF: Intel: Set the default firmware library path for IPC4
Date: Tue, 18 Oct 2022 14:38:46 +0200 [thread overview]
Message-ID: <4e501a9d-45bb-0ef0-6900-a61af5d4bae0@linux.intel.com> (raw)
In-Reply-To: <20221018120916.19820-13-peter.ujfalusi@linux.intel.com>
On 10/18/2022 2:09 PM, Peter Ujfalusi wrote:
> The default path for the external firmware libraries are:
> intel/avs-lib/<platform>
> or
> intel/sof-ipc4-lib/<platform>
>
> Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
> Reviewed-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
> Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
> Reviewed-by: Chao Song <chao.song@intel.com>
> Reviewed-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
> ---
> sound/soc/sof/intel/pci-apl.c | 6 ++++++
> sound/soc/sof/intel/pci-cnl.c | 9 +++++++++
> sound/soc/sof/intel/pci-icl.c | 6 ++++++
> sound/soc/sof/intel/pci-mtl.c | 3 +++
> sound/soc/sof/intel/pci-tgl.c | 21 +++++++++++++++++++++
> 5 files changed, 45 insertions(+)
>
> diff --git a/sound/soc/sof/intel/pci-apl.c b/sound/soc/sof/intel/pci-apl.c
> index 998e219011f0..69279dcc92dc 100644
> --- a/sound/soc/sof/intel/pci-apl.c
> +++ b/sound/soc/sof/intel/pci-apl.c
> @@ -33,6 +33,9 @@ static const struct sof_dev_desc bxt_desc = {
> [SOF_IPC] = "intel/sof",
> [SOF_INTEL_IPC4] = "intel/avs/apl",
> },
> + .default_lib_path = {
> + [SOF_INTEL_IPC4] = "intel/avs-lib/apl",
> + },
> .default_tplg_path = {
> [SOF_IPC] = "intel/sof-tplg",
> [SOF_INTEL_IPC4] = "intel/avs-tplg",
> @@ -61,6 +64,9 @@ static const struct sof_dev_desc glk_desc = {
> [SOF_IPC] = "intel/sof",
> [SOF_INTEL_IPC4] = "intel/avs/glk",
> },
> + .default_lib_path = {
> + [SOF_INTEL_IPC4] = "intel/avs-lib/glk",
> + },
> .default_tplg_path = {
> [SOF_IPC] = "intel/sof-tplg",
> [SOF_INTEL_IPC4] = "intel/avs-tplg",
> diff --git a/sound/soc/sof/intel/pci-cnl.c b/sound/soc/sof/intel/pci-cnl.c
> index c797356f7028..8db3f8d15b55 100644
> --- a/sound/soc/sof/intel/pci-cnl.c
> +++ b/sound/soc/sof/intel/pci-cnl.c
> @@ -34,6 +34,9 @@ static const struct sof_dev_desc cnl_desc = {
> [SOF_IPC] = "intel/sof",
> [SOF_INTEL_IPC4] = "intel/avs/cnl",
> },
> + .default_lib_path = {
> + [SOF_INTEL_IPC4] = "intel/avs-lib/cnl",
> + },
> .default_tplg_path = {
> [SOF_IPC] = "intel/sof-tplg",
> [SOF_INTEL_IPC4] = "intel/avs-tplg",
> @@ -62,6 +65,9 @@ static const struct sof_dev_desc cfl_desc = {
> [SOF_IPC] = "intel/sof",
> [SOF_INTEL_IPC4] = "intel/avs/cnl",
> },
> + .default_lib_path = {
> + [SOF_INTEL_IPC4] = "intel/avs-lib/cnl",
> + },
> .default_tplg_path = {
> [SOF_IPC] = "intel/sof-tplg",
> [SOF_INTEL_IPC4] = "intel/avs-tplg",
> @@ -91,6 +97,9 @@ static const struct sof_dev_desc cml_desc = {
> [SOF_IPC] = "intel/sof",
> [SOF_INTEL_IPC4] = "intel/avs/cnl",
> },
> + .default_lib_path = {
> + [SOF_INTEL_IPC4] = "intel/avs-lib/cnl",
> + },
> .default_tplg_path = {
> [SOF_IPC] = "intel/sof-tplg",
> [SOF_INTEL_IPC4] = "intel/avs-tplg",
> diff --git a/sound/soc/sof/intel/pci-icl.c b/sound/soc/sof/intel/pci-icl.c
> index 48f24f8ace26..d6cf75e357db 100644
> --- a/sound/soc/sof/intel/pci-icl.c
> +++ b/sound/soc/sof/intel/pci-icl.c
> @@ -34,6 +34,9 @@ static const struct sof_dev_desc icl_desc = {
> [SOF_IPC] = "intel/sof",
> [SOF_INTEL_IPC4] = "intel/avs/icl",
> },
> + .default_lib_path = {
> + [SOF_INTEL_IPC4] = "intel/avs-lib/icl",
> + },
> .default_tplg_path = {
> [SOF_IPC] = "intel/sof-tplg",
> [SOF_INTEL_IPC4] = "intel/avs-tplg",
> @@ -62,6 +65,9 @@ static const struct sof_dev_desc jsl_desc = {
> [SOF_IPC] = "intel/sof",
> [SOF_INTEL_IPC4] = "intel/avs/jsl",
> },
> + .default_lib_path = {
> + [SOF_INTEL_IPC4] = "intel/avs-lib/jsl",
> + },
> .default_tplg_path = {
> [SOF_IPC] = "intel/sof-tplg",
> [SOF_INTEL_IPC4] = "intel/avs-tplg",
> diff --git a/sound/soc/sof/intel/pci-mtl.c b/sound/soc/sof/intel/pci-mtl.c
> index 899b00d53d64..84445daf33af 100644
> --- a/sound/soc/sof/intel/pci-mtl.c
> +++ b/sound/soc/sof/intel/pci-mtl.c
> @@ -34,6 +34,9 @@ static const struct sof_dev_desc mtl_desc = {
> .default_fw_path = {
> [SOF_INTEL_IPC4] = "intel/sof-ipc4/mtl",
> },
> + .default_lib_path = {
> + [SOF_INTEL_IPC4] = "intel/sof-ipc4-lib/mtl",
> + },
> .default_tplg_path = {
> [SOF_INTEL_IPC4] = "intel/sof-ace-tplg",
> },
> diff --git a/sound/soc/sof/intel/pci-tgl.c b/sound/soc/sof/intel/pci-tgl.c
> index 2d63cc236a68..f9cbf3ad85b3 100644
> --- a/sound/soc/sof/intel/pci-tgl.c
> +++ b/sound/soc/sof/intel/pci-tgl.c
> @@ -34,6 +34,9 @@ static const struct sof_dev_desc tgl_desc = {
> [SOF_IPC] = "intel/sof",
> [SOF_INTEL_IPC4] = "intel/avs/tgl",
> },
> + .default_lib_path = {
> + [SOF_INTEL_IPC4] = "intel/avs-lib/tgl",
> + },
> .default_tplg_path = {
> [SOF_IPC] = "intel/sof-tplg",
> [SOF_INTEL_IPC4] = "intel/avs-tplg",
> @@ -62,6 +65,9 @@ static const struct sof_dev_desc tglh_desc = {
> [SOF_IPC] = "intel/sof",
> [SOF_INTEL_IPC4] = "intel/avs/tgl-h",
> },
> + .default_lib_path = {
> + [SOF_INTEL_IPC4] = "intel/avs-lib/tgl-h",
> + },
> .default_tplg_path = {
> [SOF_IPC] = "intel/sof-tplg",
> [SOF_INTEL_IPC4] = "intel/avs-tplg",
> @@ -90,6 +96,9 @@ static const struct sof_dev_desc ehl_desc = {
> [SOF_IPC] = "intel/sof",
> [SOF_INTEL_IPC4] = "intel/avs/ehl",
> },
> + .default_lib_path = {
> + [SOF_INTEL_IPC4] = "intel/avs-lib/ehl",
> + },
> .default_tplg_path = {
> [SOF_IPC] = "intel/sof-tplg",
> [SOF_INTEL_IPC4] = "intel/avs-tplg",
> @@ -118,6 +127,9 @@ static const struct sof_dev_desc adls_desc = {
> [SOF_IPC] = "intel/sof",
> [SOF_INTEL_IPC4] = "intel/avs/adl-s",
> },
> + .default_lib_path = {
> + [SOF_INTEL_IPC4] = "intel/avs-lib/adl-s",
> + },
> .default_tplg_path = {
> [SOF_IPC] = "intel/sof-tplg",
> [SOF_INTEL_IPC4] = "intel/avs-tplg",
> @@ -146,6 +158,9 @@ static const struct sof_dev_desc adl_desc = {
> [SOF_IPC] = "intel/sof",
> [SOF_INTEL_IPC4] = "intel/avs/adl",
> },
> + .default_lib_path = {
> + [SOF_INTEL_IPC4] = "intel/avs-lib/adl",
> + },
> .default_tplg_path = {
> [SOF_IPC] = "intel/sof-tplg",
> [SOF_INTEL_IPC4] = "intel/avs-tplg",
> @@ -174,6 +189,9 @@ static const struct sof_dev_desc rpls_desc = {
> [SOF_IPC] = "intel/sof",
> [SOF_INTEL_IPC4] = "intel/avs/rpl-s",
> },
> + .default_lib_path = {
> + [SOF_INTEL_IPC4] = "intel/avs-lib/rpl-s",
> + },
> .default_tplg_path = {
> [SOF_IPC] = "intel/sof-tplg",
> [SOF_INTEL_IPC4] = "intel/avs-tplg",
> @@ -202,6 +220,9 @@ static const struct sof_dev_desc rpl_desc = {
> [SOF_IPC] = "intel/sof",
> [SOF_INTEL_IPC4] = "intel/avs/rpl",
> },
> + .default_lib_path = {
> + [SOF_INTEL_IPC4] = "intel/avs-lib/rpl",
> + },
> .default_tplg_path = {
> [SOF_IPC] = "intel/sof-tplg",
> [SOF_INTEL_IPC4] = "intel/avs-tplg",
I'm not sure that I understand the rationale here, can't libraries be
kept in the same directory as FW, as far as I know they are version
locked to FW anyway. In avs driver when we decided on intel/avs/platform
path we planned to keep FW related libaries there...
Also adding Czarek to CC.
next prev parent reply other threads:[~2022-10-18 12:40 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-18 12:08 [PATCH 00/19] ASoC: SOF: Intel/IPC4: Support for external firmware libraries Peter Ujfalusi
2022-10-18 12:08 ` [PATCH 01/19] ASoC: SOF: loader: Set complete state before post_fw_run op Peter Ujfalusi
2022-10-18 12:08 ` [PATCH 02/19] ASoC: SOF: Introduce container struct for SOF firmware Peter Ujfalusi
2022-10-18 12:09 ` [PATCH 03/19] ASoC: SOF: amd: Use the basefw firmware container directly Peter Ujfalusi
2022-10-18 12:09 ` [PATCH 04/19] ASoC: SOF: Intel: hda-loader: " Peter Ujfalusi
2022-10-18 12:09 ` [PATCH 05/19] ASoC: SOF: Intel: hda-loader-skl: " Peter Ujfalusi
2022-10-18 12:09 ` [PATCH 06/19] ASoC: SOF: Drop the firmware and fw_offset from snd_sof_pdata Peter Ujfalusi
2022-10-18 12:09 ` [PATCH 07/19] ASoC: SOF: ipc: ops: Add support for optional init and exit callbacks Peter Ujfalusi
2022-10-18 12:09 ` [PATCH 08/19] ASoC: SOF: ipc4-loader: Save the maximum number of libraries supported Peter Ujfalusi
2022-10-18 12:09 ` [PATCH 09/19] ASoC: SOF: ipc4: Convert the firmware handling (loader) to library convention Peter Ujfalusi
2022-10-18 12:09 ` [PATCH 10/19] ASoC: SOF: IPC4: Add helper for looking up module by UUID Peter Ujfalusi
2022-10-18 12:09 ` [PATCH 11/19] ASoC: SOF: Add path definition for external firmware libraries Peter Ujfalusi
2022-10-18 12:09 ` [PATCH 12/19] ASoC: SOF: Intel: Set the default firmware library path for IPC4 Peter Ujfalusi
2022-10-18 12:38 ` Amadeusz Sławiński [this message]
2022-10-18 13:49 ` Péter Ujfalusi
2022-10-18 15:46 ` Cezary Rojewski
2022-10-18 16:37 ` Pierre-Louis Bossart
2022-10-18 17:18 ` Cezary Rojewski
2022-10-19 9:51 ` Cezary Rojewski
2022-10-19 11:16 ` Péter Ujfalusi
2022-10-19 11:58 ` Cezary Rojewski
2022-10-19 12:21 ` Péter Ujfalusi
2022-10-18 12:09 ` [PATCH 13/19] ASoC: SOF: ipc4: Define platform dependent library loading callback Peter Ujfalusi
2022-10-18 12:09 ` [PATCH 14/19] ASoC: SOF: Intel: hda: Add flag to indicate that the firmware is IMR booted Peter Ujfalusi
2022-10-18 12:09 ` [PATCH 15/19] ASoC: SOF: Intel: Add ipc4 library loading implementation Peter Ujfalusi
2022-10-18 12:09 ` [PATCH 16/19] ASoC: SOF: loader: Add support for IPC dependent post firmware boot ops Peter Ujfalusi
2022-10-18 12:09 ` [PATCH 17/19] ASoC: SOF: ipc4: Stop using the query_fw_configuration fw_loader ops Peter Ujfalusi
2022-10-18 12:09 ` [PATCH 18/19] ASoC: SOF: loader: Remove the query_fw_configuration ops Peter Ujfalusi
2022-10-18 12:09 ` [PATCH 19/19] ASoC: SOF: ipc4-loader: Support for loading external libraries Peter Ujfalusi
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4e501a9d-45bb-0ef0-6900-a61af5d4bae0@linux.intel.com \
--to=amadeuszx.slawinski@linux.intel.com \
--cc=alsa-devel@alsa-project.org \
--cc=broonie@kernel.org \
--cc=cezary.rojewski@intel.com \
--cc=chao.song@intel.com \
--cc=kai.vehmanen@linux.intel.com \
--cc=lgirdwood@gmail.com \
--cc=peter.ujfalusi@linux.intel.com \
--cc=pierre-louis.bossart@linux.intel.com \
--cc=ranjani.sridharan@linux.intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox