Unverified Commit 17082e09 authored by Simon Trimmer's avatar Simon Trimmer Committed by Mark Brown
Browse files

ASoC: cs35l56: Prevent unbalanced pm_runtime in dsp_work() on SoundWire 



Flush the SoundWire interrupt handler work instead of cancelling it.

When a SoundWire interrupt is triggered the pm_runtime is held
until the work has completed. It's therefore unsafe to cancel
the work, it must be flushed.

Signed-off-by: default avatarSimon Trimmer <simont@opensource.cirrus.com>
Signed-off-by: default avatarRichard Fitzgerald <rf@opensource.cirrus.com>
Link: https://lore.kernel.org/r/20230512144237.739000-1-rf@opensource.cirrus.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 41c5305c

sound/soc/codecs/cs35l56.c

+2 −1
Original line number Diff line number Diff line
@@ -852,10 +852,11 @@ static void cs35l56_dsp_work(struct work_struct *work) 
	 */

	if (cs35l56->sdw_peripheral) {

		cs35l56->sdw_irq_no_unmask = true;

		cancel_work_sync(&cs35l56->sdw_irq_work);

		flush_work(&cs35l56->sdw_irq_work);

		sdw_write_no_pm(cs35l56->sdw_peripheral, CS35L56_SDW_GEN_INT_MASK_1, 0);

		sdw_read_no_pm(cs35l56->sdw_peripheral, CS35L56_SDW_GEN_INT_STAT_1);

		sdw_write_no_pm(cs35l56->sdw_peripheral, CS35L56_SDW_GEN_INT_STAT_1, 0xFF);

		flush_work(&cs35l56->sdw_irq_work);

	}



	ret = cs35l56_mbox_send(cs35l56, CS35L56_MBOX_CMD_SHUTDOWN);