From patchwork Thu Jun 1 16:51:59 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philipp Zabel X-Patchwork-Id: 9760485 X-Patchwork-Delegate: agross@codeaurora.org Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id DAFAC60363 for ; Thu, 1 Jun 2017 16:54:10 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B27EF23F88 for ; Thu, 1 Jun 2017 16:54:10 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A7457284C0; Thu, 1 Jun 2017 16:54:10 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E790823F88 for ; Thu, 1 Jun 2017 16:54:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752086AbdFAQw6 (ORCPT ); Thu, 1 Jun 2017 12:52:58 -0400 Received: from metis.ext.4.pengutronix.de ([92.198.50.35]:36195 "EHLO metis.ext.4.pengutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751097AbdFAQw4 (ORCPT ); Thu, 1 Jun 2017 12:52:56 -0400 Received: from dude.hi.pengutronix.de ([2001:67c:670:100:1d::7] helo=dude.pengutronix.de.) by metis.ext.pengutronix.de with esmtp (Exim 4.84_2) (envelope-from ) id 1dGTL3-0004pb-Az; Thu, 01 Jun 2017 18:52:45 +0200 From: Philipp Zabel To: linux-kernel@vger.kernel.org Cc: Vivek Gautam , Jon Hunter , Felipe Balbi , Greg Kroah-Hartman , Thierry Reding , linux-tegra@vger.kernel.org, linux-usb@vger.kernel.org, linux-arm-msm@vger.kernel.org, Philipp Zabel Subject: [PATCH v5 2/6] reset: Add APIs to manage array of resets Date: Thu, 1 Jun 2017 18:51:59 +0200 Message-Id: <20170601165203.15315-3-p.zabel@pengutronix.de> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170601165203.15315-1-p.zabel@pengutronix.de> References: <20170601165203.15315-1-p.zabel@pengutronix.de> X-SA-Exim-Connect-IP: 2001:67c:670:100:1d::7 X-SA-Exim-Mail-From: p.zabel@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-arm-msm@vger.kernel.org Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Vivek Gautam Many devices may want to request a bunch of resets and control them. So it's better to manage them as an array. Add APIs to _get(), _assert(), and _deassert() an array of reset_control. Note that, these APIs don't guarantee that the reset lines managed in the array are handled in any particular order. Cc: Felipe Balbi Signed-off-by: Vivek Gautam Acked-by: Jon Hunter Tested-by: Jon Hunter Signed-off-by: Philipp Zabel --- drivers/reset/core.c | 202 ++++++++++++++++++++++++++++++++++++++++++++++++++ include/linux/reset.h | 93 +++++++++++++++++++++++ 2 files changed, 295 insertions(+) diff --git a/drivers/reset/core.c b/drivers/reset/core.c index 0090784ff4105..1747000757211 100644 --- a/drivers/reset/core.c +++ b/drivers/reset/core.c @@ -472,3 +472,205 @@ int device_reset(struct device *dev) return ret; } EXPORT_SYMBOL_GPL(device_reset); + +/** + * APIs to manage an array of reset controls. + */ +/** + * of_reset_control_get_count - Count number of resets available with a device + * + * @node: device node that contains 'resets'. + * + * Returns positive reset count on success, or error number on failure and + * on count being zero. + */ +static int of_reset_control_get_count(struct device_node *node) +{ + int count; + + if (!node) + return -EINVAL; + + count = of_count_phandle_with_args(node, "resets", "#reset-cells"); + if (count == 0) + count = -ENOENT; + + return count; +} + +/** + * reset_control_array_assert: assert a list of resets + * + * @resets: reset control array holding info about the list of resets + * + * This API doesn't guarantee that the reset lines controlled by + * the reset array are asserted in any particular order. + * + * Returns 0 on success or error number on failure. + */ +int reset_control_array_assert(struct reset_control_array *resets) +{ + int ret, i; + + if (!resets) + return 0; + + if (IS_ERR(resets)) + return -EINVAL; + + for (i = 0; i < resets->num_rstcs; i++) { + ret = reset_control_assert(resets->rstc[i]); + if (ret) + goto err; + } + + return 0; + +err: + while (i--) + reset_control_deassert(resets->rstc[i]); + return ret; +} +EXPORT_SYMBOL_GPL(reset_control_array_assert); + +/** + * reset_control_array_deassert: deassert a list of resets + * + * @resets: reset control array holding info about the list of resets + * + * This API doesn't guarantee that the reset lines controlled by + * the reset array are deasserted in any particular order. + * + * Returns 0 on success or error number on failure. + */ +int reset_control_array_deassert(struct reset_control_array *resets) +{ + int ret, i; + + if (!resets) + return 0; + + if (IS_ERR(resets)) + return -EINVAL; + + for (i = 0; i < resets->num_rstcs; i++) { + ret = reset_control_deassert(resets->rstc[i]); + if (ret) + goto err; + } + + return 0; + +err: + while (i--) + reset_control_assert(resets->rstc[i]); + return ret; +} +EXPORT_SYMBOL_GPL(reset_control_array_deassert); + +static void devm_reset_control_array_release(struct device *dev, void *res) +{ + reset_control_array_put(*(struct reset_control_array **)res); +} + +/** + * of_reset_control_array_get - Get a list of reset controls using + * device node. + * + * @np: device node for the device that requests the reset controls array + * @shared: whether reset controls are shared or not + * @optional: whether it is optional to get the reset controls + * + * Returns pointer to allocated reset_control_array on success or + * error on failure + */ +struct reset_control_array * +of_reset_control_array_get(struct device_node *np, bool shared, bool optional) +{ + struct reset_control_array *resets; + struct reset_control *rstc; + int num, i; + void *err; + + num = of_reset_control_get_count(np); + if (num < 0) + return optional ? NULL : ERR_PTR(num); + + resets = kzalloc(sizeof(*resets) + sizeof(resets->rstc[0]) * num, + GFP_KERNEL); + if (!resets) + return ERR_PTR(-ENOMEM); + + for (i = 0; i < num; i++) { + rstc = __of_reset_control_get(np, NULL, i, shared, optional); + if (IS_ERR(rstc)) { + err = ERR_CAST(rstc); + goto err_rst; + } + resets->rstc[i] = rstc; + } + resets->num_rstcs = num; + + return resets; + +err_rst: + while (--i >= 0) + reset_control_put(resets->rstc[i]); + + kfree(resets); + + return err; +} +EXPORT_SYMBOL_GPL(of_reset_control_array_get); + +/** + * devm_reset_control_array_get - Resource managed reset control array get + * + * @dev: device that requests the list of reset controls + * @shared: whether reset controls are shared or not + * @optional: whether it is optional to get the reset controls + * + * The reset control array APIs are intended for a list of resets + * that just have to be asserted or deasserted, without any + * requirements on the order. + * + * Returns pointer to allocated reset_control_array on success or + * error on failure + */ +struct reset_control_array * +devm_reset_control_array_get(struct device *dev, bool shared, bool optional) +{ + struct reset_control_array **devres; + struct reset_control_array *resets; + + devres = devres_alloc(devm_reset_control_array_release, + sizeof(*devres), GFP_KERNEL); + if (!devres) + return ERR_PTR(-ENOMEM); + + resets = of_reset_control_array_get(dev->of_node, shared, optional); + if (IS_ERR(resets)) { + devres_free(resets); + return resets; + } + + *devres = resets; + devres_add(dev, devres); + + return resets; +} +EXPORT_SYMBOL_GPL(devm_reset_control_array_get); + +void reset_control_array_put(struct reset_control_array *resets) +{ + int i; + + if (IS_ERR_OR_NULL(resets)) + return; + + for (i = 0; i < resets->num_rstcs; i++) + reset_control_put(resets->rstc[i]); + + kfree(resets); +} +EXPORT_SYMBOL_GPL(reset_control_array_put); diff --git a/include/linux/reset.h b/include/linux/reset.h index 13d8681210d54..df75fe50f765d 100644 --- a/include/linux/reset.h +++ b/include/linux/reset.h @@ -5,6 +5,11 @@ struct reset_control; +struct reset_control_array { + unsigned int num_rstcs; + struct reset_control *rstc[]; +}; + #ifdef CONFIG_RESET_CONTROLLER int reset_control_reset(struct reset_control *rstc); @@ -25,6 +30,14 @@ struct reset_control *__devm_reset_control_get(struct device *dev, int __must_check device_reset(struct device *dev); +int reset_control_array_assert(struct reset_control_array *resets); +int reset_control_array_deassert(struct reset_control_array *resets); +struct reset_control_array *devm_reset_control_array_get(struct device *dev, + bool shared, bool optional); +struct reset_control_array *of_reset_control_array_get(struct device_node *np, + bool shared, bool optional); +void reset_control_array_put(struct reset_control_array *resets); + static inline int device_reset_optional(struct device *dev) { return device_reset(dev); @@ -89,6 +102,35 @@ static inline struct reset_control *__devm_reset_control_get( return optional ? NULL : ERR_PTR(-ENOTSUPP); } +static inline +int reset_control_array_assert(struct reset_control_array *resets) +{ + return 0; +} + +static inline +int reset_control_array_deassert(struct reset_control_array *resets) +{ + return 0; +} + +static inline struct reset_control_array * +devm_reset_control_array_get(struct device *dev, bool shared, bool optional) +{ + return optional ? NULL : ERR_PTR(-ENOTSUPP); +} + +static inline struct reset_control_array * +of_reset_control_array_get(struct device_node *np, bool shared, bool optional) +{ + return optional ? NULL : ERR_PTR(-ENOTSUPP); +} + +static inline +void reset_control_array_put(struct reset_control_array *resets) +{ +} + #endif /* CONFIG_RESET_CONTROLLER */ /** @@ -374,4 +416,55 @@ static inline struct reset_control *devm_reset_control_get_by_index( { return devm_reset_control_get_exclusive_by_index(dev, index); } + +/* + * APIs to manage a list of reset controllers + */ +static inline struct reset_control_array * +devm_reset_control_array_get_exclusive(struct device *dev) +{ + return devm_reset_control_array_get(dev, false, false); +} + +static inline struct reset_control_array * +devm_reset_control_array_get_shared(struct device *dev) +{ + return devm_reset_control_array_get(dev, true, false); +} + +static inline struct reset_control_array * +devm_reset_control_array_get_optional_exclusive(struct device *dev) +{ + return devm_reset_control_array_get(dev, false, true); +} + +static inline struct reset_control_array * +devm_reset_control_array_get_optional_shared(struct device *dev) +{ + return devm_reset_control_array_get(dev, true, true); +} + +static inline struct reset_control_array * +of_reset_control_array_get_exclusive(struct device_node *node) +{ + return of_reset_control_array_get(node, false, false); +} + +static inline struct reset_control_array * +of_reset_control_array_get_shared(struct device_node *node) +{ + return of_reset_control_array_get(node, true, false); +} + +static inline struct reset_control_array * +of_reset_control_array_get_optional_exclusive(struct device_node *node) +{ + return of_reset_control_array_get(node, false, true); +} + +static inline struct reset_control_array * +of_reset_control_array_get_optional_shared(struct device_node *node) +{ + return of_reset_control_array_get(node, true, true); +} #endif