ASoC: cs35l56: Re-patch firmware after system suspend

Check during cs35l56_system_resume() whether the firmware patch must
be applied again.

The FIRMWARE_MISSING flag in the PROTECTION_STATUS register indicates
whether the firmware has been patched.

In non-secure mode the FIRMWARE_MISSING flag is cleared at the end of
dsp_work(). If it is set after system-resume we know that dsp_work()
must be run again.

In secure mode the pre-OS loader will have done the secure patching
and cleared the FIRMWARE_MISSING flag. So this flag does not tell us
whether firmware memory was lost. But the driver could only be
downloading non-secure tunings, which is always safe to do.

If the driver has control of RESET we will have asserted it during
suspend so the firmware patch will have been lost. The driver would only
have control of RESET in non-secure mode.

Signed-off-by: Richard Fitzgerald <rf@opensource.cirrus.com>
Link: https://lore.kernel.org/r/168122674550.26.8545058503709956172@mailman-core.alsa-project.org
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/include/sound/cs35l56.h b/include/sound/cs35l56.h
index 5f8ea2dfaa2133bb27d5d97073393733f7d2fe93..b3300bce74f4c7b948bd7086a6da9ce0b334894a 100644 (file)
--- a/include/sound/cs35l56.h
+++ b/include/sound/cs35l56.h
@@ -95,6 +95,7 @@
 #define CS35L56_MAIN_RENDER_USER_MUTE                  0x3400024
 #define CS35L56_MAIN_RENDER_USER_VOLUME                        0x340002C
 #define CS35L56_MAIN_POSTURE_NUMBER                    0x3400094
+#define CS35L56_PROTECTION_STATUS                      0x34000D8
 #define CS35L56_TRANSDUCER_ACTUAL_PS                   0x3400150
 #define CS35L56_DSP1_YMEM_UNPACKED24_6141              0x3405FF4
 #define CS35L56_DSP1_PMEM_0                            0x3800000
@@ -216,6 +217,9 @@
 #define CS35L56_MAIN_POSTURE_MAX                       255
 #define CS35L56_MAIN_POSTURE_MASK                      CS35L56_MAIN_POSTURE_MAX
 
+/* CS35L56_PROTECTION_STATUS */
+#define CS35L56_FIRMWARE_MISSING                       BIT(0)
+
 /* Software Values */
 #define CS35L56_HALO_STATE_SHUTDOWN                    1
 #define CS35L56_HALO_STATE_BOOT_DONE                   2

diff --git a/sound/soc/codecs/cs35l56-sdw.c b/sound/soc/codecs/cs35l56-sdw.c
index 947d4e5f4dc916ed083bd68e096b2caa29bf8fd1..e759347423cfe228e270c3f5c19a4d1c0e4c2df1 100644 (file)
--- a/sound/soc/codecs/cs35l56-sdw.c
+++ b/sound/soc/codecs/cs35l56-sdw.c
@@ -473,6 +473,16 @@ static int __maybe_unused cs35l56_sdw_system_suspend(struct device *dev)
        return cs35l56_system_suspend(dev);
 }
 
+static int __maybe_unused cs35l56_sdw_system_resume(struct device *dev)
+{
+       struct cs35l56_private *cs35l56 = dev_get_drvdata(dev);
+
+       cs35l56->sdw_irq_no_unmask = false;
+       /* runtime_resume re-enables the interrupt */
+
+       return cs35l56_system_resume(dev);
+}
+
 static int cs35l56_sdw_probe(struct sdw_slave *peripheral, const struct sdw_device_id *id)
 {
        struct device *dev = &peripheral->dev;
@@ -522,7 +532,7 @@ static int cs35l56_sdw_remove(struct sdw_slave *peripheral)
 
 static const struct dev_pm_ops cs35l56_sdw_pm = {
        SET_RUNTIME_PM_OPS(cs35l56_sdw_runtime_suspend, cs35l56_sdw_runtime_resume, NULL)
-       SYSTEM_SLEEP_PM_OPS(cs35l56_sdw_system_suspend, cs35l56_system_resume)
+       SYSTEM_SLEEP_PM_OPS(cs35l56_sdw_system_suspend, cs35l56_sdw_system_resume)
        LATE_SYSTEM_SLEEP_PM_OPS(cs35l56_system_suspend_late, cs35l56_system_resume_early)
        /* NOIRQ stage not needed, SoundWire doesn't use a hard IRQ */
 };

diff --git a/sound/soc/codecs/cs35l56.c b/sound/soc/codecs/cs35l56.c
index eb85c27ab08757f3607ee6f3c4a17e9717814b59..18e3417448392bb71124022797916c38bc498947 100644 (file)
--- a/sound/soc/codecs/cs35l56.c
+++ b/sound/soc/codecs/cs35l56.c
@@ -946,6 +946,7 @@ static void cs35l56_dsp_work(struct work_struct *work)
                goto err_unlock;
        }
 
