From patchwork Wed Sep 19 11:30:28 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kishon Vijay Abraham I X-Patchwork-Id: 1476921 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork2.kernel.org (Postfix) with ESMTP id 06B39DF280 for ; Wed, 19 Sep 2012 11:33:19 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TEIVI-0001W5-7e; Wed, 19 Sep 2012 11:31:40 +0000 Received: from devils.ext.ti.com ([198.47.26.153]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1TEIUR-0001ER-6f for linux-arm-kernel@lists.infradead.org; Wed, 19 Sep 2012 11:30:50 +0000 Received: from dbdp20.itg.ti.com ([172.24.170.38]) by devils.ext.ti.com (8.13.7/8.13.7) with ESMTP id q8JBUe7C015753; Wed, 19 Sep 2012 06:30:41 -0500 Received: from DBDE71.ent.ti.com (localhost [127.0.0.1]) by dbdp20.itg.ti.com (8.13.8/8.13.8) with ESMTP id q8JBUaSM009710; Wed, 19 Sep 2012 17:00:39 +0530 (IST) Received: from dbdp32.itg.ti.com (172.24.170.251) by DBDE71.ent.ti.com (172.24.170.149) with Microsoft SMTP Server id 14.1.323.3; Wed, 19 Sep 2012 17:00:37 +0530 Received: from a0393678lt.apr.dhcp.ti.com (smtpvbd.itg.ti.com [172.24.170.250]) by dbdp32.itg.ti.com (8.13.8/8.13.8) with ESMTP id q8JBUU3T005476; Wed, 19 Sep 2012 17:00:36 +0530 From: Kishon Vijay Abraham I To: , , , , , , , , , , , Subject: [PATCH 3/4] usb: phy: omap-usb3: Decrease the number of transitions to recovery Date: Wed, 19 Sep 2012 17:00:28 +0530 Message-ID: <1348054229-27362-4-git-send-email-kishon@ti.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1348054229-27362-1-git-send-email-kishon@ti.com> References: <1348054229-27362-1-git-send-email-kishon@ti.com> MIME-Version: 1.0 X-Spam-Note: CRM114 invocation failed X-Spam-Score: -7.5 (-------) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-7.5 points) pts rule name description ---- ---------------------- -------------------------------------------------- -5.0 RCVD_IN_DNSWL_HI RBL: Sender listed at http://www.dnswl.org/, high trust [198.47.26.153 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record -0.6 RP_MATCHES_RCVD Envelope sender domain matches handover relay domain -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: Moiz Sonasath X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org Power-cycling the PHY (partially) decreases the number of transitions to "Recovery" state. Hence changed the power up sequence to a partial power-up before a full power-up of the PHY. Signed-off-by: Kishon Vijay Abraham I Signed-off-by: Moiz Sonasath --- drivers/usb/phy/omap-usb3.c | 43 ++++++++++++++++++++++++++++++++++++------ include/linux/usb/omap_usb.h | 1 + 2 files changed, 38 insertions(+), 6 deletions(-) diff --git a/drivers/usb/phy/omap-usb3.c b/drivers/usb/phy/omap-usb3.c index 26402d5..fb3c5e6 100644 --- a/drivers/usb/phy/omap-usb3.c +++ b/drivers/usb/phy/omap-usb3.c @@ -35,13 +35,15 @@ static struct usb_dpll_params omap_usb3_dpll_params[NUM_SYS_CLKS] = { }; /** - * omap5_usb_phy_power - power on/off the serializer using control module + * omap5_usb_phy_partial_powerup - power on the serializer using control module * @phy: struct omap_usb * - * @on: 0 to off and 1 to on based on powering on or off the PHY * - * omap_usb3 can call this API to power on or off the PHY. + * After the dwc3 module is disabled and enabled again the synchronization + * between dwc3 and phy goes bad and the device does not get enumerated + * in superspeed mode. After some trials it was found powering up TX and + * part of RX PHY helped to solve the issue. */ -static int omap5_usb_phy_power(struct omap_usb *phy, bool on) +static int omap5_usb_phy_partial_powerup(struct omap_usb *phy) { u32 val; unsigned long rate; @@ -58,10 +60,32 @@ static int omap5_usb_phy_power(struct omap_usb *phy, bool on) val = readl(phy->control_dev); + val &= ~(USB_PWRCTL_CLK_CMD_MASK | USB_PWRCTL_CLK_FREQ_MASK); + val |= (USB3_PHY_PARTIAL_RX_POWERON | USB3_PHY_TX_RX_POWERON) + << USB_PWRCTL_CLK_CMD_SHIFT; + val |= rate << USB_PWRCTL_CLK_FREQ_SHIFT; + + writel(val, phy->control_dev); + + return 0; +} + +/** + * omap5_usb_phy_power - power on/off the serializer using control module + * @phy: struct omap_usb * + * @on: 0 to off and 1 to on based on powering on or off the PHY + * + * omap_usb3 can call this API to power on or off the PHY. + */ +static int omap5_usb_phy_power(struct omap_usb *phy, bool on) +{ + u32 val; + + val = readl(phy->control_dev); + if (on) { - val &= ~(USB_PWRCTL_CLK_CMD_MASK | USB_PWRCTL_CLK_FREQ_MASK); + val &= ~USB_PWRCTL_CLK_CMD_MASK; val |= USB3_PHY_TX_RX_POWERON << USB_PWRCTL_CLK_CMD_SHIFT; - val |= rate << USB_PWRCTL_CLK_FREQ_SHIFT; } else { val &= ~USB_PWRCTL_CLK_CMD_MASK; val |= USB3_PHY_TX_RX_POWEROFF << USB_PWRCTL_CLK_CMD_SHIFT; @@ -207,6 +231,13 @@ static int omap_usb3_init(struct usb_phy *x) struct omap_usb *phy = phy_to_omapusb(x); omap_usb_dpll_lock(phy); + omap5_usb_phy_partial_powerup(phy); + /* + * Give enough time for the PHY to partially power-up before + * powering it up completely. delay value suggested by the HW + * team. + */ + mdelay(100); omap5_usb_phy_power(phy, 1); return 0; diff --git a/include/linux/usb/omap_usb.h b/include/linux/usb/omap_usb.h index 01ed008..62b637c 100644 --- a/include/linux/usb/omap_usb.h +++ b/include/linux/usb/omap_usb.h @@ -92,6 +92,7 @@ struct omap_usb { #define USB3_PHY_TX_RX_POWERON 0x3 #define USB3_PHY_TX_RX_POWEROFF 0x0 +#define USB3_PHY_PARTIAL_RX_POWERON (0x1 << 6) #define phy_to_omapusb(x) container_of((x), struct omap_usb, phy)