From patchwork Fri Nov 21 06:01:22 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: 41278 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-la0-f70.google.com (mail-la0-f70.google.com [209.85.215.70]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 0ABAF23C27 for ; Fri, 21 Nov 2014 06:04:56 +0000 (UTC) Received: by mail-la0-f70.google.com with SMTP id q1sf2607087lam.5 for ; Thu, 20 Nov 2014 22:04:55 -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 :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=I1nF4F3IKGblkmRs+RC4VSfg2Mgxto3EP9ZOpnZoLKE=; b=EFPptJoKlVrlr0emeGksLclKK9oQL5gihoBLTRAV3Fa/pOnrSGuCXedU6PQGgm1GRl piQRdTancBC6TWiXs71j0ML3nPK+SE/XCkhi75fo87+iGiCi5lYtsXOJMSAVkzoC7Wpk h850t5gWpcXus0pbyyWGw/9h5DIc7Ef++7rhxoRVGFqGIN/LZTKIpNSG3b3mpBmuwmb1 IiSd/oV351RBbiU9bMO5OM8LVXBSQtmi3qIRodcSjm9xRDuf/myg6cTjAu8jbgdjKNfv GPfeNLgQiHM8Zl2V3WtmMa7YngUtxF1ZJfrJChKvEleXYR1Jza/dJIEYRyE11sPl6qPi kiRA== X-Gm-Message-State: ALoCoQmPkMrWqs5/P4xI/FElyduOX/Ri0a1H6w+KYocVJ4ACdFQ0qMj+opxAzE1jcHzoNQ2kHvlu X-Received: by 10.180.102.228 with SMTP id fr4mr440905wib.1.1416549894725; Thu, 20 Nov 2014 22:04:54 -0800 (PST) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.21.71 with SMTP id t7ls142904lae.11.gmail; Thu, 20 Nov 2014 22:04:54 -0800 (PST) X-Received: by 10.112.63.133 with SMTP id g5mr2075531lbs.33.1416549894413; Thu, 20 Nov 2014 22:04:54 -0800 (PST) Received: from mail-lb0-f170.google.com (mail-lb0-f170.google.com. [209.85.217.170]) by mx.google.com with ESMTPS id o7si3919037laf.103.2014.11.20.22.04.54 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 20 Nov 2014 22:04:54 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.170 as permitted sender) client-ip=209.85.217.170; Received: by mail-lb0-f170.google.com with SMTP id w7so3510538lbi.15 for ; Thu, 20 Nov 2014 22:04:54 -0800 (PST) X-Received: by 10.112.62.166 with SMTP id z6mr2086035lbr.74.1416549893981; Thu, 20 Nov 2014 22:04:53 -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 ew9csp26051lbc; Thu, 20 Nov 2014 22:04:53 -0800 (PST) X-Received: by 10.68.243.3 with SMTP id wu3mr3376328pbc.133.1416549892224; Thu, 20 Nov 2014 22:04:52 -0800 (PST) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id np6si6338642pbc.71.2014.11.20.22.04.50 for ; Thu, 20 Nov 2014 22:04:52 -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 S1757947AbaKUGEt (ORCPT + 26 others); Fri, 21 Nov 2014 01:04:49 -0500 Received: from mail-pd0-f179.google.com ([209.85.192.179]:47958 "EHLO mail-pd0-f179.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751175AbaKUGEq (ORCPT ); Fri, 21 Nov 2014 01:04:46 -0500 Received: by mail-pd0-f179.google.com with SMTP id w10so4558564pde.24 for ; Thu, 20 Nov 2014 22:04:46 -0800 (PST) X-Received: by 10.70.41.137 with SMTP id f9mr3442893pdl.83.1416549886251; Thu, 20 Nov 2014 22:04:46 -0800 (PST) Received: from c-krapar-linux.qualcomm.com ([202.46.23.54]) by mx.google.com with ESMTPSA id sq2sm3651516pbc.73.2014.11.20.22.04.42 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Thu, 20 Nov 2014 22:04:45 -0800 (PST) From: Kiran Raparthy To: linux-kernel@vger.kernel.org Cc: balbi@ti.com, john.stultz@linaro.org, sumit.semwal@linaro.org, Kiran Raparthy , Greg Kroah-Hartman , linux-usb@vger.kernel.org, Android Kernel Team , =?UTF-8?q?Arve=20Hj=F8nnev=E5g?= , Benoit Goby , Todd Poynor Subject: [PATCH v1 3/3] usb: phy: hold wakeupsource when USB is enumerated in peripheral mode Date: Fri, 21 Nov 2014 11:31:22 +0530 Message-Id: <391b355ed1f4c95ad051b86d21a82193878797aa.1416547297.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.170 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 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;