ASoC: cs35l41: Detect CSPL errors when sending CSPL commands

The existing code checks for the correct state transition after sending
a command. However, it is possible for the message box to return -1,
which indicates an error, if an error has occurred in the firmware.
We can detect if the error has occurred, and return a different error.
In addition, there is no recovering from a CSPL error, so the retry
mechanism is not needed in this case, and we can return immediately.

Signed-off-by: Stefan Binding <sbinding@opensource.cirrus.com>
Acked-by: Mark Brown <broonie@kernel.org>
Link: https://lore.kernel.org/r/20231026150558.2105827-9-sbinding@opensource.cirrus.com
Signed-off-by: Takashi Iwai <tiwai@suse.de>

diff --git a/include/sound/cs35l41.h b/include/sound/cs35l41.h
index 80df80fe31e207fc15c399ac758f535195f501ad..043f8ac65dbf6931ad881e1e2f576d602cf0c632 100644 (file)
--- a/include/sound/cs35l41.h
+++ b/include/sound/cs35l41.h
@@ -816,6 +816,8 @@ struct cs35l41_otp_map_element_t {
 };
 
 enum cs35l41_cspl_mbox_status {
+       CSPL_MBOX_STS_ERROR = U32_MAX,
+       CSPL_MBOX_STS_ERROR2 = 0x00ffffff, // firmware not always sign-extending 24-bit value
        CSPL_MBOX_STS_RUNNING = 0,
        CSPL_MBOX_STS_PAUSED = 1,
        CSPL_MBOX_STS_RDY_FOR_REINIT = 2,

diff --git a/sound/soc/codecs/cs35l41-lib.c b/sound/soc/codecs/cs35l41-lib.c
index ddedb7e63cb6f8382e7fe8cf5dc3b0f2ca2ed3fd..4569e4f7cf7e90825dcc84c249dcd172f48ab085 100644 (file)
--- a/sound/soc/codecs/cs35l41-lib.c
+++ b/sound/soc/codecs/cs35l41-lib.c
@@ -1474,6 +1474,11 @@ int cs35l41_set_cspl_mbox_cmd(struct device *dev, struct regmap *regmap,
                        continue;
                }
 
+               if (sts == CSPL_MBOX_STS_ERROR || sts == CSPL_MBOX_STS_ERROR2) {
+                       dev_err(dev, "CSPL Error Detected\n");
+                       return -EINVAL;
+               }
+
                if (!cs35l41_check_cspl_mbox_sts(cmd, sts))
                        dev_dbg(dev, "[%u] cmd %u returned invalid sts %u", i, cmd, sts);
                else