ASoC: SOF: loader: Use the BAR provided by FW (7198879e) · Commits · 戴 / test

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:

sound/soc/sof/loader.c

+9 −2

Original line number	Diff line number	Diff line
		@@ -92,7 +92,7 @@ int snd_sof_parse_module_memcpy(struct snd_sof_dev *sdev,
		struct snd_sof_mod_hdr *module)
		{
		struct snd_sof_blk_hdr *block;
		int count;
		int count, bar;
		u32 offset;
		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_DRAM:
		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;
		default:
		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);
		return -EINVAL;
		}
		snd_sof_dsp_block_write(sdev, sdev->mmio_bar, offset,
		snd_sof_dsp_block_write(sdev, bar, offset,
		block + 1, block->size);

		if (remaining < block->size) {