Unverified Commit 9b3cd8eb authored by Peter Ujfalusi's avatar Peter Ujfalusi Committed by Mark Brown
Browse files

ASoC: SOF: Intel: Use existing helpers to change GPROCEN and PIE bits 



Instead of directly changing the GPROCEN/PIE bits in PPCTL we should use
the existing helper hda_dsp_ctrl_ppcap_enable() and
hda_dsp_ctrl_ppcap_int_enable() helpers for clarity.

Reviewed-by: default avatarRanjani Sridharan <ranjani.sridharan@linux.intel.com>
Signed-off-by: default avatarPeter Ujfalusi <peter.ujfalusi@linux.intel.com>
Signed-off-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/20231127104313.16661-1-peter.ujfalusi@linux.intel.com


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

sound/soc/sof/intel/hda-loader.c

+2 −3
Original line number Diff line number Diff line
@@ -510,9 +510,8 @@ int hda_dsp_cl_boot_firmware(struct snd_sof_dev *sdev) 
		return chip_info->init_core_mask;



	/* disable DSP */

	snd_sof_dsp_update_bits(sdev, HDA_DSP_PP_BAR,

				SOF_HDA_REG_PP_PPCTL,

				SOF_HDA_PPCTL_GPROCEN, 0);

	hda_dsp_ctrl_ppcap_enable(sdev, false);



	return ret;

}

sound/soc/sof/intel/hda.c

+2 −4
Original line number Diff line number Diff line
@@ -1350,8 +1350,7 @@ void hda_dsp_remove(struct snd_sof_dev *sdev) 


	if (!sdev->dspless_mode_selected) {

		/* disable DSP IRQ */

		snd_sof_dsp_update_bits(sdev, HDA_DSP_PP_BAR, SOF_HDA_REG_PP_PPCTL,

					SOF_HDA_PPCTL_PIE, 0);

		hda_dsp_ctrl_ppcap_int_enable(sdev, false);

	}



	/* disable CIE and GIE interrupts */
@@ -1366,8 +1365,7 @@ void hda_dsp_remove(struct snd_sof_dev *sdev) 
		chip->power_down_dsp(sdev);



	/* disable DSP */

	snd_sof_dsp_update_bits(sdev, HDA_DSP_PP_BAR, SOF_HDA_REG_PP_PPCTL,

				SOF_HDA_PPCTL_GPROCEN, 0);

	hda_dsp_ctrl_ppcap_enable(sdev, false);



skip_disable_dsp:

	free_irq(sdev->ipc_irq, sdev);