[PATCH] soundwire: qcom: remove unneeded check

Steev Klimaszewski steev at kali.org
Fri Aug 19 19:25:26 CEST 2022


Oh perfect, I'm not sure how I missed that when I was searching.  This
can be abandoned but it's nice to know I got the fix right :D

On Fri, Aug 19, 2022 at 3:51 AM Amit Pundir <amit.pundir at linaro.org> wrote:
>
> Hi Steev,
>
> Thank you for looking into this crash. Srini submitted the same fix
> earlier this week
> https://www.spinics.net/lists/alsa-devel/msg146137.html
>
> Regards,
> Amit Pundir
>
> On Thu, 18 Aug 2022 at 09:21, Steev Klimaszewski <steev at kali.org> wrote:
> >
> > commit 1fd0d85affe4d6 ("soundwire: qcom: Add flag for software clock gating check")
> > added a flag for software clock gating check, however in commit
> > 33ba01788889666 ("soundwire: qcom: Add support for controlling audio CGCR from HLOS")
> > the same check was added without the flag, so we would still end up failing
> > the software clock gating check.
> >
> > Originally reported by Amit Pundir on DB845c, I also saw it on the
> > Lenovo Yoga C630, right before the splat, we would see
> >
> > qcom-soundwire wcd934x-soundwire.6.auto: Failed to get audio_cgcr reset required for soundwire-v1.6.0
> >
> > however, SDM845 has a soundwire-v1.3.0
> >
> > Since the flag was added in 1fd0d85affe, lets just remove this one.
> >
> > Fixes: 33ba01788889 ("soundwire: qcom: Add support for controlling audio CGCR from HLOS")
> > Signed-off-by: Steev Klimaszewski <steev at kali.org>
> > Reported-by: Amit Pundir <amit.pundir at linaro.org>
> > ---
> >  drivers/soundwire/qcom.c | 4 ----
> >  1 file changed, 4 deletions(-)
> >
> > diff --git a/drivers/soundwire/qcom.c b/drivers/soundwire/qcom.c
> > index 709a7c1e0704..b621f7fb866f 100644
> > --- a/drivers/soundwire/qcom.c
> > +++ b/drivers/soundwire/qcom.c
> > @@ -1355,10 +1355,6 @@ static int qcom_swrm_probe(struct platform_device *pdev)
> >         ctrl->bus.compute_params = &qcom_swrm_compute_params;
> >         ctrl->bus.clk_stop_timeout = 300;
> >
> > -       ctrl->audio_cgcr = devm_reset_control_get_exclusive(dev, "swr_audio_cgcr");
> > -       if (IS_ERR(ctrl->audio_cgcr))
> > -               dev_err(dev, "Failed to get audio_cgcr reset required for soundwire-v1.6.0\n");
> > -
> >         ret = qcom_swrm_get_port_config(ctrl);
> >         if (ret)
> >                 goto err_clk;
> > --
> > 2.35.1
> >


More information about the Alsa-devel mailing list