From patchwork Fri May 5 11:25:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Maxime Ripard X-Patchwork-Id: 13232484 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 26C79C77B75 for ; Fri, 5 May 2023 11:29:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Cc:To:In-Reply-To:References:Message-Id :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=kag7MtgccpUKrjp5T/HnxiSr2Cv+mERyFZZ4ri9bGbI=; b=u63mAOVizMhF87 m/ekB88Pt4KtMMoL6mdrQr6AS2xqWpL1R3oVAlropdxzaebup5aooXxvINCz3v+wT+mE+iVH/8A7/ YuqzTMPdXa17wwKN6EJY3bzvUDwPLvb/ho794ffgmGeB3BA4pSuOx+375hP/rsf/XzC1PnOLlaXy3 F/dp1Ed0C/sbk8gMMCzpF4YjKauDZKCBwOgEJpVT/B4ILb13UbKLQL5X2u+e+shVSEP49HIFxZuYO eLKTdpnEQKyZP16Ifzj7KP7ADNaVl7kZvWeM0SW+CNfnbAC/eZCIGqGqvch3olKR8xnEm19QbwnZ7 25++MuX/aT12pMLN760Q==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1putbh-00Ag9b-0s; Fri, 05 May 2023 11:28:13 +0000 Received: from wout1-smtp.messagingengine.com ([64.147.123.24]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1putbb-00Ag61-2D; Fri, 05 May 2023 11:28:09 +0000 Received: from compute2.internal (compute2.nyi.internal [10.202.2.46]) by mailout.west.internal (Postfix) with ESMTP id 901A032008FB; Fri, 5 May 2023 07:28:06 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute2.internal (MEProxy); Fri, 05 May 2023 07:28:07 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cerno.tech; h=cc :cc:content-transfer-encoding:content-type:content-type:date :date:from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:sender:subject:subject:to:to; s=fm2; t= 1683286086; x=1683372486; bh=PfWTmImKxKIpJoAkzALAsFwdadzDzzsF9hz gcNjJ/uM=; b=MoCmgjhsDTvl3uJotlR7ENT73i/kptayfrfL9bhtdT5Dwidwidx HsLeomfFqiX2GVWLsUSiLw+UNkh2BxnfJsg2enhvUyb2ehM5ol7Z2pXRFCzbdwYc fDlViFdBb1nOnK7F0aCrRzSmLnZOxQYb8A+/1vFXva2B/WbuCfBj33QvlZLtexCq nG//lRj5Lj0sGjJiOhUN8BiMBm6AhY7qhsU8DS4WnDGb9W/3nd7pMyoU4ITJAgDd phuQe9kLDLPOpqsMjQE0jEuANUZW18Oufm/AbuEZ3L0tvV1q9mNJxbHuf9UlOcMQ 2eJD8JVikfetlmTY9Nmt72jXs22eiCMAylg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:content-type:date:date:feedback-id:feedback-id :from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:sender:subject:subject:to:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm3; t= 1683286086; x=1683372486; bh=PfWTmImKxKIpJoAkzALAsFwdadzDzzsF9hz gcNjJ/uM=; b=TItGzxbivLbfvsh0+JM3Y5n/og4h8AnbJUlcW7j+EjoLxyakirm vmJLYy+AvOr9/YhHd69mAuUemjqV0i0REJLL4z9PjaRAL8lTb1X8z/jI2AA87L+E ojl5Ki/YaeoU1nskSez0rlV6rBHBwcdEO/lm79UncRMKEdmRYNex0rjOuij/51ro UPc0AiJJGyqh7AQcKUqkzoOtRhOMoUlf9TNBe4kJBcSj6SVDaKoVgezOrGLIsDgH mYe11kdPdKhgp7NkqWkO+d1v6RtufshDLA52zpV1TRJvX971DlHyzk+22AmKTe4t /RA4JEB34v8C82LvYR3EHA10F1cQ87dDTCA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvhedrfeefvddggedtucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephfffufggtgfgkfhfjgfvvefosehtkeertdertdejnecuhfhrohhmpeforgig ihhmvgcutfhiphgrrhguuceomhgrgihimhgvsegtvghrnhhordhtvggthheqnecuggftrf grthhtvghrnhepudduudfhveejteefgedvffdvvedvjedugedukeejhedtlefhffevtefh jeeltdevnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomh epmhgrgihimhgvsegtvghrnhhordhtvggthh X-ME-Proxy: Feedback-ID: i8771445c:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Fri, 5 May 2023 07:28:05 -0400 (EDT) From: Maxime Ripard Date: Fri, 05 May 2023 13:25:49 +0200 Subject: [PATCH v4 47/68] clk: actions: composite: div: Switch to determine_rate MIME-Version: 1.0 Message-Id: <20221018-clk-range-checks-fixes-v4-47-971d5077e7d2@cerno.tech> References: <20221018-clk-range-checks-fixes-v4-0-971d5077e7d2@cerno.tech> In-Reply-To: <20221018-clk-range-checks-fixes-v4-0-971d5077e7d2@cerno.tech> To: Michael Turquette , Stephen Boyd Cc: linux-clk@vger.kernel.org, Maxime Ripard , =?utf-8?q?Andreas_F=C3=A4rber?= , Manivannan Sadhasivam , linux-actions@lists.infradead.org, linux-arm-kernel@lists.infradead.org X-Mailer: b4 0.12.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=2950; i=maxime@cerno.tech; h=from:subject:message-id; bh=UZMNzkOWFIjD+gDO2VaoM7lgoJwIkakPOuo1/dGFvM0=; b=owGbwMvMwCX2+D1vfrpE4FHG02pJDCkhz5es+PMwXjlnkXZ9M8PES2UHJ1/+VRUrVnTwtlDOheUC PsoWHaUsDGJcDLJiiiwxwuZL4k7Net3JxjcPZg4rE8gQBi5OAZjIhB+MDAemSDZ0v3hb1v1PxrBs05 sDHeG5qTfdlSN/m5/4vPuSbQrDf6cZ7FWGLDWiB3RmGSQ9E7h/dfbfHaxuR9qkJcuqs2czMwMA X-Developer-Key: i=maxime@cerno.tech; a=openpgp; fpr=BE5675C37E818C8B5764241C254BCFC56BF6CE8D X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230505_042807_823403_7FD14C4B X-CRM114-Status: GOOD ( 18.98 ) 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 The Actions composite divider clocks implements a mux with a set_parent hook, but doesn't provide a determine_rate implementation. This is a bit odd, since set_parent() is there to, as its name implies, change the parent of a clock. However, the most likely candidate to trigger that parent change is a call to clk_set_rate(), with determine_rate() figuring out which parent is the best suited for a given rate. The other trigger would be a call to clk_set_parent(), but it's far less used, and it doesn't look like there's any obvious user for that clock. So, the set_parent hook is effectively unused, possibly because of an oversight. However, it could also be an explicit decision by the original author to avoid any reparenting but through an explicit call to clk_set_parent(). The driver does implement round_rate() though, which means that we can change the rate of the clock, but we will never get to change the parent. However, It's hard to tell whether it's been done on purpose or not. Since we'll start mandating a determine_rate() implementation, let's convert the round_rate() implementation to a determine_rate(), which will also make the current behavior explicit. And if it was an oversight, the clock behaviour can be adjusted later on. Cc: "Andreas Färber" Cc: Manivannan Sadhasivam Cc: linux-actions@lists.infradead.org Cc: linux-arm-kernel@lists.infradead.org Signed-off-by: Maxime Ripard --- drivers/clk/actions/owl-composite.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/drivers/clk/actions/owl-composite.c b/drivers/clk/actions/owl-composite.c index e7784f9e5bf6..2f1e282134b2 100644 --- a/drivers/clk/actions/owl-composite.c +++ b/drivers/clk/actions/owl-composite.c @@ -53,13 +53,19 @@ static int owl_comp_is_enabled(struct clk_hw *hw) return owl_gate_clk_is_enabled(common, &comp->gate_hw); } -static long owl_comp_div_round_rate(struct clk_hw *hw, unsigned long rate, - unsigned long *parent_rate) +static int owl_comp_div_determine_rate(struct clk_hw *hw, + struct clk_rate_request *req) { struct owl_composite *comp = hw_to_owl_comp(hw); + long rate; - return owl_divider_helper_round_rate(&comp->common, &comp->rate.div_hw, - rate, parent_rate); + rate = owl_divider_helper_round_rate(&comp->common, &comp->rate.div_hw, + req->rate, &req->best_parent_rate); + if (rate < 0) + return rate; + + req->rate = rate; + return 0; } static unsigned long owl_comp_div_recalc_rate(struct clk_hw *hw, @@ -152,7 +158,7 @@ const struct clk_ops owl_comp_div_ops = { .is_enabled = owl_comp_is_enabled, /* div_ops */ - .round_rate = owl_comp_div_round_rate, + .determine_rate = owl_comp_div_determine_rate, .recalc_rate = owl_comp_div_recalc_rate, .set_rate = owl_comp_div_set_rate, };