Unverified Commit 7ae87d3c authored by Mark Brown's avatar Mark Brown
Browse files

SoC: SOF: Intel: hda/mtl: Improve and enable DMI L1 

Merge series from Peter Ujfalusi <peter.ujfalusi@linux.intel.com>:

The first patch will improve the managing of DMI L1 by tracking it's
enabled/disabled state to avoid unconditional changes to it's state.

The remaining two patch will enable the DMI L1 for MTL platforms (ACE 1.0)
parents cc4b3c09 2b5a30ca

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

+5 −3
Original line number Diff line number Diff line
@@ -158,14 +158,16 @@ void hda_dsp_ctrl_misc_clock_gating(struct snd_sof_dev *sdev, bool enable) 
 */

int hda_dsp_ctrl_clock_power_gating(struct snd_sof_dev *sdev, bool enable)

{

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

	u32 val;



	/* enable/disable audio dsp clock gating */

	val = enable ? PCI_CGCTL_ADSPDCGE : 0;

	snd_sof_pci_update_bits(sdev, PCI_CGCTL, PCI_CGCTL_ADSPDCGE, val);



	/* enable/disable DMI Link L1 support */

	/* disable the DMI link when requested. But enable only if it wasn't disabled previously */

	val = enable ? HDA_VS_INTEL_EM2_L1SEN : 0;

	if (!enable || !hda->l1_disabled)

		snd_sof_dsp_update_bits(sdev, HDA_DSP_HDA_BAR, HDA_VS_INTEL_EM2,

					HDA_VS_INTEL_EM2_L1SEN, val);

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

+4 −6
Original line number Diff line number Diff line
@@ -776,7 +776,7 @@ int hda_dsp_resume(struct snd_sof_dev *sdev) 
		}



		/* restore L1SEN bit */

		if (hda->l1_support_changed)

		if (hda->l1_disabled)

			snd_sof_dsp_update_bits(sdev, HDA_DSP_HDA_BAR,

						HDA_VS_INTEL_EM2,

						HDA_VS_INTEL_EM2_L1SEN, 0);
@@ -868,11 +868,9 @@ int hda_dsp_suspend(struct snd_sof_dev *sdev, u32 target_state) 
		}



		/* enable L1SEN to make sure the system can enter S0Ix */

		hda->l1_support_changed =

			snd_sof_dsp_update_bits(sdev, HDA_DSP_HDA_BAR,

						HDA_VS_INTEL_EM2,

						HDA_VS_INTEL_EM2_L1SEN,

						HDA_VS_INTEL_EM2_L1SEN);

		if (hda->l1_disabled)

			snd_sof_dsp_update_bits(sdev, HDA_DSP_HDA_BAR, HDA_VS_INTEL_EM2,

						HDA_VS_INTEL_EM2_L1SEN, HDA_VS_INTEL_EM2_L1SEN);



		/* stop the CORB/RIRB DMA if it is On */

		hda_codec_suspend_cmd_io(sdev);

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

+12 −3
Original line number Diff line number Diff line
@@ -182,6 +182,8 @@ int hda_dsp_stream_spib_config(struct snd_sof_dev *sdev, 
struct hdac_ext_stream *

hda_dsp_stream_get(struct snd_sof_dev *sdev, int direction, u32 flags)

{

	const struct sof_intel_dsp_desc *chip_info =  get_chip_info(sdev->pdata);

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

	struct hdac_bus *bus = sof_to_bus(sdev);

	struct sof_intel_hda_stream *hda_stream;

	struct hdac_ext_stream *hext_stream = NULL;
@@ -220,12 +222,15 @@ hda_dsp_stream_get(struct snd_sof_dev *sdev, int direction, u32 flags) 
	/*

	 * Prevent DMI Link L1 entry for streams that don't support it.

	 * Workaround to address a known issue with host DMA that results

	 * in xruns during pause/release in capture scenarios.

	 * in xruns during pause/release in capture scenarios. This is not needed for the ACE IP.

	 */

	if (!(flags & SOF_HDA_STREAM_DMI_L1_COMPATIBLE))

	if (chip_info->hw_ip_version < SOF_INTEL_ACE_1_0 &&

	    !(flags & SOF_HDA_STREAM_DMI_L1_COMPATIBLE)) {

		snd_sof_dsp_update_bits(sdev, HDA_DSP_HDA_BAR,

					HDA_VS_INTEL_EM2,

					HDA_VS_INTEL_EM2_L1SEN, 0);

		hda->l1_disabled = true;

	}



	return hext_stream;

}
@@ -233,6 +238,8 @@ hda_dsp_stream_get(struct snd_sof_dev *sdev, int direction, u32 flags) 
/* free a stream */

int hda_dsp_stream_put(struct snd_sof_dev *sdev, int direction, int stream_tag)

{

	const struct sof_intel_dsp_desc *chip_info =  get_chip_info(sdev->pdata);

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

	struct hdac_bus *bus = sof_to_bus(sdev);

	struct sof_intel_hda_stream *hda_stream;

	struct hdac_ext_stream *hext_stream;
@@ -264,9 +271,11 @@ int hda_dsp_stream_put(struct snd_sof_dev *sdev, int direction, int stream_tag) 
	spin_unlock_irq(&bus->reg_lock);



	/* Enable DMI L1 if permitted */

	if (dmi_l1_enable)

	if (chip_info->hw_ip_version < SOF_INTEL_ACE_1_0 && dmi_l1_enable) {

		snd_sof_dsp_update_bits(sdev, HDA_DSP_HDA_BAR, HDA_VS_INTEL_EM2,

					HDA_VS_INTEL_EM2_L1SEN, HDA_VS_INTEL_EM2_L1SEN);

		hda->l1_disabled = false;

	}



	if (!found) {

		dev_err(sdev->dev, "%s: stream_tag %d not opened!\n",

sound/soc/sof/intel/hda.h

+1 −1
Original line number Diff line number Diff line
@@ -502,7 +502,7 @@ struct sof_intel_hda_dev { 
	u32 stream_max;



	/* PM related */

	bool l1_support_changed;/* during suspend, is L1SEN changed or not */

	bool l1_disabled;/* is DMI link L1 disabled? */



	/* DMIC device */

	struct platform_device *dmic_dev;

sound/soc/sof/intel/mtl.c

+3 −0
Original line number Diff line number Diff line
@@ -280,6 +280,9 @@ static int mtl_dsp_post_fw_run(struct snd_sof_dev *sdev) 
	}



	hda_sdw_int_enable(sdev, true);



	/* enable DMI L1 */

	snd_sof_dsp_update_bits(sdev, HDA_DSP_HDA_BAR, MTL_EM2, MTL_EM2_L1SEN, MTL_EM2_L1SEN);

	return 0;

}