AuxXxilium/linux_dsm_epyc7002
1
0
Fork 0
mirror of https://github.com/AuxXxilium/linux_dsm_epyc7002.git synced 2024-12-17 11:39:01 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

ASoC: SOF: loader: Use the BAR provided by FW

Browse Source 
Make sure to use the newly introduced function snd_sof_dsp_get_bar_index
that converts the section type to appropriate BAR index.

Signed-off-by: Daniel Baluta <daniel.baluta@nxp.com>
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/20190722141402.7194-8-pierre-louis.bossart@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Daniel Baluta 2019-07-22 09:13:48 -05:00 committed by Mark Brown
parent ce8234a635
commit 7198879ef5
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sound/soc/sof/loader.c
View File

@ -92,7 +92,7 @@ int snd_sof_parse_module_memcpy(struct snd_sof_dev *sdev,
struct snd_sof_mod_hdr *module) struct snd_sof_mod_hdr *module)
{ {
struct snd_sof_blk_hdr *block; struct snd_sof_blk_hdr *block;
int count; int count, bar;
u32 offset; u32 offset;
size_t remaining; size_t remaining;
@ -128,6 +128,13 @@ int snd_sof_parse_module_memcpy(struct snd_sof_dev *sdev,
case SOF_FW_BLK_TYPE_IRAM: case SOF_FW_BLK_TYPE_IRAM:
case SOF_FW_BLK_TYPE_DRAM: case SOF_FW_BLK_TYPE_DRAM:
offset = block->offset; offset = block->offset;
bar = snd_sof_dsp_get_bar_index(sdev, block->type);
if (bar < 0) {
dev_err(sdev->dev,
"error: no BAR mapping for block type 0x%x\n",
block->type);
return bar;
}
break; break;
default: default:
dev_err(sdev->dev, "error: bad type 0x%x for block 0x%x\n", dev_err(sdev->dev, "error: bad type 0x%x for block 0x%x\n",
@ -145,7 +152,7 @@ int snd_sof_parse_module_memcpy(struct snd_sof_dev *sdev,
block->size); block->size);
return -EINVAL; return -EINVAL;
} }
snd_sof_dsp_block_write(sdev, sdev->mmio_bar, offset, snd_sof_dsp_block_write(sdev, bar, offset,
block + 1, block->size); block + 1, block->size);
if (remaining < block->size) { if (remaining < block->size) {