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

firmware: cs_dsp: Add lockdep asserts to interface functions 



Some of the control functions exposed by the cs_dsp code require the
pwr_lock to be held by the caller. Add lockdep_assert_held calls to
ensure this is done correctly.

Signed-off-by: default avatarCharles Keepax <ckeepax@opensource.cirrus.com>
Link: https://lore.kernel.org/r/20211117132300.1290-2-ckeepax@opensource.cirrus.com


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

drivers/firmware/cirrus/cs_dsp.c

+14 −0
Original line number Diff line number Diff line
@@ -653,6 +653,8 @@ int cs_dsp_coeff_write_acked_control(struct cs_dsp_coeff_ctl *ctl, unsigned int 
	unsigned int reg;

	int i, ret;



	lockdep_assert_held(&dsp->pwr_lock);



	if (!dsp->running)

		return -EPERM;
@@ -754,6 +756,8 @@ int cs_dsp_coeff_write_ctrl(struct cs_dsp_coeff_ctl *ctl, const void *buf, size_ 
{

	int ret = 0;



	lockdep_assert_held(&ctl->dsp->pwr_lock);



	if (ctl->flags & WMFW_CTL_FLAG_VOLATILE)

		ret = -EPERM;

	else if (buf != ctl->cache)
@@ -811,6 +815,8 @@ int cs_dsp_coeff_read_ctrl(struct cs_dsp_coeff_ctl *ctl, void *buf, size_t len) 
{

	int ret = 0;



	lockdep_assert_held(&ctl->dsp->pwr_lock);



	if (ctl->flags & WMFW_CTL_FLAG_VOLATILE) {

		if (ctl->enabled && ctl->dsp->running)

			return cs_dsp_coeff_read_ctrl_raw(ctl, buf, len);
@@ -1453,6 +1459,8 @@ struct cs_dsp_coeff_ctl *cs_dsp_get_ctl(struct cs_dsp *dsp, const char *name, in 
{

	struct cs_dsp_coeff_ctl *pos, *rslt = NULL;



	lockdep_assert_held(&dsp->pwr_lock);



	list_for_each_entry(pos, &dsp->ctl_list, list) {

		if (!pos->subname)

			continue;
@@ -1548,6 +1556,8 @@ struct cs_dsp_alg_region *cs_dsp_find_alg_region(struct cs_dsp *dsp, 
{

	struct cs_dsp_alg_region *alg_region;



	lockdep_assert_held(&dsp->pwr_lock);



	list_for_each_entry(alg_region, &dsp->alg_regions, list) {

		if (id == alg_region->alg && type == alg_region->type)

			return alg_region;
@@ -2783,6 +2793,8 @@ int cs_dsp_read_raw_data_block(struct cs_dsp *dsp, int mem_type, unsigned int me 
	unsigned int reg;

	int ret;



	lockdep_assert_held(&dsp->pwr_lock);



	if (!mem)

		return -EINVAL;
@@ -2836,6 +2848,8 @@ int cs_dsp_write_data_word(struct cs_dsp *dsp, int mem_type, unsigned int mem_ad 
	__be32 val = cpu_to_be32(data & 0x00ffffffu);

	unsigned int reg;



	lockdep_assert_held(&dsp->pwr_lock);



	if (!mem)

		return -EINVAL;