From patchwork Sun Jun 26 07:28:21 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Boyd X-Patchwork-Id: 70870 Delivered-To: patch@linaro.org Received: by 10.140.28.4 with SMTP id 4csp555487qgy; Sun, 26 Jun 2016 00:32:10 -0700 (PDT) X-Received: by 10.98.135.193 with SMTP id i184mr22331236pfe.3.1466926330898; Sun, 26 Jun 2016 00:32:10 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id b72si4563836pfc.221.2016.06.26.00.32.10; Sun, 26 Jun 2016 00:32:10 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752234AbcFZH3M (ORCPT + 30 others); Sun, 26 Jun 2016 03:29:12 -0400 Received: from mail-pf0-f173.google.com ([209.85.192.173]:34149 "EHLO mail-pf0-f173.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752070AbcFZH2r (ORCPT ); Sun, 26 Jun 2016 03:28:47 -0400 Received: by mail-pf0-f173.google.com with SMTP id h14so51895748pfe.1 for ; Sun, 26 Jun 2016 00:28:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=i3OOVCRktbWHqRG10KmhdnaGrPfrmUDZyYuWQhYDInc=; b=bqxNXICupuV0fOlQN8Rc9bqhkq+pvLBTDmvIvHIkGzoTiDUT/klqip4HQdAeGIhfTh 1B18U/J0DtnjmGpo4OwHOQmGoTK9J+2CK99pLXWQ5J1hk3BGiEU5KCkbZsvlaa/KMax2 I5+u9RzbxNGC0fpf2l2t6OESjBNuYaBIF6Z7g= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=i3OOVCRktbWHqRG10KmhdnaGrPfrmUDZyYuWQhYDInc=; b=OWCApRXtZQin6MehIVADQ+crXdRW8GOFeLqrPfo2lCWfU6O9zUADsvxvH2UgYdU0kA a2PMKV8L3qPG+bjyHixbd6lPG6KEKcXQvmBSy0pPm6Vn4zGBkD+n8BN2PHJlSbdjFLKW iqwkd29/3ZYg+xf5Sh6y0c9aQQK0+dMiRK+g8FI0nvFdalUxiIslCKpKfH7VuieVKwln XULXgu7+ldg/QUiR4hlygN0CAprtykFvv8kHOTN1A2ZwsYRhnB9PfjAGnF/RKMdDlaWj qxDqYbhe3wBepb2WDPEgxJGQMqjaROxXPQzMNSbLso5Out7a7ZcZ1HmoYymvoQNLRgBg Cl3Q== X-Gm-Message-State: ALyK8tK0VB2L4oEtNmnuWO1lAMeQHExrIvBtuUE7VK0NZRjS1xbHX043YQLCxtQJvHObF6Zt X-Received: by 10.98.196.18 with SMTP id y18mr22486232pff.163.1466926126921; Sun, 26 Jun 2016 00:28:46 -0700 (PDT) Received: from localhost.localdomain (ip68-101-172-78.sd.sd.cox.net. [68.101.172.78]) by smtp.gmail.com with ESMTPSA id f138sm3790495pfa.17.2016.06.26.00.28.45 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 26 Jun 2016 00:28:46 -0700 (PDT) From: Stephen Boyd To: linux-usb@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, Andy Gross , Bjorn Andersson , Neil Armstrong , Arnd Bergmann , Felipe Balbi , Peter Chen , Greg Kroah-Hartman , "Ivan T. Ivanov" Subject: [PATCH 04/21] usb: chipidea: Only read/write OTGSC from one place Date: Sun, 26 Jun 2016 00:28:21 -0700 Message-Id: <20160626072838.28082-5-stephen.boyd@linaro.org> X-Mailer: git-send-email 2.9.0.rc2.8.ga28705d In-Reply-To: <20160626072838.28082-1-stephen.boyd@linaro.org> References: <20160626072838.28082-1-stephen.boyd@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org With the id and vbus detection done via extcon we need to make sure we poll the status of OTGSC properly by considering what the extcon is saying, and not just what the register is saying. Let's move this hw_wait_reg() function to the only place it's used and simplify it for polling the OTGSC register. Then we can make certain we only use the hw_read_otgsc() API to read OTGSC, which will make sure we properly handle extcon events. Cc: Peter Chen Cc: Greg Kroah-Hartman Cc: "Ivan T. Ivanov" Fixes: 3ecb3e09b042 ("usb: chipidea: Use extcon framework for VBUS and ID detect") Signed-off-by: Stephen Boyd --- drivers/usb/chipidea/core.c | 32 -------------------------------- drivers/usb/chipidea/otg.c | 35 +++++++++++++++++++++++++++++++---- 2 files changed, 31 insertions(+), 36 deletions(-) -- 2.9.0.rc2.8.ga28705d diff --git a/drivers/usb/chipidea/core.c b/drivers/usb/chipidea/core.c index 69426e644d17..01390e02ee53 100644 --- a/drivers/usb/chipidea/core.c +++ b/drivers/usb/chipidea/core.c @@ -516,38 +516,6 @@ int hw_device_reset(struct ci_hdrc *ci) return 0; } -/** - * hw_wait_reg: wait the register value - * - * Sometimes, it needs to wait register value before going on. - * Eg, when switch to device mode, the vbus value should be lower - * than OTGSC_BSV before connects to host. - * - * @ci: the controller - * @reg: register index - * @mask: mast bit - * @value: the bit value to wait - * @timeout_ms: timeout in millisecond - * - * This function returns an error code if timeout - */ -int hw_wait_reg(struct ci_hdrc *ci, enum ci_hw_regs reg, u32 mask, - u32 value, unsigned int timeout_ms) -{ - unsigned long elapse = jiffies + msecs_to_jiffies(timeout_ms); - - while (hw_read(ci, reg, mask) != value) { - if (time_after(jiffies, elapse)) { - dev_err(ci->dev, "timeout waiting for %08x in %d\n", - mask, reg); - return -ETIMEDOUT; - } - msleep(20); - } - - return 0; -} - static irqreturn_t ci_irq(int irq, void *data) { struct ci_hdrc *ci = data; diff --git a/drivers/usb/chipidea/otg.c b/drivers/usb/chipidea/otg.c index 03b6743461d1..763a8332b009 100644 --- a/drivers/usb/chipidea/otg.c +++ b/drivers/usb/chipidea/otg.c @@ -104,7 +104,32 @@ void ci_handle_vbus_change(struct ci_hdrc *ci) usb_gadget_vbus_disconnect(&ci->gadget); } -#define CI_VBUS_STABLE_TIMEOUT_MS 5000 +/** + * Sometimes, it needs to wait register value before going on. + * Eg, when switch to device mode, the vbus value should be lower + * than OTGSC_BSV before connects to host. + * + * @ci: the controller + * + * This function returns an error code if timeout + */ +static int hw_wait_otgsc_bsv(struct ci_hdrc *ci) +{ + unsigned long elapse = jiffies + msecs_to_jiffies(5000); + u32 mask = OTGSC_BSV; + + while (!hw_read_otgsc(ci, mask)) { + if (time_after(jiffies, elapse)) { + dev_err(ci->dev, "timeout waiting for %08x in OTGSC\n", + mask); + return -ETIMEDOUT; + } + msleep(20); + } + + return 0; +} + static void ci_handle_id_switch(struct ci_hdrc *ci) { enum ci_role role = ci_otg_role(ci); @@ -116,9 +141,11 @@ static void ci_handle_id_switch(struct ci_hdrc *ci) ci_role_stop(ci); if (role == CI_ROLE_GADGET) - /* wait vbus lower than OTGSC_BSV */ - hw_wait_reg(ci, OP_OTGSC, OTGSC_BSV, 0, - CI_VBUS_STABLE_TIMEOUT_MS); + /* + * wait vbus lower than OTGSC_BSV before connecting + * to host + */ + hw_wait_otgsc_bsv(ci); ci_role_start(ci, role); }