Unverified Commit c0fc71e2 authored by Mark Brown's avatar Mark Brown
Browse files

ASoC: SOF/Intel: small fixes and updates for 5.18 

Merge series from Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>:

One important fix from Kai to restore DM1 L1 functionality, one
important update from Peter to use DMA trace buffers as capture-only
and sync them and a couple of minor updates for Intel/SOF platforms.
parents ee60f738 d7be9e33

sound/soc/intel/common/soc-acpi-intel-adl-match.c

+15 −0
Original line number Diff line number Diff line
@@ -359,6 +359,15 @@ static const struct snd_soc_acpi_link_adr adl_rvp[] = { 
	{}

};



static const struct snd_soc_acpi_link_adr adlps_rvp[] = {

	{

		.mask = BIT(0),

		.num_adr = ARRAY_SIZE(rt711_sdca_0_adr),

		.adr_d = rt711_sdca_0_adr,

	},

	{}

};



static const struct snd_soc_acpi_link_adr adl_chromebook_base[] = {

	{

		.mask = BIT(0),
@@ -529,6 +538,12 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_adl_sdw_machines[] = { 
		.drv_name = "sof_sdw",

		.sof_tplg_filename = "sof-adl-rt711.tplg",

	},

	{

		.link_mask = 0x1, /* link0 required */

		.links = adlps_rvp,

		.drv_name = "sof_sdw",

		.sof_tplg_filename = "sof-adl-rt711.tplg",

	},

	{

		.link_mask = 0x5, /* rt5682 on link0 & 2xmax98373 on link 2 */

		.links = adl_chromebook_base,

sound/soc/sof/compress.c

+4 −2
Original line number Diff line number Diff line
@@ -46,8 +46,8 @@ void snd_sof_compr_init_elapsed_work(struct work_struct *work) 
 */

void snd_sof_compr_fragment_elapsed(struct snd_compr_stream *cstream)

{

	struct snd_soc_pcm_runtime *rtd = cstream->private_data;

	struct snd_compr_runtime *crtd = cstream->runtime;

	struct snd_soc_pcm_runtime *rtd;

	struct snd_compr_runtime *crtd;

	struct snd_soc_component *component;

	struct snd_compr_tstamp *tstamp;

	struct snd_sof_pcm *spcm;
@@ -55,6 +55,8 @@ void snd_sof_compr_fragment_elapsed(struct snd_compr_stream *cstream) 
	if (!cstream)

		return;



	rtd = cstream->private_data;

	crtd = cstream->runtime;

	tstamp = crtd->private_data;

	component = snd_soc_rtdcom_lookup(rtd, SOF_AUDIO_PCM_DRV_NAME);

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

+1 −0
Original line number Diff line number Diff line
@@ -315,6 +315,7 @@ int hda_dsp_pcm_open(struct snd_sof_dev *sdev, 
		runtime->hw.info &= ~SNDRV_PCM_INFO_PAUSE;



	if (hda_always_enable_dmi_l1 ||

	    direction == SNDRV_PCM_STREAM_PLAYBACK ||

	    spcm->stream[substream->stream].d0i3_compatible)

		flags |= SOF_HDA_STREAM_DMI_L1_COMPATIBLE;

sound/soc/sof/sof-pci-dev.c

+8 −0
Original line number Diff line number Diff line
@@ -75,6 +75,14 @@ static const struct dmi_system_id sof_tplg_table[] = { 
		},

		.driver_data = "sof-adl-max98360a-rt5682-2way.tplg",

	},

	{

		.callback = sof_tplg_cb,

		.matches = {

			DMI_MATCH(DMI_PRODUCT_FAMILY, "Google_Brya"),

			DMI_MATCH(DMI_OEM_STRING, "AUDIO-AUDIO_MAX98357_ALC5682I_I2S_2WAY"),

		},

		.driver_data = "sof-adl-max98357a-rt5682-2way.tplg",

	},



	{}

};

sound/soc/sof/trace.c

+10 −2
Original line number Diff line number Diff line
@@ -320,6 +320,13 @@ static ssize_t sof_dfsentry_trace_read(struct file *file, char __user *buffer, 
	if (count > avail)

		count = avail;



	/*

	 * make sure that all trace data is available for the CPU as the trace

	 * data buffer might be allocated from non consistent memory.

	 * Note: snd_dma_buffer_sync() is called for normal audio playback and

	 *	 capture streams also.

	 */

	snd_dma_buffer_sync(&sdev->dmatb, SNDRV_DMA_SYNC_CPU);

	/* copy available trace data to debugfs */

	rem = copy_to_user(buffer, ((u8 *)(dfse->buf) + lpos), count);

	if (rem)
@@ -464,8 +471,9 @@ int snd_sof_init_trace(struct snd_sof_dev *sdev) 
	}



	/* allocate trace data buffer */

	ret = snd_dma_alloc_pages(SNDRV_DMA_TYPE_DEV_SG, sdev->dev,

				  DMA_BUF_SIZE_FOR_TRACE, &sdev->dmatb);

	ret = snd_dma_alloc_dir_pages(SNDRV_DMA_TYPE_DEV_SG, sdev->dev,

				      DMA_FROM_DEVICE, DMA_BUF_SIZE_FOR_TRACE,

				      &sdev->dmatb);

	if (ret < 0) {

		dev_err(sdev->dev,

			"error: can't alloc buffer for trace %d\n", ret);