All of lore.kernel.org
 help / color / mirror / Atom feed
From: sashiko-bot@kernel.org
To: "Rafael Diniz" <rafael@riseup.net>
Cc: linux-sound@vger.kernel.org
Subject: Re: [PATCH v2] ASoC: wm8731: power the converters together, activate the interface last
Date: Fri, 20 Nov 2026 08:25:26 +0000	[thread overview]
Message-ID: <sashiko-outbox-224726@kernel.org> (raw)
In-Reply-To: <20261120080825.2078162-1-rafael@riseup.net>

Thank you for your contribution! Sashiko AI review found 3 potential
issues to consider:
- [High] ASoC: wm8731: false -EBUSY in wm8731_hw_params() when ACTIVE
  stays set
- [High] ASoC: wm8731: wm8731_interface_event() skipped on non-stream
  DAPM updates
- [Medium] ASoC: wm8731: ACTIVE stuck on in wm8731_interface_event()
  with Line Bypass
--

commit 1764fc73f40875ea1116cd822b76a8d9be453ab5
Author: Rafael Diniz <rafael@riseup.net>

ASoC: wm8731: power the converters together, activate the interface last

This commit groups the ADC, DAC, and line input power controls under a
single Converters DAPM supply widget, activates the digital audio interface
from a DAPM post widget after powering up the converters, and rejects rate
or word-length changes in wm8731_hw_params() while the interface is active.

Link: https://github.com/raspberrypi/linux/issues/7776

