Commit 07276d66 authored by Richard Fitzgerald's avatar Richard Fitzgerald Committed by Wentao Guan
Browse files

firmware: cs_dsp: Ensure cs_dsp_load[_coeff]() returns 0 on success 

mainline inclusion
from mainline-v6.15-rc1
commit 2593f7e0dc93a898a84220b3fb180d86f1ca8c60
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/IBYZED

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=2593f7e0dc93a898a84220b3fb180d86f1ca8c60



--------------------------------

Set ret = 0 on successful completion of the processing loop in
cs_dsp_load() and cs_dsp_load_coeff() to ensure that the function
returns 0 on success.

All normal firmware files will have at least one data block, and
processing this block will set ret == 0, from the result of either
regmap_raw_write() or cs_dsp_parse_coeff().

The kunit tests create a dummy firmware file that contains only the
header, without any data blocks. This gives cs_dsp a file to "load"
that will not cause any side-effects. As there aren't any data blocks,
the processing loop will not set ret == 0.

Originally there was a line after the processing loop:

    ret = regmap_async_complete(regmap);

which would set ret == 0 before the function returned.

Commit fe08b7d5085a ("firmware: cs_dsp: Remove async regmap writes")
changed the regmap write to a normal sync write, so the call to
regmap_async_complete() wasn't necessary and was removed. It was
overlooked that the ret here wasn't only to check the result of
regmap_async_complete(), it also set the final return value of the
function.

Fixes: fe08b7d5085a ("firmware: cs_dsp: Remove async regmap writes")
Signed-off-by: default avatarRichard Fitzgerald <rf@opensource.cirrus.com>
Link: https://patch.msgid.link/20250323170529.197205-1-rf@opensource.cirrus.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
(cherry picked from commit 2593f7e0dc93a898a84220b3fb180d86f1ca8c60)
Signed-off-by: default avatarWentao Guan <guanwentao@uniontech.com>
parent 55b70bf5

drivers/firmware/cirrus/cs_dsp.c

+2 −0
Original line number Diff line number Diff line
@@ -1584,6 +1584,7 @@ static int cs_dsp_load(struct cs_dsp *dsp, const struct firmware *firmware, 


	cs_dsp_debugfs_save_wmfwname(dsp, file);



	ret = 0;

out_fw:

	cs_dsp_buf_free(&buf_list);

	kfree(text);
@@ -2299,6 +2300,7 @@ static int cs_dsp_load_coeff(struct cs_dsp *dsp, const struct firmware *firmware 


	cs_dsp_debugfs_save_binname(dsp, file);



	ret = 0;

out_fw:

	cs_dsp_buf_free(&buf_list);

	kfree(text);