From nobody Fri Dec 19 18:46:34 2025 Received: from mx.adeep.su (mx.adeep.su [185.250.0.168]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2779C145B04 for ; Thu, 16 May 2024 11:31:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=185.250.0.168 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715859095; cv=none; b=PsOReVMnXTQBj4vAkOrvEuxZLNxFjKYLKlBU2nqHtuJFqniWnRjXW24u1fhn6KhDNV22s7XVvinEKEClICaq/43rywVDZOn+ZkJgB16DTh0THG4jfDK2wjAfznW8F7sHodjO3RKL/c9/Rjo+Yn57vIxr3B4NP6Io/uE+44jhvg8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715859095; c=relaxed/simple; bh=GWKuSrTWmIS6pThKyUYmnhONhinJfOqFlZ9/TygxLVs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=NL1IY0mthKHuiX8+vTyUpAul867qAd4CrN7U0/401Z7NKvoegTHY8M3KyNZUV2Gs5R3FhbBYYSw1uFsh54Yw+cpt8zMoFHsAfSWI6KpACiCx2RmTgZzWeSwpXscwTDNs9gngX3kmvC5GQ+HpYlyyuEX9KLWz04l0vQZ2mzyZh8c= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=lexina.in; spf=pass smtp.mailfrom=lexina.in; dkim=pass (2048-bit key) header.d=lexina.in header.i=@lexina.in header.b=DAq1bOfJ; arc=none smtp.client-ip=185.250.0.168 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=lexina.in Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=lexina.in Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=lexina.in header.i=@lexina.in header.b="DAq1bOfJ" Received: from [127.0.0.1] (localhost [127.0.0.1]) by localhost (Mailerdaemon) with ESMTPSA id 5F0E9181C14; Thu, 16 May 2024 14:31:26 +0300 (MSK) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=lexina.in; s=dkim; t=1715859086; h=from:subject:date:message-id:to:cc:mime-version: content-transfer-encoding:in-reply-to:references; bh=GEQArPt1kn/Khi/Y6aFVKGpGzNy0MfkExrWMzBfSx18=; b=DAq1bOfJMqCy1Nruz0C7qB4eKNGlPUEmg2JWadC+PvREVbpRUmo0F6vae3/o/kPLmCHvBJ WsDgsJ0nXoFNlxw4+uqELaz4OsSZrqCL/peX5wV1WGYXrX5dfZN4M+5acnStqubOmg5G1v PN5K6YoQUBJCscKu6qIasyH8fTbvB3nk6GP/b8dSYd+9Yc2V9ruhKmyR4QcNAQIL2WJbE0 jv89FE3tqPE3lZzujgIfNLrabyCa8WYj5yH+369XUUYdCQ/khq5eXq2MbXcgAileTSuCCx 5fawMult2oWT8H5TKpfZ+mp5GNdAPqjx65Rd4CUVAIKR7AbOCP/P8pmgFPaV6A== From: Viacheslav Bocharov To: Neil Armstrong , Kevin Hilman , Jerome Brunet , Martin Blumenstingl , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-amlogic@lists.infradead.org Cc: Rob Herring , Krzysztof Kozlowski Subject: [PATCH v4 1/4] soc: amlogic: meson-gx-socinfo: move common code to header file Date: Thu, 16 May 2024 14:26:47 +0300 Message-ID: <20240516112849.3803674-4-adeep@lexina.in> X-Mailer: git-send-email 2.43.2 In-Reply-To: <20240516112849.3803674-2-adeep@lexina.in> References: <20240516112849.3803674-2-adeep@lexina.in> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Last-TLS-Session-Version: TLSv1.3 Content-Type: text/plain; charset="utf-8" Move common constants and inline functions from meson-gx-socinfo driver to header file. Create new structures for store meson64 cpu_id and chip_id. Signed-off-by: Viacheslav Bocharov --- .../soc/amlogic/meson-gx-socinfo-internal.h | 120 ++++++++++++++++ drivers/soc/amlogic/meson-gx-socinfo.c | 136 ++---------------- 2 files changed, 134 insertions(+), 122 deletions(-) create mode 100644 drivers/soc/amlogic/meson-gx-socinfo-internal.h diff --git a/drivers/soc/amlogic/meson-gx-socinfo-internal.h b/drivers/soc/= amlogic/meson-gx-socinfo-internal.h new file mode 100644 index 000000000000..3ebb80972fc7 --- /dev/null +++ b/drivers/soc/amlogic/meson-gx-socinfo-internal.h @@ -0,0 +1,120 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/* + * Copyright (c) 2017 BayLibre, SAS + * Copyright (c) 2024 JetHome + * Author: Neil Armstrong + * Author: Viacheslav Bocharov + * + */ + +#ifndef _MESON_GX_SOCINFO_INTERNAL_H_ +#define _MESON_GX_SOCINFO_INTERNAL_H_ + +#include + +#define AO_SEC_SD_CFG8 0xe0 +#define AO_SEC_SOCINFO_OFFSET AO_SEC_SD_CFG8 + +union meson_cpu_id { + struct { // cpu_id v1 + u32 layout_ver:4; + u32 reserved:4; + u32 chip_rev:8; + u32 pack_id:8; + u32 major_id:8; + } v1; + struct { // cpu_id v2 + u32 major_id:8; + u32 chip_rev:8; + u32 pack_id:8; + u32 reserved:4; + u32 layout_ver:4; + } v2; + u32 raw; +}; + +struct meson_sm_chip_id { + u32 version; + union meson_cpu_id cpu_id; + u8 serial[12]; +}; + +static const struct meson_gx_soc_id { + const char *name; + unsigned int id; +} soc_ids[] =3D { + { "GXBB", 0x1f }, + { "GXTVBB", 0x20 }, + { "GXL", 0x21 }, + { "GXM", 0x22 }, + { "TXL", 0x23 }, + { "TXLX", 0x24 }, + { "AXG", 0x25 }, + { "GXLX", 0x26 }, + { "TXHD", 0x27 }, + { "G12A", 0x28 }, + { "G12B", 0x29 }, + { "SM1", 0x2b }, + { "A1", 0x2c }, +}; + +static const struct meson_gx_package_id { + const char *name; + unsigned int major_id; + unsigned int pack_id; + unsigned int pack_mask; +} soc_packages[] =3D { + { "S905", 0x1f, 0, 0x20 }, /* pack_id !=3D 0x20 */ + { "S905H", 0x1f, 0x3, 0xf }, /* pack_id & 0xf =3D=3D 0x3 */ + { "S905M", 0x1f, 0x20, 0xf0 }, /* pack_id =3D=3D 0x20 */ + { "S905D", 0x21, 0, 0xf0 }, + { "S905X", 0x21, 0x80, 0xf0 }, + { "S905W", 0x21, 0xa0, 0xf0 }, + { "S905L", 0x21, 0xc0, 0xf0 }, + { "S905M2", 0x21, 0xe0, 0xf0 }, + { "S805X", 0x21, 0x30, 0xf0 }, + { "S805Y", 0x21, 0xb0, 0xf0 }, + { "S912", 0x22, 0, 0x0 }, /* Only S912 is known for GXM */ + { "962X", 0x24, 0x10, 0xf0 }, + { "962E", 0x24, 0x20, 0xf0 }, + { "A113X", 0x25, 0x37, 0xff }, + { "A113D", 0x25, 0x22, 0xff }, + { "S905D2", 0x28, 0x10, 0xf0 }, + { "S905Y2", 0x28, 0x30, 0xf0 }, + { "S905X2", 0x28, 0x40, 0xf0 }, + { "A311D", 0x29, 0x10, 0xf0 }, + { "S922X", 0x29, 0x40, 0xf0 }, + { "S905D3", 0x2b, 0x4, 0xf5 }, + { "S905X3", 0x2b, 0x5, 0xf5 }, + { "S905X3", 0x2b, 0x10, 0x3f }, + { "S905D3", 0x2b, 0x30, 0x3f }, + { "A113L", 0x2c, 0x0, 0xf8 }, +}; + +static inline const char *socinfo_v1_to_package_id(union meson_cpu_id soci= nfo) +{ + int i; + + for (i =3D 0 ; i < ARRAY_SIZE(soc_packages) ; ++i) { + if (soc_packages[i].major_id =3D=3D socinfo.v1.major_id && + soc_packages[i].pack_id =3D=3D + (socinfo.v1.pack_id & soc_packages[i].pack_mask)) + return soc_packages[i].name; + } + + return "Unknown"; +} + +static inline const char *socinfo_v1_to_soc_id(union meson_cpu_id socinfo) +{ + int i; + + for (i =3D 0 ; i < ARRAY_SIZE(soc_ids) ; ++i) { + if (soc_ids[i].id =3D=3D socinfo.v1.major_id) + return soc_ids[i].name; + } + + return "Unknown"; +} + +#endif /* _MESON_GX_SOCINFO_INTERNAL_H_ */ diff --git a/drivers/soc/amlogic/meson-gx-socinfo.c b/drivers/soc/amlogic/m= eson-gx-socinfo.c index 6abb730344ab..006f3b09940d 100644 --- a/drivers/soc/amlogic/meson-gx-socinfo.c +++ b/drivers/soc/amlogic/meson-gx-socinfo.c @@ -12,118 +12,10 @@ #include #include #include -#include #include #include =20 -#define AO_SEC_SD_CFG8 0xe0 -#define AO_SEC_SOCINFO_OFFSET AO_SEC_SD_CFG8 - -#define SOCINFO_MAJOR GENMASK(31, 24) -#define SOCINFO_PACK GENMASK(23, 16) -#define SOCINFO_MINOR GENMASK(15, 8) -#define SOCINFO_MISC GENMASK(7, 0) - -static const struct meson_gx_soc_id { - const char *name; - unsigned int id; -} soc_ids[] =3D { - { "GXBB", 0x1f }, - { "GXTVBB", 0x20 }, - { "GXL", 0x21 }, - { "GXM", 0x22 }, - { "TXL", 0x23 }, - { "TXLX", 0x24 }, - { "AXG", 0x25 }, - { "GXLX", 0x26 }, - { "TXHD", 0x27 }, - { "G12A", 0x28 }, - { "G12B", 0x29 }, - { "SM1", 0x2b }, - { "A1", 0x2c }, -}; - -static const struct meson_gx_package_id { - const char *name; - unsigned int major_id; - unsigned int pack_id; - unsigned int pack_mask; -} soc_packages[] =3D { - { "S905", 0x1f, 0, 0x20 }, /* pack_id !=3D 0x20 */ - { "S905H", 0x1f, 0x3, 0xf }, /* pack_id & 0xf =3D=3D 0x3 */ - { "S905M", 0x1f, 0x20, 0xf0 }, /* pack_id =3D=3D 0x20 */ - { "S905D", 0x21, 0, 0xf0 }, - { "S905X", 0x21, 0x80, 0xf0 }, - { "S905W", 0x21, 0xa0, 0xf0 }, - { "S905L", 0x21, 0xc0, 0xf0 }, - { "S905M2", 0x21, 0xe0, 0xf0 }, - { "S805X", 0x21, 0x30, 0xf0 }, - { "S805Y", 0x21, 0xb0, 0xf0 }, - { "S912", 0x22, 0, 0x0 }, /* Only S912 is known for GXM */ - { "962X", 0x24, 0x10, 0xf0 }, - { "962E", 0x24, 0x20, 0xf0 }, - { "A113X", 0x25, 0x37, 0xff }, - { "A113D", 0x25, 0x22, 0xff }, - { "S905D2", 0x28, 0x10, 0xf0 }, - { "S905Y2", 0x28, 0x30, 0xf0 }, - { "S905X2", 0x28, 0x40, 0xf0 }, - { "A311D", 0x29, 0x10, 0xf0 }, - { "S922X", 0x29, 0x40, 0xf0 }, - { "S905D3", 0x2b, 0x4, 0xf5 }, - { "S905X3", 0x2b, 0x5, 0xf5 }, - { "S905X3", 0x2b, 0x10, 0x3f }, - { "S905D3", 0x2b, 0x30, 0x3f }, - { "A113L", 0x2c, 0x0, 0xf8 }, -}; - -static inline unsigned int socinfo_to_major(u32 socinfo) -{ - return FIELD_GET(SOCINFO_MAJOR, socinfo); -} - -static inline unsigned int socinfo_to_minor(u32 socinfo) -{ - return FIELD_GET(SOCINFO_MINOR, socinfo); -} - -static inline unsigned int socinfo_to_pack(u32 socinfo) -{ - return FIELD_GET(SOCINFO_PACK, socinfo); -} - -static inline unsigned int socinfo_to_misc(u32 socinfo) -{ - return FIELD_GET(SOCINFO_MISC, socinfo); -} - -static const char *socinfo_to_package_id(u32 socinfo) -{ - unsigned int pack =3D socinfo_to_pack(socinfo); - unsigned int major =3D socinfo_to_major(socinfo); - int i; - - for (i =3D 0 ; i < ARRAY_SIZE(soc_packages) ; ++i) { - if (soc_packages[i].major_id =3D=3D major && - soc_packages[i].pack_id =3D=3D - (pack & soc_packages[i].pack_mask)) - return soc_packages[i].name; - } - - return "Unknown"; -} - -static const char *socinfo_to_soc_id(u32 socinfo) -{ - unsigned int id =3D socinfo_to_major(socinfo); - int i; - - for (i =3D 0 ; i < ARRAY_SIZE(soc_ids) ; ++i) { - if (soc_ids[i].id =3D=3D id) - return soc_ids[i].name; - } - - return "Unknown"; -} +#include "meson-gx-socinfo-internal.h" =20 static int __init meson_gx_socinfo_init(void) { @@ -131,7 +23,7 @@ static int __init meson_gx_socinfo_init(void) struct soc_device *soc_dev; struct device_node *np; struct regmap *regmap; - unsigned int socinfo; + union meson_cpu_id socinfo; struct device *dev; int ret; =20 @@ -160,11 +52,11 @@ static int __init meson_gx_socinfo_init(void) return -ENODEV; } =20 - ret =3D regmap_read(regmap, AO_SEC_SOCINFO_OFFSET, &socinfo); + ret =3D regmap_read(regmap, AO_SEC_SOCINFO_OFFSET, &socinfo.raw); if (ret < 0) return ret; =20 - if (!socinfo) { + if (!socinfo.raw) { pr_err("%s: invalid chipid value\n", __func__); return -EINVAL; } @@ -175,13 +67,13 @@ static int __init meson_gx_socinfo_init(void) =20 soc_dev_attr->family =3D "Amlogic Meson"; soc_dev_attr->revision =3D kasprintf(GFP_KERNEL, "%x:%x - %x:%x", - socinfo_to_major(socinfo), - socinfo_to_minor(socinfo), - socinfo_to_pack(socinfo), - socinfo_to_misc(socinfo)); + socinfo.v1.major_id, + socinfo.v1.chip_rev, + socinfo.v1.pack_id, + (socinfo.v1.reserved<<4) + socinfo.v1.layout_ver); soc_dev_attr->soc_id =3D kasprintf(GFP_KERNEL, "%s (%s)", - socinfo_to_soc_id(socinfo), - socinfo_to_package_id(socinfo)); + socinfo_v1_to_soc_id(socinfo), + socinfo_v1_to_package_id(socinfo)); =20 soc_dev =3D soc_device_register(soc_dev_attr); if (IS_ERR(soc_dev)) { @@ -194,10 +86,10 @@ static int __init meson_gx_socinfo_init(void) =20 dev_info(dev, "Amlogic Meson %s Revision %x:%x (%x:%x) Detected\n", soc_dev_attr->soc_id, - socinfo_to_major(socinfo), - socinfo_to_minor(socinfo), - socinfo_to_pack(socinfo), - socinfo_to_misc(socinfo)); + socinfo.v1.major_id, + socinfo.v1.chip_rev, + socinfo.v1.pack_id, + (socinfo.v1.reserved<<4) + socinfo.v1.layout_ver); =20 return 0; } --=20 2.43.2 From nobody Fri Dec 19 18:46:34 2025 Received: from mx.adeep.su (mx.adeep.su [185.250.0.168]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 534B91459FD for ; Thu, 16 May 2024 11:31:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=185.250.0.168 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715859098; cv=none; b=kgpTthryVLnM2Tj3J1v3n4UCRp0apfQSCUMtTnctyNJLZDiUMpGZzBvxKhUEclGQPmPM5Ocxs4aHwavZp08nOKa08XQ8pwLMu8FPSGgUYBxsDdTL+sYQk3KLf5h/tzrb2j/tTwc6jGbXomJesZ+PiB+O2hcUwr+rkV24N+xAWIY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715859098; c=relaxed/simple; bh=41WBJ8oEiRHCxg72hKrW/jYHJxZ6DIhT7gWfMUa+5pc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ajCkdsZPueit7iJvxsJa6aZYbuIwE7LB80G+8vZ8ULWjUQu5hdiyHren1oMem2SA6WJpJ/YCSRRL3Z7sHOuO3DyIhF/ZnkmUBfrzTwWjbf7qLKCf5p7AjJcIABT5qH/E9uc7FOHjU/pTtWVk9OCqpC73wyli8eY/9en3PID3Llo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=lexina.in; spf=pass smtp.mailfrom=lexina.in; dkim=pass (2048-bit key) header.d=lexina.in header.i=@lexina.in header.b=CGm5j+H+; arc=none smtp.client-ip=185.250.0.168 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=lexina.in Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=lexina.in Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=lexina.in header.i=@lexina.in header.b="CGm5j+H+" Received: from [127.0.0.1] (localhost [127.0.0.1]) by localhost (Mailerdaemon) with ESMTPSA id 1D317181724; Thu, 16 May 2024 14:31:34 +0300 (MSK) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=lexina.in; s=dkim; t=1715859094; h=from:subject:date:message-id:to:cc:mime-version: content-transfer-encoding:in-reply-to:references; bh=9OapANbGyeYt8+RvoWHlCRDUBPmvfn9nPg9hL6PJwLU=; b=CGm5j+H+kw+eBBoJNHzITmTlRpExqcq8RZ0SH+KcLQLlsMwlCpfTT6gUup5Gzi5oamHmXf jEusWYFhkRf+lx6LDCPwvw92/yPuAF5bMO9i/U5WdXGkHeK44oo/TV7wZVsjmZSa8CqXfR +QD0ClHTSy0BtIvEYctO/6EQSmAJMcOYtZcOZzgROD0vw2/pj3c6h4JrGLl43LXKWwZaE4 wae02ruTNGvAwoFtQ0ugj7qoXiy3JX5RI205EGuw3VKUKffzg0X+SqlYcLuAkFtomzVhY4 FI+VO1zvV0l7+PHo+0g7Sdmpvwf1pPrTejv/b+ZJNvNwulrkuJKtbiOJjeu1Ug== From: Viacheslav Bocharov To: Neil Armstrong , Kevin Hilman , Jerome Brunet , Martin Blumenstingl , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-amlogic@lists.infradead.org Cc: Rob Herring , Krzysztof Kozlowski Subject: [PATCH v4 2/4] soc: amlogic: meson-gx-socinfo-sm: Add Amlogic secure-monitor SoC Information driver Date: Thu, 16 May 2024 14:26:48 +0300 Message-ID: <20240516112849.3803674-5-adeep@lexina.in> X-Mailer: git-send-email 2.43.2 In-Reply-To: <20240516112849.3803674-2-adeep@lexina.in> References: <20240516112849.3803674-2-adeep@lexina.in> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Last-TLS-Session-Version: TLSv1.3 Content-Type: text/plain; charset="utf-8" Amlogic SoCs have a SoC information secure-monitor call for SoC type, package type, revision information and chipid. This patchs adds support for secure-monitor call decoding and exposing with the SoC bus infrastructure in addition to the previous SoC Information driver. Signed-off-by: Viacheslav Bocharov --- drivers/soc/amlogic/Kconfig | 10 ++ drivers/soc/amlogic/Makefile | 1 + drivers/soc/amlogic/meson-gx-socinfo-sm.c | 189 ++++++++++++++++++++++ 3 files changed, 200 insertions(+) create mode 100644 drivers/soc/amlogic/meson-gx-socinfo-sm.c diff --git a/drivers/soc/amlogic/Kconfig b/drivers/soc/amlogic/Kconfig index d08e398bdad4..82fc77ca3b4b 100644 --- a/drivers/soc/amlogic/Kconfig +++ b/drivers/soc/amlogic/Kconfig @@ -26,6 +26,16 @@ config MESON_GX_SOCINFO Say yes to support decoding of Amlogic Meson GX SoC family information about the type, package and version. =20 +config MESON_GX_SOCINFO_SM + bool "Amlogic Meson GX SoC Information driver via Secure Monitor" + depends on (ARM64 && ARCH_MESON || COMPILE_TEST) && MESON_SM=3Dy + default ARCH_MESON && MESON_SM + select SOC_BUS + help + Say yes to support decoding of Amlogic Meson GX SoC family + information about the type, package and version via secure + monitor call. + config MESON_MX_SOCINFO bool "Amlogic Meson MX SoC Information driver" depends on (ARM && ARCH_MESON) || COMPILE_TEST diff --git a/drivers/soc/amlogic/Makefile b/drivers/soc/amlogic/Makefile index c25f835e6a26..45d9d6f5904c 100644 --- a/drivers/soc/amlogic/Makefile +++ b/drivers/soc/amlogic/Makefile @@ -2,4 +2,5 @@ obj-$(CONFIG_MESON_CANVAS) +=3D meson-canvas.o obj-$(CONFIG_MESON_CLK_MEASURE) +=3D meson-clk-measure.o obj-$(CONFIG_MESON_GX_SOCINFO) +=3D meson-gx-socinfo.o +obj-$(CONFIG_MESON_GX_SOCINFO_SM) +=3D meson-gx-socinfo-sm.o obj-$(CONFIG_MESON_MX_SOCINFO) +=3D meson-mx-socinfo.o diff --git a/drivers/soc/amlogic/meson-gx-socinfo-sm.c b/drivers/soc/amlogi= c/meson-gx-socinfo-sm.c new file mode 100644 index 000000000000..22acd92bb830 --- /dev/null +++ b/drivers/soc/amlogic/meson-gx-socinfo-sm.c @@ -0,0 +1,189 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (c) 2017 BayLibre, SAS + * Copyright (c) 2024 JetHome + * Author: Neil Armstrong + * Author: Viacheslav Bocharov + * + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include + +#include "meson-gx-socinfo-internal.h" + +static char *socinfo_get_chipid(struct device *dev, struct meson_sm_firmwa= re *fw, + union meson_cpu_id *socinfo) +{ + char *buf; + struct meson_sm_chip_id *id_buf; + int ret; + + id_buf =3D kzalloc(sizeof(struct meson_sm_chip_id)+1, GFP_KERNEL); + if (!id_buf) + return NULL; + + ret =3D meson_sm_call_read(fw, id_buf, sizeof(struct meson_sm_chip_id), S= M_GET_CHIP_ID, + 2, 0, 0, 0, 0); + if (ret < 0) { + kfree(id_buf); + return NULL; + } + dev_info(dev, "got sm version call %i\n", id_buf->version); + + if (id_buf->version !=3D 2) { + + u8 tmp; + /** + * Legacy 12-byte chip ID read out, transform data + * to expected order format + */ + memmove((void *)&id_buf->serial, (void *)&id_buf->cpu_id, 12); + for (int i =3D 0; i < 6; i++) { + tmp =3D id_buf->serial[i]; + id_buf->serial[i] =3D id_buf->serial[11 - i]; + id_buf->serial[11 - i] =3D tmp; + } + id_buf->cpu_id.v2.major_id =3D socinfo->v1.major_id; + id_buf->cpu_id.v2.pack_id =3D socinfo->v1.pack_id; + id_buf->cpu_id.v2.chip_rev =3D socinfo->v1.chip_rev; + id_buf->cpu_id.v2.reserved =3D socinfo->v1.reserved; + id_buf->cpu_id.v2.layout_ver =3D socinfo->v1.layout_ver; + } else { + /** + * rewrite socinfo from regmap with value from secure monitor call + */ + socinfo->v1.major_id =3D id_buf->cpu_id.v2.major_id; + socinfo->v1.pack_id =3D id_buf->cpu_id.v2.pack_id; + socinfo->v1.chip_rev =3D id_buf->cpu_id.v2.chip_rev; + socinfo->v1.reserved =3D id_buf->cpu_id.v2.reserved; + socinfo->v1.layout_ver =3D id_buf->cpu_id.v2.layout_ver; + } + + buf =3D kasprintf(GFP_KERNEL, "%4phN%12phN", &(id_buf->cpu_id), &(id_buf-= >serial)); + + kfree(id_buf); + + return buf; +} + +static int meson_gx_socinfo_sm_probe(struct platform_device *pdev) +{ + struct soc_device_attribute *soc_dev_attr; + struct soc_device *soc_dev; + struct device_node *sm_np; + struct meson_sm_firmware *fw; + struct regmap *regmap; + union meson_cpu_id socinfo; + struct device *dev; + int ret; + + /* check if chip-id is available */ + if (!of_property_read_bool(pdev->dev.of_node, "amlogic,has-chip-id")) + return -ENODEV; + + /* node should be a syscon */ + regmap =3D syscon_node_to_regmap(pdev->dev.of_node); + if (IS_ERR(regmap)) + return dev_err_probe(&pdev->dev, PTR_ERR(regmap), "failed to get regmap\= n"); + + sm_np =3D of_parse_phandle(pdev->dev.of_node, "secure-monitor", 0); + if (!sm_np) { + dev_err(&pdev->dev, "no secure-monitor node found\n"); + return -EINVAL; + } + + fw =3D meson_sm_get(sm_np); + of_node_put(sm_np); + if (!fw) { + dev_dbg(&pdev->dev, "secure-monitor device not ready, probe later\n"); + return -EPROBE_DEFER; + } + + ret =3D regmap_read(regmap, AO_SEC_SOCINFO_OFFSET, &socinfo.raw); + if (ret < 0) + return ret; + + if (!socinfo.raw) { + dev_err(&pdev->dev, "invalid regmap chipid value\n"); + return -EINVAL; + } + + soc_dev_attr =3D devm_kzalloc(&pdev->dev, sizeof(*soc_dev_attr), + GFP_KERNEL); + if (!soc_dev_attr) + return -ENOMEM; + + soc_dev_attr->serial_number =3D socinfo_get_chipid(&pdev->dev, fw, &socin= fo); + + soc_dev_attr->family =3D "Amlogic Meson"; + soc_dev_attr->revision =3D kasprintf(GFP_KERNEL, "%x:%x - %x:%x", + socinfo.v1.major_id, + socinfo.v1.chip_rev, + socinfo.v1.pack_id, + (socinfo.v1.reserved<<4) + socinfo.v1.layout_ver); + soc_dev_attr->soc_id =3D kasprintf(GFP_KERNEL, "%s (%s)", + socinfo_v1_to_soc_id(socinfo), + socinfo_v1_to_package_id(socinfo)); + + soc_dev =3D soc_device_register(soc_dev_attr); + + + if (IS_ERR(soc_dev)) { + kfree(soc_dev_attr->revision); + kfree_const(soc_dev_attr->soc_id); + return PTR_ERR(soc_dev); + } + + dev =3D soc_device_to_device(soc_dev); + platform_set_drvdata(pdev, soc_dev); + + dev_info(dev, "Amlogic Meson %s Revision %x:%x (%x:%x) Detected (SM)\n", + soc_dev_attr->soc_id, + socinfo.v1.major_id, + socinfo.v1.chip_rev, + socinfo.v1.pack_id, + (socinfo.v1.reserved<<4) + socinfo.v1.layout_ver); + + return PTR_ERR_OR_ZERO(dev); +} + + +static int meson_gx_socinfo_sm_remove(struct platform_device *pdev) +{ + struct soc_device *soc_dev =3D platform_get_drvdata(pdev); + + soc_device_unregister(soc_dev); + return 0; +} + +static const struct of_device_id meson_gx_socinfo_match[] =3D { + { .compatible =3D "amlogic,meson-gx-ao-secure", }, + { /* sentinel */ }, +}; +MODULE_DEVICE_TABLE(of, meson_gx_socinfo_match); + +static struct platform_driver meson_gx_socinfo_driver =3D { + .probe =3D meson_gx_socinfo_sm_probe, + .remove =3D meson_gx_socinfo_sm_remove, + .driver =3D { + .name =3D "meson-gx-socinfo-sm", + .of_match_table =3D meson_gx_socinfo_match, + }, +}; + + +module_platform_driver(meson_gx_socinfo_driver); + +MODULE_AUTHOR("Viacheslav Bocharov "); +MODULE_DESCRIPTION("Amlogic Meson GX SOC SM driver"); +MODULE_LICENSE("GPL"); --=20 2.43.2 From nobody Fri Dec 19 18:46:34 2025 Received: from mx.adeep.su (mx.adeep.su [185.250.0.168]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C93E5145B04 for ; Thu, 16 May 2024 11:31:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=185.250.0.168 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715859104; cv=none; b=stdvEFY2vWD+HxtkNTiCDVYKIY2MqjafZUQvBPC2B0vB+8b6UdmWzdWmQkjczk5EjzxLvb3uV0wkgJFABrEvVimMJHLjYMEo104a9kXDDnL5yOMUmRzbSVXaq/lVYM5o8Mq6iw05zw+B107Q46c5GWLG1xct9KKCAk2PtNdRabY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715859104; c=relaxed/simple; bh=lBKWNCjz5XeMeeVLKV0cVIhl8GuROrhj8AxVnzf8uiA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=HAx2vA0pz5ZYwGmPGcaxLHWbjmN09xmlB31iw3WejZhl/ZMTPHePbruNarx40Yuqw/8qSCeUcNtr0sHHhV5j+qTyM45GmxXdMAjRqRgQRIJufgOn4PxqrDCTG8/y+VjpwZh9HCVEUiQ2lyVDL/0/s9hfLTeS1olL3S6zHJlb2D4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=lexina.in; spf=pass smtp.mailfrom=lexina.in; dkim=pass (2048-bit key) header.d=lexina.in header.i=@lexina.in header.b=g9jNpinp; arc=none smtp.client-ip=185.250.0.168 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=lexina.in Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=lexina.in Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=lexina.in header.i=@lexina.in header.b="g9jNpinp" Received: from [127.0.0.1] (localhost [127.0.0.1]) by localhost (Mailerdaemon) with ESMTPSA id DB584181C2E; Thu, 16 May 2024 14:31:39 +0300 (MSK) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=lexina.in; s=dkim; t=1715859100; h=from:subject:date:message-id:to:cc:mime-version: content-transfer-encoding:in-reply-to:references; bh=hLJvt3Qp8v0w1uJwmrYsCccfbrCeUtcFvurCzwm/ryk=; b=g9jNpinpkHMYurNslyMiEuGtbzGGZ2TIYQDy7RVJDpy3biesMJBNa3/c2d45MXJ4RKqYpF hhGTxi8A1v5Yol98OElo9K1Wbf1FzwSahKr1YC6KQhW2TyGOxzlVAnMPAaFCw5BC0cr82/ 1SmSZFDAAvhBfGijvlrRIIbuh2p7EbqLQMtDpljWq5+/USwWCJFojYfOF0wqf0gG1WCCP4 OFzNgj3ZNi/yHy4yTCHlQNdwCwsY8xZtjN5Hy7dpfZQ775ARKq/c8xoIyNxkwUJ/u/wYzn t4+r5F/Xr97lYNOC8YaqyePp22cGCYFI4LKxZQIGoWtcLa/FONKxAYZNWc871g== From: Viacheslav Bocharov To: Neil Armstrong , Kevin Hilman , Jerome Brunet , Martin Blumenstingl , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-amlogic@lists.infradead.org Cc: Rob Herring , Krzysztof Kozlowski Subject: [PATCH v4 3/4] soc: amlogic: meson-gx-socinfo: add new definition for Amlogic A113X package Date: Thu, 16 May 2024 14:26:49 +0300 Message-ID: <20240516112849.3803674-6-adeep@lexina.in> X-Mailer: git-send-email 2.43.2 In-Reply-To: <20240516112849.3803674-2-adeep@lexina.in> References: <20240516112849.3803674-2-adeep@lexina.in> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Last-TLS-Session-Version: TLSv1.3 Content-Type: text/plain; charset="utf-8" Add new definition for Amlogix A113X soc found in JetHub D1/D1+ devices. Signed-off-by: Viacheslav Bocharov --- drivers/soc/amlogic/meson-gx-socinfo-internal.h | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/soc/amlogic/meson-gx-socinfo-internal.h b/drivers/soc/= amlogic/meson-gx-socinfo-internal.h index 3ebb80972fc7..2028101bb9b2 100644 --- a/drivers/soc/amlogic/meson-gx-socinfo-internal.h +++ b/drivers/soc/amlogic/meson-gx-socinfo-internal.h @@ -78,6 +78,7 @@ static const struct meson_gx_package_id { { "962X", 0x24, 0x10, 0xf0 }, { "962E", 0x24, 0x20, 0xf0 }, { "A113X", 0x25, 0x37, 0xff }, + { "A113X", 0x25, 0x43, 0xff }, { "A113D", 0x25, 0x22, 0xff }, { "S905D2", 0x28, 0x10, 0xf0 }, { "S905Y2", 0x28, 0x30, 0xf0 }, --=20 2.43.2 From nobody Fri Dec 19 18:46:34 2025 Received: from mx.adeep.su (mx.adeep.su [185.250.0.168]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id BB871145A0B; Thu, 16 May 2024 11:31:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=185.250.0.168 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715859113; cv=none; b=o9e7X0oyDvHL+E9Etps9pHC1g4MzNAgy7gF/GWVA+AR5aCt1AdrOE92uoHuMpL085BIrGeTH7iFCKnQ+HSxOarHDcMaEb5N+k0Dzxv2ZzpOT3iAd1MEUXMXgdVBEGeNz2z/X1vItonnzrRIjCqjV73HIMH8XIZ5TMRCPA81ofHU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715859113; c=relaxed/simple; bh=M+mo9Y0CHfPVQLKoZETkdBfevQ2LMWQyIi/HAshdRT4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=eMHjfDDarPCkTX9jk+yeXdbA3n+/jIY+SGnngDEYF5kcttHz6zec4Z7G+GqtezWHQD6wsHn8XcPDaGj2VItc1b4xoP3leUycY56KrplGtGzFhyp0aGJGzUJD9bLT8/+Y9v7N26PCrMrrV0lmZkVZ8G/6FHWbQiJf7v8bg0xW+Es= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=lexina.in; spf=pass smtp.mailfrom=lexina.in; dkim=pass (2048-bit key) header.d=lexina.in header.i=@lexina.in header.b=KJHUUIku; arc=none smtp.client-ip=185.250.0.168 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=lexina.in Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=lexina.in Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=lexina.in header.i=@lexina.in header.b="KJHUUIku" Received: from [127.0.0.1] (localhost [127.0.0.1]) by localhost (Mailerdaemon) with ESMTPSA id 2AC6D181D4E; Thu, 16 May 2024 14:31:47 +0300 (MSK) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=lexina.in; s=dkim; t=1715859107; h=from:subject:date:message-id:to:cc:mime-version: content-transfer-encoding:in-reply-to:references; bh=+UBrzMeNJuIEWIdnDs+QZQBlvEK3sk7AsllHTSelVpQ=; b=KJHUUIkuFggKkNXicjirmIFtaVHZGg5FPC2mBRdnou0pM5QdihSvTlOe8YW0FcZwjVAQPP uv+IsQ+vuUVRY3KiCo6js/RSRadNtAApvmKu0QD5aLQWdYGDZjNs+s3rm+ka5rUbZf0wLU 0ZZk+OFqJ7CSlJ53AWX3zoCz+fGfvWfNuuII/8Tx/QZW+Hx/1UWQsQjrFhyWoaQqizBVJp DeYgYrLLh6XG8TGLwNNzMLySYxZA7jb1t5iCdgxgHgRK85Gz+dyMNHEvERNFvOGPQM+uoL kjnLrDkwJj2yXe046L+haIZnwjfHgRR8qm32VCce8f7SKtJXYe97oXDujyf1Ig== From: Viacheslav Bocharov To: Neil Armstrong , Kevin Hilman , Jerome Brunet , Martin Blumenstingl , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-amlogic@lists.infradead.org, devicetree@vger.kernel.org Cc: Rob Herring , Krzysztof Kozlowski Subject: [PATCH v4 4/4] arm64: dts: meson: add dts links to secure-monitor for soc driver in a1, axg, gx, g12 Date: Thu, 16 May 2024 14:26:51 +0300 Message-ID: <20240516112849.3803674-8-adeep@lexina.in> X-Mailer: git-send-email 2.43.2 In-Reply-To: <20240516112849.3803674-2-adeep@lexina.in> References: <20240516112849.3803674-2-adeep@lexina.in> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Last-TLS-Session-Version: TLSv1.3 Content-Type: text/plain; charset="utf-8" Add links to secure-monitor in soc driver section for A1, AXG, GX, G12 Amlogic family for use with meson-socinfo-sm driver. Signed-off-by: Viacheslav Bocharov --- arch/arm64/boot/dts/amlogic/meson-a1.dtsi | 1 + arch/arm64/boot/dts/amlogic/meson-axg.dtsi | 1 + arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi | 1 + arch/arm64/boot/dts/amlogic/meson-gx.dtsi | 1 + 4 files changed, 4 insertions(+) diff --git a/arch/arm64/boot/dts/amlogic/meson-a1.dtsi b/arch/arm64/boot/dt= s/amlogic/meson-a1.dtsi index c03e207ea6c5..d47f056117fc 100644 --- a/arch/arm64/boot/dts/amlogic/meson-a1.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-a1.dtsi @@ -407,6 +407,7 @@ hwrng: rng@5118 { sec_AO: ao-secure@5a20 { compatible =3D "amlogic,meson-gx-ao-secure", "syscon"; reg =3D <0x0 0x5a20 0x0 0x140>; + secure-monitor =3D <&sm>; amlogic,has-chip-id; }; =20 diff --git a/arch/arm64/boot/dts/amlogic/meson-axg.dtsi b/arch/arm64/boot/d= ts/amlogic/meson-axg.dtsi index 6d12b760b90f..45791ec6694a 100644 --- a/arch/arm64/boot/dts/amlogic/meson-axg.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-axg.dtsi @@ -1689,6 +1689,7 @@ mux { sec_AO: ao-secure@140 { compatible =3D "amlogic,meson-gx-ao-secure", "syscon"; reg =3D <0x0 0x140 0x0 0x140>; + secure-monitor =3D <&sm>; amlogic,has-chip-id; }; =20 diff --git a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi b/arch/arm64= /boot/dts/amlogic/meson-g12-common.dtsi index 9d5eab6595d0..a8c1c72543b7 100644 --- a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi @@ -2026,6 +2026,7 @@ cec_AO: cec@100 { sec_AO: ao-secure@140 { compatible =3D "amlogic,meson-gx-ao-secure", "syscon"; reg =3D <0x0 0x140 0x0 0x140>; + secure-monitor =3D <&sm>; amlogic,has-chip-id; }; =20 diff --git a/arch/arm64/boot/dts/amlogic/meson-gx.dtsi b/arch/arm64/boot/dt= s/amlogic/meson-gx.dtsi index 2673f0dbafe7..656e08b3d872 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gx.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-gx.dtsi @@ -471,6 +471,7 @@ cec_AO: cec@100 { sec_AO: ao-secure@140 { compatible =3D "amlogic,meson-gx-ao-secure", "syscon"; reg =3D <0x0 0x140 0x0 0x140>; + secure-monitor =3D <&sm>; amlogic,has-chip-id; }; =20 --=20 2.43.2