mirror of https://github.com/armbian/build.git
340 lines
9.0 KiB
Diff
340 lines
9.0 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Viacheslav Bocharov <adeep@lexina.in>
|
|
Date: Tue, 4 Jun 2024 17:18:08 +0300
|
|
Subject: soc: amlogic: meson-gx-socinfo: move common code to header file
|
|
|
|
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 <adeep@lexina.in>
|
|
---
|
|
drivers/soc/amlogic/meson-gx-socinfo-internal.h | 122 ++++++++
|
|
drivers/soc/amlogic/meson-gx-socinfo.c | 140 +---------
|
|
2 files changed, 137 insertions(+), 125 deletions(-)
|
|
|
|
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..111111111111
|
|
--- /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 <neil.armstrong@linaro.org>
|
|
+ * Author: Viacheslav Bocharov <adeep@lexina.in>
|
|
+ *
|
|
+ */
|
|
+
|
|
+#ifndef _MESON_GX_SOCINFO_INTERNAL_H_
|
|
+#define _MESON_GX_SOCINFO_INTERNAL_H_
|
|
+
|
|
+#include <linux/types.h>
|
|
+
|
|
+#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[] = {
|
|
+ { "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[] = {
|
|
+ { "S905", 0x1f, 0, 0x20 }, /* pack_id != 0x20 */
|
|
+ { "S905H", 0x1f, 0x3, 0xf }, /* pack_id & 0xf == 0x3 */
|
|
+ { "S905M", 0x1f, 0x20, 0xf0 }, /* pack_id == 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 socinfo)
|
|
+{
|
|
+ int i;
|
|
+
|
|
+ for (i = 0 ; i < ARRAY_SIZE(soc_packages) ; ++i) {
|
|
+ if (soc_packages[i].major_id == socinfo.v1.major_id &&
|
|
+ soc_packages[i].pack_id ==
|
|
+ (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 = 0 ; i < ARRAY_SIZE(soc_ids) ; ++i) {
|
|
+ if (soc_ids[i].id == 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/meson-gx-socinfo.c
|
|
index 111111111111..222222222222 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 <narmstrong@baylibre.com>
|
|
*
|
|
- * SPDX-License-Identifier: GPL-2.0+
|
|
*/
|
|
|
|
#include <linux/io.h>
|
|
@@ -12,120 +12,10 @@
|
|
#include <linux/platform_device.h>
|
|
#include <linux/slab.h>
|
|
#include <linux/sys_soc.h>
|
|
-#include <linux/bitfield.h>
|
|
#include <linux/regmap.h>
|
|
#include <linux/mfd/syscon.h>
|
|
|
|
-#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[] = {
|
|
- { "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[] = {
|
|
- { "S905", 0x1f, 0, 0x20 }, /* pack_id != 0x20 */
|
|
- { "S905H", 0x1f, 0x3, 0xf }, /* pack_id & 0xf == 0x3 */
|
|
- { "S905M", 0x1f, 0x20, 0xf0 }, /* pack_id == 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 = socinfo_to_pack(socinfo);
|
|
- unsigned int major = socinfo_to_major(socinfo);
|
|
- int i;
|
|
-
|
|
- for (i = 0 ; i < ARRAY_SIZE(soc_packages) ; ++i) {
|
|
- if (soc_packages[i].major_id == major &&
|
|
- soc_packages[i].pack_id ==
|
|
- (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 = socinfo_to_major(socinfo);
|
|
- int i;
|
|
-
|
|
- for (i = 0 ; i < ARRAY_SIZE(soc_ids) ; ++i) {
|
|
- if (soc_ids[i].id == id)
|
|
- return soc_ids[i].name;
|
|
- }
|
|
-
|
|
- return "Unknown";
|
|
-}
|
|
+#include "meson-gx-socinfo-internal.h"
|
|
|
|
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;
|
|
|
|
@@ -162,11 +52,11 @@ static int __init meson_gx_socinfo_init(void)
|
|
return -ENODEV;
|
|
}
|
|
|
|
- ret = regmap_read(regmap, AO_SEC_SOCINFO_OFFSET, &socinfo);
|
|
+ ret = regmap_read(regmap, AO_SEC_SOCINFO_OFFSET, &socinfo.raw);
|
|
if (ret < 0)
|
|
return ret;
|
|
|
|
- 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)
|
|
|
|
soc_dev_attr->family = "Amlogic Meson";
|
|
soc_dev_attr->revision = 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 = 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));
|
|
|
|
soc_dev = soc_device_register(soc_dev_attr);
|
|
if (IS_ERR(soc_dev)) {
|
|
@@ -196,10 +86,10 @@ static int __init meson_gx_socinfo_init(void)
|
|
|
|
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);
|
|
|
|
return 0;
|
|
}
|
|
--
|
|
Armbian
|
|
|