Unverified Commit b4e4c0b9 authored by Ranjani Sridharan's avatar Ranjani Sridharan Committed by Mark Brown
Browse files

ASoC: SOF: Intel: hda: expose some codeloader functions 



Expose the code loader functions for re-use in new platforms

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


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

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

+14 −13
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ static void hda_ssp_set_cbp_cfp(struct snd_sof_dev *sdev) 
	}

}



static struct hdac_ext_stream *cl_stream_prepare(struct snd_sof_dev *sdev, unsigned int format,

struct hdac_ext_stream *hda_cl_stream_prepare(struct snd_sof_dev *sdev, unsigned int format,

					      unsigned int size, struct snd_dma_buffer *dmab,

					      int direction)

{
@@ -234,7 +234,7 @@ static int cl_trigger(struct snd_sof_dev *sdev, 
	}

}



static int cl_cleanup(struct snd_sof_dev *sdev, struct snd_dma_buffer *dmab,

int hda_cl_cleanup(struct snd_sof_dev *sdev, struct snd_dma_buffer *dmab,

		   struct hdac_ext_stream *hext_stream)

{

	struct hdac_stream *hstream = &hext_stream->hstream;
@@ -266,7 +266,7 @@ static int cl_cleanup(struct snd_sof_dev *sdev, struct snd_dma_buffer *dmab, 
	return ret;

}



static int cl_copy_fw(struct snd_sof_dev *sdev, struct hdac_ext_stream *hext_stream)

int hda_cl_copy_fw(struct snd_sof_dev *sdev, struct hdac_ext_stream *hext_stream)

{

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

	const struct sof_intel_dsp_desc *chip = hda->desc;
@@ -328,7 +328,7 @@ int hda_dsp_cl_boot_firmware_iccmax(struct snd_sof_dev *sdev) 
	stripped_firmware.size = plat_data->fw->size - plat_data->fw_offset;



	/* prepare capture stream for ICCMAX */

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

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

					      &dmab_bdl, SNDRV_PCM_STREAM_CAPTURE);

	if (IS_ERR(iccmax_stream)) {

		dev_err(sdev->dev, "error: dma prepare for ICCMAX stream failed\n");
@@ -341,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, &dmab_bdl, iccmax_stream);

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

	if (ret1 < 0) {

		dev_err(sdev->dev, "error: ICCMAX stream cleanup failed\n");
@@ -420,7 +420,8 @@ int hda_dsp_cl_boot_firmware(struct snd_sof_dev *sdev) 
	init_waitqueue_head(&sdev->boot_wait);



	/* prepare DMA for code loader stream */

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

	hext_stream = hda_cl_stream_prepare(sdev, HDA_CL_STREAM_FORMAT,

					    stripped_firmware.size,

					    &dmab, SNDRV_PCM_STREAM_PLAYBACK);

	if (IS_ERR(hext_stream)) {

		dev_err(sdev->dev, "error: dma prepare for fw loading failed\n");
@@ -475,7 +476,7 @@ int hda_dsp_cl_boot_firmware(struct snd_sof_dev *sdev) 
	 * Continue with code loading and firmware boot

	 */

	hda->boot_iteration = HDA_FW_BOOT_ATTEMPTS;

	ret = cl_copy_fw(sdev, hext_stream);

	ret = hda_cl_copy_fw(sdev, hext_stream);

	if (!ret)

		dev_dbg(sdev->dev, "Firmware download successful, booting...\n");

	else
@@ -488,7 +489,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, &dmab, hext_stream);

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

	if (ret1 < 0) {

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

sound/soc/sof/intel/hda.h

+6 −0
Original line number Diff line number Diff line
@@ -588,6 +588,12 @@ int hda_dsp_ipc_cmd_done(struct snd_sof_dev *sdev, int dir); 
 */

int hda_dsp_cl_boot_firmware(struct snd_sof_dev *sdev);

int hda_dsp_cl_boot_firmware_iccmax(struct snd_sof_dev *sdev);

int hda_cl_copy_fw(struct snd_sof_dev *sdev, struct hdac_ext_stream *hext_stream);

struct hdac_ext_stream *hda_cl_stream_prepare(struct snd_sof_dev *sdev, unsigned int format,

					      unsigned int size, struct snd_dma_buffer *dmab,

					      int direction);

int hda_cl_cleanup(struct snd_sof_dev *sdev, struct snd_dma_buffer *dmab,

		   struct hdac_ext_stream *hext_stream);

#define HDA_CL_STREAM_FORMAT 0x40



/* pre and post fw run ops */