[v10,07/11] usb: dwc3: qcom: Enable wakeup for applicable ports of multiport
Commit Message
Currently wakeup is supported by only single port controllers. Read speed
of each port and accordingly enable IRQ's for those ports.
Signed-off-by: Krishna Kurapati <quic_kriskura@quicinc.com>
---
drivers/usb/dwc3/dwc3-qcom.c | 64 ++++++++++++++++++++----------------
1 file changed, 35 insertions(+), 29 deletions(-)
@@ -81,7 +81,7 @@ struct dwc3_qcom {
int dp_hs_phy_irq[DWC3_MAX_PORTS];
int dm_hs_phy_irq[DWC3_MAX_PORTS];
int ss_phy_irq[DWC3_MAX_PORTS];
- enum usb_device_speed usb2_speed;
+ enum usb_device_speed usb2_speed[DWC3_MAX_PORTS];
struct extcon_dev *edev;
struct extcon_dev *host_edev;
@@ -349,7 +349,8 @@ static bool dwc3_qcom_is_host(struct dwc3_qcom *qcom)
return dwc->xhci;
}
-static enum usb_device_speed dwc3_qcom_read_usb2_speed(struct dwc3_qcom *qcom)
+static enum usb_device_speed dwc3_qcom_read_usb2_speed(struct dwc3_qcom *qcom,
+ int port_index)
{
struct dwc3 *dwc = platform_get_drvdata(qcom->dwc3);
struct usb_device *udev;
@@ -362,12 +363,10 @@ static enum usb_device_speed dwc3_qcom_read_usb2_speed(struct dwc3_qcom *qcom)
/*
* 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.
+ * USB2.0 root hub via usb_hub_for_each_child().
*/
#ifdef CONFIG_USB
- udev = usb_hub_find_child(hcd->self.root_hub, 1);
+ udev = usb_hub_find_child(hcd->self.root_hub, port_index + 1);
#else
udev = NULL;
#endif
@@ -400,23 +399,29 @@ static void dwc3_qcom_disable_wakeup_irq(int irq)
static void dwc3_qcom_disable_interrupts(struct dwc3_qcom *qcom)
{
+ int i;
+
dwc3_qcom_disable_wakeup_irq(qcom->hs_phy_irq);
- if (qcom->usb2_speed == USB_SPEED_LOW) {
- dwc3_qcom_disable_wakeup_irq(qcom->dm_hs_phy_irq[0]);
- } else if ((qcom->usb2_speed == USB_SPEED_HIGH) ||
- (qcom->usb2_speed == USB_SPEED_FULL)) {
- dwc3_qcom_disable_wakeup_irq(qcom->dp_hs_phy_irq[0]);
- } else {
- dwc3_qcom_disable_wakeup_irq(qcom->dp_hs_phy_irq[0]);
- dwc3_qcom_disable_wakeup_irq(qcom->dm_hs_phy_irq[0]);
- }
+ for (i = 0; i < qcom->data->num_ports; i++) {
+ if (qcom->usb2_speed[i] == USB_SPEED_LOW) {
+ dwc3_qcom_disable_wakeup_irq(qcom->dm_hs_phy_irq[i]);
+ } else if ((qcom->usb2_speed[i] == USB_SPEED_HIGH) ||
+ (qcom->usb2_speed[i] == USB_SPEED_FULL)) {
+ dwc3_qcom_disable_wakeup_irq(qcom->dp_hs_phy_irq[i]);
+ } else {
+ dwc3_qcom_disable_wakeup_irq(qcom->dp_hs_phy_irq[i]);
+ dwc3_qcom_disable_wakeup_irq(qcom->dm_hs_phy_irq[i]);
+ }
- dwc3_qcom_disable_wakeup_irq(qcom->ss_phy_irq[0]);
+ dwc3_qcom_disable_wakeup_irq(qcom->ss_phy_irq[i]);
+ }
}
static void dwc3_qcom_enable_interrupts(struct dwc3_qcom *qcom)
{
+ int i;
+
dwc3_qcom_enable_wakeup_irq(qcom->hs_phy_irq, 0);
/*
@@ -427,22 +432,25 @@ static void dwc3_qcom_enable_interrupts(struct dwc3_qcom *qcom)
* 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.
*/
+ for (i = 0; i < qcom->data->num_ports; i++) {
+ qcom->usb2_speed[i] = dwc3_qcom_read_usb2_speed(qcom, i);
- if (qcom->usb2_speed == USB_SPEED_LOW) {
- dwc3_qcom_enable_wakeup_irq(qcom->dm_hs_phy_irq[0],
+ if (qcom->usb2_speed[i] == USB_SPEED_LOW) {
+ dwc3_qcom_enable_wakeup_irq(qcom->dm_hs_phy_irq[i],
IRQ_TYPE_EDGE_FALLING);
- } else if ((qcom->usb2_speed == USB_SPEED_HIGH) ||
- (qcom->usb2_speed == USB_SPEED_FULL)) {
- dwc3_qcom_enable_wakeup_irq(qcom->dp_hs_phy_irq[0],
+ } else if ((qcom->usb2_speed[i] == USB_SPEED_HIGH) ||
+ (qcom->usb2_speed[i] == USB_SPEED_FULL)) {
+ dwc3_qcom_enable_wakeup_irq(qcom->dp_hs_phy_irq[i],
IRQ_TYPE_EDGE_FALLING);
- } else {
- dwc3_qcom_enable_wakeup_irq(qcom->dp_hs_phy_irq[0],
+ } else {
+ dwc3_qcom_enable_wakeup_irq(qcom->dp_hs_phy_irq[i],
IRQ_TYPE_EDGE_RISING);
- dwc3_qcom_enable_wakeup_irq(qcom->dm_hs_phy_irq[0],
+ dwc3_qcom_enable_wakeup_irq(qcom->dm_hs_phy_irq[i],
IRQ_TYPE_EDGE_RISING);
- }
+ }
- dwc3_qcom_enable_wakeup_irq(qcom->ss_phy_irq[0], 0);
+ dwc3_qcom_enable_wakeup_irq(qcom->ss_phy_irq[i], 0);
+ }
}
static int dwc3_qcom_suspend(struct dwc3_qcom *qcom, bool wakeup)
@@ -468,10 +476,8 @@ static int dwc3_qcom_suspend(struct dwc3_qcom *qcom, bool wakeup)
* The role is stable during suspend as role switching is done from a
* freezable workqueue.
*/
- if (dwc3_qcom_is_host(qcom) && wakeup) {
- qcom->usb2_speed = dwc3_qcom_read_usb2_speed(qcom);
+ if (dwc3_qcom_is_host(qcom) && wakeup)
dwc3_qcom_enable_interrupts(qcom);
- }
qcom->is_suspended = true;