Re: [PATCH 2/2] clk: versatile: clk-icst: Ensure clock names are unique

Re: [PATCH 2/2] clk: versatile: clk-icst: Ensure clock names are unique

[Guenter Roeck]

On Tue, Nov 09, 2021 at 10:46:50AM -0600, Rob Herring wrote:
> Commit 2d3de197a818 ("ARM: dts: arm: Update ICST clock nodes 'reg' and
> node names") moved to using generic node names. That results in trying
> to register multiple clocks with the same name. Fix this by including
> the unit-address in the clock name.
> 
> Fixes: 2d3de197a818 ("ARM: dts: arm: Update ICST clock nodes 'reg' and node names")
> Cc: stable@vger.kernel.org
> Cc: Linus Walleij <linus.walleij@linaro.org>
> Cc: Stephen Boyd <sboyd@kernel.org>
> Cc: linux-arm-kernel@lists.infradead.org
> Cc: linux-clk@vger.kernel.org
> Signed-off-by: Rob Herring <robh@kernel.org>

Tested-by: Guenter Roeck <linux@roeck-us.net>

> ---
> This should be applied to stable to minimize DT ABI breakage.
> ---
>  drivers/clk/versatile/clk-icst.c | 6 ++++--
>  1 file changed, 4 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/clk/versatile/clk-icst.c b/drivers/clk/versatile/clk-icst.c
> index 77fd0ecaf155..d52f976dc875 100644
> --- a/drivers/clk/versatile/clk-icst.c
> +++ b/drivers/clk/versatile/clk-icst.c
> @@ -484,7 +484,7 @@ static void __init of_syscon_icst_setup(struct device_node *np)
>  	struct device_node *parent;
>  	struct regmap *map;
>  	struct clk_icst_desc icst_desc;
> -	const char *name = np->name;
> +	const char *name;
>  	const char *parent_name;
>  	struct clk *regclk;
>  	enum icst_control_type ctype;
> @@ -533,15 +533,17 @@ static void __init of_syscon_icst_setup(struct device_node *np)
>  		icst_desc.params = &icst525_apcp_cm_params;
>  		ctype = ICST_INTEGRATOR_CP_CM_MEM;
>  	} else {
> -		pr_err("unknown ICST clock %s\n", name);
> +		pr_err("unknown ICST clock %pOF\n", np);
>  		return;
>  	}
>  
>  	/* Parent clock name is not the same as node parent */
>  	parent_name = of_clk_get_parent_name(np, 0);
> +	name = kasprintf(GFP_KERNEL, "%pOFP", np);
>  
>  	regclk = icst_clk_setup(NULL, &icst_desc, name, parent_name, map, ctype);
>  	if (IS_ERR(regclk)) {
> +		kfree(name);
>  		pr_err("error setting up syscon ICST clock %s\n", name);
>  		return;
>  	}
> -- 
> 2.32.0
> 

[PATCH 0/2] Fix Arm Ltd board node name collisions

[Rob Herring]

