From patchwork Fri Apr 20 17:54:10 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: 10353409 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 B464D602B7 for ; Fri, 20 Apr 2018 17:54:56 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A4A942879A for ; Fri, 20 Apr 2018 17:54:56 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9626528803; Fri, 20 Apr 2018 17:54:56 +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 394382879A for ; Fri, 20 Apr 2018 17:54:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753653AbeDTRyl (ORCPT ); Fri, 20 Apr 2018 13:54:41 -0400 Received: from mail-pl0-f67.google.com ([209.85.160.67]:43396 "EHLO mail-pl0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753549AbeDTRyk (ORCPT ); Fri, 20 Apr 2018 13:54:40 -0400 Received: by mail-pl0-f67.google.com with SMTP id a39-v6so5647557pla.10 for ; Fri, 20 Apr 2018 10:54:39 -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:in-reply-to:references; bh=1EGxjyKPxGwXFDxvFmAmpOvl2K7Up1Gjh6yfEh8PPDM=; b=lzINQGCdChMx1c1rlJqlIoelxLcmXI0yClXSWZjjidkIibBeuEj/QPisxnXGIRPy9c 5uRaG0tXnpD0wYJICfJReKDs2aGyEyZe7o4nkZ0OuD932jpSbDp8BoRsWyfTJJs4jiL/ tLI/KEsVAQLU0dZI/Rmwa4FpAkNVktXQgQ8s8= 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:in-reply-to :references; bh=1EGxjyKPxGwXFDxvFmAmpOvl2K7Up1Gjh6yfEh8PPDM=; b=cNEWpEmn7z85kXhUP+tR9lfhC8Qdde2UrE1uE8Vs7D3rbg4H24sX1/H/RhTGk3gj4V b/dl6LzbJbe8qA2+cS63uJpLzC1e7fMlRS5KRvmp5u6ynMo8/mClbfhOQGi6/zdU68Et NY1hI3bkqxvwouTDYkLQmoz5XSMpTPaJhQTSYT3C3q7Q68wmlqur08jVm9rvpNBIlhzq 4O480eqTNFEMA/pFywFS03zDG/rog+BymzEfDWRetuoGyguZX1wZ6Vb860FuFWxAyIpH q/ZkdIaCxElb57fVbPAocadPWU4DomZCj+dOCArJ/qtQCLXLIGH4nWfQqqNd4rHcE0p2 6JWg== X-Gm-Message-State: ALQs6tBKFm0lJbQVHl/shbytF0eFyZA1sDRSzGpKs7NB+KwPhwQNmV4t VPo00BW+U6GP78BuqqarjgTsjA== X-Google-Smtp-Source: AIpwx48ybDI8Q7hAVMtgIYPDd/5hPycTFwA2nN34vanKq32KaJ/3Q13oIE78IdkLnCvhXF1EmHKSHg== X-Received: by 2002:a17:902:1c8:: with SMTP id b66-v6mr7385554plb.156.1524246879659; Fri, 20 Apr 2018 10:54:39 -0700 (PDT) Received: from ravisadineni0.mtv.corp.google.com ([2620:0:1000:1501:22d6:f20d:f2b7:3315]) by smtp.gmail.com with ESMTPSA id t137sm13542227pgc.16.2018.04.20.10.54.36 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 20 Apr 2018 10:54:37 -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 V4] USB: Increment wakeup count on remote wakeup. Date: Fri, 20 Apr 2018 10:54:10 -0700 Message-Id: <20180420175410.191710-1-ravisadineni@chromium.org> X-Mailer: git-send-email 2.17.0.484.g0c8726318c-goog In-Reply-To: References: 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: Ravi Chandra Sadineni --- drivers/usb/core/hcd.c | 1 + drivers/usb/core/hub.c | 10 +++++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/drivers/usb/core/hcd.c b/drivers/usb/core/hcd.c index 777036ae63674..00bb8417050ff 100644 --- a/drivers/usb/core/hcd.c +++ b/drivers/usb/core/hcd.c @@ -2377,6 +2377,7 @@ void usb_hcd_resume_root_hub (struct usb_hcd *hcd) spin_lock_irqsave (&hcd_root_hub_lock, flags); if (hcd->rh_registered) { + pm_wakeup_event(&hcd->self.root_hub->dev, 0); set_bit(HCD_FLAG_WAKEUP_PENDING, &hcd->flags); queue_work(pm_wq, &hcd->wakeup_work); } diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c index f6ea16e9f6bb9..aa9968d90a48c 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); } @@ -3434,8 +3439,11 @@ int usb_port_resume(struct usb_device *udev, pm_message_t msg) /* 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)) + 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))