Unverified Commit ad249195 authored by Richard Fitzgerald's avatar Richard Fitzgerald Committed by Mark Brown
Browse files

firmware: cs_dsp: Log correct region name in bin error messages 



In cs_dsp_load_coeff() region_name should be set in the XM/YM/ZM
cases otherwise any errors will log the region as "Unknown".

While doing this also change one error message that logged the
region type ID to log the region_name instead. This makes it
consistent with other messages in the same function.

Signed-off-by: default avatarRichard Fitzgerald <rf@opensource.cirrus.com>
Link: https://lore.kernel.org/r/20230605143238.4001982-1-rf@opensource.cirrus.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 32cf0046

drivers/firmware/cirrus/cs_dsp.c

+3 −2
Original line number Diff line number Diff line
@@ -2124,6 +2124,7 @@ static int cs_dsp_load_coeff(struct cs_dsp *dsp, const struct firmware *firmware 
				   file, blocks, le32_to_cpu(blk->len),

				   type, le32_to_cpu(blk->id));



			region_name = cs_dsp_mem_region_name(type);

			mem = cs_dsp_find_region(dsp, type);

			if (!mem) {

				cs_dsp_err(dsp, "No base for region %x\n", type);
@@ -2147,8 +2148,8 @@ static int cs_dsp_load_coeff(struct cs_dsp *dsp, const struct firmware *firmware 
				reg = dsp->ops->region_to_reg(mem, reg);

				reg += offset;

			} else {

				cs_dsp_err(dsp, "No %x for algorithm %x\n",

					   type, le32_to_cpu(blk->id));

				cs_dsp_err(dsp, "No %s for algorithm %x\n",

					   region_name, le32_to_cpu(blk->id));

			}

			break;