From patchwork Thu Apr 19 00:18:50 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ravi Chandra Sadineni X-Patchwork-Id: 10349025 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id B83E26023A for ; Thu, 19 Apr 2018 00:20:11 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A84ED288B4 for ; Thu, 19 Apr 2018 00:20:07 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9BF8E2891E; Thu, 19 Apr 2018 00:20:07 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D32E3288B4 for ; Thu, 19 Apr 2018 00:20:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752810AbeDSATL (ORCPT ); Wed, 18 Apr 2018 20:19:11 -0400 Received: from mail-pl0-f66.google.com ([209.85.160.66]:39892 "EHLO mail-pl0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752391AbeDSATH (ORCPT ); Wed, 18 Apr 2018 20:19:07 -0400 Received: by mail-pl0-f66.google.com with SMTP id e7-v6so2109075plt.6 for ; Wed, 18 Apr 2018 17:19:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id; bh=KBPNMxaXO5BRdA+16kGJLSjfpSPzl0mJ7vCw/WhluSg=; b=XWE6aDKcK8JfrX+pDZoPLLwFMwxHbu94QEcmGMC0FoKYutuHsGCMi/ed/L6iebTdmh rBZRp4ATedUv0rXR522C7oIYyX/JF3eAeNSScVkh6VHhuseVG4C71U6X5Sz0YiVsDobO c/OpKYEHBWCStRq+7F8WYqtc179qGxemYr7us= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=KBPNMxaXO5BRdA+16kGJLSjfpSPzl0mJ7vCw/WhluSg=; b=bkm/XEPHdcFJ+OE7wzbhZ7HZ19DW9GpA9F4NyUd+XPPTzoGDcrh2tWxljqvab8sBed Unx68gX0tQ3Zi4c/J6t8XAHYPWQrFdwvUdIuNpvXttsPsJXTiP6QpN18JhF1CGyE6uy+ BOuyybs6rqO6V1Rkt4yimU/sJ6miOUMvhs5zlHQdUH7h5fy5Y5LSqpS3KOoTCAb86IXq oNFYFi8DT7LfhK8jSeiGmWVmTmcsPyGulNE6t9PWzTWXhS8uANvLX/vGi22g80HLqvlD 7ZjxL2zAh4GJcPXsmyc6DNXyEqulaVacwChAjn86ddV/bQrvd4QIdqnFzzbkrmbAtuJS 5jTA== X-Gm-Message-State: ALQs6tDkU2tk6rZy7OlYfGHMLVngY/naKtWNyGQcZ/OuWDSQq5WFXlxJ ksHYMNEeaEU4H/7tnko/+h/MnA== X-Google-Smtp-Source: AIpwx49Y0yzxzwyVTA9N0AfiXHpSVT5aoYNoCZFKsJ4sNmXRXZN9AHrQsEU4qxh281sTs92gNjpxiQ== X-Received: by 2002:a17:902:aa46:: with SMTP id c6-v6mr3843695plr.154.1524097146475; Wed, 18 Apr 2018 17:19:06 -0700 (PDT) Received: from ravisadineni0.mtv.corp.google.com ([2620:0:1000:1501:22d6:f20d:f2b7:3315]) by smtp.gmail.com with ESMTPSA id y6sm4487558pfd.18.2018.04.18.17.19.05 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 18 Apr 2018 17:19:05 -0700 (PDT) From: Ravi Chandra Sadineni To: stern@rowland.harvard.edu, gregkh@linuxfoundation.org, martin.blumenstingl@googlemail.com, ravisadineni@google.com, chunfeng.yun@mediatek.com, johan@kernel.org, arvind.yadav.cs@gmail.com, dtor@google.com, anton.bondarenko.sama@gmail.com, f.fainelli@gmail.com, keescook@chromium.org, mathias.nyman@linux.intel.com, felipe.balbi@linux.intel.com, ekorenevsky@gmail.com, peter.chen@nxp.com, joe@perches.com Cc: tbroch@google.com, linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, rajatja@google.com, bleung@google.com, Ravi Chandra Sadineni Subject: [PATCH] USB: Increment wakeup count on remote wakeup. Date: Wed, 18 Apr 2018 17:18:50 -0700 Message-Id: <20180419001850.133110-1-ravisadineni@chromium.org> X-Mailer: git-send-email 2.17.0.484.g0c8726318c-goog Sender: linux-usb-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-usb@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP On chromebooks we depend on wakeup count to identify the wakeup source. But currently USB devices do not increment the wakeup count when they trigger the remote wake. This patch addresses the same. Resume condition is reported differently on USB 2.0 and USB 3.0 devices. On USB 2.0 devices, a wake capable device, if wake enabled, drives resume signal to indicate a remote wake (USB 2.0 spec section 7.1.7.7). The upstream facing port then sets C_PORT_SUSPEND bit and reports a port change event (USB 2.0 spec section 11.24.2.7.2.3). Thus if a port has resumed before driving the resume signal from the host and C_PORT_SUSPEND is set, then the device attached to the given port might be the reason for the last system wakeup. Increment the wakeup count for the same. On USB 3.0 devices, a function may signal that it wants to exit from device suspend by sending a Function Wake Device Notification to the host (USB3.0 spec section 8.5.6.4) Thus on receiving the Function Wake, increment the wakeup count. Signed-off-by: ravisadineni@chromium.org --- drivers/usb/core/hcd.c | 1 + drivers/usb/core/hub.c | 12 ++++++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/drivers/usb/core/hcd.c b/drivers/usb/core/hcd.c index 777036ae63674..79f95a878fb6e 100644 --- a/drivers/usb/core/hcd.c +++ b/drivers/usb/core/hcd.c @@ -2375,6 +2375,7 @@ void usb_hcd_resume_root_hub (struct usb_hcd *hcd) { unsigned long flags; + pm_wakeup_event(dev, 0); spin_lock_irqsave (&hcd_root_hub_lock, flags); if (hcd->rh_registered) { set_bit(HCD_FLAG_WAKEUP_PENDING, &hcd->flags); diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c index f6ea16e9f6bb9..6abc5be1bcbf5 100644 --- a/drivers/usb/core/hub.c +++ b/drivers/usb/core/hub.c @@ -653,12 +653,17 @@ void usb_wakeup_notification(struct usb_device *hdev, unsigned int portnum) { struct usb_hub *hub; + struct usb_port *port_dev; if (!hdev) return; hub = usb_hub_to_struct_hub(hdev); if (hub) { + port_dev = hub->ports[portnum - 1]; + if (port_dev && port_dev->child) + pm_wakeup_event(&port_dev->child->dev, 0); + set_bit(portnum, hub->wakeup_bits); kick_hub_wq(hub); } @@ -3432,10 +3437,13 @@ int usb_port_resume(struct usb_device *udev, pm_message_t msg) usb_lock_port(port_dev); - /* Skip the initial Clear-Suspend step for a remote wakeup */ status = hub_port_status(hub, port1, &portstatus, &portchange); - if (status == 0 && !port_is_suspended(hub, portstatus)) + /* Skip the initial Clear-Suspend step for a remote wakeup */ + if (status == 0 && !port_is_suspended(hub, portstatus)) { + if (portchange & USB_PORT_STAT_C_SUSPEND) + pm_wakeup_event(&udev->dev, 0); goto SuspendCleared; + } /* see 7.1.7.7; affects power usage, but not budgeting */ if (hub_is_superspeed(hub->hdev))