On Mon, Aug 08, 2022 at 03:05:36PM +0200, Greg Kroah-Hartman wrote:
> On Thu, Aug 04, 2022 at 05:09:55PM +0200, Johan Hovold wrote:
> > A recent change added a dependency to the USB host stack and broke
> > gadget-only builds of the driver.
> >
> > Fixes: 6895ea55c385 ("usb: dwc3: qcom: Configure wakeup interrupts during suspend")
> > Reported-by: Randy Dunlap <rdunlap@xxxxxxxxxxxxx>
> > Signed-off-by: Johan Hovold <johan+linaro@xxxxxxxxxx>
> > ---
> >
> > Changes in v2
> > - new patch
> >
> > drivers/usb/dwc3/dwc3-qcom.c | 5 ++++-
> > 1 file changed, 4 insertions(+), 1 deletion(-)
> >
> > diff --git a/drivers/usb/dwc3/dwc3-qcom.c b/drivers/usb/dwc3/dwc3-qcom.c
> > index be2e3dd36440..e9364141661b 100644
> > --- a/drivers/usb/dwc3/dwc3-qcom.c
> > +++ b/drivers/usb/dwc3/dwc3-qcom.c
> > @@ -310,8 +310,11 @@ static enum usb_device_speed dwc3_qcom_read_usb2_speed(struct dwc3_qcom *qcom)
> > * currently supports only 1 port per controller. So
> > * this is sufficient.
> > */
> > +#ifdef CONFIG_USB
> > udev = usb_hub_find_child(hcd->self.root_hub, 1);
>
> If a gadget driver needs this for some reason, then the #ifdef should be
> put in a .h file, not in a .c file.
Yeah, if we're keeping this long-term then yes, and possibly also
otherwise.
> But step back a minute and ask why a host-config-only function is being
> called when a device is in gadget-only mode? This feels like a
> design/logic issue in this file, NOT something to paper over with a
> #ifdef in a .c file
We're not as I'm fixing that bug in later in the series. I should
probably have put this one after that fix, but figured fixing the build
was more important than a harder-to-hit NULL-deref due to non-host mode
not being considered when the offending series was merged.
> This implies that if this device is NOT in a host configuration, then
> the suspend path of it is not configured properly at all, as why would
> it be checking or caring about this at all if this is in gadget-only
> mode?
Right, so see path 6/9 which addresses this by only calling this hack
when in host mode:
https://lore.kernel.org/all/20220804151001.23612-7-johan+linaro@xxxxxxxxxx/
> Something else is wrong here, let's fix the root problem please. Maybe
> this driver should just never be built in gadget-only mode, as it is
> never intended to support that option?
The problem is commit 6895ea55c385 ("usb: dwc3: qcom: Configure wakeup
interrupts during suspend"), which I considered simply reverting but as
that breaks suspend completely on some boards I decided to try and fix
it up while we work on a proper long-term solution (i.e. for how the
dwc/xhci layers should be communicating to implement this).
Remember that it took two years and 21 revisions to get to the state
we're at now after you merged the wakeup series in June.
Johan
