* [PATCH] net: cadence: macb: convert from round_rate() to determine_rate()
@ 2025-08-10 22:24 Brian Masney
2025-08-13 15:29 ` Jacob Keller
2025-08-14 8:10 ` patchwork-bot+netdevbpf
0 siblings, 2 replies; 3+ messages in thread
From: Brian Masney @ 2025-08-10 22:24 UTC (permalink / raw)
To: Nicolas Ferre, Claudiu Beznea, Andrew Lunn, David S. Miller,
Eric Dumazet, Jakub Kicinski, Paolo Abeni, Paul Walmsley,
Samuel Holland, Maxime Ripard, Stephen Boyd
Cc: linux-clk, netdev, linux-kernel, linux-riscv, Brian Masney
The round_rate() clk ops is deprecated, so migrate this driver from
round_rate() to determine_rate().
Signed-off-by: Brian Masney <bmasney@redhat.com>
---
drivers/net/ethernet/cadence/macb_main.c | 61 ++++++++++++++++++--------------
1 file changed, 35 insertions(+), 26 deletions(-)
diff --git a/drivers/net/ethernet/cadence/macb_main.c b/drivers/net/ethernet/cadence/macb_main.c
index ce95fad8cedd7331d4818ba9f73fb6970249e85c..ce55a1f59b50dd85fa92bf139d06e6120d109e89 100644
--- a/drivers/net/ethernet/cadence/macb_main.c
+++ b/drivers/net/ethernet/cadence/macb_main.c
@@ -4822,36 +4822,45 @@ static unsigned long fu540_macb_tx_recalc_rate(struct clk_hw *hw,
return mgmt->rate;
}
-static long fu540_macb_tx_round_rate(struct clk_hw *hw, unsigned long rate,
- unsigned long *parent_rate)
-{
- if (WARN_ON(rate < 2500000))
- return 2500000;
- else if (rate == 2500000)
- return 2500000;
- else if (WARN_ON(rate < 13750000))
- return 2500000;
- else if (WARN_ON(rate < 25000000))
- return 25000000;
- else if (rate == 25000000)
- return 25000000;
- else if (WARN_ON(rate < 75000000))
- return 25000000;
- else if (WARN_ON(rate < 125000000))
- return 125000000;
- else if (rate == 125000000)
- return 125000000;
-
- WARN_ON(rate > 125000000);
-
- return 125000000;
+static int fu540_macb_tx_determine_rate(struct clk_hw *hw,
+ struct clk_rate_request *req)
+{
+ if (WARN_ON(req->rate < 2500000))
+ req->rate = 2500000;
+ else if (req->rate == 2500000)
+ req->rate = 2500000;
+ else if (WARN_ON(req->rate < 13750000))
+ req->rate = 2500000;
+ else if (WARN_ON(req->rate < 25000000))
+ req->rate = 25000000;
+ else if (req->rate == 25000000)
+ req->rate = 25000000;
+ else if (WARN_ON(req->rate < 75000000))
+ req->rate = 25000000;
+ else if (WARN_ON(req->rate < 125000000))
+ req->rate = 125000000;
+ else if (req->rate == 125000000)
+ req->rate = 125000000;
+ else if (WARN_ON(req->rate > 125000000))
+ req->rate = 125000000;
+ else
+ req->rate = 125000000;
+
+ return 0;
}
static int fu540_macb_tx_set_rate(struct clk_hw *hw, unsigned long rate,
unsigned long parent_rate)
{
- rate = fu540_macb_tx_round_rate(hw, rate, &parent_rate);
- if (rate != 125000000)
+ struct clk_rate_request req;
+ int ret;
+
+ clk_hw_init_rate_request(hw, &req, rate);
+ ret = fu540_macb_tx_determine_rate(hw, &req);
+ if (ret != 0)
+ return ret;
+
+ if (req.rate != 125000000)
iowrite32(1, mgmt->reg);
else
iowrite32(0, mgmt->reg);
@@ -4862,7 +4871,7 @@ static int fu540_macb_tx_set_rate(struct clk_hw *hw, unsigned long rate,
static const struct clk_ops fu540_c000_ops = {
.recalc_rate = fu540_macb_tx_recalc_rate,
- .round_rate = fu540_macb_tx_round_rate,
+ .determine_rate = fu540_macb_tx_determine_rate,
.set_rate = fu540_macb_tx_set_rate,
};
---
base-commit: 8f5ae30d69d7543eee0d70083daf4de8fe15d585
change-id: 20250729-net-round-rate-01147feda9af
Best regards,
--
Brian Masney <bmasney@redhat.com>
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] net: cadence: macb: convert from round_rate() to determine_rate()
2025-08-10 22:24 [PATCH] net: cadence: macb: convert from round_rate() to determine_rate() Brian Masney
@ 2025-08-13 15:29 ` Jacob Keller
2025-08-14 8:10 ` patchwork-bot+netdevbpf
1 sibling, 0 replies; 3+ messages in thread
From: Jacob Keller @ 2025-08-13 15:29 UTC (permalink / raw)
To: Brian Masney, Nicolas Ferre, Claudiu Beznea, Andrew Lunn,
David S. Miller, Eric Dumazet, Jakub Kicinski, Paolo Abeni,
Paul Walmsley, Samuel Holland, Maxime Ripard, Stephen Boyd
Cc: linux-clk, netdev, linux-kernel, linux-riscv
[-- Attachment #1.1: Type: text/plain, Size: 3472 bytes --]
On 8/10/2025 3:24 PM, Brian Masney wrote:
> The round_rate() clk ops is deprecated, so migrate this driver from
> round_rate() to determine_rate().
>
> Signed-off-by: Brian Masney <bmasney@redhat.com>
> ---
> drivers/net/ethernet/cadence/macb_main.c | 61 ++++++++++++++++++--------------
> 1 file changed, 35 insertions(+), 26 deletions(-)
>
> diff --git a/drivers/net/ethernet/cadence/macb_main.c b/drivers/net/ethernet/cadence/macb_main.c
> index ce95fad8cedd7331d4818ba9f73fb6970249e85c..ce55a1f59b50dd85fa92bf139d06e6120d109e89 100644
> --- a/drivers/net/ethernet/cadence/macb_main.c
> +++ b/drivers/net/ethernet/cadence/macb_main.c
> @@ -4822,36 +4822,45 @@ static unsigned long fu540_macb_tx_recalc_rate(struct clk_hw *hw,
> return mgmt->rate;
> }
>
> -static long fu540_macb_tx_round_rate(struct clk_hw *hw, unsigned long rate,
> - unsigned long *parent_rate)
> -{
> - if (WARN_ON(rate < 2500000))
> - return 2500000;
> - else if (rate == 2500000)
> - return 2500000;
> - else if (WARN_ON(rate < 13750000))
> - return 2500000;
> - else if (WARN_ON(rate < 25000000))
> - return 25000000;
> - else if (rate == 25000000)
> - return 25000000;
> - else if (WARN_ON(rate < 75000000))
> - return 25000000;
> - else if (WARN_ON(rate < 125000000))
> - return 125000000;
> - else if (rate == 125000000)
> - return 125000000;
> -
> - WARN_ON(rate > 125000000);
> -
> - return 125000000;
> +static int fu540_macb_tx_determine_rate(struct clk_hw *hw,
> + struct clk_rate_request *req)
> +{
> + if (WARN_ON(req->rate < 2500000))
> + req->rate = 2500000;
> + else if (req->rate == 2500000)
> + req->rate = 2500000;
> + else if (WARN_ON(req->rate < 13750000))
> + req->rate = 2500000;
> + else if (WARN_ON(req->rate < 25000000))
> + req->rate = 25000000;
> + else if (req->rate == 25000000)
> + req->rate = 25000000;
> + else if (WARN_ON(req->rate < 75000000))
> + req->rate = 25000000;
> + else if (WARN_ON(req->rate < 125000000))
> + req->rate = 125000000;
> + else if (req->rate == 125000000)
> + req->rate = 125000000;
> + else if (WARN_ON(req->rate > 125000000))
> + req->rate = 125000000;
> + else
> + req->rate = 125000000;
> +
> + return 0;
> }
Quite a big diff for the minimal amount of actual changes. This looks a
bit nicer with --word-diff to show that there's no real functional changes.
>
> static int fu540_macb_tx_set_rate(struct clk_hw *hw, unsigned long rate,
> unsigned long parent_rate)
> {
> - rate = fu540_macb_tx_round_rate(hw, rate, &parent_rate);
> - if (rate != 125000000)
> + struct clk_rate_request req;
> + int ret;
> +
> + clk_hw_init_rate_request(hw, &req, rate);
> + ret = fu540_macb_tx_determine_rate(hw, &req);
> + if (ret != 0)
> + return ret;
> +
> + if (req.rate != 125000000)
> iowrite32(1, mgmt->reg);
> else
> iowrite32(0, mgmt->reg);
> @@ -4862,7 +4871,7 @@ static int fu540_macb_tx_set_rate(struct clk_hw *hw, unsigned long rate,
>
> static const struct clk_ops fu540_c000_ops = {
> .recalc_rate = fu540_macb_tx_recalc_rate,
> - .round_rate = fu540_macb_tx_round_rate,
> + .determine_rate = fu540_macb_tx_determine_rate,
> .set_rate = fu540_macb_tx_set_rate,
> };
>
>
Reviewed-by: Jacob Keller <jacob.e.keller@intel.com>
> ---
> base-commit: 8f5ae30d69d7543eee0d70083daf4de8fe15d585
> change-id: 20250729-net-round-rate-01147feda9af
>
> Best regards,
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 236 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] net: cadence: macb: convert from round_rate() to determine_rate()
2025-08-10 22:24 [PATCH] net: cadence: macb: convert from round_rate() to determine_rate() Brian Masney
2025-08-13 15:29 ` Jacob Keller
@ 2025-08-14 8:10 ` patchwork-bot+netdevbpf
1 sibling, 0 replies; 3+ messages in thread
From: patchwork-bot+netdevbpf @ 2025-08-14 8:10 UTC (permalink / raw)
To: Brian Masney
Cc: nicolas.ferre, claudiu.beznea, andrew+netdev, davem, edumazet,
kuba, pabeni, paul.walmsley, samuel.holland, mripard, sboyd,
linux-clk, netdev, linux-kernel, linux-riscv
Hello:
This patch was applied to netdev/net-next.git (main)
by Paolo Abeni <pabeni@redhat.com>:
On Sun, 10 Aug 2025 18:24:14 -0400 you wrote:
> The round_rate() clk ops is deprecated, so migrate this driver from
> round_rate() to determine_rate().
>
> Signed-off-by: Brian Masney <bmasney@redhat.com>
> ---
> drivers/net/ethernet/cadence/macb_main.c | 61 ++++++++++++++++++--------------
> 1 file changed, 35 insertions(+), 26 deletions(-)
>
> [...]
Here is the summary with links:
- net: cadence: macb: convert from round_rate() to determine_rate()
https://git.kernel.org/netdev/net-next/c/40e819747b45
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2025-08-14 8:09 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-08-10 22:24 [PATCH] net: cadence: macb: convert from round_rate() to determine_rate() Brian Masney
2025-08-13 15:29 ` Jacob Keller
2025-08-14 8:10 ` patchwork-bot+netdevbpf
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).