ALSA: hda: cs35l41: Check CSPL state after loading firmware

CSPL firmware should be in RUNNING or PAUSED state after loading.
If not, the firmware has not been loaded correctly, and we can unload
it and pass the error up.

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

diff --git a/sound/pci/hda/cs35l41_hda.c b/sound/pci/hda/cs35l41_hda.c
index 69303888be1a5cf3b52841606da83c9b047659e3..496ff6a9d300dd997cf880264e406ca578420f4a 100644 (file)
--- a/sound/pci/hda/cs35l41_hda.c
+++ b/sound/pci/hda/cs35l41_hda.c
@@ -994,6 +994,7 @@ err:
 
 static int cs35l41_smart_amp(struct cs35l41_hda *cs35l41)
 {
+       unsigned int fw_status;
        __be32 halo_sts;
        int ret;
 
@@ -1027,6 +1028,23 @@ static int cs35l41_smart_amp(struct cs35l41_hda *cs35l41)
                goto clean_dsp;
        }
 
+       ret = regmap_read(cs35l41->regmap, CS35L41_DSP_MBOX_2, &fw_status);
+       if (ret < 0) {
+               dev_err(cs35l41->dev,
+                       "Failed to read firmware status: %d\n", ret);
+               goto clean_dsp;
+       }
+
+       switch (fw_status) {
+       case CSPL_MBOX_STS_RUNNING:
+       case CSPL_MBOX_STS_PAUSED:
+               break;
+       default:
+               dev_err(cs35l41->dev, "Firmware status is invalid: %u\n",
+                       fw_status);
+               goto clean_dsp;
+       }
+
        ret = cs35l41_set_cspl_mbox_cmd(cs35l41->dev, cs35l41->regmap, CSPL_MBOX_CMD_PAUSE);
        if (ret) {
                dev_err(cs35l41->dev, "Error waiting for DSP to pause: %u\n", ret);