From patchwork Sat Sep 14 18:04:54 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cristian Ciocaltea X-Patchwork-Id: 13804509 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 376D9C021A8 for ; Sat, 14 Sep 2024 18:06:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Cc:To:In-Reply-To:References :Message-Id:Content-Transfer-Encoding:Content-Type:MIME-Version:Subject:Date: From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=CCskFN2CF98NnNPNqL6/1veoUmNUR47xrYtj/ESEITc=; b=sJf79U6rkZf0jaWkpeS/mDkbFl dx/CZsZ2QnUrU6eh4a1T+covFIe9Lu/peQ98BQYB2YIvOK2Fz0EtLnLveel3UUY8LbTH3wDs99DHi t9A8sQ3eqImEb7NJnCo0KfrEC+wyRBJMmvdQJlACBtDfraF31cfSdHQDvWnPvT0ZbzWv2o5mN9b9F BGyCK3ck4tfgY1pFJEI1MsFHp+oGw6GjRdBPK3QGrMS9VsRWPLvUKME/UL2nsPkulKgxInTDinAOa OHV+/RueNGEN98WtNOQG1B7W+avx6IMsq8kdwut/ms1Dkiq2qzWWOgwgH8SSPs3Ep3rubJP9a/4UA v5xDZDNQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1spXAP-000000014mL-3nwX; Sat, 14 Sep 2024 18:06:42 +0000 Received: from bali.collaboradmins.com ([2a01:4f8:201:9162::2]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1spX9I-000000014U7-3wop; Sat, 14 Sep 2024 18:05:34 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1726337131; bh=YBD7ROn/m+4hx/YE8/G04zWv2dlzT0LgAGoiccmV39I=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=BWS0aQzlUguFPj0Ycf7Wj9K5lKxfLxazx4z3WKI1UY6jLRH0huKQSQnhhDqPjWa9g NfcX5LKO4u9/0MtO1BVZTDDPua1c5jA/EhQ48cLYKi795ApaOQFJu1rQXb+LA+iNOi AZEvHsQ1XiWgFZwDXadcatZzL6V6EOgJVhDWnoUDDzazGku1CV5hNFJhxoKR6bphyp pmrEoOYjRfx8G0NJyLvFkj6T4oWMb+4zGn8s3OgEMAbDOUGd+S0WhT27ldI9R4eh6/ oYgDTqd9XMDdj/2xerelohtedgH8VJYZUxltnoRGqaJnrIaTklwpi086keA5voklRg PVyQpx1qjIKsA== Received: from localhost (unknown [188.27.55.48]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (prime256v1) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: cristicc) by bali.collaboradmins.com (Postfix) with ESMTPSA id 0DD6717E3608; Sat, 14 Sep 2024 20:05:31 +0200 (CEST) From: Cristian Ciocaltea Date: Sat, 14 Sep 2024 21:04:54 +0300 Subject: [PATCH 1/4] clk: Provide devm_clk_bulk_get_all_enabled() helper MIME-Version: 1.0 Message-Id: <20240914-clk_bulk_ena_fix-v1-1-ce3537585c06@collabora.com> References: <20240914-clk_bulk_ena_fix-v1-0-ce3537585c06@collabora.com> In-Reply-To: <20240914-clk_bulk_ena_fix-v1-0-ce3537585c06@collabora.com> To: Michael Turquette , Stephen Boyd , Russell King , Matthias Brugger , AngeloGioacchino Del Regno , Jingoo Han , Lorenzo Pieralisi , =?utf-8?q?Krzysztof_Wilczy?= =?utf-8?q?=C5=84ski?= , Manivannan Sadhasivam , Rob Herring , Bjorn Helgaas , Krzysztof Kozlowski , Alim Akhtar Cc: kernel@collabora.com, linux-clk@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, linux-pci@vger.kernel.org, linux-samsung-soc@vger.kernel.org X-Mailer: b4 0.14.1 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240914_110533_182243_0100B767 X-CRM114-Status: GOOD ( 16.56 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Commit 265b07df758a ("clk: Provide managed helper to get and enable bulk clocks") added devm_clk_bulk_get_all_enable() function, but missed to return the number of clocks stored in the clk_bulk_data table referenced by the clks argument. Without knowing the number, it's not possible to iterate these clocks when needed, hence the argument is useless and could have been simply removed. Introduce devm_clk_bulk_get_all_enabled() variant, which is consistent with devm_clk_bulk_get_all() in terms of the returned value: > 0 if one or more clocks have been stored = 0 if there are no clocks < 0 if an error occurred Moreover, the naming is consistent with devm_clk_get_enabled(), i.e. use the past form of 'enable'. Signed-off-by: Cristian Ciocaltea Reviewed-by: AngeloGioacchino Del Regno --- drivers/clk/clk-devres.c | 34 ++++++++++++++++++++++++++++++++++ include/linux/clk.h | 24 ++++++++++++++++++++++++ 2 files changed, 58 insertions(+) diff --git a/drivers/clk/clk-devres.c b/drivers/clk/clk-devres.c index 82ae1f26e634..4203aaaa7544 100644 --- a/drivers/clk/clk-devres.c +++ b/drivers/clk/clk-devres.c @@ -250,6 +250,40 @@ int __must_check devm_clk_bulk_get_all_enable(struct device *dev, } EXPORT_SYMBOL_GPL(devm_clk_bulk_get_all_enable); +int __must_check devm_clk_bulk_get_all_enabled(struct device *dev, + struct clk_bulk_data **clks) +{ + struct clk_bulk_devres *devres; + int ret; + + devres = devres_alloc(devm_clk_bulk_release_all_enable, + sizeof(*devres), GFP_KERNEL); + if (!devres) + return -ENOMEM; + + ret = clk_bulk_get_all(dev, &devres->clks); + if (ret <= 0) + goto err_free_devres; + + *clks = devres->clks; + devres->num_clks = ret; + + ret = clk_bulk_prepare_enable(devres->num_clks, *clks); + if (ret) { + clk_bulk_put_all(devres->num_clks, devres->clks); + goto err_free_devres; + } + + devres_add(dev, devres); + + return devres->num_clks; + +err_free_devres: + devres_free(devres); + return ret; +} +EXPORT_SYMBOL_GPL(devm_clk_bulk_get_all_enabled); + static int devm_clk_match(struct device *dev, void *res, void *data) { struct clk **c = res; diff --git a/include/linux/clk.h b/include/linux/clk.h index 851a0f2cf42c..158c5072852e 100644 --- a/include/linux/clk.h +++ b/include/linux/clk.h @@ -511,6 +511,24 @@ int __must_check devm_clk_bulk_get_all(struct device *dev, int __must_check devm_clk_bulk_get_all_enable(struct device *dev, struct clk_bulk_data **clks); +/** + * devm_clk_bulk_get_all_enabled - Get and enable all clocks of the consumer (managed) + * @dev: device for clock "consumer" + * @clks: pointer to the clk_bulk_data table of consumer + * + * Returns a positive value for the number of clocks obtained while the + * clock references are stored in the clk_bulk_data table in @clks field. + * Returns 0 if there're none and a negative value if something failed. + * + * This helper function allows drivers to get all clocks of the + * consumer and enables them in one operation with management. + * The clks will automatically be disabled and freed when the device + * is unbound. + */ + +int __must_check devm_clk_bulk_get_all_enabled(struct device *dev, + struct clk_bulk_data **clks); + /** * devm_clk_get - lookup and obtain a managed reference to a clock producer. * @dev: device for clock "consumer" @@ -1040,6 +1058,12 @@ static inline int __must_check devm_clk_bulk_get_all_enable(struct device *dev, return 0; } +static inline int __must_check devm_clk_bulk_get_all_enabled(struct device *dev, + struct clk_bulk_data **clks) +{ + return 0; +} + static inline struct clk *devm_get_clk_from_child(struct device *dev, struct device_node *np, const char *con_id) {