Unverified Commit 04ff40a9 authored Feb 05, 2018 by Richard Fitzgerald Committed by Mark Brown Feb 12, 2018

ASoC: wm_adsp: Don't init cache from DSP memory if control is write-only



For controls marked write-only don't initialize the cache from the
content of the DSP memory. We stil need the cache for any new data
that is written to this control, and we need to return something
for a read of the ALSA control because most user-side code assumes
all ALSA controls are readable. The cache is already created zero-
filled so the only change needed is to skip populating it from
DSP memory if the control isn't readable.

Signed-off-by: Richard Fitzgerald <rf@opensource.cirrus.com>
Signed-off-by: Mark Brown <broonie@kernel.org>

parent 7928b2cb

sound/soc/codecs/wm_adsp.c

+10 −3

Original line number	Diff line number	Diff line
		@@ -1237,10 +1237,17 @@ static int wm_coeff_init_control_caches(struct wm_adsp *dsp)
		if (ctl->flags & WMFW_CTL_FLAG_VOLATILE)
		continue;

		/*
		* For readable controls populate the cache from the DSP memory.
		* For non-readable controls the cache was zero-filled when
		* created so we don't need to do anything.
		*/
		if (!ctl->flags \|\| (ctl->flags & WMFW_CTL_FLAG_READABLE)) {
		ret = wm_coeff_read_control(ctl, ctl->cache, ctl->len);
		if (ret < 0)
		return ret;
		}
		}

		return 0;
		}

Admin message