From mboxrd@z Thu Jan 1 00:00:00 1970 From: patrice.chotard at st.com Date: Thu, 1 Jun 2017 13:36:21 +0200 Subject: [U-Boot] [PATCH v5 10/11] usb: host: ohci-generic: add RESET support In-Reply-To: <1496316982-16572-1-git-send-email-patrice.chotard@st.com> References: <1496316982-16572-1-git-send-email-patrice.chotard@st.com> Message-ID: <1496316982-16572-11-git-send-email-patrice.chotard@st.com> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de 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 Reviewed-by: Simon Glass --- v5: _ none 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 3488a81..182f022 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 *)devfdt_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); } -- 1.9.1