+       regmap_clear_bits(cs35l56->regmap, CS35L56_PROTECTION_STATUS, CS35L56_FIRMWARE_MISSING);
        cs35l56->fw_patched = true;
 
 err_unlock:
@@ -1026,6 +1027,8 @@ static const struct snd_soc_component_driver soc_component_dev_cs35l56 = {
        .num_controls = ARRAY_SIZE(cs35l56_controls),
 
        .set_bias_level = cs35l56_set_bias_level,
+
+       .suspend_bias_off = 1, /* see cs35l56_system_resume() */
 };
 
 static const struct reg_sequence cs35l56_hibernate_seq[] = {
@@ -1156,6 +1159,47 @@ err:
 }
 EXPORT_SYMBOL_NS_GPL(cs35l56_runtime_resume_common, SND_SOC_CS35L56_CORE);
 
+static int cs35l56_is_fw_reload_needed(struct cs35l56_private *cs35l56)
+{
+       unsigned int val;
+       int ret;
+
+       /* Nothing to re-patch if we haven't done any patching yet. */
+       if (!cs35l56->fw_patched)
+               return false;
+
+       /*
+        * If we have control of RESET we will have asserted it so the firmware
+        * will need re-patching.
+        */
+       if (cs35l56->reset_gpio)
+               return true;
+
+       /*
+        * In secure mode FIRMWARE_MISSING is cleared by the BIOS loader so
+        * can't be used here to test for memory retention.
+        * Assume that tuning must be re-loaded.
+        */
+       if (cs35l56->secured)
+               return true;
+
+       ret = pm_runtime_resume_and_get(cs35l56->dev);
+       if (ret) {
+               dev_err(cs35l56->dev, "Failed to runtime_get: %d\n", ret);
+               return ret;
+       }
+
+       ret = regmap_read(cs35l56->regmap, CS35L56_PROTECTION_STATUS, &val);
+       if (ret)
+               dev_err(cs35l56->dev, "Failed to read PROTECTION_STATUS: %d\n", ret);
+       else
+               ret = !!(val & CS35L56_FIRMWARE_MISSING);
+
+       pm_runtime_put_autosuspend(cs35l56->dev);
+
+       return ret;
+}
+
 int cs35l56_system_suspend(struct device *dev)
 {
        struct cs35l56_private *cs35l56 = dev_get_drvdata(dev);
@@ -1273,7 +1317,28 @@ int cs35l56_system_resume(struct device *dev)
        if (cs35l56->irq)
                enable_irq(cs35l56->irq);
 
-       return ret;
+       if (ret)
+               return ret;
+
+       /* Firmware won't have been loaded if the component hasn't probed */
+       if (!cs35l56->component)
+               return 0;
+
+       ret = cs35l56_is_fw_reload_needed(cs35l56);
+       dev_dbg(cs35l56->dev, "fw_reload_needed: %d\n", ret);
+       if (ret < 1)
+               return ret;
+
+       cs35l56->fw_patched = false;
+       init_completion(&cs35l56->dsp_ready_completion);
+       queue_work(cs35l56->dsp_wq, &cs35l56->dsp_work);
+
+       /*
+        * suspend_bias_off ensures we are now in BIAS_OFF so there will be
+        * a BIAS_OFF->BIAS_STANDBY transition to complete dsp patching.
+        */
+
+       return 0;
 }
 EXPORT_SYMBOL_GPL(cs35l56_system_resume);