Skip to contentSkip to conversation

clk: fix clk_get_rate() always return ulong

PATCH Applied Julien Masson 3 participants 4 messages Dec 15, 2023 – Jan 30, 2024 Common clk

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 clk: fix clk_get_rate() always return ulong

When we call clk_get_rate(), we expect to get clock rate value as ulong.
In that case we should not use log_ret() macro since it use internally an int.
Otherwise we may return an invalid/truncated clock rate value.

---
Changes in v2:
- remove local var ret (fix warning)
- Link to v1: https://lore.kernel.org/all/[email protected]

---
 drivers/clk/clk-uclass.c | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)
drivers/clk/clk-uclass.c +1 -6
index 3b5e3f9c86..3cbcb2d033 100644
@@ -478,7 +478,6 @@ void clk_free(struct clk *clk)
 ulong clk_get_rate(struct clk *clk)
 {
 	const struct clk_ops *ops;
-	ulong ret;
 
 	debug("%s(clk=%p)\n", __func__, clk);
 	if (!clk_valid(clk))
@@ -488,11 +487,7 @@ ulong clk_get_rate(struct clk *clk)
 	if (!ops->get_rate)
 		return -ENOSYS;
 
-	ret = ops->get_rate(clk);
-	if (ret)
-		return log_ret(ret);
-
-	return 0;
+	return ops->get_rate(clk);
 }
 
 struct clk *clk_get_parent(struct clk *clk)
Signature · 1 line
2.43.0
Reviewed-by on v2 1/1
#1 lore raw
Quoted 7 lines · Julien Masson

When we call clk_get_rate(), we expect to get clock rate value as ulong.
In that case we should not use log_ret() macro since it use internally an int.
Otherwise we may return an invalid/truncated clock rate value.

Quoted 35 lines

---
Changes in v2:
- remove local var ret (fix warning)
- Link to v1: https://lore.kernel.org/all/[email protected]

---
 drivers/clk/clk-uclass.c | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)
drivers/clk/clk-uclass.c +1 -6
index 3b5e3f9c86..3cbcb2d033 100644
@@ -478,7 +478,6 @@ void clk_free(struct clk *clk)
 ulong clk_get_rate(struct clk *clk)
 {
 	const struct clk_ops *ops;
-	ulong ret;
 
 	debug("%s(clk=%p)\n", __func__, clk);
 	if (!clk_valid(clk))
@@ -488,11 +487,7 @@ ulong clk_get_rate(struct clk *clk)
 	if (!ops->get_rate)
 		return -ENOSYS;
 
-	ret = ops->get_rate(clk);
-	if (ret)
-		return log_ret(ret);
-
-	return 0;
+	return ops->get_rate(clk);
 }
 
 struct clk *clk_get_parent(struct clk *clk)
Signature · 1 line
2.43.0
Reviewed-by on v2 1/1
#2 lore raw
In reply to Julien Masson
Quoted 5 lines · Julien Masson

When we call clk_get_rate(), we expect to get clock rate value as ulong.
In that case we should not use log_ret() macro since it use internally an int.
Otherwise we may return an invalid/truncated clock rate value.

Fixes 5c5992cb90c ("clk: Add debugging for return values")

+CC Simon

Quoted 24 lines

---
Changes in v2:
- remove local var ret (fix warning)
- Link to v1: https://lore.kernel.org/all/[email protected]

---
  drivers/clk/clk-uclass.c | 7 +------
  1 file changed, 1 insertion(+), 6 deletions(-)
drivers/clk/clk-uclass.c +0 -1
index 3b5e3f9c86..3cbcb2d033 100644
@@ -478,7 +478,6 @@ void clk_free(struct clk *clk)
  ulong clk_get_rate(struct clk *clk)
  {
  	const struct clk_ops *ops;
-	ulong ret;
 
  	debug("%s(clk=%p)\n", __func__, clk);
  	if (!clk_valid(clk))
@@ -488,11 +487,7 @@ ulong clk_get_rate(struct clk *clk)
  	if (!ops->get_rate)
  		return -ENOSYS;

drivers/clk/clk-uclass.c ulong clk_get_rate(struct clk *clk) · line 493

Quoted 10 lines
drivers/clk/clk-uclass.c +1 -5
 
-	ret = ops->get_rate(clk);
-	if (ret)
-		return log_ret(ret);
-
-	return 0;
+	return ops->get_rate(clk);
  }
 
  struct clk *clk_get_parent(struct clk *clk)

Anyway, I don't particularly care about logging the error here.

#3 lore raw
In reply to Julien Masson
Quoted 8 lines · Julien Masson

When we call clk_get_rate(), we expect to get clock rate value as ulong.
In that case we should not use log_ret() macro since it use internally an int.
Otherwise we may return an invalid/truncated clock rate value.

[...]

Applied, thanks!

[1/1] clk: fix clk_get_rate() always return ulong

      https://source.denx.de/u-boot/custodians/u-boot-clk/-/commit/b500447ad6ae

Best regards,

Signature · 1 line
Sean Anderson <[email protected]>