From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8064A269AE3; Tue, 8 Apr 2025 12:00:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744113644; cv=none; b=RZ1EdjN3LQ9PUfrqkiZMuYX5q/bQmizfbYmeY/UaG3w3stsd0ucTJYPtSs3lIXi/OJAoz0aQlrdxX9mcs0lvWTOfLMTwGGD8balsCNuj2MPi+JlW7IDyxqE6C3DkmDgd9UmqnxcbrC5xSZ8tns6FVjyfvXhWuEeukaJNpTO7RlA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744113644; c=relaxed/simple; bh=foR/lLRUlcw7KXYTnMHcLPPiVvFlJqKUvlPLPfzYzQg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=c+SIFpTHLFQPvVRqoE2WamrAR8fC5qGUh9OoxmckGi60qAFhpHTnYHNczLGWomqM3zB2fgi4GpRxzw40CcfLSdKkJ/q0cpChCoV7/tCMF9uLQK0rVVOMwJZphbBEPrXAef5H+lLn8kUn/HqNW1Cvq1XtFZLquMRWwO7L3EoIxbQ= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=gvsN07Wm; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="gvsN07Wm" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 10809C4CEE5; Tue, 8 Apr 2025 12:00:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1744113644; bh=foR/lLRUlcw7KXYTnMHcLPPiVvFlJqKUvlPLPfzYzQg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=gvsN07Wmb+NyKodaufrU8HYH5RiJ0bqrViDxGJVV3ZGB0I9SoSnDa9Z7yPyRh0axT Zo2iWGi4Vs0aoRGyym+kd0i97V+VXuw5F+HfTcP4KcLlbz4P6I49m2YibUSk0BMmvU bQdYxhJsBbHqV86QrgDzQyw/RFpFpXUZ5fUYNu40= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Richard Fitzgerald , Mark Brown , Sasha Levin Subject: [PATCH 6.6 197/268] firmware: cs_dsp: Ensure cs_dsp_load[_coeff]() returns 0 on success Date: Tue, 8 Apr 2025 12:50:08 +0200 Message-ID: <20250408104833.868315901@linuxfoundation.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250408104828.499967190@linuxfoundation.org> References: <20250408104828.499967190@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.6-stable review patch. If anyone has any objections, please let me know. ------------------ From: Richard Fitzgerald [ Upstream commit 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: Richard Fitzgerald Link: https://patch.msgid.link/20250323170529.197205-1-rf@opensource.cirrus.com Signed-off-by: Mark Brown Signed-off-by: Sasha Levin --- drivers/firmware/cirrus/cs_dsp.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/firmware/cirrus/cs_dsp.c b/drivers/firmware/cirrus/cs_dsp.c index 4ce5681be18f0..c015d2b4c5cf9 100644 --- a/drivers/firmware/cirrus/cs_dsp.c +++ b/drivers/firmware/cirrus/cs_dsp.c @@ -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); -- 2.39.5