ASoC: SOF: cppcheck fixes and debugfs addition
Merge series from Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>: Small changes with 3 cppcheck fixes and the firmware version now visible with debugfs instead of only via dmesg logs.
This commit is contained in:
commit
ff9496dacf
@ -289,6 +289,8 @@ int acp_sof_load_signed_firmware(struct snd_sof_dev *sdev)
|
||||
ret = snd_sof_dsp_block_write(sdev, SOF_FW_BLK_TYPE_IRAM, 0,
|
||||
(void *)sdev->basefw.fw->data,
|
||||
sdev->basefw.fw->size);
|
||||
if (ret < 0)
|
||||
return ret;
|
||||
|
||||
fw_filename = kasprintf(GFP_KERNEL, "%s/%s",
|
||||
plat_data->fw_filename_prefix,
|
||||
|
@ -80,6 +80,14 @@ static ssize_t sof_ipc4_fw_parse_ext_man(struct snd_sof_dev *sdev,
|
||||
dev_dbg(sdev->dev, "Header length: %u, module count: %u\n",
|
||||
fw_header->len, fw_header->num_module_entries);
|
||||
|
||||
/* copy the fw_version of basefw into debugfs at first boot */
|
||||
if (fw == sdev->basefw.fw) {
|
||||
sdev->fw_version.major = fw_header->major_version;
|
||||
sdev->fw_version.minor = fw_header->minor_version;
|
||||
sdev->fw_version.micro = fw_header->hotfix_version;
|
||||
sdev->fw_version.build = fw_header->build_version;
|
||||
}
|
||||
|
||||
fw_lib->modules = devm_kmalloc_array(sdev->dev, fw_header->num_module_entries,
|
||||
sizeof(*fw_module), GFP_KERNEL);
|
||||
if (!fw_lib->modules)
|
||||
|
@ -112,7 +112,7 @@ extern const struct sof_ipc_tplg_control_ops tplg_ipc4_control_ops;
|
||||
extern const struct sof_ipc_pcm_ops ipc4_pcm_ops;
|
||||
extern const struct sof_ipc_fw_tracing_ops ipc4_mtrace_ops;
|
||||
|
||||
int sof_ipc4_set_pipeline_state(struct snd_sof_dev *sdev, u32 id, u32 state);
|
||||
int sof_ipc4_set_pipeline_state(struct snd_sof_dev *sdev, u32 instance_id, u32 state);
|
||||
int sof_ipc4_mtrace_update_pos(struct snd_sof_dev *sdev, int core);
|
||||
|
||||
int sof_ipc4_query_fw_configuration(struct snd_sof_dev *sdev);
|
||||
|
@ -566,7 +566,6 @@ static int sof_ipc4_widget_setup_comp_dai(struct snd_sof_widget *swidget)
|
||||
switch (ipc4_copier->dai_type) {
|
||||
case SOF_DAI_INTEL_ALH:
|
||||
{
|
||||
struct snd_sof_dev *sdev = snd_soc_component_get_drvdata(scomp);
|
||||
struct sof_ipc4_alh_configuration_blob *blob;
|
||||
struct snd_soc_dapm_path *p;
|
||||
struct snd_sof_widget *w;
|
||||
|
Loading…
x
Reference in New Issue
Block a user