From patchwork Wed Jun 10 06:42:30 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Kai-Heng Feng X-Patchwork-Id: 11597233 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 0404614B7 for ; Wed, 10 Jun 2020 06:42:48 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id DB6A82074B for ; Wed, 10 Jun 2020 06:42:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726180AbgFJGmk (ORCPT ); Wed, 10 Jun 2020 02:42:40 -0400 Received: from youngberry.canonical.com ([91.189.89.112]:51343 "EHLO youngberry.canonical.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726109AbgFJGmk (ORCPT ); Wed, 10 Jun 2020 02:42:40 -0400 Received: from 61-220-137-37.hinet-ip.hinet.net ([61.220.137.37] helo=localhost) by youngberry.canonical.com with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1jiuRX-0001Se-Lm; Wed, 10 Jun 2020 06:42:36 +0000 From: Kai-Heng Feng To: mathias.nyman@intel.com Cc: Kai-Heng Feng , Greg Kroah-Hartman , linux-usb@vger.kernel.org (open list:USB XHCI DRIVER), linux-kernel@vger.kernel.org (open list) Subject: [PATCH 1/2] xhci: Suspend ports to U3 directly from U1 or U2 Date: Wed, 10 Jun 2020 14:42:30 +0800 Message-Id: <20200610064231.9454-1-kai.heng.feng@canonical.com> X-Mailer: git-send-email 2.17.1 MIME-Version: 1.0 Sender: linux-usb-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-usb@vger.kernel.org xHCI spec "4.15.1 Port Suspend" states that port can be put to U3 as long as Enabled bit is set and from U0, U1 or U2 state. Currently only USB_PORT_FEAT_LINK_STATE puts port to U3 directly, let's do the same for USB_PORT_FEAT_SUSPEND and bus suspend case. This is particularly useful for USB2 devices, which may take a very long time to switch USB2 LPM on and off. Suggested-by: Mathias Nyman Signed-off-by: Kai-Heng Feng --- drivers/usb/host/xhci-hub.c | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/drivers/usb/host/xhci-hub.c b/drivers/usb/host/xhci-hub.c index f37316d2c8fa..f9375b77d17d 100644 --- a/drivers/usb/host/xhci-hub.c +++ b/drivers/usb/host/xhci-hub.c @@ -1196,15 +1196,6 @@ int xhci_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue, /* FIXME: What new port features do we need to support? */ switch (wValue) { case USB_PORT_FEAT_SUSPEND: - temp = readl(ports[wIndex]->addr); - if ((temp & PORT_PLS_MASK) != XDEV_U0) { - /* Resume the port to U0 first */ - xhci_set_link_state(xhci, ports[wIndex], - XDEV_U0); - spin_unlock_irqrestore(&xhci->lock, flags); - msleep(10); - spin_lock_irqsave(&xhci->lock, flags); - } /* In spec software should not attempt to suspend * a port unless the port reports that it is in the * enabled (PED = ‘1’,PLS < ‘3’) state. @@ -1645,8 +1636,10 @@ int xhci_bus_suspend(struct usb_hcd *hcd) xhci_dbg(xhci, "Bus suspend bailout, port over-current detected\n"); return -EBUSY; } - /* suspend ports in U0, or bail out for new connect changes */ - if ((t1 & PORT_PE) && (t1 & PORT_PLS_MASK) == XDEV_U0) { + /* suspend ports in U0/U1/U2, or bail out for new connect changes */ + if ((t1 & PORT_PE) && ((t1 & PORT_PLS_MASK) == XDEV_U0 || + (t1 & PORT_PLS_MASK) == XDEV_U1 || + (t1 & PORT_PLS_MASK) == XDEV_U2)) { if ((t1 & PORT_CSC) && wake_enabled) { bus_state->bus_suspended = 0; spin_unlock_irqrestore(&xhci->lock, flags); From patchwork Wed Jun 10 06:42:31 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kai-Heng Feng X-Patchwork-Id: 11597235 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 4CD37739 for ; Wed, 10 Jun 2020 06:43:04 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 3E18120872 for ; Wed, 10 Jun 2020 06:43:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726259AbgFJGm5 (ORCPT ); Wed, 10 Jun 2020 02:42:57 -0400 Received: from youngberry.canonical.com ([91.189.89.112]:51362 "EHLO youngberry.canonical.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726109AbgFJGm5 (ORCPT ); Wed, 10 Jun 2020 02:42:57 -0400 Received: from 61-220-137-37.hinet-ip.hinet.net ([61.220.137.37] helo=localhost) by youngberry.canonical.com with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1jiuRd-0001Sn-96; Wed, 10 Jun 2020 06:42:42 +0000 From: Kai-Heng Feng To: mathias.nyman@intel.com Cc: Kai-Heng Feng , Greg Kroah-Hartman , Alan Stern , Eugeniu Rosca , Qi Zhou , Hardik Gajjar , Keiya Nobuta , Jason Yan , David Heinzelmann , linux-usb@vger.kernel.org (open list:USB SUBSYSTEM), linux-kernel@vger.kernel.org (open list) Subject: [PATCH 2/2] USB: hub: Suspend and resume port with LPM enabled Date: Wed, 10 Jun 2020 14:42:31 +0800 Message-Id: <20200610064231.9454-2-kai.heng.feng@canonical.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200610064231.9454-1-kai.heng.feng@canonical.com> References: <20200610064231.9454-1-kai.heng.feng@canonical.com> Sender: linux-usb-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-usb@vger.kernel.org USB2 devices with LPM enabled may interrupt the system suspend: [ 932.510475] usb 1-7: usb suspend, wakeup 0 [ 932.510549] hub 1-0:1.0: hub_suspend [ 932.510581] usb usb1: bus suspend, wakeup 0 [ 932.510590] xhci_hcd 0000:00:14.0: port 9 not suspended [ 932.510593] xhci_hcd 0000:00:14.0: port 8 not suspended .. [ 932.520323] xhci_hcd 0000:00:14.0: Port change event, 1-7, id 7, portsc: 0x400e03 .. [ 932.591405] PM: pci_pm_suspend(): hcd_pci_suspend+0x0/0x30 returns -16 [ 932.591414] PM: dpm_run_callback(): pci_pm_suspend+0x0/0x160 returns -16 [ 932.591418] PM: Device 0000:00:14.0 failed to suspend async: error -16 During system suspend, USB core will let HC suspends the device if it doesn't have remote wakeup enabled and doesn't have any children. However, from the log above we can see that the usb 1-7 doesn't get bus suspended due to not in U0, because it requires a longer period for disabling LPM. After a while the port finished its U2 -> U0 transition, interrupts the suspend process. Though PLC shouldn't be set for U2 -> U0 case, we can avoid all that by directly put the port from U0/U1/U2 to U3, and solves this issue. Suggested-by: Mathias Nyman Signed-off-by: Kai-Heng Feng --- drivers/usb/core/hub.c | 9 --------- 1 file changed, 9 deletions(-) diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c index b1e14beaac5f..882b54df6ef5 100644 --- a/drivers/usb/core/hub.c +++ b/drivers/usb/core/hub.c @@ -3285,9 +3285,6 @@ int usb_port_suspend(struct usb_device *udev, pm_message_t msg) } } - /* disable USB2 hardware LPM */ - usb_disable_usb2_hardware_lpm(udev); - if (usb_disable_ltm(udev)) { dev_err(&udev->dev, "Failed to disable LTM before suspend\n"); status = -ENOMEM; @@ -3323,9 +3320,6 @@ int usb_port_suspend(struct usb_device *udev, pm_message_t msg) /* Try to enable USB3 LTM again */ usb_enable_ltm(udev); err_ltm: - /* Try to enable USB2 hardware LPM again */ - usb_enable_usb2_hardware_lpm(udev); - if (udev->do_remote_wakeup) (void) usb_disable_remote_wakeup(udev); err_wakeup: @@ -3606,9 +3600,6 @@ int usb_port_resume(struct usb_device *udev, pm_message_t msg) dev_dbg(&udev->dev, "can't resume, status %d\n", status); hub_port_logical_disconnect(hub, port1); } else { - /* Try to enable USB2 hardware LPM */ - usb_enable_usb2_hardware_lpm(udev); - /* Try to enable USB3 LTM */ usb_enable_ltm(udev); }