The node name changes in commits 25b892b583cc ("ARM: dts: arm: Update 
register-bit-led nodes 'reg' and node names") and 2d3de197a818 ("ARM: 
dts: arm: Update ICST clock nodes 'reg' and node names") caused name 
collisions with the kernel's handling of ICST clock names and platform 
device names. This series fixes the kernel side to handle the DT 
changes.

This does break DT ABI compatibility which is partially mitigated if 
these changes are backported to stable. The alternative is reverting the 
referenced DT changes and coming up with different node names without 
unit-addresses. Ultimately, ABI issues are platform maintainers' 
decision, not mine.

Rob


Rob Herring (2):
  of: Support using 'mask' in making device bus id
  clk: versatile: clk-icst: Ensure clock names are unique

 drivers/clk/versatile/clk-icst.c |  6 ++++--
 drivers/of/platform.c            | 10 ++++++++--
 2 files changed, 12 insertions(+), 4 deletions(-)

-- 
2.32.0

[PATCH 2/2] clk: versatile: clk-icst: Ensure clock names are unique

[Rob Herring]

Commit 2d3de197a818 ("ARM: dts: arm: Update ICST clock nodes 'reg' and
node names") moved to using generic node names. That results in trying
to register multiple clocks with the same name. Fix this by including
the unit-address in the clock name.

Fixes: 2d3de197a818 ("ARM: dts: arm: Update ICST clock nodes 'reg' and node names")
Cc: stable@vger.kernel.org
Cc: Linus Walleij <linus.walleij@linaro.org>
Cc: Stephen Boyd <sboyd@kernel.org>
Cc: linux-arm-kernel@lists.infradead.org
Cc: linux-clk@vger.kernel.org
Signed-off-by: Rob Herring <robh@kernel.org>
---
This should be applied to stable to minimize DT ABI breakage.
---
 drivers/clk/versatile/clk-icst.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/clk/versatile/clk-icst.c b/drivers/clk/versatile/clk-icst.c
index 77fd0ecaf155..d52f976dc875 100644
--- a/drivers/clk/versatile/clk-icst.c
+++ b/drivers/clk/versatile/clk-icst.c
@@ -484,7 +484,7 @@ static void __init of_syscon_icst_setup(struct device_node *np)
 	struct device_node *parent;
 	struct regmap *map;
 	struct clk_icst_desc icst_desc;
-	const char *name = np->name;
+	const char *name;
 	const char *parent_name;
 	struct clk *regclk;
 	enum icst_control_type ctype;
@@ -533,15 +533,17 @@ static void __init of_syscon_icst_setup(struct device_node *np)
 		icst_desc.params = &icst525_apcp_cm_params;
 		ctype = ICST_INTEGRATOR_CP_CM_MEM;
 	} else {
-		pr_err("unknown ICST clock %s\n", name);
+		pr_err("unknown ICST clock %pOF\n", np);
 		return;
 	}
 
 	/* Parent clock name is not the same as node parent */
 	parent_name = of_clk_get_parent_name(np, 0);
+	name = kasprintf(GFP_KERNEL, "%pOFP", np);
 
 	regclk = icst_clk_setup(NULL, &icst_desc, name, parent_name, map, ctype);
 	if (IS_ERR(regclk)) {
+		kfree(name);
 		pr_err("error setting up syscon ICST clock %s\n", name);
 		return;
 	}
-- 
2.32.0

Re: [PATCH 2/2] clk: versatile: clk-icst: Ensure clock names are unique

[Linus Walleij]

On Tue, Nov 9, 2021 at 5:46 PM Rob Herring <robh@kernel.org> wrote:

> Commit 2d3de197a818 ("ARM: dts: arm: Update ICST clock nodes 'reg' and
> node names") moved to using generic node names. That results in trying
> to register multiple clocks with the same name. Fix this by including
> the unit-address in the clock name.
>
> Fixes: 2d3de197a818 ("ARM: dts: arm: Update ICST clock nodes 'reg' and node names")
> Cc: stable@vger.kernel.org
> Cc: Linus Walleij <linus.walleij@linaro.org>
> Cc: Stephen Boyd <sboyd@kernel.org>
> Cc: linux-arm-kernel@lists.infradead.org
> Cc: linux-clk@vger.kernel.org
> Signed-off-by: Rob Herring <robh@kernel.org>

Reviewed-by: Linus Walleij <linus.walleij@linaro.org>

Yours,
Linus Walleij

Re: [PATCH 2/2] clk: versatile: clk-icst: Ensure clock names are unique

[Stephen Boyd]

Quoting Rob Herring (2021-11-09 08:46:50)
> Commit 2d3de197a818 ("ARM: dts: arm: Update ICST clock nodes 'reg' and
> node names") moved to using generic node names. That results in trying
> to register multiple clocks with the same name. Fix this by including
> the unit-address in the clock name.
> 
> Fixes: 2d3de197a818 ("ARM: dts: arm: Update ICST clock nodes 'reg' and node names")
> Cc: stable@vger.kernel.org
> Cc: Linus Walleij <linus.walleij@linaro.org>
> Cc: Stephen Boyd <sboyd@kernel.org>
> Cc: linux-arm-kernel@lists.infradead.org
> Cc: linux-clk@vger.kernel.org
> Signed-off-by: Rob Herring <robh@kernel.org>
> ---

Reviewed-by: Stephen Boyd <sboyd@kernel.org>