[PATCH] clk: scmi: Fix protocol version fetch for non-CCF platforms

[Peng Fan]

On Fri, Feb 27, 2026 at 05:37:37PM +0530, Kamlesh Gurudasani wrote:
>The SCMI clock protocol version was only being fetched when CLK_CCF
>was enabled. On non-CCF platforms, the probe function returned early
>without fetching the version, leaving priv->version as 0.
>
>This caused issues because code paths like scmi_clk_gate() and
>scmi_clk_get_permissions() depend on priv->version to determine
>which protocol message format to use, even in non-CCF mode.
>
>Fix this by moving the scmi_generic_protocol_version() call before
>the CLK_CCF check, ensuring the version is fetched for both CCF and
>non-CCF platforms.

Please include a Fixes tag.

And update commit message on which platform was tested.

Thanks,
Peng

>
>Signed-off-by: Kamlesh Gurudasani <kamlesh at ti.com>
>---
> drivers/clk/clk_scmi.c | 12 ++++++------
> 1 file changed, 6 insertions(+), 6 deletions(-)
>
>diff --git a/drivers/clk/clk_scmi.c b/drivers/clk/clk_scmi.c
>index ee237ed6337..12c7b1e8254 100644
>--- a/drivers/clk/clk_scmi.c
>+++ b/drivers/clk/clk_scmi.c
>@@ -341,6 +341,12 @@ static int scmi_clk_probe(struct udevice *dev)
> 	if (ret)
> 		return ret;
> 
>+	ret = scmi_generic_protocol_version(dev, SCMI_PROTOCOL_ID_CLOCK, &priv->version);
>+	if (ret) {
>+		dev_dbg(dev, "%s: get SCMI clock management protocol version failed\n", __func__);
>+		return ret;
>+	}
>+
> 	if (!CONFIG_IS_ENABLED(CLK_CCF))
> 		return 0;
> 
>@@ -352,12 +358,6 @@ static int scmi_clk_probe(struct udevice *dev)
> 	if (ret)
> 		return ret;
> 
>-	ret = scmi_generic_protocol_version(dev, SCMI_PROTOCOL_ID_CLOCK, &priv->version);
>-	if (ret) {
>-		dev_dbg(dev, "%s: get SCMI clock management protocol version failed\n", __func__);
>-		return ret;
>-	}
>-
> 	clk_scmi_bulk = kzalloc(num_clocks * sizeof(*clk_scmi), GFP_KERNEL);
> 	if (!clk_scmi_bulk)
> 		return -ENOMEM;
>
>---
>base-commit: f6963fc232603007c661411fb31c57f1a9678a87
>change-id: 20260227-ccf-d7f40a33985c
>
>Best regards,
>-- 
>Kamlesh Gurudasani <kamlesh at ti.com>
>
>