From nobody Fri Dec 19 21:50:52 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 3C8F46BFA5; Mon, 10 Jun 2024 08:41:13 +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=1718008876; cv=none; b=poV6KPfOLKhwyoLQVdyPRwOXJYTs09kcPDRXEn4AesxA8U5qXMFxMm6oMfRiB4KVGv7AIV6fP0LeiQp55TPc47db1FBY/rm4i/xZwStiimtBG/fdC2os0MGO7eKsae0ZuQi0YgDWwSU7EcniEA1EB2vbfufilbClJ2biPdbx9xs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718008876; c=relaxed/simple; bh=HYrxAYn8FPOPd8zhy5Tk0KeNF02NL3RY9HUt9RL/7dY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=It/CDYGTDzPu4xHd0QYOVQWHOXeu+52GOX3SXCnwvVsBUFT3wbddyfJ8HCLsiVEq1L8b9sdNnovqRWMy/1VEnvUWAUW6y3Qq0RfRuTk8YyWUIeI/90DEF0urj9lUlIV0HIboSF2U0CI+s8TFD6p4Hz9LzqGBovmCFeHwjxSYcNo= 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=GuzDGc+r; 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="GuzDGc+r" Received: from [127.0.0.1] (localhost [127.0.0.1]) by localhost (Mailerdaemon) with ESMTPSA id A31D9FAE5E; Mon, 10 Jun 2024 11:41:09 +0300 (MSK) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=lexina.in; s=dkim; t=1718008869; h=from:subject:date:message-id:to:cc:mime-version: content-transfer-encoding:in-reply-to:references; bh=Hq5Hm3yJY0jaxB+OQLPd8Xvm/lyggL7lUmRyNvoAzUU=; b=GuzDGc+rd/Zq6YndNyHDBH7dAyUZqAWemiwbFJHwPlU7S58u+JKPOat07Ji4BFgFcMXnwB V+oa3pfAQnIkLm89/0K59MhURwIGMA/CIaySjEscb/gHzKO+oDGNd56MSTu3PoIdEukAzg JRHd+Gh+ArotujgVFMQQI/6pp5ZGO48DA76ayMC2lY9HuDQp8r5QgR8iHs5lZzxcytMZ2k lklD9bRLEomz3rSE8YfleL1CHSZc4m6+/oQzJp+Ekfv4+u30d0I60BVVht0ZPk2Rkfq3Dd rBJ0WbO6WP4OwES1L4YvnryQ5s5zuSD9NwuX8MfUhMvoUNw5auTbibHY0JSLvA== 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 , Conor Dooley , devicetree@vger.kernel.org Subject: [PATCH v5 1/4] soc: amlogic: meson-gx-socinfo: move common code to header file Date: Mon, 10 Jun 2024 11:39:47 +0300 Message-ID: <20240610084032.3096614-2-adeep@lexina.in> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240610084032.3096614-1-adeep@lexina.in> References: <20240610084032.3096614-1-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 | 122 +++++++++++++++ drivers/soc/amlogic/meson-gx-socinfo.c | 140 ++---------------- 2 files changed, 137 insertions(+), 125 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..42cd57e67390 --- /dev/null +++ b/drivers/soc/amlogic/meson-gx-socinfo-internal.h @@ -0,0 +1,122 @@ +/* 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 }, + { "A113X", 0x25, 0x43, 0xff }, + { "A113D", 0x25, 0x22, 0xff }, + { "S905L", 0x26, 0, 0x0 }, + { "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 8809a948201a..ca7b82c07083 100644 --- a/drivers/soc/amlogic/meson-gx-socinfo.c +++ b/drivers/soc/amlogic/meson-gx-socinfo.c @@ -1,8 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (c) 2017 BayLibre, SAS * Author: Neil Armstrong * - * SPDX-License-Identifier: GPL-2.0+ */ =20 #include @@ -12,120 +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 }, - { "A113X", 0x25, 0x43, 0xff }, - { "A113D", 0x25, 0x22, 0xff }, - { "S905L", 0x26, 0, 0x0 }, - { "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) { @@ -133,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 @@ -162,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; } @@ -177,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)) { @@ -196,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.45.2 From nobody Fri Dec 19 21:50:52 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 2900F55C29; Mon, 10 Jun 2024 08:41:12 +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=1718008875; cv=none; b=atGLhpOq5y0WNcTlB3wkbIeBevhbVFZpRwx0P5xX/Ag/5uZCS9EVClmv4XZduqCRBgmAMtlSqSYP5TdlcdDDynwygmG0Sv96yra/DE0lt4fJSxwm5N4+eqEqlSKls8tbPCI8l/fCtss8otxF7UJOk7s1NFVqJN91W3CBB2oUZxo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718008875; c=relaxed/simple; bh=/LlJMImS2gcMz66PX0akSkRfN/F74m4UUyvJYm1SqUg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=PM8y7Im7hHDO2pGp6q2xSNBQJQ+EvI/uiexOQgpow3wcwR1NSzphgSX+mKK4JusTZVEGFNmHfyWpazsferlRrV+lavVVwtTI8LnQqQ/FEOgvtuTfTqwzkRRN8AicL2FjnHYlfGYGz20CzVbmL4WAmByIgLAMTfVzmMUPALDGndA= 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=YRQ4a+am; 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="YRQ4a+am" Received: from [127.0.0.1] (localhost [127.0.0.1]) by localhost (Mailerdaemon) with ESMTPSA id BD356FAF84; Mon, 10 Jun 2024 11:41:10 +0300 (MSK) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=lexina.in; s=dkim; t=1718008870; h=from:subject:date:message-id:to:cc:mime-version: content-transfer-encoding:in-reply-to:references; bh=7Ikj+bHTocpyNZS+nTDcS+kSHIb7v511fQ33jkgoJFc=; b=YRQ4a+amm1ine9TmTkBCWMSHZJxnHPjVZHJilBbn6YYHZb7br/cxSCFEYfG7UrNR0j6Zj8 g4gsUcMjKHrvJSqPcmF2BOOFUh3UWmpwof8fc4u1W5kyOip+7mZrhLzrW4sqMJOAJbrug3 XiTUcaybUZnmpUbNcCuhkqkeC5LX+mc9dwdr9UVm7UTkupE/UlKVa5Z4TJLGag6xY81Zim 2gZNnKb2GkvaCS2roEO7hx2NbA5FgJHBMgLArj+RDu9XQjwVLmq4RpOmBnkSlAiVgBClW9 5p8FPuwLK8djMLwWgJJEI3TbFUW9SPYUUvgJIbVCJ5W/fZPiSCGKunM1Q6BJFA== 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 , Conor Dooley , devicetree@vger.kernel.org Subject: [PATCH v5 2/4] soc: amlogic: meson-gx-socinfo-sm: Add Amlogic secure-monitor SoC Information driver Date: Mon, 10 Jun 2024 11:39:48 +0300 Message-ID: <20240610084032.3096614-3-adeep@lexina.in> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240610084032.3096614-1-adeep@lexina.in> References: <20240610084032.3096614-1-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 + .../soc/amlogic/meson-gx-socinfo-internal.h | 14 +- drivers/soc/amlogic/meson-gx-socinfo-sm.c | 190 ++++++++++++++++++ 4 files changed, 211 insertions(+), 4 deletions(-) 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-internal.h b/drivers/soc/= amlogic/meson-gx-socinfo-internal.h index 42cd57e67390..5559573c9024 100644 --- a/drivers/soc/amlogic/meson-gx-socinfo-internal.h +++ b/drivers/soc/amlogic/meson-gx-socinfo-internal.h @@ -33,10 +33,16 @@ union meson_cpu_id { u32 raw; }; =20 -struct meson_sm_chip_id { - u32 version; - union meson_cpu_id cpu_id; - u8 serial[12]; +union meson_sm_chip_id { + struct { // cpu_id v2 + u32 version; + union meson_cpu_id cpu_id; + u8 serial[12]; + } v2; + struct { // raw + u32 version; + u8 buf[12 + sizeof(union meson_cpu_id)]; + } raw; }; =20 static const struct meson_gx_soc_id { 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..e12f45cd8de2 --- /dev/null +++ b/drivers/soc/amlogic/meson-gx-socinfo-sm.c @@ -0,0 +1,190 @@ +// 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; + union meson_sm_chip_id *id_buf; + int ret; + + id_buf =3D kzalloc(sizeof(union meson_sm_chip_id)+1, GFP_KERNEL); + if (!id_buf) + return NULL; + + ret =3D meson_sm_call_read(fw, id_buf, sizeof(union meson_sm_chip_id), SM= _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->raw.version); + + if (id_buf->raw.version !=3D 2) { + + u8 tmp; + /** + * Legacy 12-byte chip ID read out, transform data + * to expected order format + */ + memmove((void *)&id_buf->v2.serial, (void *)&id_buf->raw.buf, 12); + for (int i =3D 0; i < 6; i++) { + tmp =3D id_buf->v2.serial[i]; + id_buf->v2.serial[i] =3D id_buf->v2.serial[11 - i]; + id_buf->v2.serial[11 - i] =3D tmp; + } + id_buf->v2.cpu_id.v2.major_id =3D socinfo->v1.major_id; + id_buf->v2.cpu_id.v2.pack_id =3D socinfo->v1.pack_id; + id_buf->v2.cpu_id.v2.chip_rev =3D socinfo->v1.chip_rev; + id_buf->v2.cpu_id.v2.reserved =3D socinfo->v1.reserved; + id_buf->v2.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->v2.cpu_id.v2.major_id; + socinfo->v1.pack_id =3D id_buf->v2.cpu_id.v2.pack_id; + socinfo->v1.chip_rev =3D id_buf->v2.cpu_id.v2.chip_rev; + socinfo->v1.reserved =3D id_buf->v2.cpu_id.v2.reserved; + socinfo->v1.layout_ver =3D id_buf->v2.cpu_id.v2.layout_ver; + } + + buf =3D devm_kasprintf(dev, GFP_KERNEL, "%4phN%12phN", &(id_buf->v2.cpu_i= d), + &(id_buf->v2.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.45.2 From nobody Fri Dec 19 21:50:52 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 E313474068; Mon, 10 Jun 2024 08:41:17 +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=1718008879; cv=none; b=Dny0MnyIE+NHnx4yrxC4w9V7X5fp/1N4VlAnrExOjufEZkArFbs22xOdXsOKfIrprq8rDlO4MM0A2wCUbHFcNsVtoo81d299JYUAV5fbIBFkePNvv4EOWz8BNQ02Dgh1y89qn2vZmmmdXToflukgBj7nQGvQJEZH/PhCPQnrBYY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718008879; c=relaxed/simple; bh=Rgl/wU6R7ljBF8epw4YZuVxNQeyf2OvzEU669qYabgY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=WS9c//IWVijje2MzTKUPMrR+wvFRebOcMUrfsJuxtewZ/gxCU6cmfYsJVvDQ1xpNalG0gsKJJ2xHCnHoOGdNVKEq4eukKV+JWO9EAYL9FEsai1ifpsjHIoENvKLUfkYAQCwEh0mO6FHSDdY3qjviqpT+1dasmlslT44scPB/PoI= 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=bIchdf/q; 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="bIchdf/q" Received: from [127.0.0.1] (localhost [127.0.0.1]) by localhost (Mailerdaemon) with ESMTPSA id 068A6FAF0A; Mon, 10 Jun 2024 11:41:10 +0300 (MSK) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=lexina.in; s=dkim; t=1718008876; h=from:subject:date:message-id:to:cc:mime-version: content-transfer-encoding:in-reply-to:references; bh=laCP84RUPwmaIblaMPMK69tL2FcMDmuxzvJrD60X/k8=; b=bIchdf/q7BDMXH2idoY+0OAhDhWpSb3KcwwiRJ/mjZY+MDx5+DAa/Z26EK16PSO0yS5D5Y +jfymK7FpUJy8x3MoQJCnSnuQP8N6foh3vRGNlblNWflmXM6Bdc/YyIYF4DyDB6qkYKJTb /2DTLwl9758k08J71y69AEmqxwu3suSP99fLdcC/p5kShJmm6sATjeN/bUCdICXt8AzFjR b1phmcmrXw2775Z3WpUezPwTPG/cidIfUlutXKgQTF/A/EtQ3pu1035dmJz2msqkhoPVmv uOQn8k7e6nln5cZ6DvJ9wEayzzHvmqieoLt3actzUKgq5TEe6lMCPdKEVJxQWQ== 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 , Conor Dooley , devicetree@vger.kernel.org Subject: [PATCH v5 3/4] dt-bindings: arm: amlogic: amlogic,meson-gx-ao-secure: add secure-monitor property Date: Mon, 10 Jun 2024 11:39:49 +0300 Message-ID: <20240610084032.3096614-4-adeep@lexina.in> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240610084032.3096614-1-adeep@lexina.in> References: <20240610084032.3096614-1-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 secure-monitor property to schema for meson-gx-socinfo-sm driver. Signed-off-by: Viacheslav Bocharov --- .../bindings/arm/amlogic/amlogic,meson-gx-ao-secure.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Documentation/devicetree/bindings/arm/amlogic/amlogic,meson-gx= -ao-secure.yaml b/Documentation/devicetree/bindings/arm/amlogic/amlogic,mes= on-gx-ao-secure.yaml index 7dff32f373cb..1128a794ec89 100644 --- a/Documentation/devicetree/bindings/arm/amlogic/amlogic,meson-gx-ao-sec= ure.yaml +++ b/Documentation/devicetree/bindings/arm/amlogic/amlogic,meson-gx-ao-sec= ure.yaml @@ -32,6 +32,10 @@ properties: reg: maxItems: 1 =20 + secure-monitor: + description: phandle to the secure-monitor node + $ref: /schemas/types.yaml#/definitions/phandle + amlogic,has-chip-id: description: | A firmware register encodes the SoC type, package and revision --=20 2.45.2 From nobody Fri Dec 19 21:50:52 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 0CAF27407D; Mon, 10 Jun 2024 08:41:18 +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=1718008880; cv=none; b=A5fI4xPx1ZB9lWm548dGdBEvH7wx9+BmmNsBqEmo4hOChkeWXC1G9lgP5NA7C4++ZNXni0sXEcZwELD1S778WEeMbdYx3wSX0NWMpW9Ih53ZojfMOjqPrwBd2nHYD4KIEuZPTPM7gngzUjuNdOESyAJ4SONqclWQKWQy238kEBQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718008880; c=relaxed/simple; bh=UoNYO+YBUa4Y/s6xxZhqEt51ywLq6RcjISy3r1lKmeA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=nm5gKypjtV/Zb+ywv0cKEJ6kmYgkXEVtzZ59y2U1egIXOlUljhuwnqH/lGIwwSkq/9ghqgN6hKZMySI8U5J/zZYYq6VNtlZVD5gHNSRw5oztpQCz0hlH+sO85lKTksN06zpZgpdhVFdAPeX7j6S6kSErsUKefbWrhCU45atr/gU= 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=cv1kCaah; 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="cv1kCaah" Received: from [127.0.0.1] (localhost [127.0.0.1]) by localhost (Mailerdaemon) with ESMTPSA id 7EB15FB01A; Mon, 10 Jun 2024 11:41:16 +0300 (MSK) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=lexina.in; s=dkim; t=1718008876; h=from:subject:date:message-id:to:cc:mime-version: content-transfer-encoding:in-reply-to:references; bh=nrT9Mv5nhx7yJK+tAbs1JLdncnlFoxlReCq1D8Bae3E=; b=cv1kCaahpe6gnVkHI9SOjnmxfMQ+VoRDS/FioNBPlKBsr+PzPhaIqdBYFEoRfzY3+TOAPs oZ+g8h+mW4bp52FYP05/hNl0YnaFvHQtcyImt5VOw09mMGeMAFv5wZqLbQfZCnW0+Cfux4 rZKzVeDhyTKeVrUtiomABQ8plzUNInb4d9v+ZCD9AfvSpRyOzye8WtYYZ17nmwB4SOY2gy c4vaOYgdUF7S3ZsLIT5ZIJZz7LGaf+3+18C3RiuP4SRonO6nIiP3oO/ZVsletXFxYbgjla znWt5FANvF3JzJ3KopquW69vfFJ4MGpUb2mBXhNGO7pRORl8Sv9WMsEMMxlEYg== 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 , Conor Dooley , devicetree@vger.kernel.org Subject: [PATCH v5 4/4] arm64: dts: meson: add dts links to secure-monitor for soc driver in a1, axg, gx, g12 Date: Mon, 10 Jun 2024 11:39:50 +0300 Message-ID: <20240610084032.3096614-5-adeep@lexina.in> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240610084032.3096614-1-adeep@lexina.in> References: <20240610084032.3096614-1-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 b058ed78faf0..11422d0be22b 100644 --- a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi @@ -2045,6 +2045,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.45.2