> diff --git a/sound/soc/codecs/wm8731.c b/sound/soc/codecs/wm8731.c
> index f25b50919a9a5..1a983ad43f174 100644
> --- a/sound/soc/codecs/wm8731.c
> +++ b/sound/soc/codecs/wm8731.c
> @@ -167,20 +167,76 @@ SOC_DAPM_SINGLE("HiFi Playback Switch", WM8731_APANA, 4, 1, 0),
>  static const struct snd_kcontrol_new wm8731_input_mux_controls =
>  SOC_DAPM_ENUM("Input Select", wm8731_insel_enum);
>  
> +/*
> + * The datasheet's power-up sequence powers the converters, sets the other
> + * registers and activates the digital audio interface last.  With the
> + * codec as clock provider at 96 kHz (12 MHz crystal, USB mode), powering
> + * the ADC up while the interface was already active left it, about one
> + * time in four, delivering its DC offset and noise but no signal, until the
> + * interface was deactivated and activated again.  As DAPM widgets of their
> + * own, ACTIVE (a supply) was set ahead of the ADC on every capture start,
> + * and a capture starting next to a running playback powered the ADC up
> + * under an active interface.
> + *
> + * So the ADC, DAC and line input are powered together, by one supply, with
> + * the interface inactive; the interface is activated once a stream's
> + * widgets are all up and deactivated before the converters go down.  A
> + * second stream finds both converters powered and the interface left as it
> + * is.
> + */
> +#define WM8731_PWR_CONVERTERS (WM8731_PWR_LINEINPD | WM8731_PWR_ADCPD | WM8731_PWR_DACPD)
> +
> +static int wm8731_converters_event(struct snd_soc_dapm_widget *w,
> +				   struct snd_kcontrol *kcontrol, int event)
> +{
> +	struct snd_soc_component *component = snd_soc_dapm_to_component(w->dapm);
> +
> +	snd_soc_component_update_bits(component, WM8731_ACTIVE,
> +				      WM8731_ACTIVE_ACTIVE, 0);
> +
> +	switch (event) {
> +	case SND_SOC_DAPM_PRE_PMU:
> +		snd_soc_component_update_bits(component, WM8731_PWR,
> +					      WM8731_PWR_CONVERTERS, 0);
> +		break;
> +	case SND_SOC_DAPM_PRE_PMD:
> +		snd_soc_component_update_bits(component, WM8731_PWR,
> +					      WM8731_PWR_CONVERTERS,
> +					      WM8731_PWR_CONVERTERS);
> +		break;
> +	}
> +	return 0;
> +}
> +
> +static int wm8731_interface_event(struct snd_soc_dapm_widget *w,
> +				  struct snd_kcontrol *kcontrol, int event)
> +{
> +	struct snd_soc_component *component = snd_soc_dapm_to_component(w->dapm);
> +	unsigned int pwr = snd_soc_component_read(component, WM8731_PWR);
> +
> +	if (event == SND_SOC_DAPM_POST_PMU && !(pwr & WM8731_PWR_CONVERTERS))
> +		snd_soc_component_update_bits(component, WM8731_ACTIVE,
> +					      WM8731_ACTIVE_ACTIVE,
> +					      WM8731_ACTIVE_ACTIVE);
> +	return 0;
> +}
> +
>  static const struct snd_soc_dapm_widget wm8731_dapm_widgets[] = {
> -SND_SOC_DAPM_SUPPLY("ACTIVE",WM8731_ACTIVE, 0, 0, NULL, 0),
> +SND_SOC_DAPM_POST("Interface", wm8731_interface_event),
>  SND_SOC_DAPM_SUPPLY("OSC", WM8731_PWR, 5, 1, NULL, 0),
> +SND_SOC_DAPM_SUPPLY("Converters", SND_SOC_NOPM, 0, 0, wm8731_converters_event,
> +		    SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_PRE_PMD),

[Severity: High]
Does using SND_SOC_DAPM_POST for Interface leave WM8731_ACTIVE_ACTIVE
cleared when Converters powers up from a mixer update while a stream is
already running?

In dapm_seq_run(), snd_soc_dapm_post widgets only run when the DAPM event
is SND_SOC_DAPM_STREAM_START or SND_SOC_DAPM_STREAM_STOP:

sound/soc/soc-dapm.c:dapm_seq_run() {
    ...
		case snd_soc_dapm_post:
			if (!w->event)
				continue;

			if (event == SND_SOC_DAPM_STREAM_START)
				ret = w->event(w,
					       NULL, SND_SOC_DAPM_POST_PMU);
			else if (event == SND_SOC_DAPM_STREAM_STOP)
				ret = w->event(w,
					       NULL, SND_SOC_DAPM_POST_PMD);
			break;
    ...
}

Output Mixer HiFi Playback Switch defaults to off, so starting playback
before enabling that switch leaves DAC and Converters powered down during
SND_SOC_DAPM_STREAM_START.  When HiFi Playback Switch is then turned on
(or toggled off and back on during playback), dapm_mixer_update_power()
runs with SND_SOC_DAPM_STREAM_NOP: wm8731_converters_event() clears
WM8731_ACTIVE_ACTIVE and powers up Converters, but wm8731_interface_event()
is never called, leaving the digital audio interface inactive for the
running stream.

[ ... ]

> @@ -199,8 +255,9 @@ static int wm8731_check_osc(struct snd_soc_dapm_widget *source,
>  static const struct snd_soc_dapm_route wm8731_intercon[] = {
>  	{"DAC", NULL, "OSC", wm8731_check_osc},
>  	{"ADC", NULL, "OSC", wm8731_check_osc},
> -	{"DAC", NULL, "ACTIVE"},
> -	{"ADC", NULL, "ACTIVE"},
> +	{"DAC", NULL, "Converters"},
> +	{"ADC", NULL, "Converters"},
> +	{"Line Input", NULL, "Converters"},

[Severity: Medium]
Can routing Line Input through Converters leave WM8731_ACTIVE_ACTIVE stuck
on after all PCM streams stop when Line Bypass Switch is enabled?

When Output Mixer Line Bypass Switch is on, the analog path from
LLINEIN/RLINEIN through Line Input and Output Mixer to the outputs keeps
Converters powered even without an active PCM stream.  Starting a PCM
stream sets WM8731_ACTIVE_ACTIVE in wm8731_interface_event(), but stopping
that stream does not power down Converters, and wm8731_interface_event()
does nothing on SND_SOC_DAPM_POST_PMD.  WM8731_ACTIVE_ACTIVE therefore
stays set after the stream stops, leaving the digital interface active and
causing subsequent wm8731_hw_params() calls with a different rate or bit
width to fail with -EBUSY.

> @@ -339,8 +392,25 @@ static int wm8731_hw_params(struct snd_pcm_substream *substream,
>  		break;
>  	}
>  
> -	wm8731_set_deemph(component);
> +	/*
> +	 * One sample rate and word length serve both directions.  While the
> +	 * interface is active (the other direction running) its clocking is
> +	 * not rewritten: the same settings are kept, others are refused.
> +	 */
> +	if (snd_soc_component_read(component, WM8731_ACTIVE) & WM8731_ACTIVE_ACTIVE) {
> +		if (snd_soc_component_read(component, WM8731_SRATE) != srate ||
> +		    snd_soc_component_read(component, WM8731_IFACE) != iface) {
> +			dev_err(component->dev,
> +				"interface active at other settings: %d Hz, %d bits refused\n",
> +				params_rate(params), params_width(params));
> +			return -EBUSY;
> +		}
> +		return 0;
> +	}

[Severity: High]
Will checking WM8731_ACTIVE_ACTIVE in wm8731_hw_params() reject valid rate
or bit-width changes with -EBUSY after a playback stream closes?

soc_component_dev_wm8731 sets .use_pmdown_time = 1, so closing a playback
stream does not run SND_SOC_DAPM_STREAM_STOP immediately; instead,
snd_soc_dapm_stream_stop() queues rtd->delayed_work for pmdown_time (5
seconds by default).  During that window, Converters stays powered and
WM8731_ACTIVE_ACTIVE remains set, so opening any playback or capture stream
with a different sample rate or format within 5 seconds fails in
wm8731_hw_params() with -EBUSY even though no stream is running.
Reconfiguring hw_params on a single prepared or stopped substream before
hw_free hits the same check against its own active state.

-- 
Sashiko AI review · https://sashiko.dev/#/patchset/20261120080825.2078162-1-rafael@riseup.net?part=1

  reply	other threads:[~2026-11-20  8:25 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-11-20  8:07 [PATCH v2] ASoC: wm8731: power the converters together, activate the interface last Rafael Diniz
2026-11-20  8:25 ` sashiko-bot [this message]
2026-11-20 10:11 ` Charles Keepax
2026-11-20 10:19   ` Charles Keepax
2026-11-20 16:36 ` Mark Brown

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=sashiko-outbox-224726@kernel.org \
    --to=sashiko-bot@kernel.org \
    --cc=linux-sound@vger.kernel.org \
    --cc=rafael@riseup.net \
    --cc=sashiko-reviews@lists.linux.dev \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.