| Message ID | 1653387228-28110-5-git-send-email-quic_kriskura@quicinc.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | USB DWC3 host wake up support from system suspend | expand |
Hi Krishna, On Tue, May 24, 2022 at 03:43:47PM +0530, Krishna Kurapati wrote: > From: Sandeep Maheswaram <quic_c_sanm@quicinc.com> > > 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. > > Signed-off-by: Sandeep Maheswaram <quic_c_sanm@quicinc.com> > Reviewed-by: Matthias Kaehlcke <mka@chromium.org> > Signed-off-by: Krishna Kurapati <quic_kriskura@quicinc.com> > --- > drivers/usb/dwc3/dwc3-qcom.c | 74 ++++++++++++++++++++++++++++++++++++++------ > 1 file changed, 65 insertions(+), 9 deletions(-) > > diff --git a/drivers/usb/dwc3/dwc3-qcom.c b/drivers/usb/dwc3/dwc3-qcom.c > index 7352124..5d5db62 100644 > --- a/drivers/usb/dwc3/dwc3-qcom.c > +++ b/drivers/usb/dwc3/dwc3-qcom.c > @@ -20,7 +20,8 @@ > #include <linux/usb/of.h> > #include <linux/reset.h> > #include <linux/iopoll.h> > - > +#include <linux/usb/hcd.h> > +#include <linux/usb.h> > #include "core.h" > > /* USB QSCRATCH Hardware registers */ > @@ -296,11 +297,37 @@ static void dwc3_qcom_interconnect_exit(struct dwc3_qcom *qcom) > icc_put(qcom->icc_path_apps); > } > > -static void dwc3_qcom_enable_wakeup_irq(int irq) > +enum usb_device_speed dwc3_qcom_update_usb2_speed(struct dwc3_qcom *qcom) > +{ > + struct dwc3 *dwc = platform_get_drvdata(qcom->dwc3); > + struct usb_hcd *hcd = platform_get_drvdata(dwc->xhci); > + struct usb_device *udev; > + enum usb_device_speed usb2_speed; > + > + /* > + * It is possible to query the speed of all children of > + * USB2.0 root hub via usb_hub_for_each_child(). DWC3 code > + * currently supports only 1 port per controller. So > + * this is sufficient. > + */ > + udev = usb_hub_find_child(hcd->self.root_hub, 1); > + > + if (udev) > + usb2_speed = udev->speed; > + else > + usb2_speed = USB_SPEED_UNKNOWN; > + > + return usb2_speed; > +} > + Can you rename this function since we are not updating anything here. %s/dwc3_qcom_update_usb2_speed/dwc3_qcom_get_usb2_speed > +static void dwc3_qcom_enable_wakeup_irq(int irq, unsigned int polarity) > { > if (!irq) > return; > > + if (polarity) > + irq_set_irq_type(irq, polarity); > + > enable_irq(irq); > enable_irq_wake(irq); > } > @@ -316,24 +343,53 @@ static void dwc3_qcom_disable_wakeup_irq(int irq) > > static void dwc3_qcom_disable_interrupts(struct dwc3_qcom *qcom) > { > - dwc3_qcom_disable_wakeup_irq(qcom->hs_phy_irq); > + enum usb_device_speed usb2_speed = dwc3_qcom_update_usb2_speed(qcom); I am sorry for misleading you on this. Looks like caching usb2_speed in suspend routine dwc3_qcom struct has a benefit. Can we please change to your previous patch-set style? Thanks, Pavan
On Tue, May 24, 2022 at 03:43:47PM +0530, Krishna Kurapati wrote: > From: Sandeep Maheswaram <quic_c_sanm@quicinc.com> > > 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. > > Signed-off-by: Sandeep Maheswaram <quic_c_sanm@quicinc.com> > Reviewed-by: Matthias Kaehlcke <mka@chromium.org> With the addition of dwc3_qcom_update_usb2_speed() the patch has changed a bit since my review, I'm generally on board with the direction this is going, but please remove my R-B tag for now. > Signed-off-by: Krishna Kurapati <quic_kriskura@quicinc.com> > --- > drivers/usb/dwc3/dwc3-qcom.c | 74 ++++++++++++++++++++++++++++++++++++++------ > 1 file changed, 65 insertions(+), 9 deletions(-) > > diff --git a/drivers/usb/dwc3/dwc3-qcom.c b/drivers/usb/dwc3/dwc3-qcom.c > index 7352124..5d5db62 100644 > --- a/drivers/usb/dwc3/dwc3-qcom.c > +++ b/drivers/usb/dwc3/dwc3-qcom.c > @@ -20,7 +20,8 @@ > #include <linux/usb/of.h> > #include <linux/reset.h> > #include <linux/iopoll.h> > - > +#include <linux/usb/hcd.h> > +#include <linux/usb.h> > #include "core.h" > > /* USB QSCRATCH Hardware registers */ > @@ -296,11 +297,37 @@ static void dwc3_qcom_interconnect_exit(struct dwc3_qcom *qcom) > icc_put(qcom->icc_path_apps); > } > > -static void dwc3_qcom_enable_wakeup_irq(int irq) > +enum usb_device_speed dwc3_qcom_update_usb2_speed(struct dwc3_qcom *qcom) > +{ > + struct dwc3 *dwc = platform_get_drvdata(qcom->dwc3); > + struct usb_hcd *hcd = platform_get_drvdata(dwc->xhci); > + struct usb_device *udev; > + enum usb_device_speed usb2_speed; nit: dwc and hcd are indented to align, udev and usb2_speed not. Either align the indentation or not, but don't be inconsistent. My vote goes for removing the alignment. > + > + /* > + * It is possible to query the speed of all children of > + * USB2.0 root hub via usb_hub_for_each_child(). DWC3 code > + * currently supports only 1 port per controller. So > + * this is sufficient. > + */ > + udev = usb_hub_find_child(hcd->self.root_hub, 1); > + > + if (udev) > + usb2_speed = udev->speed; > + else > + usb2_speed = USB_SPEED_UNKNOWN; > + > + return usb2_speed; nit: you could get away without 'usb2_speed': if (!udev) return USB_SPEED_UNKNOWN; return udev->speed;
diff --git a/drivers/usb/dwc3/dwc3-qcom.c b/drivers/usb/dwc3/dwc3-qcom.c index 7352124..5d5db62 100644 --- a/drivers/usb/dwc3/dwc3-qcom.c +++ b/drivers/usb/dwc3/dwc3-qcom.c @@ -20,7 +20,8 @@ #include <linux/usb/of.h> #include <linux/reset.h> #include <linux/iopoll.h> - +#include <linux/usb/hcd.h> +#include <linux/usb.h> #include "core.h" /* USB QSCRATCH Hardware registers */ @@ -296,11 +297,37 @@ static void dwc3_qcom_interconnect_exit(struct dwc3_qcom *qcom) icc_put(qcom->icc_path_apps); } -static void dwc3_qcom_enable_wakeup_irq(int irq) +enum usb_device_speed dwc3_qcom_update_usb2_speed(struct dwc3_qcom *qcom) +{ + struct dwc3 *dwc = platform_get_drvdata(qcom->dwc3); + struct usb_hcd *hcd = platform_get_drvdata(dwc->xhci); + struct usb_device *udev; + enum usb_device_speed usb2_speed; + + /* + * It is possible to query the speed of all children of + * USB2.0 root hub via usb_hub_for_each_child(). DWC3 code + * currently supports only 1 port per controller. So + * this is sufficient. + */ + udev = usb_hub_find_child(hcd->self.root_hub, 1); + + if (udev) + usb2_speed = udev->speed; + else + usb2_speed = USB_SPEED_UNKNOWN; + + return usb2_speed; +} + +static void dwc3_qcom_enable_wakeup_irq(int irq, unsigned int polarity) { if (!irq) return; + if (polarity) + irq_set_irq_type(irq, polarity); + enable_irq(irq); enable_irq_wake(irq); } @@ -316,24 +343,53 @@ static void dwc3_qcom_disable_wakeup_irq(int irq) static void dwc3_qcom_disable_interrupts(struct dwc3_qcom *qcom) { - dwc3_qcom_disable_wakeup_irq(qcom->hs_phy_irq); + enum usb_device_speed usb2_speed = dwc3_qcom_update_usb2_speed(qcom); - dwc3_qcom_disable_wakeup_irq(qcom->dp_hs_phy_irq); + dwc3_qcom_disable_wakeup_irq(qcom->hs_phy_irq); - dwc3_qcom_disable_wakeup_irq(qcom->dm_hs_phy_irq); + if (usb2_speed == USB_SPEED_LOW) { + dwc3_qcom_disable_wakeup_irq(qcom->dm_hs_phy_irq); + } else if ((usb2_speed == USB_SPEED_HIGH) || + (usb2_speed == USB_SPEED_FULL)) { + dwc3_qcom_disable_wakeup_irq(qcom->dp_hs_phy_irq); + } else { + dwc3_qcom_disable_wakeup_irq(qcom->dp_hs_phy_irq); + dwc3_qcom_disable_wakeup_irq(qcom->dm_hs_phy_irq); + } dwc3_qcom_disable_wakeup_irq(qcom->ss_phy_irq); } static void dwc3_qcom_enable_interrupts(struct dwc3_qcom *qcom) { - dwc3_qcom_enable_wakeup_irq(qcom->hs_phy_irq); + enum usb_device_speed usb2_speed = dwc3_qcom_update_usb2_speed(qcom); - dwc3_qcom_enable_wakeup_irq(qcom->dp_hs_phy_irq); + dwc3_qcom_enable_wakeup_irq(qcom->hs_phy_irq, 0); - dwc3_qcom_enable_wakeup_irq(qcom->dm_hs_phy_irq); + /* + * 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. + */ + + if (usb2_speed == USB_SPEED_LOW) { + dwc3_qcom_enable_wakeup_irq(qcom->dm_hs_phy_irq, + IRQ_TYPE_EDGE_FALLING); + } else if ((usb2_speed == USB_SPEED_HIGH) || + (usb2_speed == USB_SPEED_FULL)) { + dwc3_qcom_enable_wakeup_irq(qcom->dp_hs_phy_irq, + IRQ_TYPE_EDGE_FALLING); + } else { + dwc3_qcom_enable_wakeup_irq(qcom->dp_hs_phy_irq, + IRQ_TYPE_EDGE_RISING); + dwc3_qcom_enable_wakeup_irq(qcom->dm_hs_phy_irq, + IRQ_TYPE_EDGE_RISING); + } - dwc3_qcom_enable_wakeup_irq(qcom->ss_phy_irq); + dwc3_qcom_enable_wakeup_irq(qcom->ss_phy_irq, 0); } static int dwc3_qcom_suspend(struct dwc3_qcom *qcom)