From patchwork Fri May 5 11:25:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Maxime Ripard X-Patchwork-Id: 13232485 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 361FFC77B75 for ; Fri, 5 May 2023 11:29:17 +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=cTrDfhZZ1+xiqedMN2m2dgxc5xBxqVaG5HuVtYD5l+A=; b=P2tje1epbfFxaq 2vchxqHwUmkYzV0APajH3UWFgjog0mr5wE1vPDyboEJCXEsI9WVEYY86GWkdwWi+P2O8bNgXQic+U N9QnfARgMiKttoikixAkoQrJQ2FfOP7Zx8KwKLGz1VdmJ20I2hJo6lnBp0FK5h15DaBYZb2hLm3O/ 4osu4kb01l/S4I3RvUQbTsKpv3t/T49k3G+oyL6T3vu9DV2YvRL80J4dZbYEAbpsWs0nCP7ku9XKA HDmh4ijka3al80xnFcN518LqSAaaxFuZI1feDEdeTdSIcS4xvbvZnSN+CqpY6wwCFGud8iNbfptna 6111UFJ3xg99+8ul4j4Q==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1putbk-00AgCT-1W; Fri, 05 May 2023 11:28:16 +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 1putbe-00Ag8J-2J; Fri, 05 May 2023 11:28:12 +0000 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.west.internal (Postfix) with ESMTP id A5E623200907; Fri, 5 May 2023 07:28:09 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute5.internal (MEProxy); Fri, 05 May 2023 07:28:10 -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= 1683286089; x=1683372489; bh=sdlpRXLo9d8u/J02F/pSNfCPqLv0NBH2V0R YgvZa5mY=; b=JRNlKYx5ZjG7zOJpXUi3/XJSejKbZX1IEatjK+1LzXY09LJGIj7 b1eMzGYQcDKMI4wVEV2C6OzNSN8N2+Isz5YyvwZoHGaUswBpKHkTIhzO1pYUGnZR kqiWNG+p8VNNX5LGxZP1CplMliPHQ81KOLQ+5se8n6UBb6UnnXIq4S49tiUePC0Y 6qe3iP9fnBoFuAU3YAnSsXzgdMQxNPRmmHFXxS2y6Zyp4qIks/ZnFqTbaPTFKOKN vNe7ZlYYjUIvUE+M+ELC70JKlAF7A77ZYYPa3vVGTH4TAuCz7FrwrAtd4TgWTTvZ pm2w0Wm8muoP/2goGduAbvztEp6xfry3K5g== 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= 1683286089; x=1683372489; bh=sdlpRXLo9d8u/J02F/pSNfCPqLv0NBH2V0R YgvZa5mY=; b=NUCmixA9zL8L/xBglG89pLuYW0lZeXXEAbPbUgdjtmkUnJ5s7ko L8WugmAFgNNZsF1pZ8TW/H2aE+W9JN9GgTSiOvYwKw9fYhw5LCxAkCDJPnTVWXT8 c+ZtFj9TUW6Cmb01rdQlvf2uGht73/nvsCqhR7mM2+mftymVjnR2kNh69nM8zyQz eIneK4xFDDQIUbUJXsGdDSaW5z4yFphLMxC2nD9qWTWSAOD4SsF8fVpDkenwGajh f8Xydgfm966mPT0GJvVDF1Kr5BXYlpX4OCtIH0M47nNCIacC4Mwg2LN76FgOnFZe UTl7ZsLIXRJiOflWiOmaBnbaaFZV6BvrudQ== 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:08 -0400 (EDT) From: Maxime Ripard Date: Fri, 05 May 2023 13:25:50 +0200 Subject: [PATCH v4 48/68] clk: actions: composite: fact: Switch to determine_rate MIME-Version: 1.0 Message-Id: <20221018-clk-range-checks-fixes-v4-48-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=2964; i=maxime@cerno.tech; h=from:subject:message-id; bh=uyBaAmdNnpNkmO3cXNcw5v1QgunRrFr2A3EejTTdAcw=; b=owGbwMvMwCX2+D1vfrpE4FHG02pJDCkhz5dk5XiULZ1mt7v/ydqcltQ5arNe2MwO/b0pW76nWb+0 gv9DRykLgxgXg6yYIkuMsPmSuFOzXney8c2DmcPKBDKEgYtTACai8oSR4eC6gJLpr+pi5yVslVlx8P yLFXyvb3j1ZbGf2VhgrN220Yjhr0Cl9lkWabGDHiduBn3Qfa6mcMLHJm2lTr74pwWcqk1NDAA= 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_042810_787220_13F6BE2B X-CRM114-Status: GOOD ( 18.81 ) 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 factor 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 | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/drivers/clk/actions/owl-composite.c b/drivers/clk/actions/owl-composite.c index 2f1e282134b2..48f177f6ce9c 100644 --- a/drivers/clk/actions/owl-composite.c +++ b/drivers/clk/actions/owl-composite.c @@ -86,14 +86,20 @@ static int owl_comp_div_set_rate(struct clk_hw *hw, unsigned long rate, rate, parent_rate); } -static long owl_comp_fact_round_rate(struct clk_hw *hw, unsigned long rate, - unsigned long *parent_rate) +static int owl_comp_fact_determine_rate(struct clk_hw *hw, + struct clk_rate_request *req) { struct owl_composite *comp = hw_to_owl_comp(hw); + long rate; - return owl_factor_helper_round_rate(&comp->common, - &comp->rate.factor_hw, - rate, parent_rate); + rate = owl_factor_helper_round_rate(&comp->common, + &comp->rate.factor_hw, + req->rate, &req->best_parent_rate); + if (rate < 0) + return rate; + + req->rate = rate; + return 0; } static unsigned long owl_comp_fact_recalc_rate(struct clk_hw *hw, @@ -175,7 +181,7 @@ const struct clk_ops owl_comp_fact_ops = { .is_enabled = owl_comp_is_enabled, /* fact_ops */ - .round_rate = owl_comp_fact_round_rate, + .determine_rate = owl_comp_fact_determine_rate, .recalc_rate = owl_comp_fact_recalc_rate, .set_rate = owl_comp_fact_set_rate, };