Unverified Commit a792bfc1 authored by Pierre-Louis Bossart's avatar Pierre-Louis Bossart Committed by Mark Brown
Browse files

ASoC: SOF: Intel: hda-stream: limit PROCEN workaround 



The work-around enabled in hda-stream.c is only required on earlier
versions of SOCs/PCH (Skylake, KabyLake, ApolloLake,
GeminiLake). Before setting the format on the host DMA, it is required
to couple the host and link DMA - which as a consequence shall use the
same format.

This patch introduces a quirk field in the platform descriptor and
makes the work-around conditional. Newer platforms have
no limitations on the use of host and link DMA, which can use
different formats.

Signed-off-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: default avatarRanjani Sridharan <ranjani.sridharan@linux.intel.com>
Reviewed-by: default avatarPéter Ujfalusi <peter.ujfalusi@linux.intel.com>
Reviewed-by: default avatarRander Wang <rander.wang@intel.com>
Link: https://lore.kernel.org/r/20211207193947.71080-3-pierre-louis.bossart@linux.intel.com


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

sound/soc/sof/intel/apl.c

+1 −0
Original line number Diff line number Diff line
@@ -147,5 +147,6 @@ const struct sof_intel_dsp_desc apl_chip_info = { 
	.rom_init_timeout	= 150,

	.ssp_count = APL_SSP_COUNT,

	.ssp_base_offset = APL_SSP_BASE_OFFSET,

	.quirks = SOF_INTEL_PROCEN_FMT_QUIRK,

};

EXPORT_SYMBOL_NS(apl_chip_info, SND_SOC_SOF_INTEL_HDA_COMMON);

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

+12 −6
Original line number Diff line number Diff line
@@ -472,6 +472,7 @@ int hda_dsp_stream_hw_params(struct snd_sof_dev *sdev, 
			     struct snd_dma_buffer *dmab,

			     struct snd_pcm_hw_params *params)

{

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

	struct hdac_bus *bus = sof_to_bus(sdev);

	struct hdac_stream *hstream = &stream->hstream;

	int sd_offset = SOF_STREAM_SD_OFFSET(hstream);
@@ -584,6 +585,7 @@ int hda_dsp_stream_hw_params(struct snd_sof_dev *sdev, 


	/*

	 * Recommended hardware programming sequence for HDAudio DMA format

	 * on earlier platforms - this is not needed on newer platforms

	 *

	 * 1. Put DMA into coupled mode by clearing PPCTL.PROCEN bit

	 *    for corresponding stream index before the time of writing
@@ -593,9 +595,11 @@ int hda_dsp_stream_hw_params(struct snd_sof_dev *sdev, 
	 *    enable decoupled mode

	 */



	if (chip->quirks & SOF_INTEL_PROCEN_FMT_QUIRK) {

		/* couple host and link DMA, disable DSP features */

		snd_sof_dsp_update_bits(sdev, HDA_DSP_PP_BAR, SOF_HDA_REG_PP_PPCTL,

					mask, 0);

	}



	/* program stream format */

	snd_sof_dsp_update_bits(sdev, HDA_DSP_HDA_BAR,
@@ -603,9 +607,11 @@ int hda_dsp_stream_hw_params(struct snd_sof_dev *sdev, 
				SOF_HDA_ADSP_REG_CL_SD_FORMAT,

				0xffff, hstream->format_val);



	if (chip->quirks & SOF_INTEL_PROCEN_FMT_QUIRK) {

		/* decouple host and link DMA, enable DSP features */

		snd_sof_dsp_update_bits(sdev, HDA_DSP_PP_BAR, SOF_HDA_REG_PP_PPCTL,

					mask, mask);

	}



	/* program last valid index */

	snd_sof_dsp_update_bits(sdev, HDA_DSP_HDA_BAR,

sound/soc/sof/intel/shim.h

+4 −0
Original line number Diff line number Diff line
@@ -151,6 +151,9 @@ 
#define PCI_PMCS		0x84

#define PCI_PMCS_PS_MASK	0x3



/* Intel quirks */

#define SOF_INTEL_PROCEN_FMT_QUIRK BIT(0)



/* DSP hardware descriptor */

struct sof_intel_dsp_desc {

	int cores_num;
@@ -166,6 +169,7 @@ struct sof_intel_dsp_desc { 
	int ssp_base_offset;		/* base address of the SSPs */

	u32 sdw_shim_base;

	u32 sdw_alh_base;

	u32 quirks;

	bool (*check_sdw_irq)(struct snd_sof_dev *sdev);

};