2011-03-09 17:05:44

by Maxime Coquelin

[permalink] [raw]
Subject: [RFC PATCHv1 0/2] Export SoC info through sysfs

Here is the first version of the proposal to export SoC related information to user-space through sysFS interface.

This serie is to continue what has been discussed on the "socinfo" thread created by Eduardo Valentin:
https://lkml.org/lkml/2010/5/11/364

The first patch introduces the common part, which provides an interface to the platform to register its name, and exports platform-defined IDs to user-space.
The IDs strings can be provided in two ways: either with a pointer to the string, or by a callback returning the string.

The second patch is given as example for the ux500 architecture. It registers with the machine name "DB8500", and exports 3 informations (SoC unique ID, sili
con revision and silicon process).

Here is the output for DB8500:
root@ME:/sys/devices/system/soc ls -l
-r--r--r-- 1 root root 4096 Jan 11 02:43 mach_name
-r--r--r-- 1 root root 4096 Jan 11 02:43 process
-r--r--r-- 1 root root 4096 Jan 11 02:43 revision
-r--r--r-- 1 root root 4096 Jan 11 02:43 soc_id
root@ME:/sys/devices/system/soc cat mach_name
DB8500
root@ME:/sys/devices/system/soc cat process
Standard
root@ME:/sys/devices/system/soc cat revision
2.0
root@ME:/sys/devices/system/soc cat soc_id
2ba07ce9e5835d6185321e9577462ef2ea2129cf

Any comments are welcome.

Note that I will be off from 13th to 21th of March.

Regards,
Maxime

-------------------------------------------------------------------------------

Maxime Coquelin (2):
Export SoC info through sysfs
ux500: Export U8500 SoC info through sysfs

arch/arm/mach-ux500/id.c | 96 ++++++++++++++++++++++++++++++++++++++++++++++
drivers/base/Kconfig | 4 ++
drivers/base/Makefile | 1 +
drivers/base/soc.c | 88 ++++++++++++++++++++++++++++++++++++++++++
include/linux/sys_soc.h | 33 ++++++++++++++++
5 files changed, 222 insertions(+), 0 deletions(-)
create mode 100644 drivers/base/soc.c
create mode 100644 include/linux/sys_soc.h


2011-03-09 17:05:57

by Maxime Coquelin

[permalink] [raw]
Subject: [RFC PATCHv1 1/2] Export SoC info through sysfs

Common base to export System-on-Chip related informations through sysfs.

Creation of a "soc" directory under /sys/devices/system/.
Creation of a common "mach_name" entry to export machine name.
Creation of platform-defined SoC information entries.

Signed-off-by: Maxime COQUELIN <[email protected]>
---
drivers/base/Kconfig | 4 ++
drivers/base/Makefile | 1 +
drivers/base/soc.c | 88 +++++++++++++++++++++++++++++++++++++++++++++++
include/linux/sys_soc.h | 33 +++++++++++++++++
4 files changed, 126 insertions(+), 0 deletions(-)
create mode 100644 drivers/base/soc.c
create mode 100644 include/linux/sys_soc.h

diff --git a/drivers/base/Kconfig b/drivers/base/Kconfig
index d57e8d0..4f2b56d 100644
--- a/drivers/base/Kconfig
+++ b/drivers/base/Kconfig
@@ -168,4 +168,8 @@ config SYS_HYPERVISOR
bool
default n

+config SYS_SOC
+ bool "Export SoC specific informations"
+ depends on EMBEDDED
+
endmenu
diff --git a/drivers/base/Makefile b/drivers/base/Makefile
index 5f51c3b..f3bcfb3 100644
--- a/drivers/base/Makefile
+++ b/drivers/base/Makefile
@@ -18,6 +18,7 @@ ifeq ($(CONFIG_SYSFS),y)
obj-$(CONFIG_MODULES) += module.o
endif
obj-$(CONFIG_SYS_HYPERVISOR) += hypervisor.o
+obj-$(CONFIG_SYS_SOC) += soc.o

ccflags-$(CONFIG_DEBUG_DRIVER) := -DDEBUG

