]> git.proxmox.com Git - mirror_ubuntu-jammy-kernel.git/commitdiff
firmware: imx: Move i.MX SCU soc driver into imx firmware folder
authorAnson Huang <Anson.Huang@nxp.com>
Thu, 25 Jun 2020 21:14:07 +0000 (05:14 +0800)
committerShawn Guo <shawnguo@kernel.org>
Mon, 13 Jul 2020 02:02:00 +0000 (10:02 +0800)
The i.MX SCU soc driver depends on SCU firmware driver, so it has to
use platform driver model for proper defer probe operation, since
it has no device binding in DT file, a simple platform device is
created together inside the platform driver. To make it more clean,
we can just move the entire SCU soc driver into imx firmware folder
and initialized by i.MX SCU firmware driver.

Signed-off-by: Anson Huang <Anson.Huang@nxp.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
arch/arm64/configs/defconfig
drivers/firmware/imx/Makefile
drivers/firmware/imx/imx-scu-soc.c [new file with mode: 0644]
drivers/firmware/imx/imx-scu.c
drivers/soc/imx/Kconfig
drivers/soc/imx/Makefile
drivers/soc/imx/soc-imx-scu.c [deleted file]
include/linux/firmware/imx/sci.h

index 883e8bace3ed2567e9d8dbdb3e8567e415ab5a5d..c99237ac10a4c44c21199f5d1867fd455f4c09b6 100644 (file)
@@ -850,7 +850,6 @@ CONFIG_OWL_PM_DOMAINS=y
 CONFIG_RASPBERRYPI_POWER=y
 CONFIG_FSL_DPAA=y
 CONFIG_FSL_MC_DPIO=y
-CONFIG_IMX_SCU_SOC=y
 CONFIG_QCOM_AOSS_QMP=y
 CONFIG_QCOM_GENI_SE=y
 CONFIG_QCOM_RMTFS_MEM=m
index 17ea3613e142694c2b36a2716d1b532ea47b21ee..b76acbade2a047b5ee8300f7489b94ffb2f59c45 100644 (file)
@@ -1,4 +1,4 @@
 # SPDX-License-Identifier: GPL-2.0
 obj-$(CONFIG_IMX_DSP)          += imx-dsp.o
-obj-$(CONFIG_IMX_SCU)          += imx-scu.o misc.o imx-scu-irq.o rm.o
+obj-$(CONFIG_IMX_SCU)          += imx-scu.o misc.o imx-scu-irq.o rm.o imx-scu-soc.o
 obj-$(CONFIG_IMX_SCU_PD)       += scu-pd.o
