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

Merge series "SOF fixes and updates" from Ranjani Sridharan <ranjani.sridharan@linux.intel.com>: 

This series includes fixes for error reporting, topology parsing and
runtime PM issues along with updates for DMIC support and IMX platforms.

Iulian Olaru (2):
  ASoC: SOF: imx: Replace sdev->private with sdev->pdata->hw_pdata
  ASoC: SOF: sof-of-dev: Add .arch_ops field

Jaska Uimonen (1):
  ASoC: SOF: intel: hda: support also devices with 1 and 3 dmics

Keyon Jie (1):
  ASoC: SOF: topology: fix the ipc_size calculation for process
    component

Rander Wang (1):
  ASoC: SOF: fix a runtime pm issue in SOF when HDMI codec doesn't work

Ranjani Sridharan (2):
  ASoC: SOF: Intel: hda: report error only for the last ROM init
    iteration
  ASoC: SOF: Intel: hda: add extended rom status dump to error log

 sound/soc/sof/imx/Kconfig        |  2 ++
 sound/soc/sof/imx/imx8.c         | 17 +++++++++----
 sound/soc/sof/imx/imx8m.c        | 10 +++++---
 sound/soc/sof/intel/hda-codec.c  |  4 +--
 sound/soc/sof/intel/hda-loader.c | 42 +++++++++++++++++++-------------
 sound/soc/sof/intel/hda.c        | 26 +++++++++++++++++++-
 sound/soc/sof/topology.c         |  4 +--
 7 files changed, 74 insertions(+), 31 deletions(-)

--
2.25.1
parents e17b7389 5a1fa00a

sound/soc/sof/imx/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ config SND_SOC_SOF_IMX8_SUPPORT 


config SND_SOC_SOF_IMX8

	tristate

	select SND_SOC_SOF_XTENSA

	help

	  This option is not user-selectable but automagically handled by

	  'select' statements at a higher level
@@ -44,6 +45,7 @@ config SND_SOC_SOF_IMX8M_SUPPORT 


config SND_SOC_SOF_IMX8M

	tristate

	select SND_SOC_SOF_XTENSA

	help

	  This option is not user-selectable but automagically handled by

	  'select' statements at a higher level

sound/soc/sof/imx/imx8.c

