From patchwork Wed Nov 19 10:44:00 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Kiran Kumar Raparthy X-Patchwork-Id: 41124 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wg0-f71.google.com (mail-wg0-f71.google.com [74.125.82.71]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 0075420CBB for ; Wed, 19 Nov 2014 10:46:40 +0000 (UTC) Received: by mail-wg0-f71.google.com with SMTP id l18sf221758wgh.6 for ; Wed, 19 Nov 2014 02:46:40 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:cc:subject:date:message-id :in-reply-to:references:in-reply-to:references:mime-version:sender :precedence:list-id:x-original-sender :x-original-authentication-results:mailing-list:list-post:list-help :list-archive:list-unsubscribe:content-type :content-transfer-encoding; bh=uHsIN1di2Y4Qgkh3TUSXxArI3JOJZBw8Up8oVS+DYgU=; b=eUHkdI/hyE6nM42q5jzznqRBV5rky/PubhJJpA8sNxvre9Z+i8nJqB1LExIj8i4vdv JbeCO5QF+KR1T0lOMLEPjeo7htQYKFi2Qx1u0kJQwAMUXhT4j8gHJG55sdZ5HqLOcFe4 09riM7JlBYVlefKlGiS6lzu68aHOweP1T0O/rIg2PX4vp3dhIAGc94juA33/IVPPH6OJ opsovog+ctS30SGRGhgPXhoMMEfQpjZ2JzEMgM4iJ+iFHSAf7UfTOv6MBi9FwdIM5jk+ ChEzb/Is1rLLIwctHS4EDDdpySjMq+PTMlP25i93cpK7S3SFDuLc+dLqiDrVcSoEzfm9 N+xg== X-Gm-Message-State: ALoCoQmpKWmwKcnHwf4PkavU2HpqdIXNuW53IEEhan7Jn2FnovFel1uXZyQmhKAz+zGohV389FJL X-Received: by 10.180.94.3 with SMTP id cy3mr596080wib.7.1416394000179; Wed, 19 Nov 2014 02:46:40 -0800 (PST) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.170.165 with SMTP id an5ls1465318lac.92.gmail; Wed, 19 Nov 2014 02:46:40 -0800 (PST) X-Received: by 10.112.199.40 with SMTP id jh8mr41696205lbc.5.1416393999986; Wed, 19 Nov 2014 02:46:39 -0800 (PST) Received: from mail-lb0-f177.google.com (mail-lb0-f177.google.com. [209.85.217.177]) by mx.google.com with ESMTPS id li1si1341511lab.112.2014.11.19.02.46.39 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 19 Nov 2014 02:46:39 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.177 as permitted sender) client-ip=209.85.217.177; Received: by mail-lb0-f177.google.com with SMTP id z12so245358lbi.36 for ; Wed, 19 Nov 2014 02:46:39 -0800 (PST) X-Received: by 10.152.42.226 with SMTP id r2mr4712825lal.29.1416393999552; Wed, 19 Nov 2014 02:46:39 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.184.201 with SMTP id ew9csp60887lbc; Wed, 19 Nov 2014 02:46:38 -0800 (PST) X-Received: by 10.66.163.129 with SMTP id yi1mr11923176pab.149.1416393997648; Wed, 19 Nov 2014 02:46:37 -0800 (PST) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id tr9si2042222pac.159.2014.11.19.02.46.36 for ; Wed, 19 Nov 2014 02:46:37 -0800 (PST) Received-SPF: none (google.com: linux-kernel-owner@vger.kernel.org does not designate permitted sender hosts) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755601AbaKSKqg (ORCPT + 26 others); Wed, 19 Nov 2014 05:46:36 -0500 Received: from mail-pa0-f52.google.com ([209.85.220.52]:62258 "EHLO mail-pa0-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755225AbaKSKqd (ORCPT ); Wed, 19 Nov 2014 05:46:33 -0500 Received: by mail-pa0-f52.google.com with SMTP id eu11so334888pac.25 for ; Wed, 19 Nov 2014 02:46:32 -0800 (PST) X-Received: by 10.70.102.77 with SMTP id fm13mr9190609pdb.96.1416393992893; Wed, 19 Nov 2014 02:46:32 -0800 (PST) Received: from c-krapar-linux.qualcomm.com ([202.46.23.54]) by mx.google.com with ESMTPSA id fn7sm1547762pad.38.2014.11.19.02.46.29 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Wed, 19 Nov 2014 02:46:32 -0800 (PST) From: Kiran Kumar Raparthy To: linux-kernel@vger.kernel.org Cc: balbi@ti.com, john.stultz@linaro.org, sumit.semwal@linaro.org, Todd Poynor , Greg Kroah-Hartman , linux-usb@vger.kernel.org, Android Kernel Team , =?UTF-8?q?Arve=20Hj=F8nnev=E5g?= , Benoit Goby , Kiran Raparthy Subject: [PATCH 3/3] usb: phy: hold wakeupsource when USB is enumerated in peripheral mode Date: Wed, 19 Nov 2014 16:14:00 +0530 Message-Id: <4ea385b6bf151ebeac80bede1d1792590aa0d6e0.1416390390.git.kiran.kumar@linaro.org> X-Mailer: git-send-email 1.8.2.1 In-Reply-To: References: In-Reply-To: References: MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: kiran.kumar@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.177 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , From: Todd Poynor usb: phy: hold wakeupsource when USB is enumerated in peripheral mode Some systems require a mechanism to prevent system to enter into suspend state when USB is connected and enumerated in peripheral mode. This patch provides an interface to hold a wakeupsource to prevent suspend. PHY drivers can use this interface when USB is connected and enumerated in peripheral mode. A timed wakeupsource is temporarily held on USB disconnect events, to allow the rest of the system to react to the USB disconnection (dropping host sessions, updating charger status, etc.) prior to re-allowing suspend. Cc: Felipe Balbi Cc: Greg Kroah-Hartman Cc: linux-kernel@vger.kernel.org Cc: linux-usb@vger.kernel.org Cc: Android Kernel Team Cc: John Stultz Cc: Sumit Semwal Cc: Arve Hjřnnevĺg Cc: Benoit Goby Signed-off-by: Todd Poynor [kiran: Added context to commit message, squished build fixes from Benoit Goby and Arve Hjřnnevĺg, changed wakelocks usage to wakeupsource, merged Todd's refactoring logic and simplified the structures and code and addressed community feedback] Signed-off-by: Kiran Raparthy --- drivers/usb/phy/phy.c | 29 +++++++++++++++++++++++++++-- include/linux/usb/phy.h | 5 +++++ 2 files changed, 32 insertions(+), 2 deletions(-) diff --git a/drivers/usb/phy/phy.c b/drivers/usb/phy/phy.c index 2b1039e..b8a2d56 100644 --- a/drivers/usb/phy/phy.c +++ b/drivers/usb/phy/phy.c @@ -329,6 +329,7 @@ int usb_add_phy(struct usb_phy *x, enum usb_phy_type type) int ret = 0; unsigned long flags; struct usb_phy *phy; + char wsource_name[40]; if (x->type != USB_PHY_TYPE_UNDEFINED) { dev_err(x->dev, "not accepting initialized PHY %s\n", x->label); @@ -351,6 +352,10 @@ int usb_add_phy(struct usb_phy *x, enum usb_phy_type type) x->type = type; list_add_tail(&x->head, &phy_list); + snprintf(wsource_name, sizeof(wsource_name), "vbus-%s", + dev_name(x->dev)); + wakeup_source_init(&x->wsource, wsource_name); + out: spin_unlock_irqrestore(&phy_lock, flags); return ret; @@ -402,6 +407,7 @@ void usb_remove_phy(struct usb_phy *x) spin_lock_irqsave(&phy_lock, flags); if (x) { + wakeup_source_trash(&x->wsource); list_for_each_entry(phy_bind, &phy_bind_list, list) if (phy_bind->phy == x) phy_bind->phy = NULL; @@ -446,13 +452,32 @@ int usb_bind_phy(const char *dev_name, u8 index, EXPORT_SYMBOL_GPL(usb_bind_phy); /** - * usb_phy_set_event - set event to phy event + * usb_phy_set_event - set event to phy event and + * hold/temporarily hold wakeupsource * @x: the phy returned by usb_get_phy(); * - * This sets event to phy event + * This holds per-PHY wakeupsource/timed wakeupsource */ void usb_phy_set_event(struct usb_phy *x, unsigned long event) { + x->last_event = event; + + switch (event) { + case USB_EVENT_ENUMERATED: + __pm_stay_awake(&x->wsource); + break; + + case USB_EVENT_NONE: + case USB_EVENT_ID: + case USB_EVENT_VBUS: + case USB_EVENT_CHARGER: + __pm_wakeup_event(&x->wsource, + USB_PHY_DEFAULT_WAKEUP_SRC_TIMEOUT); + break; + + default: + break; + } } EXPORT_SYMBOL_GPL(usb_phy_set_event); diff --git a/include/linux/usb/phy.h b/include/linux/usb/phy.h index 3c713ff..c593fc6 100644 --- a/include/linux/usb/phy.h +++ b/include/linux/usb/phy.h @@ -12,6 +12,8 @@ #include #include +#define USB_PHY_DEFAULT_WAKEUP_SRC_TIMEOUT msecs_to_jiffies(2000) + enum usb_phy_interface { USBPHY_INTERFACE_MODE_UNKNOWN, USBPHY_INTERFACE_MODE_UTMI, @@ -89,6 +91,9 @@ struct usb_phy { /* for notification of usb_phy_events */ struct atomic_notifier_head notifier; + /* wakeup source */ + struct wakeup_source wsource; + /* to pass extra port status to the root hub */ u16 port_status; u16 port_change;