diff --git a/drivers/firmware/imx/imx-scu-soc.c b/drivers/firmware/imx/imx-scu-soc.c
new file mode 100644 (file)
index 0000000..2f32353
--- /dev/null
@@ -0,0 +1,138 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Copyright 2019 NXP.
+ */
+
+#include <dt-bindings/firmware/imx/rsrc.h>
+#include <linux/firmware/imx/sci.h>
+#include <linux/slab.h>
+#include <linux/sys_soc.h>
+#include <linux/platform_device.h>
+#include <linux/of.h>
+
+static struct imx_sc_ipc *imx_sc_soc_ipc_handle;
+
+struct imx_sc_msg_misc_get_soc_id {
+       struct imx_sc_rpc_msg hdr;
+       union {
+               struct {
+                       u32 control;
+                       u16 resource;
+               } __packed req;
+               struct {
+                       u32 id;
+               } resp;
+       } data;
+} __packed __aligned(4);
+
+struct imx_sc_msg_misc_get_soc_uid {
+       struct imx_sc_rpc_msg hdr;
+       u32 uid_low;
+       u32 uid_high;
+} __packed;
+
+static int imx_scu_soc_uid(u64 *soc_uid)
+{
+       struct imx_sc_msg_misc_get_soc_uid msg;
+       struct imx_sc_rpc_msg *hdr = &msg.hdr;
+       int ret;
+
+       hdr->ver = IMX_SC_RPC_VERSION;
+       hdr->svc = IMX_SC_RPC_SVC_MISC;
+       hdr->func = IMX_SC_MISC_FUNC_UNIQUE_ID;
+       hdr->size = 1;
+
+       ret = imx_scu_call_rpc(imx_sc_soc_ipc_handle, &msg, true);
+       if (ret) {
+               pr_err("%s: get soc uid failed, ret %d\n", __func__, ret);
+               return ret;
+       }
+
+       *soc_uid = msg.uid_high;
+       *soc_uid <<= 32;
+       *soc_uid |= msg.uid_low;
+
+       return 0;
+}
+
+static int imx_scu_soc_id(void)
+{
+       struct imx_sc_msg_misc_get_soc_id msg;
+       struct imx_sc_rpc_msg *hdr = &msg.hdr;
+       int ret;
+
+       hdr->ver = IMX_SC_RPC_VERSION;
+       hdr->svc = IMX_SC_RPC_SVC_MISC;
+       hdr->func = IMX_SC_MISC_FUNC_GET_CONTROL;
+       hdr->size = 3;
+
+       msg.data.req.control = IMX_SC_C_ID;
+       msg.data.req.resource = IMX_SC_R_SYSTEM;
+
+       ret = imx_scu_call_rpc(imx_sc_soc_ipc_handle, &msg, true);
+       if (ret) {
+               pr_err("%s: get soc info failed, ret %d\n", __func__, ret);
+               return ret;
+       }
+
+       return msg.data.resp.id;
+}
+
+int imx_scu_soc_init(struct device *dev)
+{
+       struct soc_device_attribute *soc_dev_attr;
+       struct soc_device *soc_dev;
+       int id, ret;
+       u64 uid = 0;
+       u32 val;
+
+       ret = imx_scu_get_handle(&imx_sc_soc_ipc_handle);
+       if (ret)
+               return ret;
+
+       soc_dev_attr = devm_kzalloc(dev, sizeof(*soc_dev_attr),
+                                   GFP_KERNEL);
+       if (!soc_dev_attr)
+               return -ENOMEM;
+
+       soc_dev_attr->family = "Freescale i.MX";
+
+       ret = of_property_read_string(of_root,
+                                     "model",
+                                     &soc_dev_attr->machine);
+       if (ret)
+               return ret;
+
+       id = imx_scu_soc_id();
+       if (id < 0)
+               return -EINVAL;
+
+       ret = imx_scu_soc_uid(&uid);
+       if (ret < 0)
+               return -EINVAL;
+
+       /* format soc_id value passed from SCU firmware */
+       val = id & 0x1f;
+       soc_dev_attr->soc_id = devm_kasprintf(dev, GFP_KERNEL, "0x%x", val);
+       if (!soc_dev_attr->soc_id)
+               return -ENOMEM;
+
+       /* format revision value passed from SCU firmware */
+       val = (id >> 5) & 0xf;
+       val = (((val >> 2) + 1) << 4) | (val & 0x3);
+       soc_dev_attr->revision = devm_kasprintf(dev, GFP_KERNEL, "%d.%d",
+                                               (val >> 4) & 0xf, val & 0xf);
+       if (!soc_dev_attr->revision)
+               return -ENOMEM;
+
+       soc_dev_attr->serial_number = devm_kasprintf(dev, GFP_KERNEL,
+                                                    "%016llX", uid);
+       if (!soc_dev_attr->serial_number)
+               return -ENOMEM;
+
+       soc_dev = soc_device_register(soc_dev_attr);
+       if (IS_ERR(soc_dev))
+               return PTR_ERR(soc_dev);
+
+       return 0;
+}
index 2ab048222fe9199b436e38cde4b3586c85e65d65..dca79caccd01c15ff5761423e24a247a858abf7a 100644 (file)
@@ -328,6 +328,10 @@ static int imx_scu_probe(struct platform_device *pdev)
 
        imx_sc_ipc_handle = sc_ipc;
 
