[PATCH] clk: tegra: Support unique names for multi-socket platforms

[PATCH] clk: tegra: Support unique names for multi-socket platforms

[Jon Hunter]

On multi-socket platforms each socket has its own BPMP which exposes the
same clock names. Fix this by appending the NUMA ID as suffix to the
clock names for multi-socket platforms.

Use 'sizeof(info->name)' in the strscpy() and snprintf() functions to
future proof against anyone changing the size of the 'name' array.

Co-developed-by: Timo Alho <talho@nvidia.com>
Signed-off-by: Timo Alho <talho@nvidia.com>
Signed-off-by: Jon Hunter <jonathanh@nvidia.com>
---
 drivers/clk/tegra/clk-bpmp.c | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/drivers/clk/tegra/clk-bpmp.c b/drivers/clk/tegra/clk-bpmp.c
index f6d2b934228b..428e776561c5 100644
--- a/drivers/clk/tegra/clk-bpmp.c
+++ b/drivers/clk/tegra/clk-bpmp.c
@@ -367,7 +367,15 @@ static int tegra_bpmp_clk_get_info(struct tegra_bpmp *bpmp, unsigned int id,
 	if (err < 0)
 		return err;
 
-	strscpy(info->name, response.name, MRQ_CLK_NAME_MAXLEN);
+	if (dev_to_node(bpmp->dev) == NUMA_NO_NODE) {
+		strscpy(info->name, response.name, sizeof(info->name));
+	} else {
+		err = snprintf(info->name, sizeof(info->name), "%s.%d",
+			       response.name, dev_to_node(bpmp->dev));
+		if (WARN_ON(err >= sizeof(info->name)))
+			return -E2BIG;
+	}
+
 	info->num_parents = response.num_parents;
 
 	for (i = 0; i < info->num_parents; i++)
-- 
2.43.0

Re: [PATCH] clk: tegra: Support unique names for multi-socket platforms

[Brian Masney]

On Fri, May 22, 2026 at 05:30:33PM +0100, Jon Hunter wrote:
> On multi-socket platforms each socket has its own BPMP which exposes the
> same clock names. Fix this by appending the NUMA ID as suffix to the
> clock names for multi-socket platforms.
> 
> Use 'sizeof(info->name)' in the strscpy() and snprintf() functions to
> future proof against anyone changing the size of the 'name' array.
> 
> Co-developed-by: Timo Alho <talho@nvidia.com>
> Signed-off-by: Timo Alho <talho@nvidia.com>
> Signed-off-by: Jon Hunter <jonathanh@nvidia.com>

Reviewed-by: Brian Masney <bmasney@redhat.com>

Re: [PATCH] clk: tegra: Support unique names for multi-socket platforms

[Jon Hunter]

On 22/05/2026 17:30, Jon Hunter wrote:
> On multi-socket platforms each socket has its own BPMP which exposes the
> same clock names. Fix this by appending the NUMA ID as suffix to the
> clock names for multi-socket platforms.
> 
> Use 'sizeof(info->name)' in the strscpy() and snprintf() functions to
> future proof against anyone changing the size of the 'name' array.
> 
> Co-developed-by: Timo Alho <talho@nvidia.com>
> Signed-off-by: Timo Alho <talho@nvidia.com>
> Signed-off-by: Jon Hunter <jonathanh@nvidia.com>
> ---
>   drivers/clk/tegra/clk-bpmp.c | 10 +++++++++-
>   1 file changed, 9 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/clk/tegra/clk-bpmp.c b/drivers/clk/tegra/clk-bpmp.c
> index f6d2b934228b..428e776561c5 100644
> --- a/drivers/clk/tegra/clk-bpmp.c
> +++ b/drivers/clk/tegra/clk-bpmp.c
> @@ -367,7 +367,15 @@ static int tegra_bpmp_clk_get_info(struct tegra_bpmp *bpmp, unsigned int id,
>   	if (err < 0)
>   		return err;
>   
> -	strscpy(info->name, response.name, MRQ_CLK_NAME_MAXLEN);
> +	if (dev_to_node(bpmp->dev) == NUMA_NO_NODE) {
> +		strscpy(info->name, response.name, sizeof(info->name));
> +	} else {
> +		err = snprintf(info->name, sizeof(info->name), "%s.%d",
> +			       response.name, dev_to_node(bpmp->dev));
> +		if (WARN_ON(err >= sizeof(info->name)))
> +			return -E2BIG;
> +	}
> +
>   	info->num_parents = response.num_parents;
>   
>   	for (i = 0; i < info->num_parents; i++)


Thierry commented on a similar patch [0] that his preference is to 
prefix the NUMA ID rather than append because this is more hierarchical. 
We agreed that we should be consistent in our approach and do the same 
here. I will send a V2 with this change.

Jon

[0] https://lore.kernel.org/linux-tegra/ahmsDANt8D7RSYdK@orome/T/#t

-- 
nvpublic