From patchwork Mon Nov 24 17:25: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: 41418 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-lb0-f198.google.com (mail-lb0-f198.google.com [209.85.217.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id E878523FFA for ; Mon, 24 Nov 2014 17:27:46 +0000 (UTC) Received: by mail-lb0-f198.google.com with SMTP id p9sf4848679lbv.9 for ; Mon, 24 Nov 2014 09:27:45 -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=TDN+0QIYtNLDxh9eexxV5wkEMNrf7O8rA7dE6OrL3p4b4z7A9jxQ8cHZDa0OAzLHwR GN9WDzxksL3ZMAOG3YwDBhilZfOPjvgEkcUjQ3aG3ngxsm7kUps0O7adaE1YeznoVycd vbIme6OoIhWy1/fF8ikaOErTXw7y8omybIQYwCloowWRpJKp/1zq3ZdJxcXp0PAwo7tK C1uesW+/bDOgSOoohv47tvPJZkwe3rjf0yInzKOlJVGYR2iGPQis129imimUPdtpF23N TyZY4GRM9GaxsM4HZAQl2EL6i90TjTLVvxN0Hpiyu6R2UV/4DohOnLcQ3r/iiWDyLrSr JozA== X-Gm-Message-State: ALoCoQlbaRrOgrQp8i66NuJ6j5PKcBUrSaOLdt/HAGZ2PXYHatmpCHc+Ka6L7dXkRIBzRiopaZZ+ X-Received: by 10.194.133.39 with SMTP id oz7mr6512744wjb.3.1416850065668; Mon, 24 Nov 2014 09:27:45 -0800 (PST) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.43.165 with SMTP id x5ls67595lal.34.gmail; Mon, 24 Nov 2014 09:27:45 -0800 (PST) X-Received: by 10.112.148.130 with SMTP id ts2mr21844546lbb.43.1416850065475; Mon, 24 Nov 2014 09:27:45 -0800 (PST) Received: from mail-lb0-f181.google.com (mail-lb0-f181.google.com. [209.85.217.181]) by mx.google.com with ESMTPS id y1si15912879laa.37.2014.11.24.09.27.45 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 24 Nov 2014 09:27:45 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.181 as permitted sender) client-ip=209.85.217.181; Received: by mail-lb0-f181.google.com with SMTP id 10so3117388lbg.12 for ; Mon, 24 Nov 2014 09:27:45 -0800 (PST) X-Received: by 10.112.235.196 with SMTP id uo4mr21367500lbc.66.1416850065337; Mon, 24 Nov 2014 09:27:45 -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 ew9csp296624lbc; Mon, 24 Nov 2014 09:27:44 -0800 (PST) X-Received: by 10.68.164.101 with SMTP id yp5mr35466448pbb.66.1416850063391; Mon, 24 Nov 2014 09:27:43 -0800 (PST) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id fc3si22718844pad.15.2014.11.24.09.27.42 for ; Mon, 24 Nov 2014 09:27:43 -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 S932075AbaKXR1h (ORCPT + 26 others); Mon, 24 Nov 2014 12:27:37 -0500 Received: from mail-pa0-f45.google.com ([209.85.220.45]:38190 "EHLO mail-pa0-f45.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754351AbaKXR1e (ORCPT ); Mon, 24 Nov 2014 12:27:34 -0500 Received: by mail-pa0-f45.google.com with SMTP id lj1so9865072pab.18 for ; Mon, 24 Nov 2014 09:27:33 -0800 (PST) X-Received: by 10.66.158.170 with SMTP id wv10mr35914864pab.64.1416850053837; Mon, 24 Nov 2014 09:27:33 -0800 (PST) Received: from localhost.localdomain ([124.123.151.231]) by mx.google.com with ESMTPSA id bj11sm12985159pdb.1.2014.11.24.09.27.30 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 24 Nov 2014 09:27:33 -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 v3 3/3] usb: phy: hold wakeupsource when USB is enumerated in peripheral mode Date: Mon, 24 Nov 2014 22:55:00 +0530 Message-Id: <1416849900-29959-3-git-send-email-kiran.kumar@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1416849900-29959-1-git-send-email-kiran.kumar@linaro.org> References: <1416849900-29959-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.181 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;