+       ret = imx_scu_soc_init(dev);
+       if (ret)
+               dev_warn(dev, "failed to initialize SoC info: %d\n", ret);
+
        ret = imx_scu_enable_general_irq_channel(dev);
        if (ret)
                dev_warn(dev,
index d515d2cc20ed13d1afb90b99a4151654909da702..d49fa63ed9c95d09bb0e296d33305c7be1542b19 100644 (file)
@@ -8,15 +8,6 @@ config IMX_GPCV2_PM_DOMAINS
        select PM_GENERIC_DOMAINS
        default y if SOC_IMX7D
 
-config IMX_SCU_SOC
-       bool "i.MX System Controller Unit SoC info support"
-       depends on IMX_SCU
-       select SOC_BUS
-       help
-         If you say yes here you get support for the NXP i.MX System
-         Controller Unit SoC info module, it will provide the SoC info
-         like SoC family, ID and revision etc.
-
 config SOC_IMX8M
        bool "i.MX8M SoC family support"
        depends on ARCH_MXC || COMPILE_TEST
index 446143241fe7c5990d557b35485934bfaf2c9202..078dc918f4f35a7607a007fa1012b5a7338f6469 100644 (file)
@@ -5,4 +5,3 @@ endif
 obj-$(CONFIG_HAVE_IMX_GPC) += gpc.o
 obj-$(CONFIG_IMX_GPCV2_PM_DOMAINS) += gpcv2.o
 obj-$(CONFIG_SOC_IMX8M) += soc-imx8m.o
-obj-$(CONFIG_IMX_SCU_SOC) += soc-imx-scu.o
diff --git a/drivers/soc/imx/soc-imx-scu.c b/drivers/soc/imx/soc-imx-scu.c
deleted file mode 100644 (file)
index 92448ca..0000000
+++ /dev/null
@@ -1,172 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-/*
- * Copyright 2019 NXP.
- */
-
-#include <dt-bindings/firmware/imx/rsrc.h>
-#include <linux/firmware/imx/sci.h>
-#include <linux/slab.h>
-#include <linux/sys_soc.h>
-#include <linux/platform_device.h>
-#include <linux/of.h>
-
-#define IMX_SCU_SOC_DRIVER_NAME                "imx-scu-soc"
-
-static struct imx_sc_ipc *soc_ipc_handle;
-
-struct imx_sc_msg_misc_get_soc_id {
-       struct imx_sc_rpc_msg hdr;
-       union {
-               struct {
-                       u32 control;
-                       u16 resource;
-               } __packed req;
-               struct {
-                       u32 id;
-               } resp;
-       } data;
-} __packed __aligned(4);
-
-struct imx_sc_msg_misc_get_soc_uid {
-       struct imx_sc_rpc_msg hdr;
-       u32 uid_low;
-       u32 uid_high;
-} __packed;
-
-static int imx_scu_soc_uid(u64 *soc_uid)
-{
-       struct imx_sc_msg_misc_get_soc_uid msg;
-       struct imx_sc_rpc_msg *hdr = &msg.hdr;
-       int ret;
-
-       hdr->ver = IMX_SC_RPC_VERSION;
-       hdr->svc = IMX_SC_RPC_SVC_MISC;
-       hdr->func = IMX_SC_MISC_FUNC_UNIQUE_ID;
-       hdr->size = 1;
-
-       ret = imx_scu_call_rpc(soc_ipc_handle, &msg, true);
-       if (ret) {
-               pr_err("%s: get soc uid failed, ret %d\n", __func__, ret);
-               return ret;
-       }
-
-       *soc_uid = msg.uid_high;
-       *soc_uid <<= 32;
-       *soc_uid |= msg.uid_low;
-
-       return 0;
-}
-
-static int imx_scu_soc_id(void)
-{
-       struct imx_sc_msg_misc_get_soc_id msg;
-       struct imx_sc_rpc_msg *hdr = &msg.hdr;
-       int ret;
-
-       hdr->ver = IMX_SC_RPC_VERSION;
-       hdr->svc = IMX_SC_RPC_SVC_MISC;
-       hdr->func = IMX_SC_MISC_FUNC_GET_CONTROL;
-       hdr->size = 3;
-
-       msg.data.req.control = IMX_SC_C_ID;
-       msg.data.req.resource = IMX_SC_R_SYSTEM;
-
-       ret = imx_scu_call_rpc(soc_ipc_handle, &msg, true);
-       if (ret) {
-               pr_err("%s: get soc info failed, ret %d\n", __func__, ret);
-               return ret;
-       }
-
-       return msg.data.resp.id;
-}
-
-static int imx_scu_soc_probe(struct platform_device *pdev)
-{
-       struct soc_device_attribute *soc_dev_attr;
-       struct soc_device *soc_dev;
-       int id, ret;
-       u64 uid = 0;
-       u32 val;
-
-       ret = imx_scu_get_handle(&soc_ipc_handle);
-       if (ret)
-               return ret;
-
-       soc_dev_attr = devm_kzalloc(&pdev->dev, sizeof(*soc_dev_attr),
-                                   GFP_KERNEL);
-       if (!soc_dev_attr)
-               return -ENOMEM;
-
-       soc_dev_attr->family = "Freescale i.MX";
-
-       ret = of_property_read_string(of_root,
-                                     "model",
-                                     &soc_dev_attr->machine);
-       if (ret)
-               return ret;
-
-       id = imx_scu_soc_id();
-       if (id < 0)
-               return -EINVAL;
-
-       ret = imx_scu_soc_uid(&uid);
-       if (ret < 0)
-               return -EINVAL;
-
-       /* format soc_id value passed from SCU firmware */
-       val = id & 0x1f;
-       soc_dev_attr->soc_id = devm_kasprintf(&pdev->dev, GFP_KERNEL, "0x%x", val);
-       if (!soc_dev_attr->soc_id)
-               return -ENOMEM;
-
-       /* format revision value passed from SCU firmware */
-       val = (id >> 5) & 0xf;
-       val = (((val >> 2) + 1) << 4) | (val & 0x3);
-       soc_dev_attr->revision = devm_kasprintf(&pdev->dev, GFP_KERNEL, "%d.%d",
-                                               (val >> 4) & 0xf, val & 0xf);
-       if (!soc_dev_attr->revision)
-               return -ENOMEM;
-
-       soc_dev_attr->serial_number = devm_kasprintf(&pdev->dev, GFP_KERNEL,
-                                                    "%016llX", uid);
-       if (!soc_dev_attr->serial_number)
-               return -ENOMEM;
-
-       soc_dev = soc_device_register(soc_dev_attr);
-       if (IS_ERR(soc_dev))
-               return PTR_ERR(soc_dev);
-
-       return 0;
-}
-
-static struct platform_driver imx_scu_soc_driver = {
-       .driver = {
-               .name = IMX_SCU_SOC_DRIVER_NAME,
-       },
-       .probe = imx_scu_soc_probe,
-};
-
-static int __init imx_scu_soc_init(void)
-{
-       struct platform_device *pdev;
-       struct device_node *np;
-       int ret;
-
-       np = of_find_compatible_node(NULL, NULL, "fsl,imx-scu");
-       if (!np)
-               return -ENODEV;
-
-       of_node_put(np);
-
-       ret = platform_driver_register(&imx_scu_soc_driver);
-       if (ret)
-               return ret;
-
-       pdev = platform_device_register_simple(IMX_SCU_SOC_DRIVER_NAME,
-                                              -1, NULL, 0);
-       if (IS_ERR(pdev))
-               platform_driver_unregister(&imx_scu_soc_driver);
-
-       return PTR_ERR_OR_ZERO(pdev);
-}
-device_initcall(imx_scu_soc_init);
index 3c459f54a88f26b13e60d7f36778324e0c7ffcfc..22c76571a2940f835d8f47c0824128831399b744 100644 (file)
@@ -20,4 +20,5 @@ int imx_scu_enable_general_irq_channel(struct device *dev);
 int imx_scu_irq_register_notifier(struct notifier_block *nb);
 int imx_scu_irq_unregister_notifier(struct notifier_block *nb);
 int imx_scu_irq_group_enable(u8 group, u32 mask, u8 enable);
+int imx_scu_soc_init(struct device *dev);
 #endif /* _SC_SCI_H */