diff mbox series

[06/26] clk: fix clock tree dump to properly dump out every registered clock

Message ID 20201110090602.2255-7-t-kristo@ti.com
State Changes Requested
Delegated to: Lokesh Vutla
Headers show
Series TI J7 SoC HSM Rearch support series | expand

Commit Message

Tero Kristo Nov. 10, 2020, 9:05 a.m. UTC
Some clocks are not associated to a DM node, so just parsing the DM is not
enough. This is especially true for root clocks, which typically don't have
any parents. Instead, fetch every registered UCLASS_CLK instance, and dump
these out.

Signed-off-by: Tero Kristo <t-kristo@ti.com>
---
 cmd/clk.c | 27 +++++++++++++++++++--------
 1 file changed, 19 insertions(+), 8 deletions(-)

Comments

Lokesh Vutla Nov. 15, 2020, 10:28 a.m. UTC | #1
+Lucasz

On 10/11/20 2:35 pm, Tero Kristo wrote:
> Some clocks are not associated to a DM node, so just parsing the DM is not
> enough. This is especially true for root clocks, which typically don't have
> any parents. Instead, fetch every registered UCLASS_CLK instance, and dump
> these out.
> 
> Signed-off-by: Tero Kristo <t-kristo@ti.com>
> ---
>  cmd/clk.c | 27 +++++++++++++++++++--------
>  1 file changed, 19 insertions(+), 8 deletions(-)
> 
> diff --git a/cmd/clk.c b/cmd/clk.c
> index e3c3d2f9bb..0245b97136 100644
> --- a/cmd/clk.c
> +++ b/cmd/clk.c
> @@ -18,11 +18,14 @@ static void show_clks(struct udevice *dev, int depth, int last_flag)
>  {
>  	int i, is_last;
>  	struct udevice *child;
> -	struct clk *clkp;
> +	struct clk *clkp, *parent;
>  	u32 rate;
>  
>  	clkp = dev_get_clk_ptr(dev);
>  	if (device_get_uclass_id(dev) == UCLASS_CLK && clkp) {
> +		parent = clk_get_parent(clkp);
> +		if (!IS_ERR(parent) && depth == -1)
> +			return;
>  		depth++;
>  		rate = clk_get_rate(clkp);
>  
> @@ -47,6 +50,9 @@ static void show_clks(struct udevice *dev, int depth, int last_flag)
>  	}
>  
>  	list_for_each_entry(child, &dev->child_head, sibling_node) {
> +		if (child == dev)
> +			continue;
> +
>  		is_last = list_is_last(&child->sibling_node, &dev->child_head);
>  		show_clks(child, depth, (last_flag << 1) | is_last);
>  	}
> @@ -54,14 +60,19 @@ static void show_clks(struct udevice *dev, int depth, int last_flag)
>  
>  int __weak soc_clk_dump(void)
>  {
> -	struct udevice *root;
> +	struct udevice *dev;
> +	struct uclass *uc;
> +	int ret;
>  
> -	root = dm_root();
> -	if (root) {
> -		printf(" Rate               Usecnt      Name\n");
> -		printf("------------------------------------------\n");
> -		show_clks(root, -1, 0);
> -	}
> +	ret = uclass_get(UCLASS_CLK, &uc);
> +	if (ret)
> +		return ret;
> +
> +	printf(" Rate               Usecnt      Name\n");
> +	printf("------------------------------------------\n");
> +
> +	uclass_foreach_dev(dev, uc)
> +		show_clks(dev, -1, 0);
>  
>  	return 0;
>  }
>
diff mbox series

Patch

diff --git a/cmd/clk.c b/cmd/clk.c
index e3c3d2f9bb..0245b97136 100644
--- a/cmd/clk.c
+++ b/cmd/clk.c
@@ -18,11 +18,14 @@  static void show_clks(struct udevice *dev, int depth, int last_flag)
 {
 	int i, is_last;
 	struct udevice *child;
-	struct clk *clkp;
+	struct clk *clkp, *parent;
 	u32 rate;
 
 	clkp = dev_get_clk_ptr(dev);
 	if (device_get_uclass_id(dev) == UCLASS_CLK && clkp) {
+		parent = clk_get_parent(clkp);
+		if (!IS_ERR(parent) && depth == -1)
+			return;
 		depth++;
 		rate = clk_get_rate(clkp);
 
@@ -47,6 +50,9 @@  static void show_clks(struct udevice *dev, int depth, int last_flag)
 	}
 
 	list_for_each_entry(child, &dev->child_head, sibling_node) {
+		if (child == dev)
+			continue;
+
 		is_last = list_is_last(&child->sibling_node, &dev->child_head);
 		show_clks(child, depth, (last_flag << 1) | is_last);
 	}
@@ -54,14 +60,19 @@  static void show_clks(struct udevice *dev, int depth, int last_flag)
 
 int __weak soc_clk_dump(void)
 {
-	struct udevice *root;
+	struct udevice *dev;
+	struct uclass *uc;
+	int ret;
 
-	root = dm_root();
-	if (root) {
-		printf(" Rate               Usecnt      Name\n");
-		printf("------------------------------------------\n");
-		show_clks(root, -1, 0);
-	}
+	ret = uclass_get(UCLASS_CLK, &uc);
+	if (ret)
+		return ret;
+
+	printf(" Rate               Usecnt      Name\n");
+	printf("------------------------------------------\n");
+
+	uclass_foreach_dev(dev, uc)
+		show_clks(dev, -1, 0);
 
 	return 0;
 }