ASoC: cs35l45: Prevents spinning during runtime suspend
authorRicardo Rivera-Matos <rriveram@opensource.cirrus.com>
Wed, 6 Dec 2023 16:03:18 +0000 (10:03 -0600)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 20 Jan 2024 10:51:44 +0000 (11:51 +0100)
[ Upstream commit a0ffa8115e1ea9786b03edc3f431d2f4ef3e7a2e ]

Masks the "DSP Virtual Mailbox 2 write" interrupt when before
issuing the hibernate command to the DSP. The interrupt is
unmasked when exiting runtime suspend as it is required for
DSP operation.

Without this change the DSP fires an interrupt when hibernating
causing the system spin between runtime suspend and runtime
resume.

Signed-off-by: Ricardo Rivera-Matos <rriveram@opensource.cirrus.com>
Acked-by: Charles Keepax <ckeepax@opensource.cirrus.com>
Link: https://lore.kernel.org/r/20231206160318.1255034-4-rriveram@opensource.cirrus.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
sound/soc/codecs/cs35l45.c

index 310747b..9b9fc2d 100644 (file)
@@ -775,6 +775,8 @@ static int cs35l45_enter_hibernate(struct cs35l45_private *cs35l45)
 
        cs35l45_setup_hibernate(cs35l45);
 
+       regmap_set_bits(cs35l45->regmap, CS35L45_IRQ1_MASK_2, CS35L45_DSP_VIRT2_MBOX_MASK);
+
        // Don't wait for ACK since bus activity would wake the device
        regmap_write(cs35l45->regmap, CS35L45_DSP_VIRT1_MBOX_1, CSPL_MBOX_CMD_HIBERNATE);
 
@@ -795,6 +797,8 @@ static int cs35l45_exit_hibernate(struct cs35l45_private *cs35l45)
                                          CSPL_MBOX_CMD_OUT_OF_HIBERNATE);
                        if (!ret) {
                                dev_dbg(cs35l45->dev, "Wake success at cycle: %d\n", j);
+                               regmap_clear_bits(cs35l45->regmap, CS35L45_IRQ1_MASK_2,
+                                                CS35L45_DSP_VIRT2_MBOX_MASK);
                                return 0;
                        }
                        usleep_range(100, 200);