clk: imx: scu: ignore clks not owned by Cortex-A partition
authorPeng Fan <peng.fan@nxp.com>
Tue, 12 Sep 2023 09:19:04 +0000 (17:19 +0800)
committerAbel Vesa <abel.vesa@linaro.org>
Wed, 4 Oct 2023 12:44:14 +0000 (15:44 +0300)
Not register clks that not owned to current partition.
CPU resources are specical resources, it is assigned in ATF, not
non-secure OS, but we still need to allow cpu freq, so return
true for non-secure OS for cpu resources.

Otherwise there will be error log if the resources are owned by current
partition:
[   19.387291] cm40_i2c_div: failed to attached the power domain -2
[   19.389305] cm40_lpuart_div: failed to attached the power domain -2

Signed-off-by: Peng Fan <peng.fan@nxp.com>
Reviewed-by: Abel Vesa <abel.vesa@linaro.org>
Link: https://lore.kernel.org/r/20230912-imx8-clk-v1-v1-6-69a34bcfcae1@nxp.com
Signed-off-by: Abel Vesa <abel.vesa@linaro.org>
drivers/clk/imx/clk-scu.c

index cd83c52..be89180 100644 (file)
 #include <linux/clk-provider.h>
 #include <linux/err.h>
 #include <linux/of.h>
+#include <linux/firmware/imx/svc/rm.h>
 #include <linux/platform_device.h>
 #include <linux/pm_domain.h>
 #include <linux/pm_runtime.h>
 #include <linux/slab.h>
+#include <xen/xen.h>
 
 #include "clk-scu.h"
 
@@ -670,6 +672,18 @@ static int imx_clk_scu_attach_pd(struct device *dev, u32 rsrc_id)
        return of_genpd_add_device(&genpdspec, dev);
 }
 
+static bool imx_clk_is_resource_owned(u32 rsrc)
+{
+       /*
+        * A-core resources are special. SCFW reports they are not "owned" by
+        * current partition but linux can still adjust them for cpufreq.
+        */
+       if (rsrc == IMX_SC_R_A53 || rsrc == IMX_SC_R_A72 || rsrc == IMX_SC_R_A35)
+               return true;
+
+       return imx_sc_rm_is_resource_owned(ccm_ipc_handle, rsrc);
+}
+
 struct clk_hw *imx_clk_scu_alloc_dev(const char *name,
                                     const char * const *parents,
                                     int num_parents, u32 rsrc_id, u8 clk_type)
@@ -687,6 +701,9 @@ struct clk_hw *imx_clk_scu_alloc_dev(const char *name,
        if (!imx_scu_clk_is_valid(rsrc_id))
                return ERR_PTR(-EINVAL);
 
+       if (!imx_clk_is_resource_owned(rsrc_id))
+               return NULL;
+
        pdev = platform_device_alloc(name, PLATFORM_DEVID_NONE);
        if (!pdev) {
                pr_err("%s: failed to allocate scu clk dev rsrc %d type %d\n",
@@ -869,6 +886,9 @@ struct clk_hw *__imx_clk_gpr_scu(const char *name, const char * const *parent_na
                return ERR_PTR(-EINVAL);
        }
 
+       if (!imx_clk_is_resource_owned(rsrc_id))
+               return NULL;
+
        clk = kzalloc(sizeof(*clk), GFP_KERNEL);
        if (!clk) {
                kfree(clk_node);