From patchwork Wed Jun 18 17:01:08 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Srinivas Kandagatla X-Patchwork-Id: 32151 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-oa0-f69.google.com (mail-oa0-f69.google.com [209.85.219.69]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id B108F206A0 for ; Wed, 18 Jun 2014 17:01:18 +0000 (UTC) Received: by mail-oa0-f69.google.com with SMTP id j17sf7381977oag.4 for ; Wed, 18 Jun 2014 10:01:18 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe; bh=WBDcqRZhZB2Dga+GDx8iI7cxb6x2t7wqmQGu18bD7TE=; b=Iw4gpdLqdnEH0vpE2zYVmHTAiAsEJhEtYvCAePWABeRlIcLVKK1myZNERRpo6t9AYo whJpLYfe2toiy4YWRSLgnIT7vghQ6pfQG1m0uhazDyaBVZxnSiZTIh8yir+POpX8WRqc fj4tkpXtiJl9Djz3NPcvcZ5hlq/0mcz1HdR7qYAc9FNg3TbFBcxHj8Ohcej4ZIJlZkmC bfLM9lZsJHHLEUo0HV+FP3o4NKObNUlvPHnZ9fsiGrHPjZgyIdIHqxFTEFOpfk/i79tw JHz5xNxk7oe7DfQt4rBZ4j4Imsbo3cwKLai51tL6p8zdgc0igAjxXoNrk0ivIkPx6HRb +cUQ== X-Gm-Message-State: ALoCoQnaibrWYSg3eQUX6TeKiDRAOfOpJ5JYWuZF64+iAI3xOrRhjqkiWqU+Va11EUIMnsavOB4U X-Received: by 10.182.130.169 with SMTP id of9mr1329391obb.27.1403110878271; Wed, 18 Jun 2014 10:01:18 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.25.225 with SMTP id 88ls187131qgt.85.gmail; Wed, 18 Jun 2014 10:01:18 -0700 (PDT) X-Received: by 10.58.132.41 with SMTP id or9mr2325129veb.5.1403110878184; Wed, 18 Jun 2014 10:01:18 -0700 (PDT) Received: from mail-vc0-f172.google.com (mail-vc0-f172.google.com [209.85.220.172]) by mx.google.com with ESMTPS id t3si1152627vcx.5.2014.06.18.10.01.18 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 18 Jun 2014 10:01:18 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.172 as permitted sender) client-ip=209.85.220.172; Received: by mail-vc0-f172.google.com with SMTP id hy10so1074342vcb.31 for ; Wed, 18 Jun 2014 10:01:18 -0700 (PDT) X-Received: by 10.52.88.44 with SMTP id bd12mr15968vdb.86.1403110878083; Wed, 18 Jun 2014 10:01:18 -0700 (PDT) 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.221.54.6 with SMTP id vs6csp299927vcb; Wed, 18 Jun 2014 10:01:17 -0700 (PDT) X-Received: by 10.68.133.229 with SMTP id pf5mr3975262pbb.115.1403110877041; Wed, 18 Jun 2014 10:01:17 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id mk6si2833910pab.91.2014.06.18.10.01.16; Wed, 18 Jun 2014 10:01:16 -0700 (PDT) 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 S1753640AbaFRRBO (ORCPT + 3 others); Wed, 18 Jun 2014 13:01:14 -0400 Received: from mail-we0-f174.google.com ([74.125.82.174]:58087 "EHLO mail-we0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753634AbaFRRBN (ORCPT ); Wed, 18 Jun 2014 13:01:13 -0400 Received: by mail-we0-f174.google.com with SMTP id u57so1169592wes.5 for ; Wed, 18 Jun 2014 10:01:12 -0700 (PDT) X-Received: by 10.180.183.131 with SMTP id em3mr7007000wic.56.1403110872063; Wed, 18 Jun 2014 10:01:12 -0700 (PDT) Received: from srini-ThinkPad-X1-Carbon-2nd.dlink.com (host-2-99-228-46.as13285.net. [2.99.228.46]) by mx.google.com with ESMTPSA id o12sm26611840wiw.5.2014.06.18.10.01.09 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 18 Jun 2014 10:01:11 -0700 (PDT) From: Srinivas Kandagatla To: linux-usb@vger.kernel.org Cc: Felipe Balbi , Greg Kroah-Hartman , linux-arm-msm@vger.kernel.org, Srinivas Kandagatla Subject: [RFC PATCH 3/3] usb: phy: msm: Do not do runtime pm if the phy is not idle Date: Wed, 18 Jun 2014 18:01:08 +0100 Message-Id: <1403110868-3924-1-git-send-email-srinivas.kandagatla@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1403110801-3790-1-git-send-email-srinivas.kandagatla@linaro.org> References: <1403110801-3790-1-git-send-email-srinivas.kandagatla@linaro.org> 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: srinivas.kandagatla@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.220.172 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: , Use case is when the phy is configured in host mode and a usb device is attached to board before bootup. On bootup, with the existing code and runtime pm enabled, the driver would decrement the pm usage count without checking the current state of the phy. This pm usage count decrement would trigger the runtime pm which than would abort the usb enumeration which was in progress. In my case a usb stick gets detected and then immediatly the driver goes to low power mode which is not correct. log: [ 1.631412] msm_hsusb_host 12520000.usb: EHCI Host Controller [ 1.636556] msm_hsusb_host 12520000.usb: new USB bus registered, assigned bus number 1 [ 1.642563] msm_hsusb_host 12520000.usb: irq 220, io mem 0x12520000 [ 1.658197] msm_hsusb_host 12520000.usb: USB 2.0 started, EHCI 1.00 [ 1.659473] hub 1-0:1.0: USB hub found [ 1.663415] hub 1-0:1.0: 1 port detected ... [ 1.973352] usb 1-1: new high-speed USB device number 2 using msm_hsusb_host [ 2.107707] usb-storage 1-1:1.0: USB Mass Storage device detected [ 2.108993] scsi0 : usb-storage 1-1:1.0 [ 2.678341] msm_otg 12520000.phy: USB in low power mode [ 3.168977] usb 1-1: USB disconnect, device number 2 This issue was detected on IFC6410 board. This patch fixes the intial runtime pm trigger by checking the phy state and decrementing the pm use count only when the phy state is IDLE. Signed-off-by: Srinivas Kandagatla --- drivers/usb/phy/phy-msm-usb.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/usb/phy/phy-msm-usb.c b/drivers/usb/phy/phy-msm-usb.c index 3bb559d..78cc870 100644 --- a/drivers/usb/phy/phy-msm-usb.c +++ b/drivers/usb/phy/phy-msm-usb.c @@ -1229,7 +1229,9 @@ static void msm_otg_sm_work(struct work_struct *w) motg->chg_state = USB_CHG_STATE_UNDEFINED; motg->chg_type = USB_INVALID_CHARGER; } - pm_runtime_put_sync(otg->phy->dev); + + if (otg->phy->state == OTG_STATE_B_IDLE) + pm_runtime_put_sync(otg->phy->dev); break; case OTG_STATE_B_PERIPHERAL: dev_dbg(otg->phy->dev, "OTG_STATE_B_PERIPHERAL state\n");