Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit a2225a6d authored by Charles Keepax's avatar Charles Keepax Committed by Mark Brown
Browse files

ASoC: wm_adsp: Add locking to wm_adsp2_bus_error 



Best to lock across handling the bus error to ensure the DSP doesn't
change power state as we are reading the status registers.

Signed-off-by: default avatarCharles Keepax <ckeepax@opensource.cirrus.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 48ead31c

sound/soc/codecs/wm_adsp.c

+8 −3
Original line number Diff line number Diff line
@@ -3922,11 +3922,13 @@ irqreturn_t wm_adsp2_bus_error(struct wm_adsp *dsp) 
	struct regmap *regmap = dsp->regmap;

	int ret = 0;



	mutex_lock(&dsp->pwr_lock);



	ret = regmap_read(regmap, dsp->base + ADSP2_LOCK_REGION_CTRL, &val);

	if (ret) {

		adsp_err(dsp,

			"Failed to read Region Lock Ctrl register: %d\n", ret);

		return IRQ_HANDLED;

		goto error;

	}



	if (val & ADSP2_WDT_TIMEOUT_STS_MASK) {
@@ -3945,7 +3947,7 @@ irqreturn_t wm_adsp2_bus_error(struct wm_adsp *dsp) 
			adsp_err(dsp,

				 "Failed to read Bus Err Addr register: %d\n",

				 ret);

			return IRQ_HANDLED;

			goto error;

		}



		adsp_err(dsp, "bus error address = 0x%x\n",
@@ -3958,7 +3960,7 @@ irqreturn_t wm_adsp2_bus_error(struct wm_adsp *dsp) 
			adsp_err(dsp,

				 "Failed to read Pmem Xmem Err Addr register: %d\n",

				 ret);

			return IRQ_HANDLED;

			goto error;

		}



		adsp_err(dsp, "xmem error address = 0x%x\n",
@@ -3971,6 +3973,9 @@ irqreturn_t wm_adsp2_bus_error(struct wm_adsp *dsp) 
	regmap_update_bits(regmap, dsp->base + ADSP2_LOCK_REGION_CTRL,

			   ADSP2_CTRL_ERR_EINT, ADSP2_CTRL_ERR_EINT);



error:

	mutex_unlock(&dsp->pwr_lock);



	return IRQ_HANDLED;

}

EXPORT_SYMBOL_GPL(wm_adsp2_bus_error);