Unverified Commit 5f6c3f90 authored by Mark Brown's avatar Mark Brown
Browse files

ASoC: SOF: Miscellaneous fixes for IPC and trace 

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

This series includes some miscellaenous fixes pertaining to IPC, DMA
buffer and DMA trace.
parents e0e1d166 9e116f5a

sound/soc/sof/compress.c

+3 −5
Original line number Diff line number Diff line
@@ -147,8 +147,7 @@ static int sof_compr_free(struct snd_soc_component *component, 
	stream.comp_id = spcm->stream[cstream->direction].comp_id;



	if (spcm->prepared[cstream->direction]) {

		ret = sof_ipc_tx_message(sdev->ipc, stream.hdr.cmd,

					 &stream, sizeof(stream),

		ret = sof_ipc_tx_message(sdev->ipc, &stream, sizeof(stream),

					 &reply, sizeof(reply));

		if (!ret)

			spcm->prepared[cstream->direction] = false;
@@ -209,7 +208,7 @@ static int sof_compr_set_params(struct snd_soc_component *component, 
		snd_pcm_format_physical_width(SNDRV_PCM_FORMAT_S32) >> 3;

	pcm.params.host_period_bytes = params->buffer.fragment_size;



	ret = sof_ipc_tx_message(sdev->ipc, pcm.hdr.cmd, &pcm, sizeof(pcm),

	ret = sof_ipc_tx_message(sdev->ipc, &pcm, sizeof(pcm),

				 &ipc_params_reply, sizeof(ipc_params_reply));

	if (ret < 0) {

		dev_err(component->dev, "error ipc failed\n");
@@ -268,8 +267,7 @@ static int sof_compr_trigger(struct snd_soc_component *component, 
		break;

	}



	return sof_ipc_tx_message(sdev->ipc, stream.hdr.cmd,

				  &stream, sizeof(stream),

	return sof_ipc_tx_message(sdev->ipc, &stream, sizeof(stream),

				  &reply, sizeof(reply));

}

sound/soc/sof/debug.c

+1 −1
Original line number Diff line number Diff line
@@ -236,7 +236,7 @@ static int memory_info_update(struct snd_sof_dev *sdev, char *buf, size_t buff_s 
		goto error;

	}



	ret = sof_ipc_tx_message(sdev->ipc, msg.cmd, &msg, msg.size, reply, SOF_IPC_MSG_MAX_SIZE);

	ret = sof_ipc_tx_message(sdev->ipc, &msg, msg.size, reply, SOF_IPC_MSG_MAX_SIZE);

	pm_runtime_mark_last_busy(sdev->dev);

	pm_runtime_put_autosuspend(sdev->dev);

	if (ret < 0 || reply->rhdr.error < 0) {

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

+3 −5
Original line number Diff line number Diff line
@@ -363,9 +363,8 @@ static int hda_dsp_send_pm_gate_ipc(struct snd_sof_dev *sdev, u32 flags) 
	pm_gate.flags = flags;



	/* send pm_gate ipc to dsp */

	return sof_ipc_tx_message_no_pm(sdev->ipc, pm_gate.hdr.cmd,

					&pm_gate, sizeof(pm_gate), &reply,

					sizeof(reply));

	return sof_ipc_tx_message_no_pm(sdev->ipc, &pm_gate, sizeof(pm_gate),

					&reply, sizeof(reply));

}



static int hda_dsp_update_d0i3c_register(struct snd_sof_dev *sdev, u8 value)
@@ -985,8 +984,7 @@ int hda_dsp_core_get(struct snd_sof_dev *sdev, int core) 
		return 0;



	/* Now notify DSP for secondary cores */

	ret = sof_ipc_tx_message(sdev->ipc, pm_core_config.hdr.cmd,

				 &pm_core_config, sizeof(pm_core_config),

	ret = sof_ipc_tx_message(sdev->ipc, &pm_core_config, sizeof(pm_core_config),

				 &pm_core_config, sizeof(pm_core_config));

	if (ret < 0) {

		dev_err(sdev->dev, "failed to enable secondary core '%d' failed with %d\n",

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

+7 −5
Original line number Diff line number Diff line
@@ -313,6 +313,7 @@ int hda_dsp_cl_boot_firmware_iccmax(struct snd_sof_dev *sdev) 
	struct hdac_ext_stream *iccmax_stream;

	struct hdac_bus *bus = sof_to_bus(sdev);

	struct firmware stripped_firmware;

	struct snd_dma_buffer dmab_bdl;

	int ret, ret1;

	u8 original_gb;
@@ -328,7 +329,7 @@ int hda_dsp_cl_boot_firmware_iccmax(struct snd_sof_dev *sdev) 


	/* prepare capture stream for ICCMAX */

	iccmax_stream = cl_stream_prepare(sdev, HDA_CL_STREAM_FORMAT, stripped_firmware.size,

					  &sdev->dmab_bdl, SNDRV_PCM_STREAM_CAPTURE);

					  &dmab_bdl, SNDRV_PCM_STREAM_CAPTURE);

	if (IS_ERR(iccmax_stream)) {

		dev_err(sdev->dev, "error: dma prepare for ICCMAX stream failed\n");

		return PTR_ERR(iccmax_stream);
@@ -340,7 +341,7 @@ int hda_dsp_cl_boot_firmware_iccmax(struct snd_sof_dev *sdev) 
	 * Perform iccmax stream cleanup. This should be done even if firmware loading fails.

	 * If the cleanup also fails, we return the initial error

	 */

	ret1 = cl_cleanup(sdev, &sdev->dmab_bdl, iccmax_stream);

	ret1 = cl_cleanup(sdev, &dmab_bdl, iccmax_stream);

	if (ret1 < 0) {

		dev_err(sdev->dev, "error: ICCMAX stream cleanup failed\n");
@@ -395,6 +396,7 @@ int hda_dsp_cl_boot_firmware(struct snd_sof_dev *sdev) 
	const struct sof_intel_dsp_desc *chip_info;

	struct hdac_ext_stream *hext_stream;

	struct firmware stripped_firmware;

	struct snd_dma_buffer dmab;

	int ret, ret1, i;



	if ((sdev->fw_ready.flags & SOF_IPC_INFO_D3_PERSISTENT) &&
@@ -419,13 +421,13 @@ int hda_dsp_cl_boot_firmware(struct snd_sof_dev *sdev) 


	/* prepare DMA for code loader stream */

	hext_stream = cl_stream_prepare(sdev, HDA_CL_STREAM_FORMAT, stripped_firmware.size,

					&sdev->dmab, SNDRV_PCM_STREAM_PLAYBACK);

					&dmab, SNDRV_PCM_STREAM_PLAYBACK);

	if (IS_ERR(hext_stream)) {

		dev_err(sdev->dev, "error: dma prepare for fw loading failed\n");

		return PTR_ERR(hext_stream);

	}



	memcpy(sdev->dmab.area, stripped_firmware.data,

	memcpy(dmab.area, stripped_firmware.data,

	       stripped_firmware.size);



	/* try ROM init a few times before giving up */
@@ -486,7 +488,7 @@ int hda_dsp_cl_boot_firmware(struct snd_sof_dev *sdev) 
	 * This should be done even if firmware loading fails.

	 * If the cleanup also fails, we return the initial error

	 */

	ret1 = cl_cleanup(sdev, &sdev->dmab, hext_stream);

	ret1 = cl_cleanup(sdev, &dmab, hext_stream);

	if (ret1 < 0) {

		dev_err(sdev->dev, "error: Code loader DSP cleanup failed\n");

sound/soc/sof/intel/tgl.c

+2 −4
Original line number Diff line number Diff line
@@ -35,8 +35,7 @@ static int tgl_dsp_core_get(struct snd_sof_dev *sdev, int core) 
		return hda_dsp_enable_core(sdev, BIT(core));



	/* notify DSP for secondary cores */

	return sof_ipc_tx_message(sdev->ipc, pm_core_config.hdr.cmd,

				 &pm_core_config, sizeof(pm_core_config),

	return sof_ipc_tx_message(sdev->ipc, &pm_core_config, sizeof(pm_core_config),

				 &pm_core_config, sizeof(pm_core_config));

}
@@ -55,8 +54,7 @@ static int tgl_dsp_core_put(struct snd_sof_dev *sdev, int core) 
		return hda_dsp_core_reset_power_down(sdev, BIT(core));



	/* notify DSP for secondary cores */

	return sof_ipc_tx_message(sdev->ipc, pm_core_config.hdr.cmd,

				 &pm_core_config, sizeof(pm_core_config),

	return sof_ipc_tx_message(sdev->ipc, &pm_core_config, sizeof(pm_core_config),

				 &pm_core_config, sizeof(pm_core_config));

}