From patchwork Wed May 24 13:07:55 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Patrice CHOTARD X-Patchwork-Id: 766476 X-Patchwork-Delegate: marek.vasut@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3wXtJQ5zztz9sNC for ; Wed, 24 May 2017 23:18:46 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 89A2AC21E43; Wed, 24 May 2017 13:12:00 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.7 required=5.0 tests=RCVD_IN_DNSWL_LOW autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id A49F7C21DDD; Wed, 24 May 2017 13:10:51 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 612FFC21DB6; Wed, 24 May 2017 13:08:16 +0000 (UTC) Received: from mx07-00178001.pphosted.com (mx08-00178001.pphosted.com [91.207.212.93]) by lists.denx.de (Postfix) with ESMTPS id 967E8C21D71 for ; Wed, 24 May 2017 13:08:16 +0000 (UTC) Received: from pps.filterd (m0046660.ppops.net [127.0.0.1]) by mx08-.pphosted.com (8.16.0.21/8.16.0.21) with SMTP id v4OD5stJ002055; Wed, 24 May 2017 15:08:15 +0200 Received: from beta.dmz-eu.st.com (beta.dmz-eu.st.com [164.129.1.35]) by mx08-.pphosted.com with ESMTP id 2amdkd9y3j-1 (version=TLSv1 cipher=ECDHE-RSA-AES256-SHA bits=256 verify=NOT); Wed, 24 May 2017 15:08:15 +0200 Received: from zeta.dmz-eu.st.com (zeta.dmz-eu.st.com [164.129.230.9]) by beta.dmz-eu.st.com (STMicroelectronics) with ESMTP id D192231; Wed, 24 May 2017 13:08:14 +0000 (GMT) Received: from Webmail-eu.st.com (sfhdag6node3.st.com [10.75.127.18]) by zeta.dmz-eu.st.com (STMicroelectronics) with ESMTP id BCD0B18D8; Wed, 24 May 2017 13:08:14 +0000 (GMT) Received: from localhost (10.75.127.51) by SFHDAG6NODE3.st.com (10.75.127.18) with Microsoft SMTP Server (TLS) id 15.0.1178.4; Wed, 24 May 2017 15:08:14 +0200 From: To: Marek Vasut , , Date: Wed, 24 May 2017 15:07:55 +0200 Message-ID: <1495631276-25676-11-git-send-email-patrice.chotard@st.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1495631276-25676-1-git-send-email-patrice.chotard@st.com> References: <1495631276-25676-1-git-send-email-patrice.chotard@st.com> MIME-Version: 1.0 X-Originating-IP: [10.75.127.51] X-ClientProxiedBy: SFHDAG6NODE3.st.com (10.75.127.18) To SFHDAG6NODE3.st.com (10.75.127.18) X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:, , definitions=2017-05-24_09:, , signatures=0 Cc: christophe.kerello@st.com Subject: [U-Boot] [PATCH v4 10/11] usb: host: ohci-generic: add RESET support X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" From: Patrice Chotard use array to save deasserted resets reference in order to assert them in case of error during probe() or during driver removal. Signed-off-by: Patrice Chotard --- v4: _ update the memory allocation for deasserted resets. Replace lists by arrays. _ usage of new RESET methods reset_assert_all() and clk_disable_all(). v3: _ extract in this patch the RESET support add-on from previous patch 5 _ keep deasserted resets reference in list in order to assert resets in error path or in .remove callback v2: _ add error path management _ add .remove callback drivers/usb/host/ohci-generic.c | 41 ++++++++++++++++++++++++++++++++++++++++- 1 file changed, 40 insertions(+), 1 deletion(-) diff --git a/drivers/usb/host/ohci-generic.c b/drivers/usb/host/ohci-generic.c index 404fc98..3f41015 100644 --- a/drivers/usb/host/ohci-generic.c +++ b/drivers/usb/host/ohci-generic.c @@ -7,6 +7,7 @@ #include #include #include +#include #include "ohci.h" #if !defined(CONFIG_USB_OHCI_NEW) @@ -16,14 +17,16 @@ struct generic_ohci { ohci_t ohci; struct clk *clocks; + struct reset_ctl *resets; int clock_count; + int reset_count; }; static int ohci_usb_probe(struct udevice *dev) { struct ohci_regs *regs = (struct ohci_regs *)dev_get_addr(dev); struct generic_ohci *priv = dev_get_priv(dev); - int i, err, ret, clock_nb; + int i, err, ret, clock_nb, reset_nb; err = 0; priv->clock_count = 0; @@ -53,10 +56,42 @@ static int ohci_usb_probe(struct udevice *dev) } } + priv->reset_count = 0; + reset_nb = reset_count(dev); + + if (reset_nb) { + priv->resets = devm_kmalloc(dev, + sizeof(struct reset_ctl) * reset_nb, + GFP_KERNEL); + if (!priv->resets) { + error("Can't allocate resource\n"); + return -ENOMEM; + } + + for (i = 0; i < reset_nb; i++) { + err = reset_get_by_index(dev, i, &priv->resets[i]); + if (err < 0) + break; + + priv->reset_count++; + + if (reset_deassert(&priv->resets[i])) { + error("failed to deassert reset %d\n", i); + reset_free(&priv->resets[i]); + goto reset_err; + } + reset_free(&priv->resets[i]); + } + } + err = ohci_register(dev, regs); if (!err) return err; +reset_err: + ret = reset_assert_all(priv->resets, priv->reset_count); + if (ret) + return ret; clk_err: ret = clk_disable_all(priv->clocks, priv->clock_count); if (ret) @@ -74,6 +109,10 @@ static int ohci_usb_remove(struct udevice *dev) if (ret) return ret; + ret = reset_assert_all(priv->resets, priv->reset_count); + if (ret) + return ret; + return clk_disable_all(priv->clocks, priv->clock_count); }