Unverified Commit b2b10aa7 authored by Peter Ujfalusi's avatar Peter Ujfalusi Committed by Mark Brown
Browse files

ASoC: SOF: Add 'non_recoverable' parameter to snd_sof_dsp_panic() 



Some platforms use retries during firmware boot to overcome DSP startup
issues.
In these cases we might receive a DSP panic message which should not be
treated as fatal if it happens during boot.

Pass this information to snd_sof_dsp_panic() and omit the panic print if
it is not fatal or the user does not want to see all dumps.

Signed-off-by: default avatarPeter Ujfalusi <peter.ujfalusi@linux.intel.com>
Reviewed-by: default avatarRanjani Sridharan <ranjani.sridharan@linux.intel.com>
Reviewed-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: default avatarKai Vehmanen <kai.vehmanen@linux.intel.com>
Link: https://lore.kernel.org/r/20211223113628.18582-6-peter.ujfalusi@linux.intel.com


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

sound/soc/sof/imx/imx8.c

+1 −1
Original line number Diff line number Diff line
@@ -97,7 +97,7 @@ static void imx8_dsp_handle_request(struct imx_dsp_ipc *ipc) 


	/* Check to see if the message is a panic code (0x0dead***) */

	if ((p & SOF_IPC_PANIC_MAGIC_MASK) == SOF_IPC_PANIC_MAGIC)

		snd_sof_dsp_panic(priv->sdev, p);

		snd_sof_dsp_panic(priv->sdev, p, true);

	else

		snd_sof_ipc_msgs_rx(priv->sdev);

}

sound/soc/sof/imx/imx8m.c

+1 −1
Original line number Diff line number Diff line
@@ -90,7 +90,7 @@ static void imx8m_dsp_handle_request(struct imx_dsp_ipc *ipc) 


	/* Check to see if the message is a panic code (0x0dead***) */

	if ((p & SOF_IPC_PANIC_MAGIC_MASK) == SOF_IPC_PANIC_MAGIC)

		snd_sof_dsp_panic(priv->sdev, p);

		snd_sof_dsp_panic(priv->sdev, p, true);

	else

		snd_sof_ipc_msgs_rx(priv->sdev);

}

sound/soc/sof/intel/atom.c

+2 −2
Original line number Diff line number Diff line
@@ -165,8 +165,8 @@ irqreturn_t atom_irq_thread(int irq, void *context) 


		/* Handle messages from DSP Core */

		if ((ipcd & SOF_IPC_PANIC_MAGIC_MASK) == SOF_IPC_PANIC_MAGIC) {

			snd_sof_dsp_panic(sdev, PANIC_OFFSET(ipcd) +

					  MBOX_OFFSET);

			snd_sof_dsp_panic(sdev, PANIC_OFFSET(ipcd) + MBOX_OFFSET,

					  true);

		} else {

			snd_sof_ipc_msgs_rx(sdev);

		}

sound/soc/sof/intel/bdw.c

+2 −2
Original line number Diff line number Diff line
@@ -344,8 +344,8 @@ static irqreturn_t bdw_irq_thread(int irq, void *context) 


		/* Handle messages from DSP Core */

		if ((ipcd & SOF_IPC_PANIC_MAGIC_MASK) == SOF_IPC_PANIC_MAGIC) {

			snd_sof_dsp_panic(sdev, BDW_PANIC_OFFSET(ipcx) +

					  MBOX_OFFSET);

			snd_sof_dsp_panic(sdev, BDW_PANIC_OFFSET(ipcx) + MBOX_OFFSET,

					  true);

		} else {

			snd_sof_ipc_msgs_rx(sdev);

		}

sound/soc/sof/intel/cnl.c

+18 −3
Original line number Diff line number Diff line
@@ -82,9 +82,24 @@ irqreturn_t cnl_ipc_irq_thread(int irq, void *context) 
			 msg, msg_ext);



		/* handle messages from DSP */

		if ((hipctdr & SOF_IPC_PANIC_MAGIC_MASK) ==

		   SOF_IPC_PANIC_MAGIC) {

			snd_sof_dsp_panic(sdev, HDA_DSP_PANIC_OFFSET(msg_ext));

		if ((hipctdr & SOF_IPC_PANIC_MAGIC_MASK) == SOF_IPC_PANIC_MAGIC) {

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

			bool non_recoverable = true;



			/*

			 * This is a PANIC message!

			 *

			 * If it is arriving during firmware boot and it is not

			 * the last boot attempt then change the non_recoverable

			 * to false as the DSP might be able to boot in the next

			 * iteration(s)

			 */

			if (sdev->fw_state == SOF_FW_BOOT_IN_PROGRESS &&

			    hda->boot_iteration < HDA_FW_BOOT_ATTEMPTS)

				non_recoverable = false;



			snd_sof_dsp_panic(sdev, HDA_DSP_PANIC_OFFSET(msg_ext),

					  non_recoverable);

		} else {

			snd_sof_ipc_msgs_rx(sdev);

		}