Unverified Commit 76003e4d authored by Mark Brown's avatar Mark Brown
Browse files

ASoC: SOF: Intel: MTL: Fixes for suspend/resume 

Merge series from Ranjani Sridharan <ranjani.sridharan@linux.intel.com>:

This series includes fixes for suspend/resume and module
loading/unloading for the MTL platform.
parents 583ccffc 68fb254e

sound/soc/sof/intel/apl.c

+2 −0
Original line number Diff line number Diff line
@@ -104,6 +104,8 @@ const struct sof_intel_dsp_desc apl_chip_info = { 
	.quirks = SOF_INTEL_PROCEN_FMT_QUIRK,

	.check_ipc_irq	= hda_dsp_check_ipc_irq,

	.cl_init = cl_dsp_init,

	.power_down_dsp = hda_power_down_dsp,

	.disable_interrupts = hda_dsp_disable_interrupts,

	.hw_ip_version = SOF_INTEL_CAVS_1_5_PLUS,

};

EXPORT_SYMBOL_NS(apl_chip_info, SND_SOC_SOF_INTEL_HDA_COMMON);

sound/soc/sof/intel/cnl.c

+4 −0
Original line number Diff line number Diff line
@@ -412,6 +412,8 @@ const struct sof_intel_dsp_desc cnl_chip_info = { 
	.check_sdw_irq	= hda_common_check_sdw_irq,

	.check_ipc_irq	= hda_dsp_check_ipc_irq,

	.cl_init = cl_dsp_init,

	.power_down_dsp = hda_power_down_dsp,

	.disable_interrupts = hda_dsp_disable_interrupts,

	.hw_ip_version = SOF_INTEL_CAVS_1_8,

};

EXPORT_SYMBOL_NS(cnl_chip_info, SND_SOC_SOF_INTEL_HDA_COMMON);
@@ -442,6 +444,8 @@ const struct sof_intel_dsp_desc jsl_chip_info = { 
	.check_sdw_irq	= hda_common_check_sdw_irq,

	.check_ipc_irq	= hda_dsp_check_ipc_irq,

	.cl_init = cl_dsp_init,

	.power_down_dsp = hda_power_down_dsp,

	.disable_interrupts = hda_dsp_disable_interrupts,

	.hw_ip_version = SOF_INTEL_CAVS_2_0,

};

EXPORT_SYMBOL_NS(jsl_chip_info, SND_SOC_SOF_INTEL_HDA_COMMON);

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

+13 −8
Original line number Diff line number Diff line
@@ -629,10 +629,9 @@ static int hda_suspend(struct snd_sof_dev *sdev, bool runtime_suspend) 
	    sdev->fw_state == SOF_FW_BOOT_FAILED)

		hda->skip_imr_boot = true;



	hda_sdw_int_enable(sdev, false);



	/* disable IPC interrupts */

	hda_dsp_ipc_int_disable(sdev);

	ret = chip->disable_interrupts(sdev);

	if (ret < 0)

		return ret;



#if IS_ENABLED(CONFIG_SND_SOC_SOF_HDA)

	hda_codec_jack_wake_enable(sdev, runtime_suspend);
@@ -641,11 +640,9 @@ static int hda_suspend(struct snd_sof_dev *sdev, bool runtime_suspend) 
	snd_hdac_ext_bus_link_power_down_all(bus);

#endif



	/* power down DSP */

	ret = hda_dsp_core_reset_power_down(sdev, chip->host_managed_cores_mask);

	ret = chip->power_down_dsp(sdev);

	if (ret < 0) {

		dev_err(sdev->dev,

			"error: failed to power down core during suspend\n");

		dev_err(sdev->dev, "failed to power down DSP during suspend\n");

		return ret;

	}
@@ -989,3 +986,11 @@ int hda_dsp_core_get(struct snd_sof_dev *sdev, int core) 


	return ret;

}



int hda_dsp_disable_interrupts(struct snd_sof_dev *sdev)

{

	hda_sdw_int_enable(sdev, false);

	hda_dsp_ipc_int_disable(sdev);



	return 0;

}

sound/soc/sof/intel/hda.c

+11 −3
Original line number Diff line number Diff line
@@ -1191,9 +1191,9 @@ int hda_dsp_remove(struct snd_sof_dev *sdev) 
	snd_sof_dsp_update_bits(sdev, HDA_DSP_HDA_BAR, SOF_HDA_INTCTL,

				SOF_HDA_INT_CTRL_EN | SOF_HDA_INT_GLOBAL_EN, 0);



	/* disable cores */

	if (chip)

		hda_dsp_core_reset_power_down(sdev, chip->host_managed_cores_mask);

	/* no need to check for error as the DSP will be disabled anyway */

	if (chip && chip->power_down_dsp)

		chip->power_down_dsp(sdev);



	/* disable DSP */

	snd_sof_dsp_update_bits(sdev, HDA_DSP_PP_BAR, SOF_HDA_REG_PP_PPCTL,
@@ -1219,6 +1219,14 @@ int hda_dsp_remove(struct snd_sof_dev *sdev) 
	return 0;

}



int hda_power_down_dsp(struct snd_sof_dev *sdev)

{

	struct sof_intel_hda_dev *hda = sdev->pdata->hw_pdata;

	const struct sof_intel_dsp_desc *chip = hda->desc;



	return hda_dsp_core_reset_power_down(sdev, chip->host_managed_cores_mask);

}



#if IS_ENABLED(CONFIG_SND_SOC_SOF_HDA)

static void hda_generic_machine_select(struct snd_sof_dev *sdev,

				       struct snd_soc_acpi_mach **mach)

sound/soc/sof/intel/hda.h

+2 −0
Original line number Diff line number Diff line
@@ -567,6 +567,7 @@ int hda_dsp_core_run(struct snd_sof_dev *sdev, unsigned int core_mask); 
int hda_dsp_enable_core(struct snd_sof_dev *sdev, unsigned int core_mask);

int hda_dsp_core_reset_power_down(struct snd_sof_dev *sdev,

				  unsigned int core_mask);

int hda_power_down_dsp(struct snd_sof_dev *sdev);

int hda_dsp_core_get(struct snd_sof_dev *sdev, int core);

void hda_dsp_ipc_int_enable(struct snd_sof_dev *sdev);

void hda_dsp_ipc_int_disable(struct snd_sof_dev *sdev);
@@ -586,6 +587,7 @@ void hda_dsp_dump(struct snd_sof_dev *sdev, u32 flags); 
void hda_ipc_dump(struct snd_sof_dev *sdev);

void hda_ipc_irq_dump(struct snd_sof_dev *sdev);

void hda_dsp_d0i3_work(struct work_struct *work);

int hda_dsp_disable_interrupts(struct snd_sof_dev *sdev);



/*

 * DSP PCM Operations.