From patchwork Fri Nov 21 17:46:31 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: 41338 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ee0-f72.google.com (mail-ee0-f72.google.com [74.125.83.72]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id D045423C27 for ; Fri, 21 Nov 2014 17:48:35 +0000 (UTC) Received: by mail-ee0-f72.google.com with SMTP id e53sf3663769eek.3 for ; Fri, 21 Nov 2014 09:48:35 -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:mime-version:content-type :content-transfer-encoding:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe; bh=IpT/IcpZB02t4hjhzkBYZv6v1G/07T6Q1RVK48ViWvI=; b=EZOOV5b77V7qL3zYUxopxzIKNBCaC7eNb4SPFF63ro+Dj/MDxCwzHloqEJC8AZ1syU dES84q0T36JmivF6r537+idlM8eDtAW2kPJNOy2LmDDKTi1PtsojK6E90RQVtogGiONG aapgVH0576vIalAyIyjqUtlGqr1T1p1A78xcy88arN0ITQme6+pe5sYQJ4cOuc+0Z8nZ ebbQbjygQOhWWzRJRVagkxLEL6dMR6rHZQUv6Tn4OJ8fQM1eoNcSBkDO1UJADg7qs0lh i0zDqKehpHZRiNwMN3Vc2oHQ+Hl3apL+iksEUGns1H0gtddgyP6Lro5vIxy4K1Ih2hKJ xjRg== X-Gm-Message-State: ALoCoQlU0vEoxSTr9mQhHpaUfhB0LJirVgcRR16g+l/0s84pTgfbSzFs3e8uqHmYt0iQ666+A9aC X-Received: by 10.112.201.169 with SMTP id kb9mr242405lbc.20.1416592115099; Fri, 21 Nov 2014 09:48:35 -0800 (PST) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.19.39 with SMTP id b7ls202941lae.38.gmail; Fri, 21 Nov 2014 09:48:34 -0800 (PST) X-Received: by 10.152.36.232 with SMTP id t8mr1587530laj.6.1416592114797; Fri, 21 Nov 2014 09:48:34 -0800 (PST) Received: from mail-lb0-f178.google.com (mail-lb0-f178.google.com. [209.85.217.178]) by mx.google.com with ESMTPS id iz2si6633263lbc.92.2014.11.21.09.48.34 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 21 Nov 2014 09:48:34 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.178 as permitted sender) client-ip=209.85.217.178; Received: by mail-lb0-f178.google.com with SMTP id f15so3328271lbj.9 for ; Fri, 21 Nov 2014 09:48:34 -0800 (PST) X-Received: by 10.152.37.69 with SMTP id w5mr6516386laj.67.1416592114635; Fri, 21 Nov 2014 09:48:34 -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 ew9csp135953lbc; Fri, 21 Nov 2014 09:48:33 -0800 (PST) X-Received: by 10.66.222.100 with SMTP id ql4mr9190311pac.123.1416592112819; Fri, 21 Nov 2014 09:48:32 -0800 (PST) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id hq8si9907003pbc.57.2014.11.21.09.48.32 for ; Fri, 21 Nov 2014 09:48:32 -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 S1751278AbaKURs0 (ORCPT + 26 others); Fri, 21 Nov 2014 12:48:26 -0500 Received: from mail-pd0-f170.google.com ([209.85.192.170]:60296 "EHLO mail-pd0-f170.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751206AbaKURsW (ORCPT ); Fri, 21 Nov 2014 12:48:22 -0500 Received: by mail-pd0-f170.google.com with SMTP id fp1so5733344pdb.29 for ; Fri, 21 Nov 2014 09:48:22 -0800 (PST) X-Received: by 10.70.23.163 with SMTP id n3mr9884715pdf.0.1416592102500; Fri, 21 Nov 2014 09:48:22 -0800 (PST) Received: from localhost.localdomain ([124.123.151.231]) by mx.google.com with ESMTPSA id ra4sm5428477pab.33.2014.11.21.09.48.18 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 21 Nov 2014 09:48:21 -0800 (PST) From: Kiran Raparthy To: linux-kernel@vger.kernel.org Cc: Kiran Raparthy , Felipe Balbi , Greg Kroah-Hartman , linux-usb@vger.kernel.org, Android Kernel Team , John Stultz , Sumit Semwal , =?UTF-8?q?Arve=20Hj=C3=B8nnev=C3=A5g?= , Benoit Goby , Todd Poynor Subject: [PATCH v2 3/3] usb: phy: hold wakeupsource when USB is enumerated in peripheral mode Date: Fri, 21 Nov 2014 23:16:31 +0530 Message-Id: <1416591991-18925-3-git-send-email-kiran.kumar@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1416591991-18925-1-git-send-email-kiran.kumar@linaro.org> References: <1416591991-18925-1-git-send-email-kiran.kumar@linaro.org> 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.178 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: , 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 [Original patch in Android from Todd] Cc: Todd Poynor 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 b4066a0..8c87bc3 100644 --- a/drivers/usb/phy/phy.c +++ b/drivers/usb/phy/phy.c @@ -331,6 +331,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); @@ -353,6 +354,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; @@ -404,6 +409,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; @@ -448,13 +454,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 f499c23..63a56bf 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, @@ -88,6 +90,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;