Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
MIME-Version: 1.0
References: <20230701094723.29379-1-johan+linaro@kernel.org>
In-Reply-To: <20230701094723.29379-1-johan+linaro@kernel.org>
From:   Steev Klimaszewski <steev@kali.org>
Date:   Sun, 2 Jul 2023 10:35:23 -0500
Message-ID: <CAKXuJqjyjbRi2H=A_d=RgMOKSy=ZRqr0YVqsFObMYKtp66RyHA@mail.gmail.com>
Subject: Re: [PATCH] ASoC: codecs: wcd938x: fix soundwire initialisation race
To:     Johan Hovold <johan+linaro@kernel.org>
Cc:     Mark Brown <broonie@kernel.org>,
        Liam Girdwood <lgirdwood@gmail.com>,
        Jaroslav Kysela <perex@perex.cz>,
        Takashi Iwai <tiwai@suse.com>, alsa-devel@alsa-project.org,
        linux-kernel@vger.kernel.org, stable@vger.kernel.org,
        Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
Precedence: bulk

On Sat, Jul 1, 2023 at 4:48=E2=80=AFAM Johan Hovold <johan+linaro@kernel.or=
g> wrote:
>
> Make sure that the soundwire device used for register accesses has been
> enumerated and initialised before trying to read the codec variant
> during component probe.
>
> This specifically avoids interpreting (a masked and shifted) -EBUSY
> errno as the variant:
>
>         wcd938x_codec audio-codec: ASoC: error at soc_component_read_no_l=
ock on audio-codec for register: [0x000034b0] -16
>
> in case the soundwire device has not yet been initialised, which in turn
> prevents some headphone controls from being registered.
>
> Fixes: 8d78602aa87a ("ASoC: codecs: wcd938x: add basic driver")
> Cc: stable@vger.kernel.org      # 5.14
> Cc: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
> Reported-by: Steev Klimaszewski <steev@kali.org>
> Signed-off-by: Johan Hovold <johan+linaro@kernel.org>
> ---
>  sound/soc/codecs/wcd938x.c | 9 +++++++++
>  1 file changed, 9 insertions(+)
>
> diff --git a/sound/soc/codecs/wcd938x.c b/sound/soc/codecs/wcd938x.c
> index e3ae4fb2c4db..4571588fad62 100644
> --- a/sound/soc/codecs/wcd938x.c
> +++ b/sound/soc/codecs/wcd938x.c
> @@ -3080,9 +3080,18 @@ static int wcd938x_irq_init(struct wcd938x_priv *w=
cd, struct device *dev)
>  static int wcd938x_soc_codec_probe(struct snd_soc_component *component)
>  {
>         struct wcd938x_priv *wcd938x =3D snd_soc_component_get_drvdata(co=
mponent);
> +       struct sdw_slave *tx_sdw_dev =3D wcd938x->tx_sdw_dev;
>         struct device *dev =3D component->dev;
> +       unsigned long time_left;
>         int ret, i;
>
> +       time_left =3D wait_for_completion_timeout(&tx_sdw_dev->initializa=
tion_complete,
> +                                               msecs_to_jiffies(2000));
> +       if (!time_left) {
> +               dev_err(dev, "soundwire device init timeout\n");
> +               return -ETIMEDOUT;
> +       }
> +
>         snd_soc_component_init_regmap(component, wcd938x->regmap);
>
>         ret =3D pm_runtime_resume_and_get(dev);
> --
> 2.39.3
>

Thank you!  Tested with this and the other patch applied on my X13s
with a pair of Apple EarPods with 3.5mm Headphone Plug, audio is quite
nice through them.

Tested-by: Steev Klimaszewski <steev@kali.org>