diff --git a/drivers/base/soc.c b/drivers/base/soc.c
new file mode 100644
index 0000000..6fa538b
--- /dev/null
+++ b/drivers/base/soc.c
@@ -0,0 +1,88 @@
+/*
+ * Copyright (C) ST-Ericsson SA 2011
+ * Author: Maxime Coquelin <[email protected]> for ST-Ericsson.
+ * License terms: GNU General Public License (GPL), version 2
+ */
+
+#include <linux/sysdev.h>
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/stat.h>
+#include <linux/slab.h>
+#include <linux/sys_soc.h>
+
+static struct sysdev_class_attribute *soc_default_attrs[];
+
+struct sys_soc {
+ char *mach_name;
+ struct sysdev_class class;
+};
+
+struct sys_soc soc = {
+ .class = {
+ .name = "soc",
+ .attrs = soc_default_attrs,
+ },
+};
+
+static ssize_t show_mach_name(struct sysdev_class *class,
+ struct sysdev_class_attribute *attr, char *buf)
+{
+ return sprintf(buf, "%s\n", soc.mach_name);
+}
+static SYSDEV_CLASS_ATTR(mach_name, S_IRUGO, show_mach_name, NULL);
+
+static ssize_t show_info(struct sysdev_class *class,
+ struct sysdev_class_attribute *attr, char *buf)
+{
+ struct sys_soc_info *si = container_of(attr,
+ struct sys_soc_info, attr);
+
+ if (si->info)
+ return sprintf(buf, "%s\n", si->info);
+ else if (si->get_info)
+ return sprintf(buf, "%s\n", si->get_info(si));
+ else
+ return sprintf(buf, "No data\n");
+}
+
+void __init register_sys_soc_info(struct sys_soc_info *info, int nb_info)
+{
+ int i;
+
+ for (i = 0; i < nb_info; i++) {
+ info[i].attr.attr.name = info[i].name;
+ info[i].attr.attr.mode = S_IRUGO;
+ info[i].attr.show = show_info;
+
+ sysdev_class_create_file(&soc.class, &info[i].attr);
+ }
+}
+
+void __init register_sys_soc(char *name, struct sys_soc_info *info, int num)
+{
+ int len;
+
+ len = strlen(name);
+ soc.mach_name = kzalloc(len + 1, GFP_KERNEL);
+ if (!soc.mach_name)
+ return;
+
+ sprintf(soc.mach_name, "%s", name);
+
+ if (sysdev_class_register(&soc.class)) {
+ kfree(soc.mach_name);
+ return;
+ }
+
+ register_sys_soc_info(info, num);
+}
+
+/*
+ * Common attributes for all platforms.
+ * Only machine name for now
+ */
+static struct sysdev_class_attribute *soc_default_attrs[] = {
+ &attr_mach_name,
+ NULL
+};
diff --git a/include/linux/sys_soc.h b/include/linux/sys_soc.h
new file mode 100644
index 0000000..b91a924
--- /dev/null
+++ b/include/linux/sys_soc.h
@@ -0,0 +1,33 @@
+/*
+ * Copyright (C) ST-Ericsson SA 2011
+ * Author: Maxime Coquelin <[email protected]> for ST-Ericsson.
+ * License terms: GNU General Public License (GPL), version 2
+ */
+#ifndef __SYS_SOC_H
+#define __SYS_SOC_H
+
+#include <linux/sysdev.h>
+
+/**
+ * struct sys_soc_info - SoC exports related informations
+ * @name: name of the export
+ * @info: pointer on the key to export
+ * @get_info: callback to retrieve key if info field is NULL
+ * @attr: export's sysdev class attribute
+ */
+struct sys_soc_info {
+ char *name;
+ char *info;
+ char *(*get_info)(struct sys_soc_info *);
+ struct sysdev_class_attribute attr;
+};
+
+/**
+ * void register_sys_soc(char *name, struct sys_soc_info *, int num)
+ * @name: name of the machine
+ * @info: pointer on the info table to export
+ * @num: number of info to export
+ */
+void register_sys_soc(char *name, struct sys_soc_info *info, int num);
+
+#endif /* __SYS_SOC_H */
--
1.7.1

