Received: by 2002:a25:86ce:0:0:0:0:0 with SMTP id y14csp1303749ybm; Wed, 22 May 2019 21:55:22 -0700 (PDT) X-Google-Smtp-Source: APXvYqwbFZoemJ1ADlbynphkPxFze5VNytGhfQBSoFwGpG1WM7tEF0JQKO8vbw3TGdFCM7LGP4/D X-Received: by 2002:a17:902:b941:: with SMTP id h1mr36399408pls.289.1558587322378; Wed, 22 May 2019 21:55:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1558587322; cv=none; d=google.com; s=arc-20160816; b=g6PHQ6ab+UgWHZOJVtQzp+S9BzHIep9rJBEv+sSmMC4VjB9uhfk83L/adqw2BHMHlN 89wsnEniIN5L4QpNRB0cKbngZEqrRZot1UwQHiSvJhpoDMmJRp0IZ1L/3FdU8y3aNgV9 wj/qWrU95tBWPqbsnquq0zaiVf8kuS/VFtIyXyYan3ju33TDQojB4iDoh2LpBgq06eUb U4BhR8bItG5kZE5NZnZt9D5mBgcwkBpboUbgy0AZJhhf9vLvtOMbwOmdi2iOAkwi4cI3 dxi1qLPnYhEoKFCxAMx8A0A898jwZT1xB2Tkp4JhUI0xpN5npQl5+rvv7GefhEEWH4as DAfQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:content-transfer-encoding :content-id:content-language:accept-language:message-id:date :thread-index:thread-topic:subject:cc:to:from:dkim-signature; bh=N4WU3ZxLdXwBfrglLvc+CCt/oJA3mHl9tSaRvdzqo3g=; b=PxUbnPHLw5NuwCd3uTZ012eNIhoXScubjjqHm3OIH049QfXXfsEi+rb5CEmwVTr4Tg EcQQ1OTyk5EOZRBtS6XwzeQL85RJlvXmzxgE+Hu6eMWRDBezU1Smtk8UMCtFt7dJDjlp wj0uV8jT0THMDMdADijxSXxRs7EDFUjUKTZe/fQZHkYTMX1g7lGUsVnmS0DtWDSpx/me bQIES9HtmusezH/nhNBQGMvvQPtHyikcAwuTz22gOSa4PitLxhs5gTctYHv7y4sKkGMl p8tr1uKKgtUTRnK5ecPHzoskQWOwBpRp6V79OLGaIae2p+OWEUgmQhaz88sdj7EDRpix EnMQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nxp.com header.s=selector2 header.b=YnWewp50; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=nxp.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id f3si28248604pld.434.2019.05.22.21.55.04; Wed, 22 May 2019 21:55:22 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@nxp.com header.s=selector2 header.b=YnWewp50; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=nxp.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726359AbfEWExx (ORCPT + 99 others); Thu, 23 May 2019 00:53:53 -0400 Received: from mail-eopbgr40065.outbound.protection.outlook.com ([40.107.4.65]:59101 "EHLO EUR03-DB5-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1725792AbfEWExx (ORCPT ); Thu, 23 May 2019 00:53:53 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=N4WU3ZxLdXwBfrglLvc+CCt/oJA3mHl9tSaRvdzqo3g=; b=YnWewp50kN9CyAWncyadFMnk7tnBCLLzQE2jD4VBz1gWmjW46bdok5kO0obqGZbVL6YBLE+RoU6iNDOg42U6Zb7VAz+rr6zKIjRMNteJK8RqGXuhPTQq8oeI0g79LQoEaTjfxvkTcV8bBLAyl6VoIgqlrycEzvkIWUlJJzlfBEA= Received: from DB3PR0402MB3916.eurprd04.prod.outlook.com (52.134.72.18) by DB3PR0402MB3881.eurprd04.prod.outlook.com (52.134.73.28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1922.17; Thu, 23 May 2019 04:53:46 +0000 Received: from DB3PR0402MB3916.eurprd04.prod.outlook.com ([fe80::5835:e874:bd94:fec]) by DB3PR0402MB3916.eurprd04.prod.outlook.com ([fe80::5835:e874:bd94:fec%5]) with mapi id 15.20.1922.017; Thu, 23 May 2019 04:53:46 +0000 From: Anson Huang To: "catalin.marinas@arm.com" , "will.deacon@arm.com" , "shawnguo@kernel.org" , "s.hauer@pengutronix.de" , "kernel@pengutronix.de" , "festevam@gmail.com" , "maxime.ripard@bootlin.com" , "olof@lixom.net" , "agross@kernel.org" , "jagan@amarulasolutions.com" , "bjorn.andersson@linaro.org" , Leonard Crestez , "dinguyen@kernel.org" , "enric.balletbo@collabora.com" , Aisheng Dong , Abel Vesa , "l.stach@pengutronix.de" , "tglx@linutronix.de" , "robh@kernel.org" , "gregkh@linuxfoundation.org" , "linux-arm-kernel@lists.infradead.org" , "linux-kernel@vger.kernel.org" CC: dl-linux-imx Subject: [PATCH V6 1/2] soc: imx: Add SCU SoC info driver support Thread-Topic: [PATCH V6 1/2] soc: imx: Add SCU SoC info driver support Thread-Index: AQHVESOBOi968fgyqkGLTWjGKVXT0g== Date: Thu, 23 May 2019 04:53:46 +0000 Message-ID: <1558586911-29309-1-git-send-email-Anson.Huang@nxp.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-mailer: git-send-email 2.7.4 x-clientproxiedby: HK0PR03CA0034.apcprd03.prod.outlook.com (2603:1096:203:2f::22) To DB3PR0402MB3916.eurprd04.prod.outlook.com (2603:10a6:8:10::18) authentication-results: spf=none (sender IP is ) smtp.mailfrom=anson.huang@nxp.com; x-ms-exchange-messagesentrepresentingtype: 1 x-originating-ip: [119.31.174.66] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 242dffd5-3965-4ed0-55c0-08d6df3aa352 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0;PCL:0;RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600141)(711020)(4605104)(4618075)(2017052603328)(7193020);SRVR:DB3PR0402MB3881; x-ms-traffictypediagnostic: DB3PR0402MB3881: x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:2201; x-forefront-prvs: 00462943DE x-forefront-antispam-report: SFV:NSPM;SFS:(10009020)(39860400002)(346002)(136003)(366004)(376002)(396003)(199004)(189003)(7736002)(66476007)(7416002)(6116002)(66556008)(64756008)(3846002)(66446008)(73956011)(66946007)(81156014)(8936002)(81166006)(50226002)(316002)(8676002)(186003)(4326008)(2906002)(26005)(476003)(2616005)(36756003)(6436002)(68736007)(99286004)(6486002)(110136005)(71200400001)(305945005)(71190400001)(14454004)(478600001)(486006)(256004)(53936002)(2201001)(6512007)(86362001)(25786009)(2501003)(102836004)(386003)(6506007)(66066001)(5660300002)(52116002)(921003)(1121003);DIR:OUT;SFP:1101;SCL:1;SRVR:DB3PR0402MB3881;H:DB3PR0402MB3916.eurprd04.prod.outlook.com;FPR:;SPF:None;LANG:en;PTR:InfoNoRecords;A:1;MX:1; received-spf: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: 44Zl8EPNxLwDkX/eV+QVh2HfOzSqaDPdmYE4fnlRj0VclzSZNPqBNKLDKyAclvKfIpo1hDjNAOtGWeBRQiJAVNSL7FZfVS16pf+BJhNnmMK4S3KyhmcJlKeHVUgD1Hp0Id7zqZwdph/gpZY/DPz1kU3mkUVel5PBG3Jvm/GvsxAcpzbKNuvSwmcs9n18AXx8ESdR3aY1XpYx0TP08JZ5egPHn7s0srn3SmvAYnfGsuxS2kq0XNBrQsHDhr3HPYNvhKCwsqUkiFkofVU2hYW5vnbVYLOnZmrkiVQJ3JDVD+13IiIop11u4vgeLFkeSXpGy0jQte/3trQxZP9xGNUavzELa1yV8vvCAMnbZrJi1aQ2ZhG84aaM/kT5/Xx433eV89qPnpO9L17NCTPRqWe/UM6NliQJHPJPW/BFT+VyLS0= Content-Type: text/plain; charset="iso-8859-1" Content-ID: <1FF5B11B81644A49835431FB9A8CB99D@eurprd04.prod.outlook.com> Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 242dffd5-3965-4ed0-55c0-08d6df3aa352 X-MS-Exchange-CrossTenant-originalarrivaltime: 23 May 2019 04:53:46.8238 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: anson.huang@nxp.com X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB3PR0402MB3881 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Add i.MX SCU SoC info driver to support i.MX8QXP SoC, introduce driver dependency into Kconfig as CONFIG_IMX_SCU must be selected to support i.MX SCU SoC driver, also need to use platform driver model to make sure IMX_SCU driver is probed before i.MX SCU SoC driver. With this patch, SoC info can be read from sysfs: i.mx8qxp-mek# cat /sys/devices/soc0/family Freescale i.MX i.mx8qxp-mek# cat /sys/devices/soc0/soc_id 0x2 i.mx8qxp-mek# cat /sys/devices/soc0/machine Freescale i.MX8QXP MEK i.mx8qxp-mek# cat /sys/devices/soc0/revision 1.1 Signed-off-by: Anson Huang Reviewed-by: Abel Vesa Reviewed-by: Dong Aisheng --- Changes since V5: - remove unnecessary comment; - improve the IPC message structure definition; - improve the error check and return value in imx_scu_soc_init() to save s= ome code. --- drivers/soc/imx/Kconfig | 9 +++ drivers/soc/imx/Makefile | 1 + drivers/soc/imx/soc-imx-scu.c | 147 ++++++++++++++++++++++++++++++++++++++= ++++ 3 files changed, 157 insertions(+) create mode 100644 drivers/soc/imx/soc-imx-scu.c diff --git a/drivers/soc/imx/Kconfig b/drivers/soc/imx/Kconfig index ade1b46..8aaebf1 100644 --- a/drivers/soc/imx/Kconfig +++ b/drivers/soc/imx/Kconfig @@ -8,4 +8,13 @@ config IMX_GPCV2_PM_DOMAINS select PM_GENERIC_DOMAINS default y if SOC_IMX7D =20 +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. + endmenu diff --git a/drivers/soc/imx/Makefile b/drivers/soc/imx/Makefile index caa8653..cf9ca42 100644 --- a/drivers/soc/imx/Makefile +++ b/drivers/soc/imx/Makefile @@ -2,3 +2,4 @@ obj-$(CONFIG_HAVE_IMX_GPC) +=3D gpc.o obj-$(CONFIG_IMX_GPCV2_PM_DOMAINS) +=3D gpcv2.o obj-$(CONFIG_ARCH_MXC) +=3D soc-imx8.o +obj-$(CONFIG_IMX_SCU_SOC) +=3D soc-imx-scu.o diff --git a/drivers/soc/imx/soc-imx-scu.c b/drivers/soc/imx/soc-imx-scu.c new file mode 100644 index 0000000..258c987 --- /dev/null +++ b/drivers/soc/imx/soc-imx-scu.c @@ -0,0 +1,147 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Copyright 2019 NXP. + */ + +#include +#include +#include +#include +#include +#include + +#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; + } __packed resp; + } data; +} __packed; + +static u32 imx_scu_soc_id(void) +{ + struct imx_sc_msg_misc_get_soc_id msg; + struct imx_sc_rpc_msg *hdr =3D &msg.hdr; + int ret; + + hdr->ver =3D IMX_SC_RPC_VERSION; + hdr->svc =3D IMX_SC_RPC_SVC_MISC; + hdr->func =3D IMX_SC_MISC_FUNC_GET_CONTROL; + hdr->size =3D 3; + + msg.data.req.control =3D IMX_SC_C_ID; + msg.data.req.resource =3D IMX_SC_R_SYSTEM; + + ret =3D imx_scu_call_rpc(soc_ipc_handle, &msg, true); + if (ret) { + pr_err("%s: get soc info failed, ret %d\n", __func__, ret); + /* return 0 means getting revision failed */ + return 0; + } + + 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; + u32 id, val; + int ret; + + ret =3D imx_scu_get_handle(&soc_ipc_handle); + if (ret) + return ret; + + soc_dev_attr =3D devm_kzalloc(&pdev->dev, sizeof(*soc_dev_attr), + GFP_KERNEL); + if (!soc_dev_attr) + return -ENOMEM; + + soc_dev_attr->family =3D "Freescale i.MX"; + + ret =3D of_property_read_string(of_root, + "model", + &soc_dev_attr->machine); + if (ret) + return ret; + + id =3D imx_scu_soc_id(); + + /* format soc_id value passed from SCU firmware */ + val =3D id & 0x1f; + soc_dev_attr->soc_id =3D val ? kasprintf(GFP_KERNEL, "0x%x", val) + : "unknown"; + if (!soc_dev_attr->soc_id) + return -ENOMEM; + + /* format revision value passed from SCU firmware */ + val =3D (id >> 5) & 0xf; + val =3D (((val >> 2) + 1) << 4) | (val & 0x3); + soc_dev_attr->revision =3D val ? kasprintf(GFP_KERNEL, + "%d.%d", + (val >> 4) & 0xf, + val & 0xf) : "unknown"; + if (!soc_dev_attr->revision) { + ret =3D -ENOMEM; + goto free_soc_id; + } + + soc_dev =3D soc_device_register(soc_dev_attr); + if (IS_ERR(soc_dev)) { + ret =3D PTR_ERR(soc_dev); + goto free_revision; + } + + return 0; + +free_revision: + kfree(soc_dev_attr->revision); +free_soc_id: + kfree(soc_dev_attr->soc_id); + return ret; +} + +static struct platform_driver imx_scu_soc_driver =3D { + .driver =3D { + .name =3D IMX_SCU_SOC_DRIVER_NAME, + }, + .probe =3D imx_scu_soc_probe, +}; + +static int __init imx_scu_soc_init(void) +{ + struct platform_device *imx_scu_soc_pdev; + struct device_node *np; + int ret; + + np =3D of_find_compatible_node(NULL, NULL, "fsl,imx-scu"); + if (!np) + return -ENODEV; + + of_node_put(np); + + ret =3D platform_driver_register(&imx_scu_soc_driver); + if (ret) + return ret; + + imx_scu_soc_pdev =3D + platform_device_register_simple(IMX_SCU_SOC_DRIVER_NAME, + -1, + NULL, + 0); + if (IS_ERR(imx_scu_soc_pdev)) + platform_driver_unregister(&imx_scu_soc_driver); + + return PTR_ERR_OR_ZERO(imx_scu_soc_pdev); +} +device_initcall(imx_scu_soc_init); --=20 2.7.4