Re: [alsa-devel] [PATCH 2/3] ASoC: SOF: Intel: Fix CFL and CML FW nocodec binary names.

Re: [alsa-devel] [PATCH 2/3] ASoC: SOF: Intel: Fix CFL and CML FW nocodec binary names.

[Bernie Innocenti]

Greetings Liam and Pierre,

 > @@ -149,7 +149,7 @@ static const struct sof_dev_desc cml_desc = {
 > 	.chip_info = &cnl_chip_info,
 > 	.default_fw_path = "intel/sof",
 > 	.default_tplg_path = "intel/sof-tplg",
 >-	.nocodec_fw_filename = "sof-cnl.ri",
 >+	.nocodec_fw_filename = "sof-cml.ri",

Where is this new firmware file? This patch has flown into Fedora 
kernels 5.4.5-301.fc31 and 5.5.0-0.rc3.git0.1.fc32, and now I'm getting 
this error when the module loads on a Thinkpad X1 Gen 7:

   sof-audio-pci 0000:00:1f.3: Direct firmware load for 
intel/sof/sof-cml.ri failed with error -2

The other .ri files come with alsa-firmware, but sof-cml.ri is absent in 
the latest upstream release (alsa-firmware-1.2.1).

The only reference I could find is this symlink, but it's not clear to 
me how and when it will get into distributions:

 
https://github.com/thesofproject/linux-firmware/commit/beff732e6642bd77dac5dd08514264f055fc4d10#diff-76c141712563cc9d4730eb63acb36ad5R3807-R3808

-- 
_ // Bernie Innocenti
\X/  https://codewiz.org/
_______________________________________________
Alsa-devel mailing list
Alsa-devel@alsa-project.org
https://mailman.alsa-project.org/mailman/listinfo/alsa-devel

Re: [alsa-devel] [PATCH 2/3] ASoC: SOF: Intel: Fix CFL and CML FW nocodec binary names.

[Pierre-Louis Bossart]

On 12/29/19 6:15 PM, Bernie Innocenti wrote:
> Greetings Liam and Pierre,
> 
>  > @@ -149,7 +149,7 @@ static const struct sof_dev_desc cml_desc = {
>  >     .chip_info = &cnl_chip_info,
>  >     .default_fw_path = "intel/sof",
>  >     .default_tplg_path = "intel/sof-tplg",
>  >-    .nocodec_fw_filename = "sof-cnl.ri",
>  >+    .nocodec_fw_filename = "sof-cml.ri",
> 
> Where is this new firmware file? This patch has flown into Fedora 
> kernels 5.4.5-301.fc31 and 5.5.0-0.rc3.git0.1.fc32, and now I'm getting 
> this error when the module loads on a Thinkpad X1 Gen 7:
> 
>    sof-audio-pci 0000:00:1f.3: Direct firmware load for 
> intel/sof/sof-cml.ri failed with error -2
> 
> The other .ri files come with alsa-firmware, but sof-cml.ri is absent in 
> the latest upstream release (alsa-firmware-1.2.1).
> 
> The only reference I could find is this symlink, but it's not clear to 
> me how and when it will get into distributions:
> 
> 
> https://github.com/thesofproject/linux-firmware/commit/beff732e6642bd77dac5dd08514264f055fc4d10#diff-76c141712563cc9d4730eb63acb36ad5R3807-R3808 

Yes, sorry for the delay. we run out of time at the end of 2019 (needed 
to verify the compilation of the firmware signed with the community key 
and matching changes in the SOF driver to select the right files [1]). 
Once this is done, we will make a pull request so that the releases flow 
into linux-firmware.

[1] https://github.com/thesofproject/linux/pull/1646
_______________________________________________
Alsa-devel mailing list
Alsa-devel@alsa-project.org
https://mailman.alsa-project.org/mailman/listinfo/alsa-devel

Re: [alsa-devel] [PATCH 2/3] ASoC: SOF: Intel: Fix CFL and CML FW nocodec binary names.

[Jaroslav Kysela]

Dne 02. 01. 20 v 19:00 Pierre-Louis Bossart napsal(a):
> 
> 
> On 12/29/19 6:15 PM, Bernie Innocenti wrote:
>> Greetings Liam and Pierre,
>>
>>   > @@ -149,7 +149,7 @@ static const struct sof_dev_desc cml_desc = {
>>   >     .chip_info = &cnl_chip_info,
>>   >     .default_fw_path = "intel/sof",
>>   >     .default_tplg_path = "intel/sof-tplg",
>>   >-    .nocodec_fw_filename = "sof-cnl.ri",
>>   >+    .nocodec_fw_filename = "sof-cml.ri",
>>
>> Where is this new firmware file? This patch has flown into Fedora
>> kernels 5.4.5-301.fc31 and 5.5.0-0.rc3.git0.1.fc32, and now I'm getting
>> this error when the module loads on a Thinkpad X1 Gen 7:
>>
>>     sof-audio-pci 0000:00:1f.3: Direct firmware load for
>> intel/sof/sof-cml.ri failed with error -2
>>
>> The other .ri files come with alsa-firmware, but sof-cml.ri is absent in
>> the latest upstream release (alsa-firmware-1.2.1).
>>
>> The only reference I could find is this symlink, but it's not clear to
>> me how and when it will get into distributions:
>>
>>
>> https://github.com/thesofproject/linux-firmware/commit/beff732e6642bd77dac5dd08514264f055fc4d10#diff-76c141712563cc9d4730eb63acb36ad5R3807-R3808
> 
> Yes, sorry for the delay. we run out of time at the end of 2019 (needed
> to verify the compilation of the firmware signed with the community key
> and matching changes in the SOF driver to select the right files [1]).
> Once this is done, we will make a pull request so that the releases flow
> into linux-firmware.
> 
> [1] https://github.com/thesofproject/linux/pull/1646

My comments for the linux-firmware commit:

https://github.com/thesofproject/linux-firmware/commit/beff732e6642bd77dac5dd08514264f055fc4d10#r36656734

Bernie, I maintain the alsa-firmware package for Fedora and trying to catch 
the Intel changes to make things working for new laptops with this Intel hardware.

					Jaroslav

-- 
Jaroslav Kysela <perex@perex.cz>
Linux Sound Maintainer; ALSA Project; Red Hat, Inc.
_______________________________________________
Alsa-devel mailing list
Alsa-devel@alsa-project.org
https://mailman.alsa-project.org/mailman/listinfo/alsa-devel

[alsa-devel] [PATCH 2/3] ASoC: SOF: Intel: Fix CFL and CML FW nocodec binary names.

[Pierre-Louis Bossart]

From: Liam Girdwood <liam.r.girdwood@linux.intel.com>

The manifest information is different between CNL, CML and CFL platforms
hence we need to load different files.

Signed-off-by: Liam Girdwood <liam.r.girdwood@linux.intel.com>
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
---
 sound/soc/sof/sof-pci-dev.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/sound/soc/sof/sof-pci-dev.c b/sound/soc/sof/sof-pci-dev.c
index 3b58b91e7b9e..bbeffd932de7 100644
--- a/sound/soc/sof/sof-pci-dev.c
+++ b/sound/soc/sof/sof-pci-dev.c
@@ -120,7 +120,7 @@ static const struct sof_dev_desc cnl_desc = {
 
 #if IS_ENABLED(CONFIG_SND_SOC_SOF_COFFEELAKE)
 static const struct sof_dev_desc cfl_desc = {
-	.machines		= snd_soc_acpi_intel_cnl_machines,
+	.machines		= snd_soc_acpi_intel_cfl_machines,
 	.resindex_lpe_base	= 0,
 	.resindex_pcicfg_base	= -1,
 	.resindex_imr_base	= -1,
@@ -129,7 +129,7 @@ static const struct sof_dev_desc cfl_desc = {
 	.chip_info = &cnl_chip_info,
 	.default_fw_path = "intel/sof",
 	.default_tplg_path = "intel/sof-tplg",
-	.nocodec_fw_filename = "sof-cnl.ri",
+	.nocodec_fw_filename = "sof-cfl.ri",
 	.nocodec_tplg_filename = "sof-cnl-nocodec.tplg",
 	.ops = &sof_cnl_ops,
 	.arch_ops = &sof_xtensa_arch_ops
@@ -140,7 +140,7 @@ static const struct sof_dev_desc cfl_desc = {
 	IS_ENABLED(CONFIG_SND_SOC_SOF_COMETLAKE_H)
 
 static const struct sof_dev_desc cml_desc = {
-	.machines		= snd_soc_acpi_intel_cnl_machines,
+	.machines		= snd_soc_acpi_intel_cml_machines,
 	.resindex_lpe_base	= 0,
 	.resindex_pcicfg_base	= -1,
 	.resindex_imr_base	= -1,
@@ -149,7 +149,7 @@ static const struct sof_dev_desc cml_desc = {
 	.chip_info = &cnl_chip_info,
 	.default_fw_path = "intel/sof",
 	.default_tplg_path = "intel/sof-tplg",
-	.nocodec_fw_filename = "sof-cnl.ri",
+	.nocodec_fw_filename = "sof-cml.ri",
 	.nocodec_tplg_filename = "sof-cnl-nocodec.tplg",
 	.ops = &sof_cnl_ops,
 	.arch_ops = &sof_xtensa_arch_ops
-- 
2.20.1

_______________________________________________
Alsa-devel mailing list
Alsa-devel@alsa-project.org
https://mailman.alsa-project.org/mailman/listinfo/alsa-devel