2011-03-09 17:28:00

by Maxime Coquelin

[permalink] [raw]
Subject: [RFC PATCHv1 2/2] ux500: Export U8500 SoC info through sysfs

ST-Ericsson's U8500 implementation.
Register sysfs SoC interface, and export SoC ID, process and silicon revision
number.

Signed-off-by: Maxime COQUELIN <[email protected]>
---
arch/arm/mach-ux500/id.c | 96 ++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 96 insertions(+), 0 deletions(-)

diff --git a/arch/arm/mach-ux500/id.c b/arch/arm/mach-ux500/id.c
index d35122e..0d41c77 100644
--- a/arch/arm/mach-ux500/id.c
+++ b/arch/arm/mach-ux500/id.c
@@ -8,6 +8,8 @@
#include <linux/kernel.h>
#include <linux/init.h>
#include <linux/io.h>
+#include <linux/sys_soc.h>
+#include <linux/slab.h>

#include <asm/cputype.h>
#include <asm/tlbflush.h>
@@ -105,3 +107,97 @@ void __init ux500_map_io(void)

ux500_print_soc_info(asicid);
}
+
+
+#ifdef CONFIG_SYS_SOC
+#define U8500_BB_UID_BASE (U8500_BACKUPRAM1_BASE + 0xFC0)
+#define U8500_BB_UID_LENGTH 5
+
+#define UX500_SOC_INFO_SZ 64
+
+static char soc_id[UX500_SOC_INFO_SZ];
+static char revision[UX500_SOC_INFO_SZ];
+static char process[UX500_SOC_INFO_SZ];
+
+static char *ux500_get_soc_id(struct sys_soc_info *si)
+{
+ void __iomem *uid_base = __io_address(U8500_BB_UID_BASE);
+ int i, sz = 0;
+
+ if (dbx500_partnumber() == 0x8500) {
+ for (i = 0; i < U8500_BB_UID_LENGTH; i++)
+ sz += snprintf(soc_id + sz, UX500_SOC_INFO_SZ - sz, "%08x",
+ readl(uid_base + i * sizeof(u32)));
+ }
+ else {
+ /* Don't know where it is located for U5500 */
+ sprintf(soc_id, "N/A");
+ }
+
+ /*
+ * As this key will never change, no need to read it anymore.
+ */
+ si->info = soc_id;
+ return soc_id;
+}
+
+static char *ux500_get_revision(struct sys_soc_info *si)
+{
+ unsigned int rev = dbx500_revision();
+
+ if (rev == 0x01)
+ sprintf(revision, "%s", "ED");
+ else if (rev >= 0xA0)
+ sprintf(revision, "%d.%d" , (rev >> 4) - 0xA + 1, rev & 0xf);
+ else
+ sprintf(revision, "%s", "Unknown");
+
+ /*
+ * As this key will never change, no need to read it anymore.
+ */
+ si->info = revision;
+ return revision;
+}
+
+static char *ux500_get_process(struct sys_soc_info *si)
+{
+ if (dbx500_id.process == 0x00)
+ sprintf(process, "Standard");
+ else
+ sprintf(process, "%02xnm", dbx500_id.process);
+
+ /*
+ * As this key will never change, no need to read it anymore.
+ */
+ si->info = process;
+ return process;
+}
+
+static struct sys_soc_info soc_info[] = {
+ [0] = {
+ .name = "soc_id",
+ .get_info = ux500_get_soc_id,
+ },
+ [1] = {
+ .name = "revision",
+ .get_info = ux500_get_revision,
+ },
+ [2] = {
+ .name = "process",
+ .get_info = ux500_get_process,
+ },
+};
+
+static int __init ux500_sys_soc_init(void)
+{
+ char part_number[8];
+
+ sprintf(part_number, "DB%4x", dbx500_partnumber());
+ register_sys_soc(part_number, soc_info, ARRAY_SIZE(soc_info));
+
+ return 0;
+}
+
+module_init(ux500_sys_soc_init);
+#endif
+
--
1.7.1