* [PATCH 1/3] clk: test: remove references to clk_ops.round_rate
2025-12-11 23:41 [PATCH 0/3] clk: remove round_rate clk op from the clk core Brian Masney
@ 2025-12-11 23:41 ` Brian Masney
2025-12-11 23:41 ` [PATCH 2/3] clk: composite: convert from round_rate() to determine_rate() Brian Masney
2025-12-11 23:41 ` [PATCH 3/3] clk: remove round_rate() clk ops Brian Masney
2 siblings, 0 replies; 4+ messages in thread
From: Brian Masney @ 2025-12-11 23:41 UTC (permalink / raw)
To: Jonathan Corbet, Michael Turquette, Stephen Boyd, Maxime Ripard
Cc: linux-doc, linux-kernel, linux-clk, Brian Masney
The round_rate() clk ops is going away, so let's go ahead and remove any
references to it in the comments.
Signed-off-by: Brian Masney <bmasney@redhat.com>
---
drivers/clk/clk_test.c | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/drivers/clk/clk_test.c b/drivers/clk/clk_test.c
index a268d7b5d4cb28ec1f029f828c31107f8e130556..b1961daac5e22fb84f493f04feab1ff94a975d90 100644
--- a/drivers/clk/clk_test.c
+++ b/drivers/clk/clk_test.c
@@ -241,8 +241,8 @@ static void clk_test_get_rate(struct kunit *test)
* Test that, after a call to clk_set_rate(), the rate returned by
* clk_get_rate() matches.
*
- * This assumes that clk_ops.determine_rate or clk_ops.round_rate won't
- * modify the requested rate, which is our case in clk_dummy_rate_ops.
+ * This assumes that clk_ops.determine_rate won't modify the requested rate,
+ * which is our case in clk_dummy_rate_ops.
*/
static void clk_test_set_get_rate(struct kunit *test)
{
@@ -266,8 +266,8 @@ static void clk_test_set_get_rate(struct kunit *test)
* Test that, after several calls to clk_set_rate(), the rate returned
* by clk_get_rate() matches the last one.
*
- * This assumes that clk_ops.determine_rate or clk_ops.round_rate won't
- * modify the requested rate, which is our case in clk_dummy_rate_ops.
+ * This assumes that clk_ops.determine_rate won't modify the requested rate,
+ * which is our case in clk_dummy_rate_ops.
*/
static void clk_test_set_set_get_rate(struct kunit *test)
{
@@ -1675,8 +1675,8 @@ static void clk_range_test_set_range_set_round_rate_consistent_higher(struct kun
* call to clk_set_rate_range(), the rate will be raised to match the
* new minimum.
*
- * This assumes that clk_ops.determine_rate or clk_ops.round_rate won't
- * modify the requested rate, which is our case in clk_dummy_rate_ops.
+ * This assumes that clk_ops.determine_rate won't modify the requested rate,
+ * which is our case in clk_dummy_rate_ops.
*/
static void clk_range_test_set_range_get_rate_raised(struct kunit *test)
{
@@ -1707,8 +1707,8 @@ static void clk_range_test_set_range_get_rate_raised(struct kunit *test)
* call to clk_set_rate_range(), the rate will be lowered to match the
* new maximum.
*
- * This assumes that clk_ops.determine_rate or clk_ops.round_rate won't
- * modify the requested rate, which is our case in clk_dummy_rate_ops.
+ * This assumes that clk_ops.determine_rate won't modify the requested rate,
+ * which is our case in clk_dummy_rate_ops.
*/
static void clk_range_test_set_range_get_rate_lowered(struct kunit *test)
{
--
2.52.0
^ permalink raw reply related [flat|nested] 4+ messages in thread* [PATCH 2/3] clk: composite: convert from round_rate() to determine_rate()
2025-12-11 23:41 [PATCH 0/3] clk: remove round_rate clk op from the clk core Brian Masney
2025-12-11 23:41 ` [PATCH 1/3] clk: test: remove references to clk_ops.round_rate Brian Masney
@ 2025-12-11 23:41 ` Brian Masney
2025-12-11 23:41 ` [PATCH 3/3] clk: remove round_rate() clk ops Brian Masney
2 siblings, 0 replies; 4+ messages in thread
From: Brian Masney @ 2025-12-11 23:41 UTC (permalink / raw)
To: Jonathan Corbet, Michael Turquette, Stephen Boyd, Maxime Ripard
Cc: linux-doc, linux-kernel, linux-clk, Brian Masney
The round_rate() clk ops is deprecated and going away, so migrate
this driver from round_rate() to determine_rate().
Signed-off-by: Brian Masney <bmasney@redhat.com>
---
drivers/clk/clk-composite.c | 38 +++++---------------------------------
1 file changed, 5 insertions(+), 33 deletions(-)
diff --git a/drivers/clk/clk-composite.c b/drivers/clk/clk-composite.c
index 66759fe28fad67f98b6c723ce70849490a022e26..0d96d46712b7258cf23d7b3768a5e75690e2c9d9 100644
--- a/drivers/clk/clk-composite.c
+++ b/drivers/clk/clk-composite.c
@@ -47,22 +47,10 @@ static int clk_composite_determine_rate_for_parent(struct clk_hw *rate_hw,
struct clk_hw *parent_hw,
const struct clk_ops *rate_ops)
{
- long rate;
-
req->best_parent_hw = parent_hw;
req->best_parent_rate = clk_hw_get_rate(parent_hw);
- if (rate_ops->determine_rate)
- return rate_ops->determine_rate(rate_hw, req);
-
- rate = rate_ops->round_rate(rate_hw, req->rate,
- &req->best_parent_rate);
- if (rate < 0)
- return rate;
-
- req->rate = rate;
-
- return 0;
+ return rate_ops->determine_rate(rate_hw, req);
}
static int clk_composite_determine_rate(struct clk_hw *hw,
@@ -79,8 +67,7 @@ static int clk_composite_determine_rate(struct clk_hw *hw,
unsigned long best_rate = 0;
int i, ret;
- if (rate_hw && rate_ops &&
- (rate_ops->determine_rate || rate_ops->round_rate) &&
+ if (rate_hw && rate_ops && rate_ops->determine_rate &&
mux_hw && mux_ops && mux_ops->set_parent) {
req->best_parent_hw = NULL;
@@ -150,18 +137,6 @@ static int clk_composite_determine_rate(struct clk_hw *hw,
}
}
-static long clk_composite_round_rate(struct clk_hw *hw, unsigned long rate,
- unsigned long *prate)
-{
- struct clk_composite *composite = to_clk_composite(hw);
- const struct clk_ops *rate_ops = composite->rate_ops;
- struct clk_hw *rate_hw = composite->rate_hw;
-
- __clk_hw_set_clk(rate_hw, hw);
-
- return rate_ops->round_rate(rate_hw, rate, prate);
-}
-
static int clk_composite_set_rate(struct clk_hw *hw, unsigned long rate,
unsigned long parent_rate)
{
@@ -288,17 +263,14 @@ static struct clk_hw *__clk_hw_register_composite(struct device *dev,
if (rate_ops->determine_rate)
clk_composite_ops->determine_rate =
clk_composite_determine_rate;
- else if (rate_ops->round_rate)
- clk_composite_ops->round_rate =
- clk_composite_round_rate;
- /* .set_rate requires either .round_rate or .determine_rate */
+ /* .set_rate requires .determine_rate */
if (rate_ops->set_rate) {
- if (rate_ops->determine_rate || rate_ops->round_rate)
+ if (rate_ops->determine_rate)
clk_composite_ops->set_rate =
clk_composite_set_rate;
else
- WARN(1, "%s: missing round_rate op is required\n",
+ WARN(1, "%s: missing determine_rate op is required\n",
__func__);
}
--
2.52.0
^ permalink raw reply related [flat|nested] 4+ messages in thread* [PATCH 3/3] clk: remove round_rate() clk ops
2025-12-11 23:41 [PATCH 0/3] clk: remove round_rate clk op from the clk core Brian Masney
2025-12-11 23:41 ` [PATCH 1/3] clk: test: remove references to clk_ops.round_rate Brian Masney
2025-12-11 23:41 ` [PATCH 2/3] clk: composite: convert from round_rate() to determine_rate() Brian Masney
@ 2025-12-11 23:41 ` Brian Masney
2 siblings, 0 replies; 4+ messages in thread
From: Brian Masney @ 2025-12-11 23:41 UTC (permalink / raw)
To: Jonathan Corbet, Michael Turquette, Stephen Boyd, Maxime Ripard
Cc: linux-doc, linux-kernel, linux-clk, Brian Masney
The round_rate() clk ops is deprecated, and all in tree drivers have
been converted, so let's go ahead and remove any references to the
round_rate() clk ops.
Signed-off-by: Brian Masney <bmasney@redhat.com>
---
Documentation/driver-api/clk.rst | 9 +--------
drivers/clk/clk.c | 39 ++++++++++++++-------------------------
include/linux/clk-provider.h | 18 ++++++------------
3 files changed, 21 insertions(+), 45 deletions(-)
diff --git a/Documentation/driver-api/clk.rst b/Documentation/driver-api/clk.rst
index 93bab5336dfda06069eea700d2830089bf3bce03..c6aca8186a7864f77c00feccd68d431303ab01b7 100644
--- a/Documentation/driver-api/clk.rst
+++ b/Documentation/driver-api/clk.rst
@@ -77,9 +77,6 @@ the operations defined in clk-provider.h::
void (*disable_unused)(struct clk_hw *hw);
unsigned long (*recalc_rate)(struct clk_hw *hw,
unsigned long parent_rate);
- long (*round_rate)(struct clk_hw *hw,
- unsigned long rate,
- unsigned long *parent_rate);
int (*determine_rate)(struct clk_hw *hw,
struct clk_rate_request *req);
int (*set_parent)(struct clk_hw *hw, u8 index);
@@ -220,9 +217,7 @@ optional or must be evaluated on a case-by-case basis.
+----------------+------+-------------+---------------+-------------+------+
|.recalc_rate | | y | | | |
+----------------+------+-------------+---------------+-------------+------+
- |.round_rate | | y [1]_ | | | |
- +----------------+------+-------------+---------------+-------------+------+
- |.determine_rate | | y [1]_ | | | |
+ |.determine_rate | | y | | | |
+----------------+------+-------------+---------------+-------------+------+
|.set_rate | | y | | | |
+----------------+------+-------------+---------------+-------------+------+
@@ -238,8 +233,6 @@ optional or must be evaluated on a case-by-case basis.
|.init | | | | | |
+----------------+------+-------------+---------------+-------------+------+
-.. [1] either one of round_rate or determine_rate is required.
-
Finally, register your clock at run-time with a hardware-specific
registration function. This function simply populates struct clk_foo's
data and then passes the common struct clk parameters to the framework
diff --git a/drivers/clk/clk.c b/drivers/clk/clk.c
index 85d2f2481acf360f0618a4a382fb51250e9c2fc4..cab715bbe6474451776c95da7e37b24a228a233f 100644
--- a/drivers/clk/clk.c
+++ b/drivers/clk/clk.c
@@ -1560,8 +1560,6 @@ late_initcall_sync(clk_disable_unused);
static int clk_core_determine_round_nolock(struct clk_core *core,
struct clk_rate_request *req)
{
- long rate;
-
lockdep_assert_held(&prepare_lock);
if (!core)
@@ -1591,13 +1589,6 @@ static int clk_core_determine_round_nolock(struct clk_core *core,
req->rate = core->rate;
} else if (core->ops->determine_rate) {
return core->ops->determine_rate(core->hw, req);
- } else if (core->ops->round_rate) {
- rate = core->ops->round_rate(core->hw, req->rate,
- &req->best_parent_rate);
- if (rate < 0)
- return rate;
-
- req->rate = rate;
} else {
return -EINVAL;
}
@@ -1682,7 +1673,7 @@ EXPORT_SYMBOL_GPL(clk_hw_forward_rate_request);
static bool clk_core_can_round(struct clk_core * const core)
{
- return core->ops->determine_rate || core->ops->round_rate;
+ return core->ops->determine_rate;
}
static int clk_core_round_rate_nolock(struct clk_core *core,
@@ -1750,11 +1741,11 @@ EXPORT_SYMBOL_GPL(__clk_determine_rate);
* use.
*
* Context: prepare_lock must be held.
- * For clk providers to call from within clk_ops such as .round_rate,
+ * For clk providers to call from within clk_ops such as
* .determine_rate.
*
- * Return: returns rounded rate of hw clk if clk supports round_rate operation
- * else returns the parent rate.
+ * Return: returns rounded rate of hw clk if clk supports determine_rate
+ * operation; else returns the parent rate.
*/
unsigned long clk_hw_round_rate(struct clk_hw *hw, unsigned long rate)
{
@@ -2569,12 +2560,13 @@ static int clk_core_set_rate_nolock(struct clk_core *core,
*
* Setting the CLK_SET_RATE_PARENT flag allows the rate change operation to
* propagate up to clk's parent; whether or not this happens depends on the
- * outcome of clk's .round_rate implementation. If *parent_rate is unchanged
- * after calling .round_rate then upstream parent propagation is ignored. If
- * *parent_rate comes back with a new rate for clk's parent then we propagate
- * up to clk's parent and set its rate. Upward propagation will continue
- * until either a clk does not support the CLK_SET_RATE_PARENT flag or
- * .round_rate stops requesting changes to clk's parent_rate.
+ * outcome of clk's .determine_rate implementation. If req->best_parent_rate
+ * is unchanged after calling .determine_rate then upstream parent propagation
+ * is ignored. If req->best_parent_rate comes back with a new rate for clk's
+ * parent then we propagate up to clk's parent and set its rate. Upward
+ * propagation will continue until either a clk does not support the
+ * CLK_SET_RATE_PARENT flag or .determine_rate stops requesting changes to
+ * clk's parent_rate.
*
* Rate changes are accomplished via tree traversal that also recalculates the
* rates for the clocks and fires off POST_RATE_CHANGE notifiers.
@@ -2703,8 +2695,6 @@ static int clk_set_rate_range_nolock(struct clk *clk,
* FIXME:
* There is a catch. It may fail for the usual reason (clock
* broken, clock protected, etc) but also because:
- * - round_rate() was not favorable and fell on the wrong
- * side of the boundary
* - the determine_rate() callback does not really check for
* this corner case when determining the rate
*/
@@ -3915,10 +3905,9 @@ static int __clk_core_init(struct clk_core *core)
}
/* check that clk_ops are sane. See Documentation/driver-api/clk.rst */
- if (core->ops->set_rate &&
- !((core->ops->round_rate || core->ops->determine_rate) &&
- core->ops->recalc_rate)) {
- pr_err("%s: %s must implement .round_rate or .determine_rate in addition to .recalc_rate\n",
+ if (core->ops->set_rate && !core->ops->determine_rate &&
+ core->ops->recalc_rate) {
+ pr_err("%s: %s must implement .determine_rate in addition to .recalc_rate\n",
__func__, core->name);
ret = -EINVAL;
goto out;
diff --git a/include/linux/clk-provider.h b/include/linux/clk-provider.h
index 630705a47129453c241f1b1755f2c2f2a7ed8f77..1cda2c78dffaff037f0f16b0f11106b63b3a746f 100644
--- a/include/linux/clk-provider.h
+++ b/include/linux/clk-provider.h
@@ -136,10 +136,6 @@ struct clk_duty {
* 0. Returns the calculated rate. Optional, but recommended - if
* this op is not set then clock rate will be initialized to 0.
*
- * @round_rate: Given a target rate as input, returns the closest rate actually
- * supported by the clock. The parent rate is an input/output
- * parameter.
- *
* @determine_rate: Given a target rate as input, returns the closest rate
* actually supported by the clock, and optionally the parent clock
* that should be used to provide the clock rate.
@@ -163,13 +159,13 @@ struct clk_duty {
*
* @set_rate: Change the rate of this clock. The requested rate is specified
* by the second argument, which should typically be the return
- * of .round_rate call. The third argument gives the parent rate
- * which is likely helpful for most .set_rate implementation.
+ * of .determine_rate call. The third argument gives the parent
+ * rate which is likely helpful for most .set_rate implementation.
* Returns 0 on success, -EERROR otherwise.
*
* @set_rate_and_parent: Change the rate and the parent of this clock. The
* requested rate is specified by the second argument, which
- * should typically be the return of .round_rate call. The
+ * should typically be the return of clk_round_rate() call. The
* third argument gives the parent rate which is likely helpful
* for most .set_rate_and_parent implementation. The fourth
* argument gives the parent index. This callback is optional (and
@@ -244,8 +240,6 @@ struct clk_ops {
void (*restore_context)(struct clk_hw *hw);
unsigned long (*recalc_rate)(struct clk_hw *hw,
unsigned long parent_rate);
- long (*round_rate)(struct clk_hw *hw, unsigned long rate,
- unsigned long *parent_rate);
int (*determine_rate)(struct clk_hw *hw,
struct clk_rate_request *req);
int (*set_parent)(struct clk_hw *hw, u8 index);
@@ -679,7 +673,7 @@ struct clk_div_table {
* @lock: register lock
*
* Clock with an adjustable divider affecting its output frequency. Implements
- * .recalc_rate, .set_rate and .round_rate
+ * .recalc_rate, .set_rate and .determine_rate
*
* @flags:
* CLK_DIVIDER_ONE_BASED - by default the divisor is the value read from the
@@ -1126,7 +1120,7 @@ void of_fixed_factor_clk_setup(struct device_node *node);
*
* Clock with a fixed multiplier and divider. The output frequency is the
* parent clock rate divided by div and multiplied by mult.
- * Implements .recalc_rate, .set_rate, .round_rate and .recalc_accuracy
+ * Implements .recalc_rate, .set_rate, .determine_rate and .recalc_accuracy
*
* Flags:
* * CLK_FIXED_FACTOR_FIXED_ACCURACY - Use the value in @acc instead of the
@@ -1254,7 +1248,7 @@ void clk_hw_unregister_fractional_divider(struct clk_hw *hw);
* @lock: register lock
*
* Clock with an adjustable multiplier affecting its output frequency.
- * Implements .recalc_rate, .set_rate and .round_rate
+ * Implements .recalc_rate, .set_rate and .determine_rate
*
* @flags:
* CLK_MULTIPLIER_ZERO_BYPASS - By default, the multiplier is the value read
--
2.52.0
^ permalink raw reply related [flat|nested] 4+ messages in thread