iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ASoC: SOF: amd: Compute file paths on firmware load

Browse Source 
Commit 6c393ebbd74a ("ASoC: SOF: core: Implement IPC version fallback if
firmware files are missing") changed the order of some operations and
the firmware paths are not available anymore at snd_sof_probe() time.

Precisely, fw_filename_prefix is set by sof_select_ipc_and_paths() via

  plat_data->fw_filename_prefix = out_profile.fw_path;

but sof_init_environment() which calls this function was moved from
snd_sof_device_probe() to sof_probe_continue(). Moreover,
snd_sof_probe() was moved from sof_probe_continue() to
sof_init_environment(), but before the call to
sof_select_ipc_and_paths().

The problem here is that amd_sof_acp_probe() uses fw_filename_prefix to
compute fw_code_bin and fw_data_bin paths, and because the field is not
yet initialized, the paths end up containing (null):

snd_sof_amd_vangogh 0000:04:00.5: Direct firmware load for (null)/sof-vangogh-code.bin failed with error -2
snd_sof_amd_vangogh 0000:04:00.5: sof signed firmware code bin is missing
snd_sof_amd_vangogh 0000:04:00.5: error: failed to load DSP firmware -2
snd_sof_amd_vangogh: probe of 0000:04:00.5 failed with error -2

Move usage of fw_filename_prefix right before request_firmware() calls
in acp_sof_load_signed_firmware().

Fixes: 6c393ebbd74a ("ASoC: SOF: core: Implement IPC version fallback if firmware files are missing")
Signed-off-by: Cristian Ciocaltea <cristian.ciocaltea@collabora.com>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
Link: https://msgid.link/r/20231219030728.2431640-9-cristian.ciocaltea@collabora.com
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Cristian Ciocaltea 2023-12-19 05:07:26 +02:00 committed by Mark Brown
parent 369b997a13
commit d9cacc1a2a
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
2 changed files with 29 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
sound/soc/sof/amd/acp-loader.c
View File

@ -267,29 +267,49 @@ int acp_sof_load_signed_firmware(struct snd_sof_dev *sdev)
{ {
struct snd_sof_pdata *plat_data = sdev->pdata; struct snd_sof_pdata *plat_data = sdev->pdata;
struct acp_dev_data *adata = plat_data->hw_pdata; struct acp_dev_data *adata = plat_data->hw_pdata;
const char *fw_filename;
int ret; int ret;
ret = request_firmware(&sdev->basefw.fw, adata->fw_code_bin, sdev->dev); fw_filename = kasprintf(GFP_KERNEL, "%s/%s",
plat_data->fw_filename_prefix,
adata->fw_code_bin);
if (!fw_filename)
return -ENOMEM;
ret = request_firmware(&sdev->basefw.fw, fw_filename, sdev->dev);
if (ret < 0) { if (ret < 0) {
kfree(fw_filename);
dev_err(sdev->dev, "sof signed firmware code bin is missing\n"); dev_err(sdev->dev, "sof signed firmware code bin is missing\n");
return ret; return ret;
} else { } else {
dev_dbg(sdev->dev, "request_firmware %s successful\n", adata->fw_code_bin); dev_dbg(sdev->dev, "request_firmware %s successful\n", fw_filename);
} }
ret = snd_sof_dsp_block_write(sdev, SOF_FW_BLK_TYPE_IRAM, 0, kfree(fw_filename);
(void *)sdev->basefw.fw->data, sdev->basefw.fw->size);
ret = request_firmware(&adata->fw_dbin, adata->fw_data_bin, sdev->dev); ret = snd_sof_dsp_block_write(sdev, SOF_FW_BLK_TYPE_IRAM, 0,
(void *)sdev->basefw.fw->data,
sdev->basefw.fw->size);
fw_filename = kasprintf(GFP_KERNEL, "%s/%s",
plat_data->fw_filename_prefix,
adata->fw_data_bin);
if (!fw_filename)
return -ENOMEM;
ret = request_firmware(&adata->fw_dbin, fw_filename, sdev->dev);
if (ret < 0) { if (ret < 0) {
kfree(fw_filename);
dev_err(sdev->dev, "sof signed firmware data bin is missing\n"); dev_err(sdev->dev, "sof signed firmware data bin is missing\n");
return ret; return ret;
} else { } else {
dev_dbg(sdev->dev, "request_firmware %s successful\n", adata->fw_data_bin); dev_dbg(sdev->dev, "request_firmware %s successful\n", fw_filename);
} }
kfree(fw_filename);
ret = snd_sof_dsp_block_write(sdev, SOF_FW_BLK_TYPE_DRAM, 0, ret = snd_sof_dsp_block_write(sdev, SOF_FW_BLK_TYPE_DRAM, 0,
(void *)adata->fw_dbin->data, adata->fw_dbin->size); (void *)adata->fw_dbin->data,
adata->fw_dbin->size);
return ret; return ret;
} }
EXPORT_SYMBOL_NS(acp_sof_load_signed_firmware, SND_SOC_SOF_AMD_COMMON); EXPORT_SYMBOL_NS(acp_sof_load_signed_firmware, SND_SOC_SOF_AMD_COMMON);

7
sound/soc/sof/amd/acp.c
View File

@ -493,7 +493,6 @@ EXPORT_SYMBOL_NS(amd_sof_acp_resume, SND_SOC_SOF_AMD_COMMON);
int amd_sof_acp_probe(struct snd_sof_dev *sdev) int amd_sof_acp_probe(struct snd_sof_dev *sdev)
{ {
struct pci_dev *pci = to_pci_dev(sdev->dev); struct pci_dev *pci = to_pci_dev(sdev->dev);
struct snd_sof_pdata *plat_data = sdev->pdata;
struct acp_dev_data *adata; struct acp_dev_data *adata;
const struct sof_amd_acp_desc *chip; const struct sof_amd_acp_desc *chip;
const struct dmi_system_id *dmi_id; const struct dmi_system_id *dmi_id;
@ -561,8 +560,7 @@ int amd_sof_acp_probe(struct snd_sof_dev *sdev)
dmi_id = dmi_first_match(acp_sof_quirk_table); dmi_id = dmi_first_match(acp_sof_quirk_table);
if (dmi_id && dmi_id->driver_data) { if (dmi_id && dmi_id->driver_data) {
adata->fw_code_bin = devm_kasprintf(sdev->dev, GFP_KERNEL, adata->fw_code_bin = devm_kasprintf(sdev->dev, GFP_KERNEL,
"%s/sof-%s-code.bin", "sof-%s-code.bin",
plat_data->fw_filename_prefix,
chip->name); chip->name);
if (!adata->fw_code_bin) { if (!adata->fw_code_bin) {
ret = -ENOMEM; ret = -ENOMEM;
@ -570,8 +568,7 @@ int amd_sof_acp_probe(struct snd_sof_dev *sdev)
} }
adata->fw_data_bin = devm_kasprintf(sdev->dev, GFP_KERNEL, adata->fw_data_bin = devm_kasprintf(sdev->dev, GFP_KERNEL,
"%s/sof-%s-data.bin", "sof-%s-data.bin",
plat_data->fw_filename_prefix,
chip->name); chip->name);
if (!adata->fw_data_bin) { if (!adata->fw_data_bin) {
ret = -ENOMEM; ret = -ENOMEM;