From patchwork Wed Nov 12 06:41:19 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: 40641 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wg0-f72.google.com (mail-wg0-f72.google.com [74.125.82.72]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id DC07324493 for ; Wed, 12 Nov 2014 06:41:42 +0000 (UTC) Received: by mail-wg0-f72.google.com with SMTP id k14sf6186864wgh.7 for ; Tue, 11 Nov 2014 22:41:41 -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 :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=LnV7K7s4fiaSvvxJVxOqy/sisbokBuhRkCjt7bhwAbI=; b=EgMmeKubI6rJr2dp+FnXtOw28QJ42vhYqLmu8aGJu64wv6WTIFE2RX/dvnhdbblhSP 7Sun/nNj2XV1xZuRf9FJCsT48iD5VoUaYSj1Dvby26oEdpgGjgPGgJSwIM/EocZJK5l7 ZVyB1G8wBkSeN2w6PgEO57aFCWiNXD3asWwdr6/iw/sDFgB4iA1aQR1GSkQU9WDoUWx+ Nq53yzgg3hVAQndSqAcZ8WtSm3fgCDNOwX/w9NZ/sWDiFQXrKSNeb0XBZLZ5ZvD9vV53 hrhwu7IbkxCFUTTMCXY6D/LrBrxiO8UFkuiT0RW3KjkKgT6N+QoVaGNTpMMjGCqaogsk A19g== X-Gm-Message-State: ALoCoQnXZSnnh0AJznOZaKBXPDPdCkxE6EIzdeaksp96maaaopRXpdnWIJxpifqBYC5YdNgwjYbF X-Received: by 10.112.201.169 with SMTP id kb9mr5753lbc.20.1415774501782; Tue, 11 Nov 2014 22:41:41 -0800 (PST) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.28.67 with SMTP id z3ls671608lag.74.gmail; Tue, 11 Nov 2014 22:41:41 -0800 (PST) X-Received: by 10.112.150.71 with SMTP id ug7mr15139434lbb.73.1415774501264; Tue, 11 Nov 2014 22:41:41 -0800 (PST) Received: from mail-la0-f43.google.com (mail-la0-f43.google.com. [209.85.215.43]) by mx.google.com with ESMTPS id p7si20220969lah.133.2014.11.11.22.41.41 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 11 Nov 2014 22:41:41 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.43 as permitted sender) client-ip=209.85.215.43; Received: by mail-la0-f43.google.com with SMTP id ge10so10954545lab.30 for ; Tue, 11 Nov 2014 22:41:41 -0800 (PST) X-Received: by 10.112.14.69 with SMTP id n5mr40368444lbc.34.1415774501082; Tue, 11 Nov 2014 22:41:41 -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 ew9csp378392lbc; Tue, 11 Nov 2014 22:41:40 -0800 (PST) X-Received: by 10.70.48.10 with SMTP id h10mr45085364pdn.2.1415774499572; Tue, 11 Nov 2014 22:41:39 -0800 (PST) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id gr3si17470303pbc.98.2014.11.11.22.41.38 for ; Tue, 11 Nov 2014 22:41:39 -0800 (PST) Received-SPF: none (google.com: linux-usb-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 S1753348AbaKLGlh (ORCPT + 3 others); Wed, 12 Nov 2014 01:41:37 -0500 Received: from mail-pd0-f172.google.com ([209.85.192.172]:59145 "EHLO mail-pd0-f172.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751756AbaKLGlg (ORCPT ); Wed, 12 Nov 2014 01:41:36 -0500 Received: by mail-pd0-f172.google.com with SMTP id r10so11629890pdi.17 for ; Tue, 11 Nov 2014 22:41:35 -0800 (PST) X-Received: by 10.70.88.44 with SMTP id bd12mr17331499pdb.133.1415774495825; Tue, 11 Nov 2014 22:41:35 -0800 (PST) Received: from c-krapar-linux.qualcomm.com ([202.46.23.54]) by mx.google.com with ESMTPSA id fl2sm6120106pab.0.2014.11.11.22.41.32 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Tue, 11 Nov 2014 22:41:35 -0800 (PST) From: Kiran Kumar Raparthy To: linux-kernel@vger.kernel.org Cc: Todd Poynor , Felipe Balbi , Greg Kroah-Hartman , linux-usb@vger.kernel.org, Android Kernel Team , John Stultz , Sumit Semwal , =?UTF-8?q?Arve=20Hj=F8nnev=E5g?= , Benoit Goby , Kiran Raparthy Subject: [RFC v6 3/3] usb: phy: hold wakeupsource when USB is enumerated in peripheral mode Date: Wed, 12 Nov 2014 12:11:19 +0530 Message-Id: <1415774479-21794-1-git-send-email-kiran.kumar@linaro.org> X-Mailer: git-send-email 1.8.2.1 MIME-Version: 1.0 Sender: linux-usb-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-usb@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.215.43 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..b5c5fd3 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, + msecs_to_jiffies(TEMPORARY_HOLD_TIME)); + 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..bc58fb8 100644 --- a/include/linux/usb/phy.h +++ b/include/linux/usb/phy.h @@ -12,6 +12,8 @@ #include #include +#define TEMPORARY_HOLD_TIME 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;