Re: [PATCH 2/3] USB: dwc3: qcom: fix wakeup after probe deferral

Andrew Halaney
2023-11-20T20:51:02Z

On Mon, Nov 20, 2023 at 11:39:07AM -0600, Andrew Halaney wrote:
> On Mon, Nov 20, 2023 at 05:16:06PM +0100, Johan Hovold wrote:
> > The Qualcomm glue driver is overriding the interrupt trigger types
> > defined by firmware when requesting the wakeup interrupts during probe.
> >
> > This can lead to a failure to map the DP/DM wakeup interrupts after a
> > probe deferral as the firmware defined trigger types do not match the
> > type used for the initial mapping:
> >
> > irq: type mismatch, failed to map hwirq-14 for interrupt-controller@b220000!
> > irq: type mismatch, failed to map hwirq-15 for interrupt-controller@b220000!
> >
> > Fix this by not overriding the firmware provided trigger types when
> > requesting the wakeup interrupts.
>
> This series looks good to me and makes sense except for one point that
> I'm struggling to understand. What exactly is the relationship with this
> failure and probe deferral?

Eric Chanudet pointed out to me (thanks!) offlist that if you:

1. Probe
2. Grab the IRQ
3. Request it (and muck with the trigger from the firmware default)
4. Defer out
5. Reprobe
6. Grab the IRQ again

You get that error, which I played with some this afternoon...
and can confirm.

It really seems like maybe we should consider reworking messing with the
trigger type at all (which is done later for runtime/system suspend)
in a follow-up series?

As far as I can tell if you were to remove the driver and reprobe after
a suspend you'd hit similar. I've been sitting here scratching my head a
bit trying to reason out why keeping it as IRQ_TYPE_EDGE_BOTH isn't
acceptable in dwc3_qcom_enable_interrupts()... Correct me if you think
that playing with the trigger there is really ok, but it seems like you
run the same risks if you do that and then modprobe -r dwc3-qcom.

I get that dwc3_qcom_enable_interrupts() limits the scope of what wakes us
up to what we expect given the current device (or lack thereof), but it
doesn't seem like you're really meant to play with the IRQ triggers,
or at least the warning you shared makes me think it is not a great idea
if you plan to probe the device ever again in the future.

I'll post the current comment in dwc3_qcom_enable_interrupts() to
explain the "limits the scope of what wakes us up" a bit more clearly:

/*
* Configure DP/DM line interrupts based on the USB2 device attached to
* the root hub port. When HS/FS device is connected, configure the DP line
* as falling edge to detect both disconnect and remote wakeup scenarios. When
* LS device is connected, configure DM line as falling edge to detect both
* disconnect and remote wakeup. When no device is connected, configure both
* DP and DM lines as rising edge to detect HS/HS/LS device connect scenario.
*/

>
> Thanks,
> Andrew
>
> >
> > Fixes: a4333c3a6ba9 ("usb: dwc3: Add Qualcomm DWC3 glue driver")
> > Cc: stable@vger.kernel.org # 4.18
> > Signed-off-by: Johan Hovold <johan+linaro@kernel.org>
> > ---
> > drivers/usb/dwc3/dwc3-qcom.c | 8 ++++----
> > 1 file changed, 4 insertions(+), 4 deletions(-)
> >
> > diff --git a/drivers/usb/dwc3/dwc3-qcom.c b/drivers/usb/dwc3/dwc3-qcom.c
> > index 10fb481d943b..82544374110b 100644
> > --- a/drivers/usb/dwc3/dwc3-qcom.c
> > +++ b/drivers/usb/dwc3/dwc3-qcom.c
> > @@ -549,7 +549,7 @@ static int dwc3_qcom_setup_irq(struct platform_device *pdev)
> > irq_set_status_flags(irq, IRQ_NOAUTOEN);
> > ret = devm_request_threaded_irq(qcom->dev, irq, NULL,
> > qcom_dwc3_resume_irq,
> > - IRQF_TRIGGER_HIGH | IRQF_ONESHOT,
> > + IRQF_ONESHOT,
> > "qcom_dwc3 HS", qcom);
> > if (ret) {
> > dev_err(qcom->dev, "hs_phy_irq failed: %d\n", ret);
> > @@ -564,7 +564,7 @@ static int dwc3_qcom_setup_irq(struct platform_device *pdev)
> > irq_set_status_flags(irq, IRQ_NOAUTOEN);
> > ret = devm_request_threaded_irq(qcom->dev, irq, NULL,
> > qcom_dwc3_resume_irq,
> > - IRQF_TRIGGER_HIGH | IRQF_ONESHOT,
> > + IRQF_ONESHOT,
> > "qcom_dwc3 DP_HS", qcom);
> > if (ret) {
> > dev_err(qcom->dev, "dp_hs_phy_irq failed: %d\n", ret);
> > @@ -579,7 +579,7 @@ static int dwc3_qcom_setup_irq(struct platform_device *pdev)
> > irq_set_status_flags(irq, IRQ_NOAUTOEN);
> > ret = devm_request_threaded_irq(qcom->dev, irq, NULL,
> > qcom_dwc3_resume_irq,
> > - IRQF_TRIGGER_HIGH | IRQF_ONESHOT,
> > + IRQF_ONESHOT,
> > "qcom_dwc3 DM_HS", qcom);
> > if (ret) {
> > dev_err(qcom->dev, "dm_hs_phy_irq failed: %d\n", ret);
> > @@ -594,7 +594,7 @@ static int dwc3_qcom_setup_irq(struct platform_device *pdev)
> > irq_set_status_flags(irq, IRQ_NOAUTOEN);
> > ret = devm_request_threaded_irq(qcom->dev, irq, NULL,
> > qcom_dwc3_resume_irq,
> > - IRQF_TRIGGER_HIGH | IRQF_ONESHOT,
> > + IRQF_ONESHOT,
> > "qcom_dwc3 SS", qcom);
> > if (ret) {
> > dev_err(qcom->dev, "ss_phy_irq failed: %d\n", ret);
> > --
> > 2.41.0
> >
> >