Commit 7b6466ad authored by Richard Fitzgerald's avatar Richard Fitzgerald Committed by Takashi Iwai
Browse files

ALSA: hda/cs35l56: Complete firmware reboot before calling cs_dsp_run() 



Move the call to cs_dsp_run() in cs35l56_hda_fw_load() so that it
is after the CS35L56 has been reset/reinit'd and the regmap
cache has been synced.

cs_dsp_run() syncs up ALSA control cache values with the DSP memory
so this must not be done until the firmware has reinitialized.

Signed-off-by: default avatarRichard Fitzgerald <rf@opensource.cirrus.com>
Link: https://lore.kernel.org/r/20230731165726.7940-2-rf@opensource.cirrus.com


Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 2ad27caa

sound/pci/hda/cs35l56_hda.c

+5 −6
Original line number Diff line number Diff line
@@ -562,12 +562,6 @@ static int cs35l56_hda_fw_load(struct cs35l56_hda *cs35l56) 
	if (coeff_filename)

		dev_dbg(cs35l56->base.dev, "Loaded Coefficients: %s\n", coeff_filename);



	ret = cs_dsp_run(&cs35l56->cs_dsp);

	if (ret) {

		dev_dbg(cs35l56->base.dev, "%s: cs_dsp_run ret %d\n", __func__, ret);

		goto err;

	}



	if (cs35l56->base.secured) {

		ret = cs35l56_mbox_send(&cs35l56->base, CS35L56_MBOX_CMD_AUDIO_REINIT);

		if (ret)
@@ -591,6 +585,11 @@ static int cs35l56_hda_fw_load(struct cs35l56_hda *cs35l56) 
	regmap_clear_bits(cs35l56->base.regmap, CS35L56_PROTECTION_STATUS,

			  CS35L56_FIRMWARE_MISSING);

	cs35l56->base.fw_patched = true;



	ret = cs_dsp_run(&cs35l56->cs_dsp);

	if (ret)

		dev_dbg(cs35l56->base.dev, "%s: cs_dsp_run ret %d\n", __func__, ret);



err:

	pm_runtime_put(cs35l56->base.dev);

	mutex_unlock(&cs35l56->base.irq_lock);