From nobody Tue Feb 10 16:18:42 2026 Received: from mx.msync.work (mx.msync.work [62.182.159.68]) (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 6C6A17F7FC for ; Wed, 21 Feb 2024 14:46:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=62.182.159.68 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708526781; cv=none; b=Qe++S1kSRb081rlKMFd1HrguiHn+OIp6ZOKxGBYIDdZ0vHl1Nh+q2ODyavZqjNotMmLJx2JYMO6MhvV2i6udt69w1mOHdJmwh+E/gxV2zAzdup/U6TBiCsp8QSInOGikFcVUCHBoDiOC/GNXhdy4nzWnVXpZKXa87YDO+5Wsf4I= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708526781; c=relaxed/simple; bh=GWKuSrTWmIS6pThKyUYmnhONhinJfOqFlZ9/TygxLVs=; h=From:To:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=CdpV0eu9y43hsxNEy0ytQwZqppY4BvFHMnl3KgV9FephdzjPrz0NVhVWYPkroP3G2gz0dMK6Et/XlGF5k72/1+RgCOGkV7E1nsLiNtfZ/MhF2uZECxJMyrbr5ZZPULY2ohmygTfaq39wIYMLGXi4QwLw/9NzdFAwXJlH2ACjmeA= 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=P2eBt6uT; arc=none smtp.client-ip=62.182.159.68 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="P2eBt6uT" Received: from [127.0.0.1] (localhost [127.0.0.1]) by localhost (Mailerdaemon) with ESMTPSA id 9023610D6F0; Wed, 21 Feb 2024 14:37:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=lexina.in; s=dkim; t=1708526224; h=from:subject:date:message-id:to:mime-version: content-transfer-encoding:in-reply-to:references; bh=GEQArPt1kn/Khi/Y6aFVKGpGzNy0MfkExrWMzBfSx18=; b=P2eBt6uTVZ8cFP9+hIJg5UNauXnq5amDgz9wloQx6Uvir/25xuowB2PSw2irSwiDC44VFq 1CC2r3bB57U+r/QzTgzJSGq3DpmLwDwYxWWM8bnsxRjowTv6koQ5ceaGEfySL0u9JkLGGp Z7KFbObW6wbGSR+br1d7PVsKAMtD6XOTtq0cx9+cZigmGyaCwlxkTboSWCgjYyhRELMRV8 /FHpf1ZS1vm3lh5Jo3CJdGi3do7qNJXEMhgbYOwA4yvaPMM8HK8cWvhETdY96H22y5LJ+e vDKZeR5majwFzLaJGBieWy9Tik4rBFuMM4Wlm2PHaor2Mo0XoZorHMVJKWAoCg== 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 Subject: [PATCH v2 1/3] soc: amlogic: meson-gx-socinfo: move common code to header file Date: Wed, 21 Feb 2024 17:36:14 +0300 Message-ID: <20240221143654.544444-2-adeep@lexina.in> X-Mailer: git-send-email 2.43.2 In-Reply-To: <20240221143654.544444-1-adeep@lexina.in> References: <20240221143654.544444-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 | 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