From patchwork Tue Apr 18 11:21:26 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vivek Gautam X-Patchwork-Id: 9685379 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 4A634602C9 for ; Tue, 18 Apr 2017 11:21:58 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3FBFD283E8 for ; Tue, 18 Apr 2017 11:21:58 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3310C28415; Tue, 18 Apr 2017 11:21:58 +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.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham 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 78D26283E8 for ; Tue, 18 Apr 2017 11:21:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756524AbdDRLVz (ORCPT ); Tue, 18 Apr 2017 07:21:55 -0400 Received: from smtp.codeaurora.org ([198.145.29.96]:49558 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756413AbdDRLVw (ORCPT ); Tue, 18 Apr 2017 07:21:52 -0400 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id 3D8FC60F6A; Tue, 18 Apr 2017 11:21:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1492514506; bh=d216pwFD3euLh90xt/yvZ5bmcsHcAOckAx8pBAyjBjI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=iMmov9JrFn6AiLjAnJ5rG4/0eWnK59+UuuopMqci/V03/VSJvtM7xz6kw5e85rEds TtzI+n1kHVIn40uiJLF/v5eTMue81tn4cuJkBZxmxJGfIErJ2ddaEU39eGsR4kXFrD FX131xH6YNyhSiQc7MorCb5xC1KLMGL5GsvMdML0= Received: from blr-ubuntu-41.ap.qualcomm.com (unknown [202.46.23.61]) (using TLSv1.1 with cipher ECDHE-RSA-AES128-SHA (128/128 bits)) (No client certificate requested) (Authenticated sender: vivek.gautam@smtp.codeaurora.org) by smtp.codeaurora.org (Postfix) with ESMTPSA id 2786660DF8; Tue, 18 Apr 2017 11:21:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1492514504; bh=d216pwFD3euLh90xt/yvZ5bmcsHcAOckAx8pBAyjBjI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Bmj1OD0OIEilFx3zBYWQd5W/x0W7Tz4IVQwcDbTAVUnckJW18TEkawzip6DP2R2wL ZzwnK9P50GaUE6u/w/7/suTo1eWCzl5FtTU35DODxjoyNk+sdm282FXYv4l/Ghe+IX 96BbPkdfdAGn8EqeC3K6TSr/9/c+286iANPrTEwU= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org 2786660DF8 Authentication-Results: pdx-caf-mail.web.codeaurora.org; dmarc=none (p=none dis=none) header.from=codeaurora.org Authentication-Results: pdx-caf-mail.web.codeaurora.org; spf=none smtp.mailfrom=vivek.gautam@codeaurora.org From: Vivek Gautam To: p.zabel@pengutronix.de, swarren@wwwdotorg.org, balbi@kernel.org Cc: linux-kernel@vger.kernel.org, linux-tegra@vger.kernel.org, linux-usb@vger.kernel.org, thierry.reding@gmail.com, gregkh@linuxfoundation.org, linux-arm-msm@vger.kernel.org, Vivek Gautam Subject: [PATCH V3 2/4] reset: Add APIs to manage array of resets Date: Tue, 18 Apr 2017 16:51:26 +0530 Message-Id: <1492514488-27385-3-git-send-email-vivek.gautam@codeaurora.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1492514488-27385-1-git-send-email-vivek.gautam@codeaurora.org> References: <1492514488-27385-1-git-send-email-vivek.gautam@codeaurora.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 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. Cc: Philipp Zabel Signed-off-by: Vivek Gautam --- drivers/reset/core.c | 177 ++++++++++++++++++++++++++++++++++++++++++++++++++ include/linux/reset.h | 93 ++++++++++++++++++++++++++ 2 files changed, 270 insertions(+) diff --git a/drivers/reset/core.c b/drivers/reset/core.c index f0a06a7aca93..54bd3be5e7a4 100644 --- a/drivers/reset/core.c +++ b/drivers/reset/core.c @@ -488,3 +488,180 @@ int of_reset_control_get_count(struct device_node *node) return count; } EXPORT_SYMBOL_GPL(of_reset_control_get_count); + +/** + * APIs to manage an array of reset controls. + */ +/** + * 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) + return ret; + } + + return 0; +} +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) +{ + struct reset_control_array *resets = res; + + reset_control_array_put(resets); +} + +/** + * 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 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 1b5a6aafd3e6..8edb69e93355 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); @@ -26,6 +31,14 @@ struct reset_control *__devm_reset_control_get(struct device *dev, int __must_check device_reset(struct device *dev); int of_reset_control_get_count(struct device_node *node); +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); @@ -95,6 +108,35 @@ static inline int of_reset_control_get_count(struct device_node *node) return -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 */ /** @@ -380,4 +422,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