ASoC: wm_adsp: Don't allow compress stream on DSP after WDT expiry

Prevent compress stream start on a DSP after the WDT has expired.
Additionally, if the stream has already started, put it into a bad
state and then wake any polls so that they can see the change.

Change-Id: I69d6c36d8dae4868cd2d00f34e2b00b5e1cc9b58
Signed-off-by: Stuart Henderson <[email protected]>

Author: stuhenderson

sound/soc/codecs/wm_adsp.c

@@ -3903,6 +3903,8 @@ int wm_halo_event(struct snd_soc_dapm_widget *w, struct snd_kcontrol *kcontrol,
 		if (wm_adsp_fw[dsp->fw].num_caps != 0)
 			wm_adsp_buffer_free(dsp);
 
+		dsp->fatal_error = false;
+
 		mutex_unlock(&dsp->pwr_lock);
 
 		/* reset halo core with CORE_SOFT_REEST */
@@ -4049,7 +4051,7 @@ static int wm_adsp_compr_attach(struct wm_adsp_compr *compr)
 	 * Note this will be more complex once each DSP can support multiple
 	 * streams
 	 */
-	if (!compr->dsp->buffer)
+	if (!compr->dsp->buffer || compr->dsp->fatal_error)
 		return -EINVAL;
 
 	compr->buf = compr->dsp->buffer;
@@ -5065,6 +5067,12 @@ irqreturn_t wm_halo_wdt_expire(int irq, void *data)
 	adsp_warn(dsp, "WDT Expiry Fault\n");
 	wm_halo_stop_watchdog(dsp);
 
+	dsp->fatal_error = true;
+	if (dsp->compr && dsp->compr->stream) {
+		snd_compr_stop_error(dsp->compr->stream, SNDRV_PCM_STATE_XRUN);
+		snd_compr_fragment_elapsed(dsp->compr->stream);
+	}
+
 	mutex_unlock(&dsp->pwr_lock);
 
 	return IRQ_HANDLED;

sound/soc/codecs/wm_adsp.h

@@ -87,6 +87,7 @@ struct wm_adsp {
 	bool preloaded;
 	bool booted;
 	bool running;
+	bool fatal_error;
 
 	struct list_head ctl_list;