+12 −5
Original line number Diff line number Diff line
@@ -126,7 +126,7 @@ static struct imx_dsp_ops dsp_ops = { 


static int imx8_send_msg(struct snd_sof_dev *sdev, struct snd_sof_ipc_msg *msg)

{

	struct imx8_priv *priv = (struct imx8_priv *)sdev->private;

	struct imx8_priv *priv = sdev->pdata->hw_pdata;



	sof_mailbox_write(sdev, sdev->host_box.offset, msg->msg_data,

			  msg->msg_size);
@@ -140,7 +140,7 @@ static int imx8_send_msg(struct snd_sof_dev *sdev, struct snd_sof_ipc_msg *msg) 
 */

static int imx8x_run(struct snd_sof_dev *sdev)

{

	struct imx8_priv *dsp_priv = (struct imx8_priv *)sdev->private;

	struct imx8_priv *dsp_priv = sdev->pdata->hw_pdata;

	int ret;



	ret = imx_sc_misc_set_control(dsp_priv->sc_ipc, IMX_SC_R_DSP,
@@ -180,7 +180,7 @@ static int imx8x_run(struct snd_sof_dev *sdev) 


static int imx8_run(struct snd_sof_dev *sdev)

{

	struct imx8_priv *dsp_priv = (struct imx8_priv *)sdev->private;

	struct imx8_priv *dsp_priv = sdev->pdata->hw_pdata;

	int ret;



	ret = imx_sc_misc_set_control(dsp_priv->sc_ipc, IMX_SC_R_DSP,
@@ -213,7 +213,7 @@ static int imx8_probe(struct snd_sof_dev *sdev) 
	if (!priv)

		return -ENOMEM;



	sdev->private = priv;

	sdev->pdata->hw_pdata = priv;

	priv->dev = sdev->dev;

	priv->sdev = sdev;
@@ -339,7 +339,7 @@ static int imx8_probe(struct snd_sof_dev *sdev) 


static int imx8_remove(struct snd_sof_dev *sdev)

{

	struct imx8_priv *priv = (struct imx8_priv *)sdev->private;

	struct imx8_priv *priv = sdev->pdata->hw_pdata;

	int i;



	platform_device_unregister(priv->ipc_dev);
@@ -424,6 +424,9 @@ struct snd_sof_dsp_ops sof_imx8_ops = { 
	/* firmware loading */

	.load_firmware	= snd_sof_load_firmware_memcpy,



	/* Firmware ops */

	.arch_ops = &sof_xtensa_arch_ops,



	/* DAI drivers */

	.drv = imx8_dai,

	.num_drv = ARRAY_SIZE(imx8_dai),
@@ -464,6 +467,9 @@ struct snd_sof_dsp_ops sof_imx8x_ops = { 
	/* firmware loading */

	.load_firmware	= snd_sof_load_firmware_memcpy,



	/* Firmware ops */

	.arch_ops = &sof_xtensa_arch_ops,



	/* DAI drivers */

	.drv = imx8_dai,

	.num_drv = ARRAY_SIZE(imx8_dai),
@@ -477,4 +483,5 @@ struct snd_sof_dsp_ops sof_imx8x_ops = { 
};

EXPORT_SYMBOL(sof_imx8x_ops);



MODULE_IMPORT_NS(SND_SOC_SOF_XTENSA);

MODULE_LICENSE("Dual BSD/GPL");

sound/soc/sof/imx/imx8m.c

+7 −3
Original line number Diff line number Diff line
@@ -99,7 +99,7 @@ static struct imx_dsp_ops imx8m_dsp_ops = { 


static int imx8m_send_msg(struct snd_sof_dev *sdev, struct snd_sof_ipc_msg *msg)

{

	struct imx8m_priv *priv = (struct imx8m_priv *)sdev->private;

	struct imx8m_priv *priv = sdev->pdata->hw_pdata;



	sof_mailbox_write(sdev, sdev->host_box.offset, msg->msg_data,

			  msg->msg_size);
@@ -133,7 +133,7 @@ static int imx8m_probe(struct snd_sof_dev *sdev) 
	if (!priv)

		return -ENOMEM;



	sdev->private = priv;

	sdev->pdata->hw_pdata = priv;

	priv->dev = sdev->dev;

	priv->sdev = sdev;
@@ -209,7 +209,7 @@ static int imx8m_probe(struct snd_sof_dev *sdev) 


static int imx8m_remove(struct snd_sof_dev *sdev)

{

	struct imx8m_priv *priv = (struct imx8m_priv *)sdev->private;

	struct imx8m_priv *priv = sdev->pdata->hw_pdata;



	platform_device_unregister(priv->ipc_dev);
@@ -277,6 +277,9 @@ struct snd_sof_dsp_ops sof_imx8m_ops = { 
	/* firmware loading */

	.load_firmware	= snd_sof_load_firmware_memcpy,



	/* Firmware ops */

	.arch_ops = &sof_xtensa_arch_ops,



	/* DAI drivers */

	.drv = imx8m_dai,

	.num_drv = ARRAY_SIZE(imx8m_dai),
@@ -289,4 +292,5 @@ struct snd_sof_dsp_ops sof_imx8m_ops = { 
};

EXPORT_SYMBOL(sof_imx8m_ops);



MODULE_IMPORT_NS(SND_SOC_SOF_XTENSA);

MODULE_LICENSE("Dual BSD/GPL");

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

+2 −2
Original line number Diff line number Diff line
@@ -151,7 +151,7 @@ static int hda_codec_probe(struct snd_sof_dev *sdev, int address, 
		if (!hdev->bus->audio_component) {

			dev_dbg(sdev->dev,

				"iDisp hw present but no driver\n");

			return -ENOENT;

			goto error;

		}

		hda_priv->need_display_power = true;

	}
@@ -174,7 +174,7 @@ static int hda_codec_probe(struct snd_sof_dev *sdev, int address, 
		 * other return codes without modification

		 */

		if (ret == 0)

			ret = -ENOENT;

			goto error;

	}



	return ret;

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

+25 −17
Original line number Diff line number Diff line
@@ -79,7 +79,7 @@ static int cl_stream_prepare(struct snd_sof_dev *sdev, unsigned int format, 
 * reset/stall and then turn it off

 */

static int cl_dsp_init(struct snd_sof_dev *sdev, const void *fwdata,

		       u32 fwsize, int stream_tag)

		       u32 fwsize, int stream_tag, int iteration)

{

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

	const struct sof_intel_dsp_desc *chip = hda->desc;
@@ -90,6 +90,7 @@ static int cl_dsp_init(struct snd_sof_dev *sdev, const void *fwdata, 
	/* step 1: power up corex */

	ret = hda_dsp_core_power_up(sdev, chip->cores_mask);

	if (ret < 0) {

		if (iteration == HDA_FW_BOOT_ATTEMPTS)

			dev_err(sdev->dev, "error: dsp core 0/1 power up failed\n");

		goto err;

	}
@@ -112,7 +113,9 @@ static int cl_dsp_init(struct snd_sof_dev *sdev, const void *fwdata, 
	/* step 3: unset core 0 reset state & unstall/run core 0 */

	ret = hda_dsp_core_run(sdev, HDA_DSP_CORE_MASK(0));

	if (ret < 0) {

		dev_err(sdev->dev, "error: dsp core start failed %d\n", ret);

		if (iteration == HDA_FW_BOOT_ATTEMPTS)

			dev_err(sdev->dev,

				"error: dsp core start failed %d\n", ret);

		ret = -EIO;

		goto err;

	}
@@ -126,7 +129,9 @@ static int cl_dsp_init(struct snd_sof_dev *sdev, const void *fwdata, 
					    HDA_DSP_INIT_TIMEOUT_US);



	if (ret < 0) {

		dev_err(sdev->dev, "error: %s: timeout for HIPCIE done\n",

		if (iteration == HDA_FW_BOOT_ATTEMPTS)

			dev_err(sdev->dev,

				"error: %s: timeout for HIPCIE done\n",

				__func__);

		goto err;

	}
@@ -141,7 +146,9 @@ static int cl_dsp_init(struct snd_sof_dev *sdev, const void *fwdata, 
	ret = hda_dsp_core_power_down(sdev,

				  chip->cores_mask & ~(HDA_DSP_CORE_MASK(0)));

	if (ret < 0) {

		dev_err(sdev->dev, "error: dsp core x power down failed\n");

		if (iteration == HDA_FW_BOOT_ATTEMPTS)

			dev_err(sdev->dev,

				"error: dsp core x power down failed\n");

		goto err;

	}
@@ -159,6 +166,7 @@ static int cl_dsp_init(struct snd_sof_dev *sdev, const void *fwdata, 
	if (!ret)

		return 0;



	if (iteration == HDA_FW_BOOT_ATTEMPTS)

		dev_err(sdev->dev,

			"error: %s: timeout HDA_DSP_SRAM_REG_ROM_STATUS read\n",

			__func__);
@@ -329,25 +337,25 @@ int hda_dsp_cl_boot_firmware(struct snd_sof_dev *sdev) 


	/* try ROM init a few times before giving up */

	for (i = 0; i < HDA_FW_BOOT_ATTEMPTS; i++) {

		dev_dbg(sdev->dev,

			"Attempting iteration %d of Core En/ROM load...\n", i);



		ret = cl_dsp_init(sdev, stripped_firmware.data,

				  stripped_firmware.size, tag);

				  stripped_firmware.size, tag, i + 1);



		/* don't retry anymore if successful */

		if (!ret)

			break;

	}



		dev_dbg(sdev->dev, "iteration %d of Core En/ROM load failed: %d\n",

	if (i == HDA_FW_BOOT_ATTEMPTS) {

		dev_err(sdev->dev, "error: dsp init failed after %d attempts with err: %d\n",

			i, ret);

		dev_dbg(sdev->dev, "Error code=0x%x: FW status=0x%x\n",

		dev_err(sdev->dev, "ROM error=0x%x: FW status=0x%x\n",

			snd_sof_dsp_read(sdev, HDA_DSP_BAR,

					 HDA_DSP_SRAM_REG_ROM_ERROR),

			snd_sof_dsp_read(sdev, HDA_DSP_BAR,

					 HDA_DSP_SRAM_REG_ROM_STATUS));

	}



	if (i == HDA_FW_BOOT_ATTEMPTS) {

		dev_err(sdev->dev, "error: dsp init failed after %d attempts with err: %d\n",

			i, ret);

		goto cleanup;

	}