* [PATCH 01/34] System Firmware Interface
[not found] <1310994528-26276-1-git-send-email-prarit@redhat.com>
@ 2011-07-18 13:08 ` Prarit Bhargava
[not found] ` <1310994528-26276-2-git-send-email-prarit-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
[not found] ` <1310994528-26276-1-git-send-email-prarit-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
` (3 subsequent siblings)
4 siblings, 1 reply; 7+ messages in thread
From: Prarit Bhargava @ 2011-07-18 13:08 UTC (permalink / raw)
To: linux-kernel
Cc: linux-ia64, linux-pci, dri-devel, platform-driver-x86,
grant.likely, linux-ide, linux-i2c, device-drivers-devel, abelay,
Prarit Bhargava, eric.piel, x86, lm-sensors, linux-acpi,
linux-input, linux-media, johnpol, linux-watchdog, rtc-linux, dz,
openipmi-developer, evel, netdev, linux-usb, rpurdie,
linux-crypto
This patch introduces a general System Firmware interface to the kernel, called
sysfw.
Inlcluded in this interface is the ability to search a standard set of fields,
sysfw_lookup(). The fields are currently based upon the x86 and ia64 SMBIOS
fields but exapandable to fields that other arches may introduce. Also
included is the ability to search and match against those fields, and run
a callback function against the matches, sysfw_callback().
Modify module code to use sysfw instead of old DMI interface.
[v2]: Modified sysfw_id to include up to 8 matches. Almost all declarations of
sysfw_id are __init so the increased kernel image size isn't a big issue.
[v3]: Use sysfs bus instead of class, restore existing dmi class for backwards
compatibility.
Cc: linux-ia64@vger.kernel.org
Cc: x86@kernel.org
Cc: linux-acpi@vger.kernel.org
Cc: linux-ide@vger.kernel.org
Cc: openipmi-developer@lists.sourceforge.net
Cc: platform-driver-x86@vger.kernel.org
Cc: linux-crypto@vger.kernel.org
Cc: dri-devel@lists.freedesktop.org
Cc: lm-sensors@lm-sensors.org
Cc: linux-i2c@vger.kernel.org
Cc: linux-ide@vger.kernel.org
Cc: linux-input@vger.kernel.org
Cc: linux-media@vger.kernel.org
Cc: netdev@vger.kernel.org
Cc: linux-pci@vger.kernel.org
Cc: rtc-linux@googlegroups.com
Cc: evel@driverdev.osuosl.org
Cc: linux-usb@vger.kernel.org
Cc: device-drivers-devel@blackfin.uclinux.org
Cc: linux-watchdog@vger.kernel.org
Cc: grant.likely@secretlab.ca
Cc: dz@debian.org
Cc: rpurdie@rpsys.net
Cc: eric.piel@tremplin-utc.net
Cc: abelay@mit.edu
Cc: johnpol@2ka.mipt.ru
Signed-off-by: Prarit Bhargava <prarit@redhat.com>
---
drivers/firmware/Kconfig | 25 +++
drivers/firmware/Makefile | 3 +-
drivers/firmware/sysfw-sysfs.c | 306 +++++++++++++++++++++++++++++++++++++++
drivers/firmware/sysfw.c | 168 +++++++++++++++++++++
include/linux/mod_devicetable.h | 62 ++++++++
include/linux/sysfw.h | 113 ++++++++++++++
init/main.c | 3 +
scripts/mod/file2alias.c | 52 ++++----
8 files changed, 705 insertions(+), 27 deletions(-)
create mode 100644 drivers/firmware/sysfw-sysfs.c
create mode 100644 drivers/firmware/sysfw.c
create mode 100644 include/linux/sysfw.h
diff --git a/drivers/firmware/Kconfig b/drivers/firmware/Kconfig
index efba163..79a1b9d 100644
--- a/drivers/firmware/Kconfig
+++ b/drivers/firmware/Kconfig
@@ -157,6 +157,31 @@ config SIGMA
If unsure, say N here. Drivers that need these helpers will select
this option automatically.
+config SYSTEM_FIRMWARE
+ bool "System Firmware Interface"
+ default y
+ help
+ Enables common System Firmware Interface to export system firmware
+ (SMBIOS, DMI, etc.) information to kernel and userspace.
+
+config SYSTEM_FIRMWARE_SYSFS
+ bool "Export System Firmware identification via sysfs to userspace"
+ depends on SYSTEM_FIRMWARE
+ help
+ Say Y here if you want to query system identification information
+ from userspace through /sys/class/sysfw/id/ or if you want
+ system firmware (sysfw) based module auto-loading.
+
+config SYSTEM_FIRMWARE_DMI_COMPAT
+ bool "Export dmi compatibility class in sysfs"
+ depends on SYSTEM_FIRMWARE
+ default y
+ help
+ This exposes /sys/class/dmi/* as a pointer to the sysfw class for
+ old software. This is purely a backwards compatability feature and
+ should not be used in new user space software. Please see
+ Documentation/ABI for details.
+
source "drivers/firmware/google/Kconfig"
endmenu
diff --git a/drivers/firmware/Makefile b/drivers/firmware/Makefile
index 47338c9..41bc64a 100644
--- a/drivers/firmware/Makefile
+++ b/drivers/firmware/Makefile
@@ -13,5 +13,6 @@ obj-$(CONFIG_ISCSI_IBFT_FIND) += iscsi_ibft_find.o
obj-$(CONFIG_ISCSI_IBFT) += iscsi_ibft.o
obj-$(CONFIG_FIRMWARE_MEMMAP) += memmap.o
obj-$(CONFIG_SIGMA) += sigma.o
-
obj-$(CONFIG_GOOGLE_FIRMWARE) += google/
+obj-$(CONFIG_SYSTEM_FIRMWARE) += sysfw.o
+obj-$(CONFIG_SYSTEM_FIRMWARE_SYSFS) += sysfw-sysfs.o
diff --git a/drivers/firmware/sysfw-sysfs.c b/drivers/firmware/sysfw-sysfs.c
new file mode 100644
index 0000000..48d7d07
--- /dev/null
+++ b/drivers/firmware/sysfw-sysfs.c
@@ -0,0 +1,306 @@
+/*
+ * Export sysfs sysfw_field's to userspace
+ *
+ * Updated 2011, Prarit Bhargava, prarit@redhat.com
+ * Copyright 2007, Lennart Poettering
+ *
+ * Licensed under GPLv2
+ */
+
+#include <linux/module.h>
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/sysfw.h>
+#include <linux/device.h>
+#include <linux/slab.h>
+#include <linux/sysfw.h>
+
+struct sysfw_device_attribute {
+ struct device_attribute dev_attr;
+ int field;
+};
+#define to_sysfw_dev_attr(_dev_attr) \
+ container_of(_dev_attr, struct sysfw_device_attribute, dev_attr)
+
+static ssize_t sys_sysfw_field_show(struct device *dev,
+ struct device_attribute *attr,
+ char *page)
+{
+ int field = to_sysfw_dev_attr(attr)->field;
+ ssize_t len;
+ len = scnprintf(page, PAGE_SIZE, "%s\n", sysfw_lookup(field));
+ page[len-1] = '\n';
+ return len;
+}
+
+#define SYSFW_ATTR(_name, _mode, _show, _field) \
+ { .dev_attr = __ATTR(_name, _mode, _show, NULL), \
+ .field = _field }
+
+#define DEFINE_SYSFW_ATTR_WITH_SHOW(_name, _mode, _field) \
+static struct sysfw_device_attribute sys_sysfw_##_name##_attr = \
+ SYSFW_ATTR(_name, _mode, sys_sysfw_field_show, _field);
+
+DEFINE_SYSFW_ATTR_WITH_SHOW(bios_vendor, 0444, SYSFW_BIOS_VENDOR);
+DEFINE_SYSFW_ATTR_WITH_SHOW(bios_version, 0444, SYSFW_BIOS_VERSION);
+DEFINE_SYSFW_ATTR_WITH_SHOW(bios_date, 0444, SYSFW_BIOS_DATE);
+DEFINE_SYSFW_ATTR_WITH_SHOW(sys_vendor, 0444, SYSFW_SYS_VENDOR);
+DEFINE_SYSFW_ATTR_WITH_SHOW(product_name, 0444, SYSFW_PRODUCT_NAME);
+DEFINE_SYSFW_ATTR_WITH_SHOW(product_version, 0444, SYSFW_PRODUCT_VERSION);
+DEFINE_SYSFW_ATTR_WITH_SHOW(product_serial, 0400, SYSFW_PRODUCT_SERIAL);
+DEFINE_SYSFW_ATTR_WITH_SHOW(product_uuid, 0400, SYSFW_PRODUCT_UUID);
+DEFINE_SYSFW_ATTR_WITH_SHOW(board_vendor, 0444, SYSFW_BOARD_VENDOR);
+DEFINE_SYSFW_ATTR_WITH_SHOW(board_name, 0444, SYSFW_BOARD_NAME);
+DEFINE_SYSFW_ATTR_WITH_SHOW(board_version, 0444, SYSFW_BOARD_VERSION);
+DEFINE_SYSFW_ATTR_WITH_SHOW(board_serial, 0400, SYSFW_BOARD_SERIAL);
+DEFINE_SYSFW_ATTR_WITH_SHOW(board_asset_tag, 0444, SYSFW_BOARD_ASSET_TAG);
+DEFINE_SYSFW_ATTR_WITH_SHOW(chassis_vendor, 0444, SYSFW_CHASSIS_VENDOR);
+DEFINE_SYSFW_ATTR_WITH_SHOW(chassis_type, 0444, SYSFW_CHASSIS_TYPE);
+DEFINE_SYSFW_ATTR_WITH_SHOW(chassis_version, 0444, SYSFW_CHASSIS_VERSION);
+DEFINE_SYSFW_ATTR_WITH_SHOW(chassis_serial, 0400, SYSFW_CHASSIS_SERIAL);
+DEFINE_SYSFW_ATTR_WITH_SHOW(chassis_asset_tag, 0444, SYSFW_CHASSIS_ASSET_TAG);
+
+static void ascii_filter(char *d, const char *s)
+{
+ /* Filter out characters we don't want to see in the modalias string */
+ for (; *s; s++)
+ if (*s > ' ' && *s < 127 && *s != ':')
+ *(d++) = *s;
+
+ *d = 0;
+}
+
+static ssize_t get_modalias(char *buffer, size_t buffer_size,
+ struct device *dev)
+{
+ static const struct mafield {
+ const char *prefix;
+ int field;
+ } fields[] = {
+ { "bvn", SYSFW_BIOS_VENDOR },
+ { "bvr", SYSFW_BIOS_VERSION },
+ { "bd", SYSFW_BIOS_DATE },
+ { "svn", SYSFW_SYS_VENDOR },
+ { "pn", SYSFW_PRODUCT_NAME },
+ { "pvr", SYSFW_PRODUCT_VERSION },
+ { "rvn", SYSFW_BOARD_VENDOR },
+ { "rn", SYSFW_BOARD_NAME },
+ { "rvr", SYSFW_BOARD_VERSION },
+ { "cvn", SYSFW_CHASSIS_VENDOR },
+ { "ct", SYSFW_CHASSIS_TYPE },
+ { "cvr", SYSFW_CHASSIS_VERSION },
+ { NULL, SYSFW_NONE }
+ };
+ ssize_t l, left;
+ char *p;
+ const struct mafield *f;
+ const char *name = dev_name(dev);
+
+ left = buffer_size;
+ p = buffer;
+ name = dev_name(dev);
+ if (!strncmp(dev_name(dev), "sysfw", 5)) {
+ strcpy(buffer, "sysfw");
+ p += 5;
+ left -= 6;
+ }
+#ifdef CONFIG_SYSTEM_FIRMWARE_DMI_COMPAT
+ if (!strncmp(dev_name(dev), "id", 2)) { /* old dmi */
+ strcpy(buffer, "dmi");
+ p += 3;
+ left -= 4;
+ }
+#endif
+
+ for (f = fields; f->prefix && left > 0; f++) {
+ const char *c;
+ char *t;
+
+ c = sysfw_lookup(f->field);
+ if (!c)
+ continue;
+
+ t = kmalloc(strlen(c) + 1, GFP_KERNEL);
+ if (!t)
+ break;
+ ascii_filter(t, c);
+ l = scnprintf(p, left, ":%s%s", f->prefix, t);
+ kfree(t);
+
+ p += l;
+ left -= l;
+ }
+
+ p[0] = ':';
+ p[1] = 0;
+
+ return p - buffer + 1;
+}
+
+static ssize_t sys_sysfw_modalias_show(struct device *dev,
+ struct device_attribute *attr,
+ char *page)
+{
+ ssize_t r;
+ r = get_modalias(page, PAGE_SIZE-1, dev);
+ page[r] = '\n';
+ page[r+1] = 0;
+ return r+1;
+}
+
+static struct device_attribute sys_sysfw_modalias_attr =
+ __ATTR(modalias, 0444, sys_sysfw_modalias_show, NULL);
+
+static struct attribute *sys_sysfw_attributes[SYSFW_STRING_MAX+2];
+
+static struct attribute_group sys_sysfw_attribute_group = {
+ .attrs = sys_sysfw_attributes,
+};
+
+static const struct attribute_group *sys_sysfw_attribute_groups[] = {
+ &sys_sysfw_attribute_group,
+ NULL
+};
+
+static void sys_sysfw_release(struct device *dev)
+{
+ /* nothing to do */
+ return;
+}
+
+static struct device_type sysfw_type = {
+ .groups = sys_sysfw_attribute_groups,
+ .release = sys_sysfw_release,
+};
+
+/* Initialization */
+
+#define ADD_SYSFW_ATTR(_name, _field) \
+ if (sysfw_lookup(_field)) \
+ sys_sysfw_attributes[i++] = \
+ &sys_sysfw_##_name##_attr.dev_attr.attr;
+
+/* In a separate function to keep gcc 3.2 happy - do NOT merge this in
+ sysfw_bus_init! */
+static void __init sysfw_id_init_attr_table(void)
+{
+ int i;
+
+ /* Not necessarily all SYSFW fields are available on all
+ * systems, hence let's built an attribute table of just
+ * what's available */
+ i = 0;
+ ADD_SYSFW_ATTR(bios_vendor, SYSFW_BIOS_VENDOR);
+ ADD_SYSFW_ATTR(bios_version, SYSFW_BIOS_VERSION);
+ ADD_SYSFW_ATTR(bios_date, SYSFW_BIOS_DATE);
+ ADD_SYSFW_ATTR(sys_vendor, SYSFW_SYS_VENDOR);
+ ADD_SYSFW_ATTR(product_name, SYSFW_PRODUCT_NAME);
+ ADD_SYSFW_ATTR(product_version, SYSFW_PRODUCT_VERSION);
+ ADD_SYSFW_ATTR(product_serial, SYSFW_PRODUCT_SERIAL);
+ ADD_SYSFW_ATTR(product_uuid, SYSFW_PRODUCT_UUID);
+ ADD_SYSFW_ATTR(board_vendor, SYSFW_BOARD_VENDOR);
+ ADD_SYSFW_ATTR(board_name, SYSFW_BOARD_NAME);
+ ADD_SYSFW_ATTR(board_version, SYSFW_BOARD_VERSION);
+ ADD_SYSFW_ATTR(board_serial, SYSFW_BOARD_SERIAL);
+ ADD_SYSFW_ATTR(board_asset_tag, SYSFW_BOARD_ASSET_TAG);
+ ADD_SYSFW_ATTR(chassis_vendor, SYSFW_CHASSIS_VENDOR);
+ ADD_SYSFW_ATTR(chassis_type, SYSFW_CHASSIS_TYPE);
+ ADD_SYSFW_ATTR(chassis_version, SYSFW_CHASSIS_VERSION);
+ ADD_SYSFW_ATTR(chassis_serial, SYSFW_CHASSIS_SERIAL);
+ ADD_SYSFW_ATTR(chassis_asset_tag, SYSFW_CHASSIS_ASSET_TAG);
+ sys_sysfw_attributes[i++] = &sys_sysfw_modalias_attr.attr;
+}
+
+static int sysfw_dev_uevent(struct device *dev, struct kobj_uevent_env *env)
+{
+ ssize_t len;
+
+ if (add_uevent_var(env, "MODALIAS="))
+ return -ENOMEM;
+ len = get_modalias(&env->buf[env->buflen - 1],
+ sizeof(env->buf) - env->buflen, dev);
+ if (len >= (sizeof(env->buf) - env->buflen))
+ return -ENOMEM;
+ env->buflen += len;
+ return 0;
+}
+
+#ifdef CONFIG_SYSTEM_FIRMWARE_DMI_COMPAT
+/* Hopefully someday we can get rid of this. */
+static struct class dmi_class = {
+ .name = "dmi",
+ .dev_release = (void(*)(struct device *)) kfree,
+ .dev_uevent = sysfw_dev_uevent,
+};
+
+static struct device dmi_dev = {
+ .class = &dmi_class,
+ .groups = sys_sysfw_attribute_groups,
+};
+
+static int __init sysfw_legacy_dmi(void)
+{
+ int ret;
+
+ ret = class_register(&dmi_class);
+ if (ret)
+ return ret;
+
+ dev_set_name(&dmi_dev, "id");
+ ret = device_register(&dmi_dev);
+ return ret;
+}
+#else
+static int __init sysfw_legacy_dmi(void)
+{
+ return 0;
+}
+#endif
+
+static int sysfw_bus_match(struct device *dev, struct device_driver *drv)
+{
+ return 1;
+}
+
+struct bus_type sysfw_bus_type = {
+ .name = "sysfw",
+ .match = sysfw_bus_match,
+ .uevent = sysfw_dev_uevent,
+};
+
+static struct device sysfw_dev = {
+ .bus = &sysfw_bus_type,
+ .type = &sysfw_type,
+};
+
+void sysfw_sysfs_device_init(const char *name)
+{
+ if (!dev_name(&sysfw_dev))
+ dev_set_name(&sysfw_dev, name);
+}
+
+static int __init sysfw_bus_init(void)
+{
+ int ret;
+
+ sysfw_id_init_attr_table();
+
+ ret = bus_register(&sysfw_bus_type);
+ if (ret)
+ return ret;
+
+ ret = device_register(&sysfw_dev);
+ if (ret) {
+ bus_unregister(&sysfw_bus_type);
+ }
+ return ret;
+
+ /* Failing to setup legacy DMI is NOT a fatal error */
+ ret = sysfw_legacy_dmi();
+ if (ret)
+ printk(KERN_ERR "SYSFW: DMI Legacy sysfs did not "
+ "initialize.\n");
+
+ return 0;
+}
+arch_initcall(sysfw_bus_init);
diff --git a/drivers/firmware/sysfw.c b/drivers/firmware/sysfw.c
new file mode 100644
index 0000000..c37e19e
--- /dev/null
+++ b/drivers/firmware/sysfw.c
@@ -0,0 +1,168 @@
+/*
+ * System Firmware (sysfw) support
+ *
+ * started by Prarit Bhargava, Copyright (C) 2011 Red Hat, Inc.
+ *
+ * SYSFW interface to export commonly used values from System Firmware
+ *
+ * Some bits copied directly from original x86 and ia64 dmi*.c files
+ */
+#include <linux/device.h>
+#include <linux/errno.h>
+#include <linux/init.h>
+#include <linux/kernel.h>
+#include <linux/mod_devicetable.h>
+#include <linux/slab.h>
+#include <linux/sysfw.h>
+
+/* Global sysfw instance */
+static struct sysfw_driver *sysfw;
+
+/**
+ * sysfw_driver_register - register a firmware driver
+ * @driver: sysfw_driver struct representing driver to register
+ *
+ * This function registers a sysfw driver. Since the FW exists for the
+ * lifetime of the system there is no need for an unregister function.
+ */
+int __init sysfw_driver_register(struct sysfw_driver *driver)
+{
+ int ret;
+
+ if (!driver->init || !driver->name) {
+ WARN(1, "System Firmware Interface: driver error\n");
+ return -EFAULT;
+ }
+
+ if (sysfw) {
+ WARN(1, "System Firmware Interface: already registered\n");
+ return -EBUSY;
+ }
+
+ sysfw = driver;
+ ret = sysfw->init();
+ if (ret)
+ return -ENODEV;
+
+ return 0;
+}
+
+/* called in start_kernel(), after memory management has been initialized. */
+void __init sysfw_init_late(void)
+{
+ if (sysfw && sysfw->late)
+ sysfw->late();
+ sysfw_sysfs_device_init(sysfw->name);
+}
+
+/**
+ * sysfw_lookup - find a sysfw value for a given field.
+ * @field: field to lookup
+ *
+ * This function calls into the system firmware and returns an appropriate
+ * string.
+ */
+const char *sysfw_lookup(int field)
+{
+ if (sysfw && sysfw->lookup)
+ return sysfw->lookup(field);
+ return NULL;
+}
+EXPORT_SYMBOL_GPL(sysfw_lookup);
+
+/**
+ * sysfw_vendor_is - checks to see if the vendor fields in the firmware
+ * contain a string
+ * @str: string to search for
+ *
+ * Returns true/false if the string is in any of the SYSFW_*VENDOR* fields.
+ */
+bool sysfw_vendor_is(const char *str)
+{
+ static int fields[] = { SYSFW_BIOS_VENDOR, SYSFW_BIOS_VERSION,
+ SYSFW_SYS_VENDOR, SYSFW_PRODUCT_NAME,
+ SYSFW_PRODUCT_VERSION, SYSFW_BOARD_VENDOR,
+ SYSFW_BOARD_NAME, SYSFW_BOARD_VERSION,
+ SYSFW_NONE };
+ int i;
+
+ if (!sysfw)
+ return false;
+
+ if (!sysfw->lookup)
+ return false;
+
+ for (i = 0; fields[i] != SYSFW_NONE; i++) {
+ if (sysfw_lookup(i) && strstr(sysfw_lookup(i), str))
+ return true;
+ }
+ return false;
+}
+EXPORT_SYMBOL(sysfw_vendor_is);
+
+/**
+ * sysfw_get_date - returns the date of the firmware in YYYYMMDD format.
+ *
+ * Retuns the date the firmware was built in YYYYMMDD for easy comparisons.
+ */
+int sysfw_get_date(void)
+{
+ if (sysfw && sysfw->date)
+ return sysfw->date();
+ return 0;
+}
+EXPORT_SYMBOL(sysfw_get_date);
+
+/* compares and matches the strings in sysfw_id */
+static bool sysfw_match_fields(const struct sysfw_id *id, int exactmatch)
+{
+ int i;
+
+ for (i = 0; i < ARRAY_SIZE(id->matches); i++) {
+ int s = id->matches[i].slot;
+ if (s == SYSFW_NONE)
+ break;
+ if (!sysfw_lookup(s))
+ continue;
+ if (exactmatch &&
+ !strcmp(sysfw_lookup(s), id->matches[i].substr))
+ continue;
+ if (!exactmatch &&
+ strstr(sysfw_lookup(s), id->matches[i].substr))
+ continue;
+ /* No match */
+ return false;
+ }
+ return true;
+}
+
+static bool sysfw_is_end_of_table(const struct sysfw_id *id)
+{
+ return id->matches[0].slot == SYSFW_NONE;
+}
+
+/**
+ * sysfw_callback - go through a list and run a function on all matching ids
+ * @list: list of ids to search
+ *
+ * This function takes a list of fields and strings to compare, attempts to
+ * compare the strings to the sysfw fields and runs a callback function for
+ * each positive comparison. The comparison can stop by returning 0 in
+ * the callback function.
+ */
+const struct sysfw_id *sysfw_callback(const struct sysfw_id *list)
+{
+ const struct sysfw_id *id;
+
+ if (!sysfw)
+ return NULL;
+
+ for (id = list; !sysfw_is_end_of_table(id); id++)
+ if (sysfw_match_fields(id, id->exactmatch)) {
+ if (id->callback)
+ id->callback(id);
+ return id;
+ }
+ return NULL;
+}
+EXPORT_SYMBOL(sysfw_callback);
diff --git a/include/linux/mod_devicetable.h b/include/linux/mod_devicetable.h
index ae28e93..89153ad 100644
--- a/include/linux/mod_devicetable.h
+++ b/include/linux/mod_devicetable.h
@@ -482,6 +482,68 @@ struct dmi_system_id {
#define DMI_MATCH(a, b) { a, b }
+/*
+ * sysfw field - right now these are based on x86/ia64's SMBIOS fields. But
+ * other arches are certainly welcome to add additional fields. The
+ * sys_lookup() functions must be careful to return NULL on non-populated
+ * fields.
+ */
+enum sysfw_field {
+ SYSFW_NONE,
+ SYSFW_BIOS_VENDOR,
+ SYSFW_BIOS_VERSION,
+ SYSFW_BIOS_DATE,
+ SYSFW_SYS_VENDOR,
+ SYSFW_PRODUCT_NAME,
+ SYSFW_PRODUCT_VERSION,
+ SYSFW_PRODUCT_SERIAL,
+ SYSFW_PRODUCT_UUID,
+ SYSFW_BOARD_VENDOR,
+ SYSFW_BOARD_NAME,
+ SYSFW_BOARD_VERSION,
+ SYSFW_BOARD_SERIAL,
+ SYSFW_BOARD_ASSET_TAG,
+ SYSFW_CHASSIS_VENDOR,
+ SYSFW_CHASSIS_TYPE,
+ SYSFW_CHASSIS_VERSION,
+ SYSFW_CHASSIS_SERIAL,
+ SYSFW_CHASSIS_ASSET_TAG,
+ SYSFW_STRING_MAX,
+};
+
+struct sysfw_strmatch {
+ unsigned char slot;
+ char substr[79];
+};
+
+#ifndef __KERNEL__
+struct sysfw_id {
+ kernel_ulong_t callback;
+ kernel_ulong_t ident;
+ struct sysfw_strmatch matches[8];
+ kernel_ulong_t driver_data
+ __attribute__((aligned(sizeof(kernel_ulong_t))));
+ kernel_ulong_t exactmatch;
+};
+#else
+struct sysfw_id {
+ int (*callback)(const struct sysfw_id *);
+ const char *ident;
+ struct sysfw_strmatch matches[8];
+ void *driver_data;
+ kernel_ulong_t exactmatch;
+};
+/*
+ * struct sysfw_device_id appears during expansion of
+ * "MODULE_DEVICE_TABLE(sysfw, x)". Compiler doesn't look inside it
+ * but this is enough for gcc 3.4.6 to error out:
+ * error: storage size of '__mod_sysfw_device_table' isn't known
+ */
+#define sysfw_device_id sysfw_system_id
+#endif
+
+#define SYSFW_MATCH(a, b) { a, b }
+
#define PLATFORM_NAME_SIZE 20
#define PLATFORM_MODULE_PREFIX "platform:"
diff --git a/include/linux/sysfw.h b/include/linux/sysfw.h
new file mode 100644
index 0000000..8dcb674
--- /dev/null
+++ b/include/linux/sysfw.h
@@ -0,0 +1,113 @@
+/*
+ * include/linux/sysfw.h
+ *
+ * System Firmware (sysfw) Interface
+ */
+#ifndef _SYSFW_H
+#define _SYSFW_H
+
+#include <linux/mod_devicetable.h>
+
+/*
+ * sysfw_id and sysfw_field (the SYSFW_*) enums are defined in
+ * mod_devicetable.h
+ */
+
+/*
+ * sysfw_driver struct -- passed in to sysfw_init() by every firmware
+ * driver
+ */
+struct sysfw_driver {
+ const char *name;
+ /* find & evaluate firmware */
+ int (*init)(void);
+ /* late init, done after memory management is initialized */
+ int (*late)(void);
+ /* find a specific value in sysfw_field */
+ const char * (*lookup)(int field);
+ /* return date in YYYYMMDD format */
+ int (*date)(void);
+};
+
+#ifdef CONFIG_SYSTEM_FIRMWARE
+/**
+ * sysfw_driver_register - register a firmware driver
+ * @driver: sysfw_driver struct representing driver to register
+ *
+ * This function registers a sysfw driver. Since the FW exists for the
+ * lifetime of the system there is no need for an unregister function.
+ */
+extern int sysfw_driver_register(struct sysfw_driver *driver);
+
+/**
+ * sysfw_lookup - find a sysfw value for a given field.
+ * @field: field to lookup
+ *
+ * This function calls into the system firmware and returns an appropriate
+ * string.
+ */
+extern const char *sysfw_lookup(int field);
+
+/**
+ * sysfw_get_date - returns the date of the firmware in YYYYMMDD format.
+ *
+ * Retuns the date the firmware was built in YYYYMMDD for easy comparisons.
+ */
+extern int sysfw_get_date(void);
+
+/**
+ * sysfw_vendor_is - checks to see if the vendor fields in the firmware
+ * contain a string
+ * @str: string to search for
+ *
+ * Returns true/false if the string is in any of the SYSFW_*VENDOR* fields.
+ */
+extern bool sysfw_vendor_is(const char *str);
+
+/**
+ * sysfw_callback - go through a list and run a function on all matching ids
+ * @list: list of ids to search
+ *
+ * This function takes a list of fields and strings to compare, attempts to
+ * compare the strings to the sysfw fields and runs a callback function for
+ * each positive comparison. The comparison can stop by returning 0 in
+ * the callback function. The function returns the first match in the list.
+ */
+extern const struct sysfw_id *sysfw_callback(const struct sysfw_id *list);
+
+/* Kernel internal only, run after memory management has been initialized */
+extern void sysfw_init_late(void);
+/* Kernel internal only, init's sysfs for the sysfw device */
+extern void sysfw_sysfs_device_init(const char *name);
+
+#else /* CONFIG_SYSTEM_FIRMWARE */
+
+static inline int sysfw_driver_register(struct sysfw_driver *driver)
+{
+ return -1;
+}
+static inline const char *sysfw_lookup(int field)
+{
+ return NULL;
+}
+static inline int sysfw_get_date(void)
+{
+ return 0;
+}
+static inline bool sysfw_vendor_is(const char *str)
+{
+ return false;
+}
+static const struct sysfw_id *sysfw_callback(const struct sysfw_id *list)
+{
+ return NULL;
+}
+static inline void sysfw_init_late(void)
+{
+ return;
+}
+#endif /* CONFIG_SYSTEM_FIRMWARE */
+
+#define sysfw_vendor_contains(str) sysfw_vendor_is(str)
+
+#endif /* _SYSFW_H */
diff --git a/init/main.c b/init/main.c
index d7211fa..8b99aeb 100644
--- a/init/main.c
+++ b/init/main.c
@@ -68,6 +68,7 @@
#include <linux/shmem_fs.h>
#include <linux/slab.h>
#include <linux/perf_event.h>
+#include <linux/sysfw.h>
#include <asm/io.h>
#include <asm/bugs.h>
@@ -554,6 +555,8 @@ asmlinkage void __init start_kernel(void)
kmem_cache_init_late();
+ sysfw_init_late();
+
/*
* HACK ALERT! This is early. We're enabling the console before
* we've done PCI setups etc, and console_init() must be aware of
diff --git a/scripts/mod/file2alias.c b/scripts/mod/file2alias.c
index e26e2fb..92a27e3 100644
--- a/scripts/mod/file2alias.c
+++ b/scripts/mod/file2alias.c
@@ -753,26 +753,26 @@ static int do_spi_entry(const char *filename, struct spi_device_id *id,
return 1;
}
-static const struct dmifield {
+static const struct sysfwfield {
const char *prefix;
int field;
-} dmi_fields[] = {
- { "bvn", DMI_BIOS_VENDOR },
- { "bvr", DMI_BIOS_VERSION },
- { "bd", DMI_BIOS_DATE },
- { "svn", DMI_SYS_VENDOR },
- { "pn", DMI_PRODUCT_NAME },
- { "pvr", DMI_PRODUCT_VERSION },
- { "rvn", DMI_BOARD_VENDOR },
- { "rn", DMI_BOARD_NAME },
- { "rvr", DMI_BOARD_VERSION },
- { "cvn", DMI_CHASSIS_VENDOR },
- { "ct", DMI_CHASSIS_TYPE },
- { "cvr", DMI_CHASSIS_VERSION },
- { NULL, DMI_NONE }
+} sysfw_fields[] = {
+ { "bvn", SYSFW_BIOS_VENDOR },
+ { "bvr", SYSFW_BIOS_VERSION },
+ { "bd", SYSFW_BIOS_DATE },
+ { "svn", SYSFW_SYS_VENDOR },
+ { "pn", SYSFW_PRODUCT_NAME },
+ { "pvr", SYSFW_PRODUCT_VERSION },
+ { "rvn", SYSFW_BOARD_VENDOR },
+ { "rn", SYSFW_BOARD_NAME },
+ { "rvr", SYSFW_BOARD_VERSION },
+ { "cvn", SYSFW_CHASSIS_VENDOR },
+ { "ct", SYSFW_CHASSIS_TYPE },
+ { "cvr", SYSFW_CHASSIS_VERSION },
+ { NULL, SYSFW_NONE }
};
-static void dmi_ascii_filter(char *d, const char *s)
+static void sysfw_ascii_filter(char *d, const char *s)
{
/* Filter out characters we don't want to see in the modalias string */
for (; *s; s++)
@@ -783,20 +783,20 @@ static void dmi_ascii_filter(char *d, const char *s)
}
-static int do_dmi_entry(const char *filename, struct dmi_system_id *id,
- char *alias)
+static int do_sysfw_entry(const char *filename, struct sysfw_id *id,
+ char *alias)
{
int i, j;
- sprintf(alias, "dmi*");
+ sprintf(alias, "sysfw*");
- for (i = 0; i < ARRAY_SIZE(dmi_fields); i++) {
+ for (i = 0; i < ARRAY_SIZE(sysfw_fields); i++) {
for (j = 0; j < 4; j++) {
if (id->matches[j].slot &&
- id->matches[j].slot == dmi_fields[i].field) {
+ id->matches[j].slot == sysfw_fields[i].field) {
sprintf(alias + strlen(alias), ":%s*",
- dmi_fields[i].prefix);
- dmi_ascii_filter(alias + strlen(alias),
+ sysfw_fields[i].prefix);
+ sysfw_ascii_filter(alias + strlen(alias),
id->matches[j].substr);
strcat(alias, "*");
}
@@ -1002,10 +1002,10 @@ void handle_moddevtable(struct module *mod, struct elf_info *info,
do_table(symval, sym->st_size,
sizeof(struct spi_device_id), "spi",
do_spi_entry, mod);
- else if (sym_is(symname, "__mod_dmi_device_table"))
+ else if (sym_is(symname, "__mod_sysfw_device_table"))
do_table(symval, sym->st_size,
- sizeof(struct dmi_system_id), "dmi",
- do_dmi_entry, mod);
+ sizeof(struct sysfw_id), "sysfw",
+ do_sysfw_entry, mod);
else if (sym_is(symname, "__mod_platform_device_table"))
do_table(symval, sym->st_size,
sizeof(struct platform_device_id), "platform",
--
1.6.5.2
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH 02/34] New SMBIOS driver for x86 and ia64.
[not found] ` <1310994528-26276-1-git-send-email-prarit-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
@ 2011-07-18 13:08 ` Prarit Bhargava
0 siblings, 0 replies; 7+ messages in thread
From: Prarit Bhargava @ 2011-07-18 13:08 UTC (permalink / raw)
To: linux-kernel-u79uwXL29TY76Z2rM5mHXA
Cc: Prarit Bhargava, linux-ia64-u79uwXL29TY76Z2rM5mHXA,
x86-DgEjT+Ai2ygdnm+yROfE0A, linux-acpi-u79uwXL29TY76Z2rM5mHXA,
linux-ide-u79uwXL29TY76Z2rM5mHXA,
openipmi-developer-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f,
platform-driver-x86-u79uwXL29TY76Z2rM5mHXA,
linux-crypto-u79uwXL29TY76Z2rM5mHXA,
dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW,
lm-sensors-GZX6beZjE8VD60Wz+7aTrA,
linux-i2c-u79uwXL29TY76Z2rM5mHXA,
linux-input-u79uwXL29TY76Z2rM5mHXA,
linux-media-u79uwXL29TY76Z2rM5mHXA, netdev-u79uwXL29TY76Z2rM5mHXA,
linux-pci-u79uwXL29TY76Z2rM5mHXA,
rtc-linux-/JYPxA39Uh5TLH3MbocFFw,
evel-gWbeCf7V1WCQmaza687I9mD2FQJk+8+b,
linux-usb-u79uwXL29TY76Z2rM5mHXA,
device-drivers-devel-ZG0+EudsQA8dtHy/vicBwGD2FQJk+8+b,
linux-watchdog-u79uwXL29TY76Z2rM5mHXA,
grant.likely-s3s/WqlpOiPyB63q8FvJNQ, dz-8fiUuRrzOP0dnm+yROfE0A,
rpurdie-Fm38FmjxZ/leoWH0uzbU5w, eric.piel-VkQ1JFuSMpfAbQlEx87xDw,
abelay-3s7WtUTddSA, johnpol-9fLWQ3dKdXwox3rIn2DAYQ
This, along with the System Firmware (sysfw) interface replaces the existing
DMI code in the kernel.
This subsystem provides functionality for individual drivers to access
the SMBIOS structures for their own use, smbios_walk(), as well as some
helper functions for some kernel modules.
Cc: linux-ia64-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
Cc: x86-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org
Cc: linux-acpi-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
Cc: linux-ide-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
Cc: openipmi-developer-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f@public.gmane.org
Cc: platform-driver-x86-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
Cc: linux-crypto-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
Cc: dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org
Cc: lm-sensors-GZX6beZjE8VD60Wz+7aTrA@public.gmane.org
Cc: linux-i2c-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
Cc: linux-ide-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
Cc: linux-input-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
Cc: linux-media-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
Cc: netdev-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
Cc: linux-pci-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
Cc: rtc-linux-/JYPxA39Uh5TLH3MbocFFw@public.gmane.org
Cc: evel-gWbeCf7V1WCQmaza687I9mD2FQJk+8+b@public.gmane.org
Cc: linux-usb-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
Cc: device-drivers-devel-ZG0+EudsQA8dtHy/vicBwGD2FQJk+8+b@public.gmane.org
Cc: linux-watchdog-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
Cc: grant.likely-s3s/WqlpOiPyB63q8FvJNQ@public.gmane.org
Cc: dz-8fiUuRrzOP0dnm+yROfE0A@public.gmane.org
Cc: rpurdie-Fm38FmjxZ/leoWH0uzbU5w@public.gmane.org
Cc: eric.piel-VkQ1JFuSMpfAbQlEx87xDw@public.gmane.org
Cc: abelay-3s7WtUTddSA@public.gmane.org
Cc: johnpol-9fLWQ3dKdXwox3rIn2DAYQ@public.gmane.org
Signed-off-by: Prarit Bhargava <prarit-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
---
Documentation/ABI/obsolete/sysfs-dmi | 40 ++
Documentation/ABI/testing/sysfw-smbios | 36 ++
arch/ia64/Kconfig | 5 +
arch/ia64/include/asm/smbios.h | 12 +
arch/x86/Kconfig | 10 +
arch/x86/include/asm/smbios.h | 19 +
drivers/firmware/Kconfig | 20 +
drivers/firmware/Makefile | 2 +
drivers/firmware/smbios-sysfs.c | 705 ++++++++++++++++++++++++++++++++
drivers/firmware/smbios.c | 687 +++++++++++++++++++++++++++++++
include/linux/smbios.h | 243 +++++++++++
11 files changed, 1779 insertions(+), 0 deletions(-)
create mode 100644 Documentation/ABI/obsolete/sysfs-dmi
create mode 100644 Documentation/ABI/testing/sysfw-smbios
create mode 100644 arch/ia64/include/asm/smbios.h
create mode 100644 arch/x86/include/asm/smbios.h
create mode 100644 drivers/firmware/smbios-sysfs.c
create mode 100644 drivers/firmware/smbios.c
create mode 100644 include/linux/smbios.h
diff --git a/Documentation/ABI/obsolete/sysfs-dmi b/Documentation/ABI/obsolete/sysfs-dmi
new file mode 100644
index 0000000..547dc4b
--- /dev/null
+++ b/Documentation/ABI/obsolete/sysfs-dmi
@@ -0,0 +1,40 @@
+What: /sys/class/dmi
+Date: July 2011
+KernelVersion: 3.0
+Contact: Prarit Bhargava <prarit-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
+Description:
+ The dmi class is exported if CONFIG_SMBIOS_DMI_COMPAT is
+ set.
+
+ The DMI code currently exposes several values via sysfs.
+ These values are:
+
+ bios_date: The datestamp of the BIOS.
+ bios_vendor: The company that wrote the BIOS.
+ bios_version: The version of the BIOS.
+ board_asset_tag: A unique identifier for the system
+ motherboard.
+ board_name: The name of the type of motherboard.
+ board_serial: The serial number of the motherboard.
+ board_vendor: The company that designed the motherboard.
+ board_version: The version of the motherboard.
+ chassis_asset_tag: A unique identifier for the chassis.
+ chassis_serial: The serial number of the chassis.
+ chassis_type: The type of chassis.
+ chassis_vendor: The company that designed the chassis.
+ chassis_version: The version of the chassis.
+ product_name: The name of the system as determined by the
+ OEM.
+ product_serial: The serial number of the system.
+ product_uuid: A unique UUID for the system.
+ product_version: The version number of the system.
+ sys_vendor: The OEM company for the system.
+
+ In addition to these the standard class files are exposed
+ for DMI (uvent, power, subsystem) as well as a modalias
+ file.
+
+ The dmi class is deprecated and should not be used by new
+ code. Existing code should be migrated to use
+ /sys/class/smbios/* which exposes the same data.
+ The dmi class link will be removed in July of 2013.
diff --git a/Documentation/ABI/testing/sysfw-smbios b/Documentation/ABI/testing/sysfw-smbios
new file mode 100644
index 0000000..c6045f1
--- /dev/null
+++ b/Documentation/ABI/testing/sysfw-smbios
@@ -0,0 +1,36 @@
+What: /sys/bus/sysfw
+Date: May 1 2011
+KernelVersion: 2.6.39
+Contact: Prarit Bhargava <prarit-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
+Description:
+ The dmi class is exported if CONFIG_SMBIOS is set.
+
+ The SMBIOS code currently exposes several values via sysfs
+ primarily for use by module handling code.
+
+ These values are:
+
+ bios_date: The datestamp of the BIOS.
+ bios_vendor: The company that wrote the BIOS.
+ bios_version: The version of the BIOS.
+ board_asset_tag: A unique identifier for the system
+ motherboard.
+ board_name: The name of the type of motherboard.
+ board_serial: The serial number of the motherboard.
+ board_vendor: The company that designed the motherboard.
+ board_version: The version of the motherboard.
+ chassis_asset_tag: A unique identifier for the chassis.
+ chassis_serial: The serial number of the chassis.
+ chassis_type: The type of chassis.
+ chassis_vendor: The company that designed the chassis.
+ chassis_version: The version of the chassis.
+ product_name: The name of the system as determined by the
+ OEM.
+ product_serial: The serial number of the system.
+ product_uuid: A unique UUID for the system.
+ product_version: The version number of the system.
+ sys_vendor: The OEM company for the system.
+
+ In addition to these the standard class files are exposed
+ for SMBIOS (uvent, power, subsystem) as well as a modalias
+ file.
diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig
index 38280ef..ac14d3c 100644
--- a/arch/ia64/Kconfig
+++ b/arch/ia64/Kconfig
@@ -93,6 +93,11 @@ config DMI
bool
default y
+config SMBIOS
+ bool
+ default y
+ depends on SYSTEM_FIRMWARE
+
config EFI
bool
default y
diff --git a/arch/ia64/include/asm/smbios.h b/arch/ia64/include/asm/smbios.h
new file mode 100644
index 0000000..19c0019
--- /dev/null
+++ b/arch/ia64/include/asm/smbios.h
@@ -0,0 +1,12 @@
+#ifndef _ASM_SMBIOS_H
+#define _ASM_SMBIOS_H 1
+
+#include <linux/slab.h>
+#include <asm/io.h>
+
+/* Use normal IO mappings for SMBIOS */
+#define smbios_ioremap ioremap
+#define smbios_iounmap(x, l) iounmap(x)
+#define smbios_alloc(l) kmalloc(l, GFP_ATOMIC)
+
+#endif
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index da34972..e7cdde8 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -635,6 +635,16 @@ config DMI
affected by entries in the DMI blacklist. Required by PNP
BIOS code.
+config SMBIOS
+ depends on SYSTEM_FIRMWARE
+ bool "Enable SMBIOS scanning" if EXPERT
+ default y
+ ---help---
+ Enabled scanning of SMBIOS to identify machine quirks. Say Y
+ here unless you have verified that your setup is not
+ affected by entries in the SMBIOS blacklist. Required by PNP
+ BIOS code.
+
config GART_IOMMU
bool "GART IOMMU support" if EXPERT
default y
diff --git a/arch/x86/include/asm/smbios.h b/arch/x86/include/asm/smbios.h
new file mode 100644
index 0000000..767270b
--- /dev/null
+++ b/arch/x86/include/asm/smbios.h
@@ -0,0 +1,19 @@
+#ifndef _ASM_X86_SMBIOS_H
+#define _ASM_X86_SMBIOS_H
+
+#include <linux/compiler.h>
+#include <linux/init.h>
+
+#include <asm/io.h>
+#include <asm/setup.h>
+
+static __always_inline __init void *smbios_alloc(unsigned len)
+{
+ return extend_brk(len, sizeof(int));
+}
+
+/* Use early IO mappings for SMBIOS because it's initialized early */
+#define smbios_ioremap early_ioremap
+#define smbios_iounmap early_iounmap
+
+#endif /* _ASM_X86_SMBIOS_H */
diff --git a/drivers/firmware/Kconfig b/drivers/firmware/Kconfig
index 79a1b9d..23066d8 100644
--- a/drivers/firmware/Kconfig
+++ b/drivers/firmware/Kconfig
@@ -182,6 +182,26 @@ config SYSTEM_FIRMWARE_DMI_COMPAT
should not be used in new user space software. Please see
Documentation/ABI for details.
+config SYSTEM_FIRMWARE_DMI_COMPAT
+ bool "Export dmi compatibility class in sysfs"
+ depends on SMBIOSID
+ default y
+ help
+ This exposes /sys/class/dmi/* as a pointer to the sysfw class for
+ old software. This is purely a backwards compatability feature and
+ should not be used in new user space software. Please see
+ Documentation/ABI for details.
+
+config SMBIOS_SYSFS
+ tristate "SMBIOS table support in sysfs"
+ depends on SYSFS && SMBIOS
+ help
+ Say Y or M here to enable the exporting of the raw SMBIOS table
+ data via sysfs. This is useful for consuming the data without
+ requiring any access to /dev/mem at all. Tables are found
+ under /sys/firmware/smbios when this option is enabled and
+ loaded.
+
source "drivers/firmware/google/Kconfig"
endmenu
diff --git a/drivers/firmware/Makefile b/drivers/firmware/Makefile
index 41bc64a..5c9d81f 100644
--- a/drivers/firmware/Makefile
+++ b/drivers/firmware/Makefile
@@ -16,3 +16,5 @@ obj-$(CONFIG_SIGMA) += sigma.o
obj-$(CONFIG_GOOGLE_FIRMWARE) += google/
obj-$(CONFIG_SYSTEM_FIRMWARE) += sysfw.o
obj-$(CONFIG_SYSTEM_FIRMWARE_SYSFS) += sysfw-sysfs.o
+obj-$(CONFIG_SMBIOS) += smbios.o
+obj-$(CONFIG_SMBIOS_SYSFS) += smbios-sysfs.o
diff --git a/drivers/firmware/smbios-sysfs.c b/drivers/firmware/smbios-sysfs.c
new file mode 100644
index 0000000..9fd36a6
--- /dev/null
+++ b/drivers/firmware/smbios-sysfs.c
@@ -0,0 +1,705 @@
+/*
+ * smbios-sysfs.c
+ *
+ * This module exports the SMBIOS tables read-only to userspace through the
+ * sysfs file system.
+ *
+ * Data is currently found below
+ * /sys/firmware/smbios/...
+ *
+ * SMBIOS attributes are presented in attribute files with names
+ * formatted using %d-%d, so that the first integer indicates the
+ * structure type (0-255), and the second field is the instance of that
+ * entry.
+ *
+ * Copyright 2011 Google, Inc.
+ */
+
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/module.h>
+#include <linux/types.h>
+#include <linux/kobject.h>
+#include <linux/smbios.h>
+#include <linux/capability.h>
+#include <linux/slab.h>
+#include <linux/list.h>
+#include <linux/io.h>
+
+#define MAX_ENTRY_TYPE 255 /* Most of these aren't used, but we consider
+ the top entry type is only 8 bits */
+
+struct smbios_sysfs_entry {
+ struct smbios_header dh;
+ struct kobject kobj;
+ int instance;
+ int position;
+ struct list_head list;
+ struct kobject *child;
+};
+
+/*
+ * Global list of smbios_sysfs_entry. Even though this should only be
+ * manipulated at setup and teardown, the lazy nature of the kobject
+ * system means we get lazy removes.
+ */
+static LIST_HEAD(entry_list);
+static DEFINE_SPINLOCK(entry_list_lock);
+
+/* smbios_sysfs_attribute - Top level attribute. used by all entries. */
+struct smbios_sysfs_attribute {
+ struct attribute attr;
+ ssize_t (*show)(struct smbios_sysfs_entry *entry, char *buf);
+};
+
+#define SMBIOS_SYSFS_ATTR(_entry, _name) \
+struct smbios_sysfs_attribute smbios_sysfs_attr_##_entry##_##_name = { \
+ .attr = {.name = __stringify(_name), .mode = 0400}, \
+ .show = smbios_sysfs_##_entry##_##_name, \
+}
+
+/*
+ * smbios_sysfs_mapped_attribute - Attribute where we require the entry be
+ * mapped in. Use in conjunction with smbios_sysfs_specialize_attr_ops.
+ */
+struct smbios_sysfs_mapped_attribute {
+ struct attribute attr;
+ ssize_t (*show)(struct smbios_sysfs_entry *entry,
+ const struct smbios_header *dh,
+ char *buf);
+};
+
+#define SMBIOS_SYSFS_MAPPED_ATTR(_entry, _name) \
+struct smbios_sysfs_mapped_attribute smbios_sysfs_attr_##_entry##_##_name = { \
+ .attr = {.name = __stringify(_name), .mode = 0400}, \
+ .show = smbios_sysfs_##_entry##_##_name, \
+}
+
+/*************************************************
+ * Generic SMBIOS entry support.
+ *************************************************/
+static void smbios_entry_free(struct kobject *kobj)
+{
+ kfree(kobj);
+}
+
+static struct smbios_sysfs_entry *to_entry(struct kobject *kobj)
+{
+ return container_of(kobj, struct smbios_sysfs_entry, kobj);
+}
+
+static struct smbios_sysfs_attribute *to_attr(struct attribute *attr)
+{
+ return container_of(attr, struct smbios_sysfs_attribute, attr);
+}
+
+static ssize_t smbios_sysfs_attr_show(struct kobject *kobj,
+ struct attribute *_attr, char *buf)
+{
+ struct smbios_sysfs_entry *entry = to_entry(kobj);
+ struct smbios_sysfs_attribute *attr = to_attr(_attr);
+
+ /* SMBIOS stuff is only ever admin visible */
+ if (!capable(CAP_SYS_ADMIN))
+ return -EACCES;
+
+ return attr->show(entry, buf);
+}
+
+static const struct sysfs_ops smbios_sysfs_attr_ops = {
+ .show = smbios_sysfs_attr_show,
+};
+
+typedef ssize_t (*smbios_callback)(struct smbios_sysfs_entry *,
+ const struct smbios_header *dh, void *);
+
+struct find_smbios_data {
+ struct smbios_sysfs_entry *entry;
+ smbios_callback callback;
+ void *private;
+ int instance_countdown;
+ ssize_t ret;
+};
+
+static int find_smbios_entry_helper(const union smbios_struct *ss, void *_data)
+{
+ struct find_smbios_data *data = _data;
+ struct smbios_sysfs_entry *entry = data->entry;
+
+ /* Is this the entry we want? */
+ if (ss->header.type != entry->dh.type)
+ return SMBIOS_WALK_CONTINUE;
+
+ if (data->instance_countdown != 0) {
+ /* try the next instance? */
+ data->instance_countdown--;
+ return SMBIOS_WALK_CONTINUE;
+ }
+
+ /*
+ * Don't ever revisit the instance. Short circuit later
+ * instances by letting the instance_countdown run negative
+ */
+ data->instance_countdown--;
+
+ /* Found the entry */
+ data->ret = data->callback(entry, &ss->header, data->private);
+
+ return SMBIOS_WALK_STOP;
+}
+
+/* State for passing the read parameters through smbios_find_entry() */
+struct smbios_read_state {
+ char *buf;
+ loff_t pos;
+ size_t count;
+};
+
+static ssize_t find_smbios_entry(struct smbios_sysfs_entry *entry,
+ smbios_callback callback, void *private)
+{
+ struct find_smbios_data data = {
+ .entry = entry,
+ .callback = callback,
+ .private = private,
+ .instance_countdown = entry->instance,
+ .ret = -EIO, /* To signal the entry disappeared */
+ };
+ const union smbios_struct *ss;
+
+ ss = smbios_walk(find_smbios_entry_helper, &data);
+ if (!ss)
+ return -EINVAL;
+ return data.ret;
+}
+
+/*
+ * Calculate and return the byte length of the smbios entry identified by
+ * dh. This includes both the formatted portion as well as the
+ * unformatted string space, including the two trailing nul characters.
+ */
+static size_t smbios_entry_length(const struct smbios_header *dh)
+{
+ const char *p = (const char *)dh;
+
+ p += dh->length;
+
+ while (p[0] || p[1])
+ p++;
+
+ return 2 + p - (const char *)dh;
+}
+
+/*************************************************
+ * Support bits for specialized SMBIOS entry support
+ *************************************************/
+struct smbios_entry_attr_show_data {
+ struct attribute *attr;
+ char *buf;
+};
+
+static ssize_t smbios_entry_attr_show_helper(struct smbios_sysfs_entry *entry,
+ const struct smbios_header *dh,
+ void *_data)
+{
+ struct smbios_entry_attr_show_data *data = _data;
+ struct smbios_sysfs_mapped_attribute *attr;
+
+ attr = container_of(data->attr,
+ struct smbios_sysfs_mapped_attribute, attr);
+ return attr->show(entry, dh, data->buf);
+}
+
+static ssize_t smbios_entry_attr_show(struct kobject *kobj,
+ struct attribute *attr,
+ char *buf)
+{
+ struct smbios_entry_attr_show_data data = {
+ .attr = attr,
+ .buf = buf,
+ };
+ /* Find the entry according to our parent and call the
+ * normalized show method hanging off of the attribute */
+ return find_smbios_entry(to_entry(kobj->parent),
+ smbios_entry_attr_show_helper, &data);
+}
+
+static const struct sysfs_ops smbios_sysfs_specialize_attr_ops = {
+ .show = smbios_entry_attr_show,
+};
+
+/*************************************************
+ * Specialized SMBIOS entry support.
+ *************************************************/
+
+/*** Type 15 - System Event Table ***/
+
+#define SMBIOS_SEL_ACCESS_METHOD_IO8 0x00
+#define SMBIOS_SEL_ACCESS_METHOD_IO2x8 0x01
+#define SMBIOS_SEL_ACCESS_METHOD_IO16 0x02
+#define SMBIOS_SEL_ACCESS_METHOD_PHYS32 0x03
+#define SMBIOS_SEL_ACCESS_METHOD_GPNV 0x04
+
+struct smbios_system_event_log {
+ struct smbios_header header;
+ u16 area_length;
+ u16 header_start_offset;
+ u16 data_start_offset;
+ u8 access_method;
+ u8 status;
+ u32 change_token;
+ union {
+ struct {
+ u16 index_addr;
+ u16 data_addr;
+ } io;
+ u32 phys_addr32;
+ u16 gpnv_handle;
+ u32 access_method_address;
+ };
+ u8 header_format;
+ u8 type_descriptors_supported_count;
+ u8 per_log_type_descriptor_length;
+ u8 supported_log_type_descriptos[0];
+} __packed;
+
+#define SMBIOS_SYSFS_SEL_FIELD(_field) \
+static ssize_t smbios_sysfs_sel_##_field(struct smbios_sysfs_entry *entry, \
+ const struct smbios_header *dh, \
+ char *buf) \
+{ \
+ struct smbios_system_event_log sel; \
+ if (sizeof(sel) > smbios_entry_length(dh)) \
+ return -EIO; \
+ memcpy(&sel, dh, sizeof(sel)); \
+ return sprintf(buf, "%u\n", sel._field); \
+} \
+static SMBIOS_SYSFS_MAPPED_ATTR(sel, _field)
+
+SMBIOS_SYSFS_SEL_FIELD(area_length);
+SMBIOS_SYSFS_SEL_FIELD(header_start_offset);
+SMBIOS_SYSFS_SEL_FIELD(data_start_offset);
+SMBIOS_SYSFS_SEL_FIELD(access_method);
+SMBIOS_SYSFS_SEL_FIELD(status);
+SMBIOS_SYSFS_SEL_FIELD(change_token);
+SMBIOS_SYSFS_SEL_FIELD(access_method_address);
+SMBIOS_SYSFS_SEL_FIELD(header_format);
+SMBIOS_SYSFS_SEL_FIELD(type_descriptors_supported_count);
+SMBIOS_SYSFS_SEL_FIELD(per_log_type_descriptor_length);
+
+static struct attribute *smbios_sysfs_sel_attrs[] = {
+ &smbios_sysfs_attr_sel_area_length.attr,
+ &smbios_sysfs_attr_sel_header_start_offset.attr,
+ &smbios_sysfs_attr_sel_data_start_offset.attr,
+ &smbios_sysfs_attr_sel_access_method.attr,
+ &smbios_sysfs_attr_sel_status.attr,
+ &smbios_sysfs_attr_sel_change_token.attr,
+ &smbios_sysfs_attr_sel_access_method_address.attr,
+ &smbios_sysfs_attr_sel_header_format.attr,
+ &smbios_sysfs_attr_sel_type_descriptors_supported_count.attr,
+ &smbios_sysfs_attr_sel_per_log_type_descriptor_length.attr,
+ NULL,
+};
+
+
+static struct kobj_type smbios_system_event_log_ktype = {
+ .release = smbios_entry_free,
+ .sysfs_ops = &smbios_sysfs_specialize_attr_ops,
+ .default_attrs = smbios_sysfs_sel_attrs,
+};
+
+typedef u8 (*sel_io_reader)(const struct smbios_system_event_log *sel,
+ loff_t offset);
+
+static DEFINE_MUTEX(io_port_lock);
+
+static u8 read_sel_8bit_indexed_io(const struct smbios_system_event_log *sel,
+ loff_t offset)
+{
+ u8 ret;
+
+ mutex_lock(&io_port_lock);
+ outb((u8)offset, sel->io.index_addr);
+ ret = inb(sel->io.data_addr);
+ mutex_unlock(&io_port_lock);
+ return ret;
+}
+
+static u8 read_sel_2x8bit_indexed_io(const struct smbios_system_event_log *sel,
+ loff_t offset)
+{
+ u8 ret;
+
+ mutex_lock(&io_port_lock);
+ outb((u8)offset, sel->io.index_addr);
+ outb((u8)(offset >> 8), sel->io.index_addr + 1);
+ ret = inb(sel->io.data_addr);
+ mutex_unlock(&io_port_lock);
+ return ret;
+}
+
+static u8 read_sel_16bit_indexed_io(const struct smbios_system_event_log *sel,
+ loff_t offset)
+{
+ u8 ret;
+
+ mutex_lock(&io_port_lock);
+ outw((u16)offset, sel->io.index_addr);
+ ret = inb(sel->io.data_addr);
+ mutex_unlock(&io_port_lock);
+ return ret;
+}
+
+static sel_io_reader sel_io_readers[] = {
+ [SMBIOS_SEL_ACCESS_METHOD_IO8] = read_sel_8bit_indexed_io,
+ [SMBIOS_SEL_ACCESS_METHOD_IO2x8] = read_sel_2x8bit_indexed_io,
+ [SMBIOS_SEL_ACCESS_METHOD_IO16] = read_sel_16bit_indexed_io,
+};
+
+static ssize_t smbios_sel_raw_read_io(struct smbios_sysfs_entry *entry,
+ const struct smbios_system_event_log *sel,
+ char *buf, loff_t pos, size_t count)
+{
+ ssize_t wrote = 0;
+
+ sel_io_reader io_reader = sel_io_readers[sel->access_method];
+
+ while (count && pos < sel->area_length) {
+ count--;
+ *(buf++) = io_reader(sel, pos++);
+ wrote++;
+ }
+
+ return wrote;
+}
+
+static ssize_t smbios_sel_raw_read_phys32(struct smbios_sysfs_entry *entry,
+ const struct smbios_system_event_log *sel,
+ char *buf, loff_t pos, size_t count)
+{
+ u8 __iomem *mapped;
+ ssize_t wrote = 0;
+
+ mapped = ioremap(sel->access_method_address, sel->area_length);
+ if (!mapped)
+ return -EIO;
+
+ while (count && pos < sel->area_length) {
+ count--;
+ *(buf++) = readb(mapped + pos++);
+ wrote++;
+ }
+
+ iounmap(mapped);
+ return wrote;
+}
+
+static ssize_t smbios_sel_raw_read_helper(struct smbios_sysfs_entry *entry,
+ const struct smbios_header *dh,
+ void *_state)
+{
+ struct smbios_read_state *state = _state;
+ struct smbios_system_event_log sel;
+
+ if (sizeof(sel) > smbios_entry_length(dh))
+ return -EIO;
+
+ memcpy(&sel, dh, sizeof(sel));
+
+ switch (sel.access_method) {
+ case SMBIOS_SEL_ACCESS_METHOD_IO8:
+ case SMBIOS_SEL_ACCESS_METHOD_IO2x8:
+ case SMBIOS_SEL_ACCESS_METHOD_IO16:
+ return smbios_sel_raw_read_io(entry, &sel, state->buf,
+ state->pos, state->count);
+ case SMBIOS_SEL_ACCESS_METHOD_PHYS32:
+ return smbios_sel_raw_read_phys32(entry, &sel, state->buf,
+ state->pos, state->count);
+ case SMBIOS_SEL_ACCESS_METHOD_GPNV:
+ pr_info("smbios-sysfs: GPNV support missing.\n");
+ return -EIO;
+ default:
+ pr_info("smbios-sysfs: Unknown access method %02x\n",
+ sel.access_method);
+ return -EIO;
+ }
+}
+
+static ssize_t smbios_sel_raw_read(struct file *filp, struct kobject *kobj,
+ struct bin_attribute *bin_attr,
+ char *buf, loff_t pos, size_t count)
+{
+ struct smbios_sysfs_entry *entry = to_entry(kobj->parent);
+ struct smbios_read_state state = {
+ .buf = buf,
+ .pos = pos,
+ .count = count,
+ };
+
+ return find_smbios_entry(entry, smbios_sel_raw_read_helper, &state);
+}
+
+static struct bin_attribute smbios_sel_raw_attr = {
+ .attr = {.name = "raw_event_log", .mode = 0400},
+ .read = smbios_sel_raw_read,
+};
+
+static int smbios_system_event_log(struct smbios_sysfs_entry *entry)
+{
+ int ret;
+
+ entry->child = kzalloc(sizeof(*entry->child), GFP_KERNEL);
+ if (!entry->child)
+ return -ENOMEM;
+ ret = kobject_init_and_add(entry->child,
+ &smbios_system_event_log_ktype,
+ &entry->kobj,
+ "system_event_log");
+ if (ret)
+ goto out_free;
+
+ ret = sysfs_create_bin_file(entry->child, &smbios_sel_raw_attr);
+ if (ret)
+ goto out_del;
+
+ return 0;
+
+out_del:
+ kobject_del(entry->child);
+out_free:
+ kfree(entry->child);
+ return ret;
+}
+
+/*************************************************
+ * Generic SMBIOS entry support.
+ *************************************************/
+
+static ssize_t smbios_sysfs_entry_length(struct smbios_sysfs_entry *entry,
+ char *buf)
+{
+ return sprintf(buf, "%d\n", entry->dh.length);
+}
+
+static ssize_t smbios_sysfs_entry_handle(struct smbios_sysfs_entry *entry,
+ char *buf)
+{
+ return sprintf(buf, "%d\n", entry->dh.handle);
+}
+
+static ssize_t smbios_sysfs_entry_type(struct smbios_sysfs_entry *entry,
+ char *buf)
+{
+ return sprintf(buf, "%d\n", entry->dh.type);
+}
+
+static ssize_t smbios_sysfs_entry_instance(struct smbios_sysfs_entry *entry,
+ char *buf)
+{
+ return sprintf(buf, "%d\n", entry->instance);
+}
+
+static ssize_t smbios_sysfs_entry_position(struct smbios_sysfs_entry *entry,
+ char *buf)
+{
+ return sprintf(buf, "%d\n", entry->position);
+}
+
+static SMBIOS_SYSFS_ATTR(entry, length);
+static SMBIOS_SYSFS_ATTR(entry, handle);
+static SMBIOS_SYSFS_ATTR(entry, type);
+static SMBIOS_SYSFS_ATTR(entry, instance);
+static SMBIOS_SYSFS_ATTR(entry, position);
+
+static struct attribute *smbios_sysfs_entry_attrs[] = {
+ &smbios_sysfs_attr_entry_length.attr,
+ &smbios_sysfs_attr_entry_handle.attr,
+ &smbios_sysfs_attr_entry_type.attr,
+ &smbios_sysfs_attr_entry_instance.attr,
+ &smbios_sysfs_attr_entry_position.attr,
+ NULL,
+};
+
+static ssize_t smbios_entry_raw_read_helper(struct smbios_sysfs_entry *entry,
+ const struct smbios_header *dh,
+ void *_state)
+{
+ struct smbios_read_state *state = _state;
+ size_t entry_length;
+
+ entry_length = smbios_entry_length(dh);
+
+ return memory_read_from_buffer(state->buf, state->count,
+ &state->pos, dh, entry_length);
+}
+
+static ssize_t smbios_entry_raw_read(struct file *filp,
+ struct kobject *kobj,
+ struct bin_attribute *bin_attr,
+ char *buf, loff_t pos, size_t count)
+{
+ struct smbios_sysfs_entry *entry = to_entry(kobj);
+ struct smbios_read_state state = {
+ .buf = buf,
+ .pos = pos,
+ .count = count,
+ };
+
+ return find_smbios_entry(entry, smbios_entry_raw_read_helper, &state);
+}
+
+static const struct bin_attribute smbios_entry_raw_attr = {
+ .attr = {.name = "raw", .mode = 0400},
+ .read = smbios_entry_raw_read,
+};
+
+static void smbios_sysfs_entry_release(struct kobject *kobj)
+{
+ struct smbios_sysfs_entry *entry = to_entry(kobj);
+ sysfs_remove_bin_file(&entry->kobj, &smbios_entry_raw_attr);
+ spin_lock(&entry_list_lock);
+ list_del(&entry->list);
+ spin_unlock(&entry_list_lock);
+ kfree(entry);
+}
+
+static struct kobj_type smbios_sysfs_entry_ktype = {
+ .release = smbios_sysfs_entry_release,
+ .sysfs_ops = &smbios_sysfs_attr_ops,
+ .default_attrs = smbios_sysfs_entry_attrs,
+};
+
+static struct kobject *smbios_kobj;
+static struct kset *smbios_kset;
+
+/* Global count of all instances seen. Only for setup */
+static int __initdata instance_counts[MAX_ENTRY_TYPE + 1];
+
+/* Global positional count of all entries seen. Only for setup */
+static int __initdata position_count;
+
+static int __init smbios_sysfs_register_handle(const union smbios_struct *ss,
+ void *_ret)
+{
+ struct smbios_sysfs_entry *entry;
+ int *ret = _ret;
+
+ /* Allocate and register a new entry into the entries set */
+ entry = kzalloc(sizeof(*entry), GFP_KERNEL);
+ if (!entry) {
+ *ret = -ENOMEM;
+ return SMBIOS_WALK_STOP;
+ }
+
+ /* Set the key */
+ memcpy(&entry->dh, &ss->header, sizeof(struct smbios_header));
+ entry->instance = instance_counts[ss->header.type]++;
+ entry->position = position_count++;
+
+ entry->kobj.kset = smbios_kset;
+ *ret = kobject_init_and_add(&entry->kobj, &smbios_sysfs_entry_ktype,
+ NULL,
+ "%d-%d", ss->header.type, entry->instance);
+
+ if (*ret) {
+ kfree(entry);
+ return SMBIOS_WALK_STOP;
+ }
+
+ /* Thread on the global list for cleanup */
+ spin_lock(&entry_list_lock);
+ list_add_tail(&entry->list, &entry_list);
+ spin_unlock(&entry_list_lock);
+
+ /* Handle specializations by type */
+ switch (ss->header.type) {
+ case 15:
+ /* System Event Log */
+ *ret = smbios_system_event_log(entry);
+ break;
+ default:
+ /* No specialization */
+ break;
+ }
+ if (*ret)
+ goto out_err;
+
+ /* Create the raw binary file to access the entry */
+ *ret = sysfs_create_bin_file(&entry->kobj, &smbios_entry_raw_attr);
+ if (*ret)
+ goto out_err;
+
+ return SMBIOS_WALK_CONTINUE;
+out_err:
+ kobject_put(entry->child);
+ kobject_put(&entry->kobj);
+ return SMBIOS_WALK_STOP;
+}
+
+static void cleanup_entry_list(void)
+{
+ struct smbios_sysfs_entry *entry, *next;
+
+ /* No locks, we are on our way out */
+ list_for_each_entry_safe(entry, next, &entry_list, list) {
+ kobject_put(entry->child);
+ kobject_put(&entry->kobj);
+ }
+}
+
+static int __init smbios_sysfs_init(void)
+{
+ int error = -ENOMEM;
+ int val, ret;
+ const union smbios_struct *ss;
+
+ /* Set up our directory */
+ smbios_kobj = kobject_create_and_add("smbios", firmware_kobj);
+ if (!smbios_kobj)
+ goto err;
+
+ smbios_kset = kset_create_and_add("entries", NULL, smbios_kobj);
+ if (!smbios_kset)
+ goto err;
+
+ val = 0;
+ ss = smbios_walk(smbios_sysfs_register_handle, &val);
+ if (ss) {
+ error = -EIO;
+ goto err;
+ }
+ if (val) {
+ error = val;
+ goto err;
+ }
+
+#ifdef CONFIG_SYSTEM_FIRMWARE_DMI_COMPAT
+ ret = sysfs_create_link(firmware_kobj, smbios_kobj, "dmi");
+ if (!ret)
+ pr_debug("smbios-sysfs: DMI compatibility failed.\n");
+#endif
+ pr_debug("smbios-sysfs: loaded.\n");
+
+ return 0;
+err:
+ cleanup_entry_list();
+ kset_unregister(smbios_kset);
+ kobject_put(smbios_kobj);
+ return error;
+}
+
+/* clean up everything. */
+static void __exit smbios_sysfs_exit(void)
+{
+ pr_debug("smbios-sysfs: unloading.\n");
+ cleanup_entry_list();
+ kset_unregister(smbios_kset);
+ kobject_put(smbios_kobj);
+}
+
+module_init(smbios_sysfs_init);
+module_exit(smbios_sysfs_exit);
+
+MODULE_AUTHOR("Mike Waychison <mikew-hpIqsD4AKlfQT0dZR+AlfA@public.gmane.org>");
+MODULE_DESCRIPTION("SMBIOS sysfs support");
+MODULE_LICENSE("GPL");
diff --git a/drivers/firmware/smbios.c b/drivers/firmware/smbios.c
new file mode 100644
index 0000000..ff83ae5
--- /dev/null
+++ b/drivers/firmware/smbios.c
@@ -0,0 +1,687 @@
+/*
+ * SMBIOS support
+ *
+ * started by Prarit Bhargava, Copyright (C) 2011 Red Hat, Inc.
+ *
+ * SMBIOS interpretation
+ *
+ * Some bits copied directly from original dmi*.c files
+ */
+#include <linux/types.h>
+#include <linux/string.h>
+#include <linux/init.h>
+#include <linux/module.h>
+#include <linux/ctype.h>
+#include <linux/smbios.h>
+#include <linux/efi.h>
+#include <linux/bootmem.h>
+#include <linux/sysfw.h>
+#include <linux/pci.h>
+
+#include <asm/smbios.h>
+
+/*
+ * "The SMBIOS Specification addresses how motherboard and system vendors
+ * present management information about their products in a standard format by
+ * extending the BIOS interface on x86 architecture systems. The information is
+ * intended to allow generic instrumentation to deliver this information to
+ * management applications that use DMI, CIM or direct access, eliminating the
+ * need for error prone operations like probing system hardware for presence
+ * detection."
+ *
+ * From http://www.dmtf.org/standards/smbios
+ *
+ * ... Grab the Spec. It'll help.
+ */
+
+/*
+ * SMBIOS Structure Table Entry Point, STEP
+ */
+struct smbios_step {
+ char anchor_string[4]; /* 0x0, always is "_SM_" */
+ u8 checksum;
+ u8 length;
+ u8 major;
+ u8 minor;
+ u16 max_size;
+ u8 eps_revision;
+ u8 reserved[5];
+ u8 dmi_string[5]; /* 0x10, always is "_DMI_" */
+ u8 intermediate_chksum;
+ u16 struct_len;
+ u32 struct_addr;
+ u16 num_structs;
+ u8 bcd_revision;
+} __packed;
+static struct smbios_step smbios_step;
+
+/* is there an SMBIOS? */
+int smbios_available;
+EXPORT_SYMBOL_GPL(smbios_available);
+
+/* Address of the actual SMBIOS struct */
+static unsigned long smbios_addr;
+
+/* Start address of the SMBIOS tables */
+static u32 smbios_base;
+/* Length of the all the SMBIOS tables */
+static u16 smbios_len;
+/* Number of SMBIOS tables */
+static u16 smbios_num;
+/*
+ * This is the BRK space or IO mapped address of the SMBIOS table. SMBIOS is
+ * switched from BRK space and into the IO map in smbios_init_late(). After
+ * it is IO mapped, it MUST NOT be unmapped (o/w very bad things will happen).
+ */
+static u8 *smbios_map;
+
+/* We need to store the type field and the UUID somewhere. */
+static char smbios_type3_type[4];
+static char smbios_type1_uuid[16*2+4+1];
+
+/** find the first SMBIOS structure of a specific type */
+const union smbios_struct *smbios_find_struct(int type)
+{
+ int size = sizeof(struct smbios_header);
+ int i = 0;
+ u8 *data = smbios_map;
+ struct smbios_header *dm = NULL;
+
+ /*
+ * Stop when we see all the items the table claimed to have
+ * OR we run off the end of the table (also happens)
+ */
+ while ((i < smbios_num) &&
+ (data - smbios_map + size) <= smbios_len) {
+ dm = (struct smbios_header *)data;
+
+ /*
+ * We want to know the total length (formatted area and
+ * strings) before returning to make sure we don't return
+ * a partial structure
+ */
+ data += dm->length;
+ while ((data - smbios_map < smbios_len - 1) &&
+ (data[0] || data[1]))
+ data++;
+ if ((data - smbios_map < smbios_len - 1) &&
+ (type == dm->type)) {
+ break;
+ }
+ data += 2;
+ i++;
+ }
+ /* just return the address */
+ return (const union smbios_struct *)dm;
+}
+
+static const char smbios_empty_string[] = " ";
+
+/**
+ * smbios_get_string -- return a string from an SMBIOS structure
+ * @ss: pointer to structure being examined
+ * @s: number of string being examined
+ *
+ * This function returns a string within the structure ss. Many SMBIOS
+ * structures have their strings at the end of the structure, and the location
+ * of each string is enumerated throughout the structure.
+ *
+ * For example, The BIOS Information structure, type0, has the BIOS Version
+ * at offset 0x6, which contains a number enumerating the strings at the end
+ * of the structure.
+ *
+ * ie) s is an actual _number_, not a pointer.
+ */
+const char *smbios_get_string(const union smbios_struct *ss, u8 s)
+{
+ const u8 *bp = ((u8 *) ss) + ss->header.length;
+
+ if (s) {
+ s--;
+ while (s > 0 && *bp) {
+ bp += strlen(bp) + 1;
+ s--;
+ }
+
+ if (*bp != 0) {
+ size_t len = strlen(bp)+1;
+ size_t cmp_len = len > 8 ? 8 : len;
+
+ if (!memcmp(bp, smbios_empty_string, cmp_len))
+ return smbios_empty_string;
+ return bp;
+ }
+ }
+
+ return "";
+}
+EXPORT_SYMBOL(smbios_get_string);
+
+#define smbios_find_ptr(_ptr, _struct_name, _type, _field) \
+ _struct_name = smbios_find_struct(_type); \
+ _ptr = smbios_get_string(_struct_name, \
+ _struct_name->type##_type._field);
+
+static const char *smbios_sysfw_lookup(int field)
+{
+ const union smbios_struct *ss;
+ const u8 *ptr;
+
+ switch (field) {
+ case SYSFW_BIOS_VENDOR:
+ smbios_find_ptr(ptr, ss, 0, vendor);
+ break;
+ case SYSFW_BIOS_VERSION:
+ smbios_find_ptr(ptr, ss, 0, bios_version);
+ break;
+ case SYSFW_BIOS_DATE:
+ smbios_find_ptr(ptr, ss, 0, bios_release_date);
+ break;
+ case SYSFW_SYS_VENDOR:
+ smbios_find_ptr(ptr, ss, 1, manufacturer);
+ break;
+ case SYSFW_PRODUCT_NAME:
+ smbios_find_ptr(ptr, ss, 1, product_name);
+ break;
+ case SYSFW_PRODUCT_VERSION:
+ smbios_find_ptr(ptr, ss, 1, version);
+ break;
+ case SYSFW_PRODUCT_SERIAL:
+ smbios_find_ptr(ptr, ss, 1, serial_number);
+ break;
+ case SYSFW_PRODUCT_UUID:
+ ptr = smbios_type1_uuid;
+ break;
+ case SYSFW_BOARD_VENDOR:
+ smbios_find_ptr(ptr, ss, 2, manufacturer);
+ break;
+ case SYSFW_BOARD_NAME:
+ smbios_find_ptr(ptr, ss, 2, product);
+ break;
+ case SYSFW_BOARD_VERSION:
+ smbios_find_ptr(ptr, ss, 2, version);
+ break;
+ case SYSFW_BOARD_SERIAL:
+ smbios_find_ptr(ptr, ss, 2, serial_number);
+ break;
+ case SYSFW_BOARD_ASSET_TAG:
+ smbios_find_ptr(ptr, ss, 2, asset_tag);
+ break;
+ case SYSFW_CHASSIS_VENDOR:
+ smbios_find_ptr(ptr, ss, 3, manufacturer);
+ break;
+ case SYSFW_CHASSIS_TYPE:
+ ptr = smbios_type3_type;
+ break;
+ case SYSFW_CHASSIS_VERSION:
+ smbios_find_ptr(ptr, ss, 3, version);
+ break;
+ case SYSFW_CHASSIS_SERIAL:
+ smbios_find_ptr(ptr, ss, 3, serial_number);
+ break;
+ case SYSFW_CHASSIS_ASSET_TAG:
+ smbios_find_ptr(ptr, ss, 3, asset_tag_number);
+ break;
+ case SYSFW_STRING_MAX:
+ case SYSFW_NONE:
+ default:
+ ptr = NULL;
+ break;
+ }
+
+ return (const char *)ptr;
+}
+
+/* returns date in formation YYYYMMDD for easy comparisons */
+static int smbios_sysfw_get_date(void)
+{
+ const char *smbios_date;
+ int date, d, m, y;
+
+ /* SMBIOS BIOS DATE is in DD/MM/YYYY format */
+ smbios_date = smbios_sysfw_lookup(SYSFW_BIOS_DATE);
+ if (!smbios_date)
+ return 0;
+
+ sscanf(smbios_date, "%d/%d/%d", &d, &m, &y);
+ date = (y * 10000 + m * 100 + d);
+ return date;
+}
+
+static int __init smbios_sysfw_late(void)
+{
+ if (!smbios_available)
+ return -1;
+
+ /* This looks strange but we're unmapping the BRK space and
+ * then mapping into memory after the memory subsystem has been
+ * initialized. */
+ smbios_iounmap(smbios_map, smbios_len);
+ smbios_map = ioremap(smbios_base, smbios_len);
+ if (!smbios_map) {
+ smbios_available = 0;
+ WARN(1, "SMBIOS ioremap failed.");
+ return -ENOMEM;
+ }
+ return 0;
+}
+
+/* print pretty things */
+static void __init print_filtered(const char *info)
+{
+ const char *p;
+
+ if (!info)
+ return;
+
+ for (p = info; *p; p++)
+ if (isprint(*p))
+ printk(KERN_CONT "%c", *p);
+ else
+ printk(KERN_CONT "\\x%02x", *p & 0xff);
+}
+
+/* Dump some basic system information at the beginning of boot */
+static void __init smbios_boot_display(void)
+{
+ const char *board; /* Board Name is optional */
+
+ if (smbios_available)
+ printk(KERN_DEBUG "SMBIOS: ");
+ else
+ printk(KERN_DEBUG "DMI: ");
+ print_filtered(smbios_sysfw_lookup(SYSFW_SYS_VENDOR));
+ printk(KERN_CONT " ");
+ print_filtered(smbios_sysfw_lookup(SYSFW_PRODUCT_NAME));
+ board = smbios_sysfw_lookup(SYSFW_BOARD_NAME);
+ if (board) {
+ printk(KERN_CONT "/");
+ print_filtered(board);
+ }
+ printk(KERN_CONT ", BIOS ");
+ print_filtered(smbios_sysfw_lookup(SYSFW_BIOS_VERSION));
+ printk(KERN_CONT " ");
+ print_filtered(smbios_sysfw_lookup(SYSFW_BIOS_DATE));
+ printk(KERN_CONT "\n");
+}
+
+static int __init smbios_sysfw_init(void)
+{
+ smbios_boot_display();
+ printk(KERN_INFO "Registered SMBIOS sysfw driver\n");
+ return 0;
+}
+
+static struct sysfw_driver __refdata smbios_sysfw_driver = {
+ .name = "smbios",
+ .init = smbios_sysfw_init,
+ .late = smbios_sysfw_late,
+ .lookup = smbios_sysfw_lookup,
+ .date = smbios_sysfw_get_date,
+};
+
+/*
+ * There are two special "core" values, that require their own strings.
+ * These are SYSFW_CHASSIS_TYPE(ss->type3->type) and
+ * SYSFW_PRODUCT_UUID(ss->type1->uuid).
+ */
+static void smbios_decode_core(void)
+{
+ const union smbios_struct *ss;
+
+ /* SYSFW_CHASSIS_TYPE */
+ ss = smbios_find_struct(3);
+ sprintf(smbios_type3_type, "%u", ss->type3.type & 0x7f);
+ /* SYSFW_PRODUCT_UUID */
+ ss = smbios_find_struct(1);
+ sprintf(smbios_type1_uuid, "%pUB", ss->type1.uuid);
+}
+
+/* This is only useful for legacy DMI table decoding. */
+static int __init dmi_checksum(const u8 *buf)
+{
+ u8 sum = 0;
+ int a;
+
+ for (a = 0; a < 15; a++)
+ sum += buf[a];
+
+ return sum == 0;
+}
+
+/* This is only useful for legacy DMI table decoding. */
+static int __init dmi_present(const char __iomem *p)
+{
+ u8 buf[15];
+
+ memcpy_fromio(buf, p, 15);
+ if ((memcmp(buf, "_DMI_", 5) == 0) && dmi_checksum(buf)) {
+ /* use smbios_ even though it's really dmi_ */
+ smbios_num = (buf[13] << 8) | buf[12];
+ smbios_len = (buf[7] << 8) | buf[6];
+ smbios_base = (buf[11] << 24) | (buf[10] << 16) |
+ (buf[9] << 8) | buf[8];
+
+ printk(KERN_INFO "DMI %d.%d present.\n", buf[14] >> 4,
+ buf[14] & 0xF);
+
+ smbios_map = smbios_ioremap(smbios_base, smbios_len);
+ if (!smbios_map)
+ return -ENOMEM;
+ smbios_boot_display();
+ }
+ return 1;
+}
+
+/* Check and decode the SMBIOS STEP function */
+static int __init smbios_decode_step(void)
+{
+ u8 chksum1, chksum2, *buf, fp;
+
+ if (!smbios_addr)
+ return -ENODEV;
+
+ buf = smbios_ioremap(smbios_addr, sizeof(struct smbios_step));
+ if (!buf)
+ return -ENODEV;
+
+ memcpy(&smbios_step, buf, sizeof(struct smbios_step));
+
+ /* checksum the entire STEP structure */
+ chksum1 = 0;
+ for (fp = 0; fp < smbios_step.length; fp++)
+ chksum1 += buf[fp];
+ if (chksum1) {
+ smbios_iounmap(buf, sizeof(struct smbios_step));
+ WARN(1, "SMBIOS: Invalid STEP table checksum = %u\n", chksum1);
+ return -EINVAL;
+ }
+
+ /* checksum the Intermediate structure */
+ chksum2 = 0;
+ for (fp = 0x10; fp < smbios_step.length; fp++)
+ chksum2 += buf[fp];
+ if (chksum2) {
+ smbios_iounmap(buf, sizeof(struct smbios_step));
+ WARN(1, "SMBIOS: Invalid Intermediate checksum = %u\n",
+ chksum2);
+ return -EINVAL;
+ }
+
+ smbios_iounmap(buf, sizeof(struct smbios_step));
+
+ printk(KERN_INFO "SMBIOS: version %u.%u @ 0x%lX | %d structures\n",
+ smbios_step.major, smbios_step.minor, smbios_addr,
+ smbios_step.num_structs);
+
+ smbios_num = smbios_step.num_structs;
+ smbios_len = smbios_step.struct_len;
+ smbios_base = smbios_step.struct_addr;
+
+ /*
+ * Need to map smbios_map for the smbios_walk() and other potential
+ * early callers. This is unmapped, and ioremap'ed in the late call.
+ */
+ smbios_map = smbios_ioremap(smbios_base, smbios_len);
+ if (!smbios_map) {
+ printk(KERN_INFO "SMBIOS tables are invalid.\n");
+ return -ENOMEM;
+ }
+ smbios_available = 1;
+
+ return 0;
+}
+
+/**
+ * smbios_init - Initialize the SMBIOS code and register a sysfw driver
+ *
+ * This function looks for the SMBIOS tables, maps them, and registers a
+ * System Firmware driver.
+ */
+int __init smbios_init(void)
+{
+ u8 *buf;
+ int fp = 0, rc;
+ int ret = 0;
+ int smbios_present = 0;
+
+ if (efi_enabled) {
+ if (efi.smbios == EFI_INVALID_TABLE_ADDR) {
+ ret = -ENODEV;
+ goto error;
+ }
+ smbios_addr = efi.smbios;
+ } else {
+ /*
+ * Legacy SMBIOS is mapped @ 0xF0000, but may not
+ * necessarily be _at_ 0xF0000
+ */
+ smbios_addr = 0xF0000;
+ }
+ buf = smbios_ioremap(smbios_addr, SMBIOS_SIZE);
+ if (!buf) {
+ ret = -ENODEV;
+ goto error;
+ }
+
+ /* Find the SMBIOS entry point */
+ for (fp = 0; fp <= 0xFFF0; fp += 0x10) {
+ if (!memcmp(buf + fp, "_SM_", 4)) {
+ smbios_addr += fp;
+ smbios_present = 1;
+ break;
+ }
+ }
+ smbios_iounmap(buf, SMBIOS_SIZE);
+
+ if (smbios_present) {
+ rc = smbios_decode_step();
+ if (rc)
+ return -ENODEV;
+ rc = sysfw_driver_register(&smbios_sysfw_driver);
+ if (rc)
+ return rc;
+ smbios_decode_core();
+ } else {
+ /*
+ * SMBIOS has been around since the 1990s. The likelihood
+ * of there being a DMI table not embedded in a SMBIOS table
+ * is extremely unlikely, but the old code did look for this
+ * and there is at least a possibility of a system out there
+ * like this ... so check to see if an old legacy _DMI_ table
+ * is available.
+ *
+ * XXX: Hopefully we can get rid of this one day.
+ */
+ buf = smbios_ioremap(smbios_addr, SMBIOS_SIZE);
+ if (!buf) {
+ ret = -ENODEV;
+ goto error;
+ }
+
+ /* Find the DMI entry point */
+ for (fp = 0; fp <= 0xFFF0; fp += 0x10) {
+ if (dmi_present(buf + fp)) {
+ smbios_addr += fp;
+ break;
+ }
+ }
+ smbios_iounmap(buf, SMBIOS_SIZE);
+ }
+error:
+ if (!smbios_present)
+ printk(KERN_INFO "SMBIOS not present.");
+ return ret;
+
+}
+
+/**
+ * smbios_walk - executes a function for each SMBIOS structure
+ * @decode: Function to execute
+ * private_data: data passed into decode function
+ *
+ * This function walks the SMBIOS structures and executes decode on each
+ * structure. This should have minimal usage in the kernel. Unless you have
+ * need to access the raw SMBIOS data, you should use sysfw_lookup() or
+ * sysfw_callback().
+ */
+const union smbios_struct
+*smbios_walk(int (*decode)(const union smbios_struct *, void *),
+ void *private_data)
+{
+ u8 *data = smbios_map;
+ int size = sizeof(struct smbios_header);
+ int i = 0;
+ int ret = SMBIOS_WALK_CONTINUE;
+ const union smbios_struct *ss = NULL;
+
+ /*
+ * Stop when we see all the items the table claimed to have
+ * OR we run off the end of the table (also happens)
+ */
+ while ((i < smbios_num) &&
+ (data - smbios_map + size) <= smbios_len) {
+ const struct smbios_header *dm;
+
+ /*
+ * We want to know the total length (formatted area and
+ * strings) before decoding to make sure we won't run off the
+ * table
+ */
+ dm = (const struct smbios_header *)data;
+ data += dm->length;
+ while ((data - smbios_map < smbios_len - 1) &&
+ (data[0] || data[1]))
+ data++;
+ if (data - smbios_map < smbios_len - 1) {
+ ret = decode((union smbios_struct *)dm, private_data);
+ if (ret == SMBIOS_WALK_STOP) {
+ ss = (union smbios_struct *)dm;
+ break;
+ }
+ }
+ data += 2;
+ i++;
+ }
+
+ return ss;
+}
+EXPORT_SYMBOL_GPL(smbios_walk);
+
+/*
+ * Helper Functions -- We really don't want a lot of these, but structs like
+ * the OEM Strings have a lot of elements and multiple drivers need to
+ * grep through them for string matches. Might as well do all of this in
+ * one place.
+ */
+
+/*
+ * This seems really general and currently has only two specific needs
+ * in the kernel (type10 and type11). But looking at other structs we'll need
+ * this for those as well.
+ */
+struct _smbios_strings {
+ int type;
+ int (*count_fn)(const union smbios_struct *ss);
+ const char *in;
+ const char *out;
+};
+
+/* returns SMBIOS_WALK_STOP & match->out != NULL on string match success */
+static int _match_string(const union smbios_struct *ss, void *_match)
+{
+ int i;
+ const char *str;
+ struct _smbios_strings *match = (struct _smbios_strings *)_match;
+
+ if (ss->header.type != match->type)
+ return SMBIOS_WALK_CONTINUE;
+
+ BUG_ON(!match->count_fn);
+
+ for (i = 1; i <= match->count_fn(ss); i++) {
+ str = smbios_get_string(ss, i);
+ if (!strncmp(match->in, str, strlen(match->in))) {
+ match->out = str;
+ return SMBIOS_WALK_STOP;
+ }
+ }
+
+ return SMBIOS_WALK_CONTINUE;
+}
+
+static int type10_count_fn(const union smbios_struct *ss)
+{
+ /*
+ * From SMBIOS Specification: The user of this structure determines the
+ * the number of devices as (Length - 4)/2.
+ */
+ return (ss->header.length - 4) / 2;
+}
+
+const char *smbios_match_type10_string(const char *match, int check_disabled)
+{
+ struct _smbios_strings _match = {
+ .in = match,
+ .out = NULL,
+ .type = 10,
+ .count_fn = type10_count_fn,
+ };
+ const union smbios_struct *ss;
+
+ ss = smbios_walk(_match_string, (void *)&_match);
+ if ((ss && check_disabled) || (ss && (ss->type10.device_type & 0x80)))
+ return _match.out;
+ return NULL;
+}
+
+/** smbios_is_onboard_device - Determines if a device is on (soldered on)
+ * @match: string to match
+ * @check_disabled_devices: match against devices marked disabled in structure
+ *
+ * This function returns true if the string passed in matches a device
+ * that the SMBIOS recognizes as being on board (soldered on). The function
+ * also can ignore SMBIOS's information about whether or not a device is
+ * disabled in order to workaround broken BIOSes.
+ *
+ * Note: This currently only looks at the type 10 structure.
+ */
+bool smbios_is_onboard_device(const char *match, int check_disabled_devices)
+{
+ const char *ret;
+
+ ret = smbios_match_type10_string(match, check_disabled_devices);
+ if (ret)
+ return true;
+ return false;
+}
+EXPORT_SYMBOL_GPL(smbios_is_onboard_device);
+
+static int type11_count_fn(const union smbios_struct *ss)
+{
+ return ss->type11.count;
+}
+
+/**
+ * smbios_match_oem_string - match a string with the OEM strings provided by
+ * @match: string to match
+ *
+ * This function returns the matching SMBIOS string if the string passed in
+ * matches the OEM strings provided by the SMBIOS.
+ */
+const char *smbios_match_oem_string(const char *match)
+{
+ struct _smbios_strings _match = {
+ .in = match,
+ .out = NULL,
+ .type = 11,
+ .count_fn = type11_count_fn,
+ };
+ const union smbios_struct *ss;
+
+ ss = smbios_walk(_match_string, (void *)&_match);
+ if (ss)
+ return _match.out;
+ return NULL;
+}
+EXPORT_SYMBOL_GPL(smbios_match_oem_string);
diff --git a/include/linux/smbios.h b/include/linux/smbios.h
new file mode 100644
index 0000000..180a5d8
--- /dev/null
+++ b/include/linux/smbios.h
@@ -0,0 +1,243 @@
+/*
+ * linux/include/smbios.h
+ *
+ * "The SMBIOS Specification addresses how motherboard and system vendors
+ * present management information about their products in a standard format by
+ * extending the BIOS interface on x86 architecture systems. The information is
+ * intended to allow generic instrumentation to deliver this information to
+ * management applications that use DMI, CIM or direct access, eliminating the
+ * need for error prone operations like probing system hardware for presence
+ * detection."
+ *
+ * From http://www.dmtf.org/standards/smbios
+ *
+ * ... Grab the Spec. It'll help.
+ */
+#ifndef __SMBIOS_H__
+#define __SMBIOS_H__
+
+#include <linux/mod_devicetable.h>
+
+/* struct smbios_step (SMBIOS STEP) is defined in drivers/firmware/smbios.c */
+/* enum sysfw_field (SYSFW_BIOS_VENDOR, etc.) is in mod_devicetable.h */
+
+/* max size of SMBIOS as specified in SMBIOS Specification */
+#define SMBIOS_SIZE 0x10000
+
+struct smbios_header {
+ u8 type;
+ u8 length;
+ u16 handle;
+} __attribute__((__packed__));
+
+/* UNION of SMBIOS types as listed in SMBIOS Specification. */
+union smbios_struct {
+ struct smbios_header header;
+ struct { /* BIOS Information */
+ struct smbios_header header;
+ u8 vendor;
+ u8 bios_version;
+ u16 bios_starting_address_segment;
+ u8 bios_release_date;
+ u8 bios_rom_size;
+ u32 bios_characteristics;
+ u16 bios_characteristics_extension_bytes;
+ u8 system_bios_major_release;
+ u8 system_bios_minor_release;
+ u8 embedded_controller_firmware_major_release;
+ u8 embedded_controller_firmware_minor_release;
+ } __attribute__((__packed__)) type0;
+ struct { /* System Information */
+ struct smbios_header header;
+ u8 manufacturer;
+ u8 product_name;
+ u8 version;
+ u8 serial_number;
+ u8 uuid[16];
+ u8 wake_up_type;
+ u8 sku_number;
+ } __attribute__((__packed__)) type1;
+ struct { /* Baseboard (or Module) Information */
+ struct smbios_header header;
+ u8 manufacturer;
+ u8 product;
+ u8 version;
+ u8 serial_number;
+ u8 asset_tag;
+ u8 feature_flags;
+ } __attribute__((__packed__)) type2;
+ struct { /* System Enclosure of Chassis */
+ struct smbios_header header;
+ u8 manufacturer;
+ u8 type;
+ u8 version;
+ u8 serial_number;
+ u8 asset_tag_number;
+ u8 boot_up_state;
+ u8 power_supply_state;
+ u8 thermal_state;
+ u8 security_status;
+ u8 oem_defined;
+ u8 height;
+ u8 number_of_power_cords;
+ u8 contained_element_count;
+ u8 contained_element_record;
+ /* contained elements = contained_element_count X */
+ /* contained_element_record */
+ u8 contained_elements;
+ /* u8 sku_number is allocated after that */
+ } __attribute__((__packed__)) type3;
+ struct { /* System Slots */
+ struct smbios_header header;
+ u8 slot_designation;
+ u8 slot_type;
+ u8 slot_data_bus_width;
+ u8 current_usage;
+ u8 slot_length;
+ u16 slot_id;
+ u8 slot_characteristics_1;
+ u8 slot_characteristics_2;
+ u16 segment_group_number;
+ u8 bus_number;
+ u8 device_function_number;
+ } __attribute__((__packed__)) type9;
+ struct { /* On Board Devices Information (Obsolete) */
+ struct smbios_header header; /* count = (length - 4)/2 */
+ u8 device_type; /* one for each device */
+ /* strings at end of struct, one per device */
+ } __attribute__((__packed__)) type10;
+ struct { /* OEM Strings */
+ struct smbios_header header;
+ u8 count;
+ u8 start;
+ /* variable number (equal to count) strings listed here */
+ } __attribute__((__packed__)) type11;
+ struct { /* IPMI Device Information - BMC Interface Type */
+ struct smbios_header header;
+ u8 interface_type;
+ u8 ipmi_specification_revision;
+ u8 i2c_slave_address;
+ u8 nv_storage_device_address;
+ u32 base_address;
+ union {
+ u8 base_address_modifier;
+ u8 interrupt_info;
+ };
+ u8 interrupt_number;
+ } __attribute__((__packed__)) type38;
+ struct { /* Onboard Devices Extended Information */
+ struct smbios_header header;
+ u8 reference_designation; /* "silkscreen label */
+ u8 device_type;
+ u8 device_type_instance;
+ u16 segment_group_number;
+ u8 bus_number;
+ u8 device_function_number;
+ } __attribute__((__packed__)) type41;
+};
+
+/* enum used for returns in smbios_walk decode() function */
+enum smbios_walk_value {
+ SMBIOS_WALK_CONTINUE = 0, /* continue executing in smbios_walk */
+ SMBIOS_WALK_STOP, /* stop executing and return */
+};
+
+#ifdef CONFIG_SMBIOS
+
+/* is there an SMBIOS on this system? */
+extern int smbios_available;
+
+/**
+ * smbios_get_string -- return a string from an SMBIOS structure
+ * @ss: pointer to structure being examined
+ * @s: number of string being examined
+ *
+ * This function returns a string within the structure ss. Many SMBIOS
+ * structures have their strings at the end of the structure, and the location
+ * of each string is enumerated throughout the structure.
+ *
+ * For example, The BIOS Information structure, type0, has the BIOS Version
+ * at offset 0x6, which contains a number enumerating the strings at the end
+ * of the structure.
+ *
+ * ie) s is an actual _number_, not a pointer.
+ */
+extern const char *smbios_get_string(const union smbios_struct *ss, u8 s);
+
+/**
+ * smbios_init - Initialize the SMBIOS code and register a sysfw driver
+ *
+ * This function looks for the SMBIOS tables, maps them, and registers a
+ * System Firmware driver.
+ */
+extern int smbios_init(void);
+
+/**
+ * smbios_walk - executes a function for each SMBIOS structure
+ * @decode: Function to execute
+ * private_data: data passed into decode function
+ *
+ * This function walks the SMBIOS structures and executes decode on each
+ * structure. If you are looking for a specific unique type of structure,
+ * you should use smbios_find_struct().
+ *
+ * This should have minimal usage in the kernel. The only reason this should
+ * be used is if you need access the raw SMBIOS data. Otherwise you should
+ * use sysfw_lookup() or sysfw_callback().
+ */
+extern const union smbios_struct *
+smbios_walk(int (*decode)(const union smbios_struct *, void *),
+ void *private_data);
+
+/* Helper Functions */
+
+/** smbios_is_onboard_device - Determines if a device is on (soldered on)
+ * @match: string to match
+ * @check_disabled_devices: match against devices marked disabled in structure
+ *
+ * This function returns true if the string passed in matches a device
+ * that the SMBIOS recognizes as being on board (soldered on). The function
+ * also can ignore SMBIOS's information about whether or not a device is
+ * disabled in order to workaround broken BIOSes.
+ *
+ * XXX: Fix me. This currently only looks at the type 10 structure.
+ */
+extern bool smbios_is_onboard_device(const char *match,
+ int check_disabled_devices);
+
+/**
+ * smbios_match_oem_string - match a string with the OEM strings provided by
+ * @match: string to match
+ *
+ * This function returns the matching SMBIOS string if the string passed in
+ * matches the OEM strings provided by the SMBIOS.
+ */
+extern const char *smbios_match_oem_string(const char *match);
+
+#else
+#define smbios_available 0
+static inline const char *smbios_get_string(const union smbios_struct *ss, u8 s)
+{
+ return NULL;
+}
+static inline void smbios_init(void)
+{
+ return;
+}
+static inline const union smbios_struct
+*smbios_walk(int (*decode)(const union smbios_struct *, void *),
+ void *private_data)
+{
+ return NULL;
+}
+static inline bool smbios_is_onboard_device(const char *match,
+ int check_disabled_devices)
+{
+ return 0;
+}
+static inline const char *smbios_match_oem_string(const char *match)
+{
+ return NULL;
+}
+#endif
+#endif /* __SMBIOS_H__ */
--
1.6.5.2
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH 07/34] drivers/char changes for SMBIOS and System Firmware
[not found] <1310994528-26276-1-git-send-email-prarit@redhat.com>
2011-07-18 13:08 ` [PATCH 01/34] System Firmware Interface Prarit Bhargava
[not found] ` <1310994528-26276-1-git-send-email-prarit-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
@ 2011-07-18 13:08 ` Prarit Bhargava
2011-07-18 13:08 ` [PATCH 21/34] drivers/platform " Prarit Bhargava
2011-07-18 13:08 ` [PATCH 34/34] Remove old DMI & SMBIOS code and make SMBIOS default on Prarit Bhargava
4 siblings, 0 replies; 7+ messages in thread
From: Prarit Bhargava @ 2011-07-18 13:08 UTC (permalink / raw)
To: linux-kernel; +Cc: Prarit Bhargava, openipmi-developer, dz, platform-driver-x86
As part of the new SMBIOS and System Firmware code:
- Replace old dmi* structures and functions with new sysfw* and smbios*
structures and functions in individual drivers
- cleanup sysfw_id lookup tables
Cc: openipmi-developer@lists.sourceforge.net
Cc: dz@debian.org
Cc: platform-driver-x86@vger.kernel.org
Signed-off-by: Prarit Bhargava <prarit@redhat.com>
---
drivers/char/i8k.c | 75 +++++++++---------
drivers/char/ipmi/ipmi_si_intf.c | 159 +++++++++++++++++++-------------------
drivers/char/sonypi.c | 16 ++--
3 files changed, 125 insertions(+), 125 deletions(-)
diff --git a/drivers/char/i8k.c b/drivers/char/i8k.c
index 6e40072..f198fac 100644
--- a/drivers/char/i8k.c
+++ b/drivers/char/i8k.c
@@ -24,7 +24,7 @@
#include <linux/init.h>
#include <linux/proc_fs.h>
#include <linux/seq_file.h>
-#include <linux/dmi.h>
+#include <linux/sysfw.h>
#include <linux/capability.h>
#include <linux/mutex.h>
#include <linux/hwmon.h>
@@ -73,9 +73,10 @@ static int force;
module_param(force, bool, 0);
MODULE_PARM_DESC(force, "Force loading without checking for supported models");
-static int ignore_dmi;
-module_param(ignore_dmi, bool, 0);
-MODULE_PARM_DESC(ignore_dmi, "Continue probing hardware even if DMI data does not match");
+static int ignore_smbios;
+module_param(ignore_smbios, bool, 0);
+MODULE_PARM_DESC(ignore_smbios,
+ "Continue probing hardware even if SMBIOS data does not match");
static int restricted;
module_param(restricted, bool, 0);
@@ -110,11 +111,11 @@ struct smm_regs {
unsigned int edi __attribute__ ((packed));
};
-static inline const char *i8k_get_dmi_data(int field)
+static inline const char *i8k_get_smbios_data(int field)
{
- const char *dmi_data = dmi_get_system_info(field);
+ const char *smbios_data = sysfw_lookup(field);
- return dmi_data && *dmi_data ? dmi_data : "?";
+ return smbios_data && *smbios_data ? smbios_data : "?";
}
/*
@@ -333,7 +334,8 @@ i8k_ioctl_unlocked(struct file *fp, unsigned int cmd, unsigned long arg)
case I8K_MACHINE_ID:
memset(buff, 0, 16);
- strlcpy(buff, i8k_get_dmi_data(DMI_PRODUCT_SERIAL), sizeof(buff));
+ strlcpy(buff, i8k_get_smbios_data(SYSFW_PRODUCT_SERIAL),
+ sizeof(buff));
break;
case I8K_FN_STATUS:
@@ -450,7 +452,7 @@ static int i8k_proc_show(struct seq_file *seq, void *offset)
return seq_printf(seq, "%s %s %s %d %d %d %d %d %d %d\n",
I8K_PROC_FMT,
bios_version,
- i8k_get_dmi_data(DMI_PRODUCT_SERIAL),
+ i8k_get_smbios_data(SYSFW_PRODUCT_SERIAL),
cpu_temp,
left_fan, right_fan, left_speed, right_speed,
ac_power, fn_key);
@@ -607,64 +609,64 @@ static void __exit i8k_exit_hwmon(void)
hwmon_device_unregister(i8k_hwmon_dev);
}
-static struct dmi_system_id __initdata i8k_dmi_table[] = {
+static struct sysfw_id __initdata i8k_smbios_table[] = {
{
.ident = "Dell Inspiron",
.matches = {
- DMI_MATCH(DMI_SYS_VENDOR, "Dell Computer"),
- DMI_MATCH(DMI_PRODUCT_NAME, "Inspiron"),
+ SYSFW_MATCH(SYSFW_SYS_VENDOR, "Dell Computer"),
+ SYSFW_MATCH(SYSFW_PRODUCT_NAME, "Inspiron"),
},
},
{
.ident = "Dell Latitude",
.matches = {
- DMI_MATCH(DMI_SYS_VENDOR, "Dell Computer"),
- DMI_MATCH(DMI_PRODUCT_NAME, "Latitude"),
+ SYSFW_MATCH(SYSFW_SYS_VENDOR, "Dell Computer"),
+ SYSFW_MATCH(SYSFW_PRODUCT_NAME, "Latitude"),
},
},
{
.ident = "Dell Inspiron 2",
.matches = {
- DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
- DMI_MATCH(DMI_PRODUCT_NAME, "Inspiron"),
+ SYSFW_MATCH(SYSFW_SYS_VENDOR, "Dell Inc."),
+ SYSFW_MATCH(SYSFW_PRODUCT_NAME, "Inspiron"),
},
},
{
.ident = "Dell Latitude 2",
.matches = {
- DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
- DMI_MATCH(DMI_PRODUCT_NAME, "Latitude"),
+ SYSFW_MATCH(SYSFW_SYS_VENDOR, "Dell Inc."),
+ SYSFW_MATCH(SYSFW_PRODUCT_NAME, "Latitude"),
},
},
{ /* UK Inspiron 6400 */
.ident = "Dell Inspiron 3",
.matches = {
- DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
- DMI_MATCH(DMI_PRODUCT_NAME, "MM061"),
+ SYSFW_MATCH(SYSFW_SYS_VENDOR, "Dell Inc."),
+ SYSFW_MATCH(SYSFW_PRODUCT_NAME, "MM061"),
},
},
{
.ident = "Dell Inspiron 3",
.matches = {
- DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
- DMI_MATCH(DMI_PRODUCT_NAME, "MP061"),
+ SYSFW_MATCH(SYSFW_SYS_VENDOR, "Dell Inc."),
+ SYSFW_MATCH(SYSFW_PRODUCT_NAME, "MP061"),
},
},
{
.ident = "Dell Precision",
.matches = {
- DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
- DMI_MATCH(DMI_PRODUCT_NAME, "Precision"),
+ SYSFW_MATCH(SYSFW_SYS_VENDOR, "Dell Inc."),
+ SYSFW_MATCH(SYSFW_PRODUCT_NAME, "Precision"),
},
},
{
.ident = "Dell Vostro",
.matches = {
- DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
- DMI_MATCH(DMI_PRODUCT_NAME, "Vostro"),
+ SYSFW_MATCH(SYSFW_SYS_VENDOR, "Dell Inc."),
+ SYSFW_MATCH(SYSFW_PRODUCT_NAME, "Vostro"),
},
},
- { }
+ {}
};
/*
@@ -676,20 +678,21 @@ static int __init i8k_probe(void)
int version;
/*
- * Get DMI information
+ * Get SMBIOS information
*/
- if (!dmi_check_system(i8k_dmi_table)) {
- if (!ignore_dmi && !force)
+ if (!sysfw_callback(i8k_smbios_table)) {
+ if (!ignore_smbios && !force)
return -ENODEV;
printk(KERN_INFO "i8k: not running on a supported Dell system.\n");
printk(KERN_INFO "i8k: vendor=%s, model=%s, version=%s\n",
- i8k_get_dmi_data(DMI_SYS_VENDOR),
- i8k_get_dmi_data(DMI_PRODUCT_NAME),
- i8k_get_dmi_data(DMI_BIOS_VERSION));
+ i8k_get_smbios_data(SYSFW_SYS_VENDOR),
+ i8k_get_smbios_data(SYSFW_PRODUCT_NAME),
+ i8k_get_smbios_data(SYSFW_BIOS_VERSION));
}
- strlcpy(bios_version, i8k_get_dmi_data(DMI_BIOS_VERSION), sizeof(bios_version));
+ strlcpy(bios_version, i8k_get_smbios_data(SYSFW_BIOS_VERSION),
+ sizeof(bios_version));
/*
* Get SMM Dell signature
@@ -713,9 +716,9 @@ static int __init i8k_probe(void)
buff[2] = (version) & 0xff;
buff[3] = '\0';
/*
- * If DMI BIOS version is unknown use SMM BIOS version.
+ * If SMBIOS version is unknown use SMM BIOS version.
*/
- if (!dmi_get_system_info(DMI_BIOS_VERSION))
+ if (!sysfw_lookup(SYSFW_BIOS_VERSION))
strlcpy(bios_version, buff, sizeof(bios_version));
/*
diff --git a/drivers/char/ipmi/ipmi_si_intf.c b/drivers/char/ipmi/ipmi_si_intf.c
index 9397ab4..7c64c3d 100644
--- a/drivers/char/ipmi/ipmi_si_intf.c
+++ b/drivers/char/ipmi/ipmi_si_intf.c
@@ -63,7 +63,7 @@
#include <asm/io.h>
#include "ipmi_si_sm.h"
#include <linux/init.h>
-#include <linux/dmi.h>
+#include <linux/smbios.h>
#include <linux/string.h>
#include <linux/ctype.h>
#include <linux/pnp.h>
@@ -273,7 +273,7 @@ struct smi_info {
*/
int dev_registered;
- /* Slave address, could be reported from DMI. */
+ /* Slave address, could be reported from SMBIOS. */
unsigned char slave_addr;
/* Counters and things for the proc filesystem. */
@@ -2269,8 +2269,7 @@ static struct pnp_driver ipmi_pnp_driver = {
};
#endif
-#ifdef CONFIG_DMI
-struct dmi_ipmi_data {
+struct smbios_ipmi_data {
u8 type;
u8 addr_space;
unsigned long base_addr;
@@ -2279,69 +2278,7 @@ struct dmi_ipmi_data {
u8 slave_addr;
};
-static int __devinit decode_dmi(const struct dmi_header *dm,
- struct dmi_ipmi_data *dmi)
-{
- const u8 *data = (const u8 *)dm;
- unsigned long base_addr;
- u8 reg_spacing;
- u8 len = dm->length;
-
- dmi->type = data[4];
-
- memcpy(&base_addr, data+8, sizeof(unsigned long));
- if (len >= 0x11) {
- if (base_addr & 1) {
- /* I/O */
- base_addr &= 0xFFFE;
- dmi->addr_space = IPMI_IO_ADDR_SPACE;
- } else
- /* Memory */
- dmi->addr_space = IPMI_MEM_ADDR_SPACE;
-
- /* If bit 4 of byte 0x10 is set, then the lsb for the address
- is odd. */
- dmi->base_addr = base_addr | ((data[0x10] & 0x10) >> 4);
-
- dmi->irq = data[0x11];
-
- /* The top two bits of byte 0x10 hold the register spacing. */
- reg_spacing = (data[0x10] & 0xC0) >> 6;
- switch (reg_spacing) {
- case 0x00: /* Byte boundaries */
- dmi->offset = 1;
- break;
- case 0x01: /* 32-bit boundaries */
- dmi->offset = 4;
- break;
- case 0x02: /* 16-byte boundaries */
- dmi->offset = 16;
- break;
- default:
- /* Some other interface, just ignore it. */
- return -EIO;
- }
- } else {
- /* Old DMI spec. */
- /*
- * Note that technically, the lower bit of the base
- * address should be 1 if the address is I/O and 0 if
- * the address is in memory. So many systems get that
- * wrong (and all that I have seen are I/O) so we just
- * ignore that bit and assume I/O. Systems that use
- * memory should use the newer spec, anyway.
- */
- dmi->base_addr = base_addr & 0xfffe;
- dmi->addr_space = IPMI_IO_ADDR_SPACE;
- dmi->offset = 1;
- }
-
- dmi->slave_addr = data[6];
-
- return 0;
-}
-
-static void __devinit try_init_dmi(struct dmi_ipmi_data *ipmi_data)
+static void __devinit try_init_smbios(struct smbios_ipmi_data *ipmi_data)
{
struct smi_info *info;
@@ -2409,21 +2346,83 @@ static void __devinit try_init_dmi(struct dmi_ipmi_data *ipmi_data)
kfree(info);
}
-static void __devinit dmi_find_bmc(void)
+/* XXX: This code doesn't use the smbios_struct laid out for IPMI. It should
+ * be investigated to see if this code even works */
+static int __devinit decode_smbios(const union smbios_struct *ss,
+ void *smbios_data)
{
- const struct dmi_device *dev = NULL;
- struct dmi_ipmi_data data;
- int rv;
+ const u8 *data = (const u8 *)ss;
+ unsigned long base_addr;
+ u8 reg_spacing;
+ u8 len = ss->header.length;
+ struct smbios_ipmi_data *smbios = smbios_data;
- while ((dev = dmi_find_device(DMI_DEV_TYPE_IPMI, NULL, dev))) {
- memset(&data, 0, sizeof(data));
- rv = decode_dmi((const struct dmi_header *) dev->device_data,
- &data);
- if (!rv)
- try_init_dmi(&data);
+ if (ss->header.type != 38)
+ return SMBIOS_WALK_CONTINUE;
+
+ smbios->type = data[4];
+
+ memcpy(&base_addr, data+8, sizeof(unsigned long));
+ if (len >= 0x11) {
+ if (base_addr & 1) {
+ /* I/O */
+ base_addr &= 0xFFFE;
+ smbios->addr_space = IPMI_IO_ADDR_SPACE;
+ } else
+ /* Memory */
+ smbios->addr_space = IPMI_MEM_ADDR_SPACE;
+
+ /* If bit 4 of byte 0x10 is set, then the lsb for the address
+ is odd. */
+ smbios->base_addr = base_addr | ((data[0x10] & 0x10) >> 4);
+
+ smbios->irq = data[0x11];
+
+ /* The top two bits of byte 0x10 hold the register spacing. */
+ reg_spacing = (data[0x10] & 0xC0) >> 6;
+ switch (reg_spacing) {
+ case 0x00: /* Byte boundaries */
+ smbios->offset = 1;
+ break;
+ case 0x01: /* 32-bit boundaries */
+ smbios->offset = 3;
+ break;
+ case 0x02: /* 16-byte boundaries */
+ smbios->offset = 16;
+ break;
+ default:
+ /* Some other interface, just ignore it. */
+ return SMBIOS_WALK_CONTINUE;
+ }
+ } else {
+ /* Old SMBIOS spec. */
+ /*
+ * Note that technically, the lower bit of the base
+ * address should be 1 if the address is I/O and 0 if
+ * the address is in memory. So many systems get that
+ * wrong (and all that I have seen are I/O) so we just
+ * ignore that bit and assume I/O. Systems that use
+ * memory should use the newer spec, anyway.
+ */
+ smbios->base_addr = base_addr & 0xfffe;
+ smbios->addr_space = IPMI_IO_ADDR_SPACE;
+ smbios->offset = 1;
}
+
+ smbios->slave_addr = data[6];
+
+ try_init_smbios(smbios);
+
+ return SMBIOS_WALK_STOP;
+}
+
+
+static void __devinit smbios_find_bmc(void)
+{
+ struct smbios_ipmi_data data;
+
+ smbios_walk(decode_smbios, &data);
}
-#endif /* CONFIG_DMI */
#ifdef CONFIG_PCI
@@ -3417,9 +3416,7 @@ static int __devinit init_ipmi_si(void)
pnp_registered = 1;
#endif
-#ifdef CONFIG_DMI
- dmi_find_bmc();
-#endif
+ smbios_find_bmc();
#ifdef CONFIG_ACPI
spmi_find_bmc();
diff --git a/drivers/char/sonypi.c b/drivers/char/sonypi.c
index 1ee8ce7..4a50ebd 100644
--- a/drivers/char/sonypi.c
+++ b/drivers/char/sonypi.c
@@ -46,11 +46,11 @@
#include <linux/delay.h>
#include <linux/wait.h>
#include <linux/acpi.h>
-#include <linux/dmi.h>
#include <linux/err.h>
#include <linux/kfifo.h>
#include <linux/platform_device.h>
#include <linux/gfp.h>
+#include <linux/sysfw.h>
#include <asm/uaccess.h>
#include <asm/io.h>
@@ -1497,22 +1497,22 @@ static struct platform_driver sonypi_driver = {
static struct platform_device *sonypi_platform_device;
-static struct dmi_system_id __initdata sonypi_dmi_table[] = {
+static struct sysfw_id __initdata sonypi_smbios_table[] = {
{
.ident = "Sony Vaio",
.matches = {
- DMI_MATCH(DMI_SYS_VENDOR, "Sony Corporation"),
- DMI_MATCH(DMI_PRODUCT_NAME, "PCG-"),
+ SYSFW_MATCH(SYSFW_SYS_VENDOR, "Sony Corporation"),
+ SYSFW_MATCH(SYSFW_PRODUCT_NAME, "PCG-"),
},
},
{
.ident = "Sony Vaio",
.matches = {
- DMI_MATCH(DMI_SYS_VENDOR, "Sony Corporation"),
- DMI_MATCH(DMI_PRODUCT_NAME, "VGN-"),
+ SYSFW_MATCH(SYSFW_SYS_VENDOR, "Sony Corporation"),
+ SYSFW_MATCH(SYSFW_PRODUCT_NAME, "VGN-"),
},
},
- { }
+ {}
};
static int __init sonypi_init(void)
@@ -1523,7 +1523,7 @@ static int __init sonypi_init(void)
"sonypi: Sony Programmable I/O Controller Driver v%s.\n",
SONYPI_DRIVER_VERSION);
- if (!dmi_check_system(sonypi_dmi_table))
+ if (!sysfw_callback(sonypi_smbios_table))
return -ENODEV;
error = platform_driver_register(&sonypi_driver);
--
1.6.5.2
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH 21/34] drivers/platform changes for SMBIOS and System Firmware
[not found] <1310994528-26276-1-git-send-email-prarit@redhat.com>
` (2 preceding siblings ...)
2011-07-18 13:08 ` [PATCH 07/34] drivers/char changes for SMBIOS and System Firmware Prarit Bhargava
@ 2011-07-18 13:08 ` Prarit Bhargava
2011-08-11 4:30 ` Jonathan Woithe
2011-07-18 13:08 ` [PATCH 34/34] Remove old DMI & SMBIOS code and make SMBIOS default on Prarit Bhargava
4 siblings, 1 reply; 7+ messages in thread
From: Prarit Bhargava @ 2011-07-18 13:08 UTC (permalink / raw)
To: linux-kernel; +Cc: Prarit Bhargava, platform-driver-x86
- Replace old dmi* structures and functions with new sysfw* and smbios*
structures and functions in individual drivers
- cleanup sysfw_id lookup tables
- add exactmatch functionality
- edit udev notifiers
- cleanup of includes for dmi.h and mod_devicetable.h which were included in
some files that did not need them
[v2]: Re-exported dmi MODULE_ALIAS
Cc: platform-driver-x86@vger.kernel.org
Signed-off-by: Prarit Bhargava <prarit@redhat.com>
---
drivers/platform/x86/acer-wmi.c | 119 +++++++++++-----------
drivers/platform/x86/acerhdf.c | 18 +++-
drivers/platform/x86/asus-laptop.c | 29 +++---
drivers/platform/x86/compal-laptop.c | 106 +++++++++++---------
drivers/platform/x86/dell-laptop.c | 66 +++++++------
drivers/platform/x86/dell-wmi.c | 15 ++-
drivers/platform/x86/eeepc-laptop.c | 58 +++++++++--
drivers/platform/x86/eeepc-wmi.c | 30 +++---
drivers/platform/x86/fujitsu-laptop.c | 41 ++++----
drivers/platform/x86/hdaps.c | 76 +++++++-------
drivers/platform/x86/hp_accel.c | 98 +++++++++---------
drivers/platform/x86/ibm_rtl.c | 21 ++--
drivers/platform/x86/intel_oaktrail.c | 15 ++--
drivers/platform/x86/msi-laptop.c | 115 +++++++++++---------
drivers/platform/x86/samsung-laptop.c | 183 +++++++++++++++++----------------
drivers/platform/x86/sony-laptop.c | 16 ++--
drivers/platform/x86/thinkpad_acpi.c | 64 ++++++------
17 files changed, 580 insertions(+), 490 deletions(-)
diff --git a/drivers/platform/x86/acer-wmi.c b/drivers/platform/x86/acer-wmi.c
index e1c4938..3a9dba1 100644
--- a/drivers/platform/x86/acer-wmi.c
+++ b/drivers/platform/x86/acer-wmi.c
@@ -28,7 +28,8 @@
#include <linux/module.h>
#include <linux/init.h>
#include <linux/types.h>
-#include <linux/dmi.h>
+#include <linux/smbios.h>
+#include <linux/sysfw.h>
#include <linux/fb.h>
#include <linux/backlight.h>
#include <linux/leds.h>
@@ -278,9 +279,9 @@ static void set_quirks(void)
interface->capability |= ACER_CAP_BRIGHTNESS;
}
-static int dmi_matched(const struct dmi_system_id *dmi)
+static int quirk_matched(const struct sysfw_id *quirk)
{
- quirks = dmi->driver_data;
+ quirks = quirk->driver_data;
return 1;
}
@@ -305,148 +306,148 @@ static struct quirk_entry quirk_fujitsu_amilo_li_1718 = {
};
/* The Aspire One has a dummy ACPI-WMI interface - disable it */
-static struct dmi_system_id __devinitdata acer_blacklist[] = {
+static struct sysfw_id __devinitdata acer_blacklist[] = {
{
.ident = "Acer Aspire One (SSD)",
.matches = {
- DMI_MATCH(DMI_SYS_VENDOR, "Acer"),
- DMI_MATCH(DMI_PRODUCT_NAME, "AOA110"),
+ SYSFW_MATCH(SYSFW_SYS_VENDOR, "Acer"),
+ SYSFW_MATCH(SYSFW_PRODUCT_NAME, "AOA110"),
},
},
{
.ident = "Acer Aspire One (HDD)",
.matches = {
- DMI_MATCH(DMI_SYS_VENDOR, "Acer"),
- DMI_MATCH(DMI_PRODUCT_NAME, "AOA150"),
+ SYSFW_MATCH(SYSFW_SYS_VENDOR, "Acer"),
+ SYSFW_MATCH(SYSFW_PRODUCT_NAME, "AOA150"),
},
},
{}
};
-static struct dmi_system_id acer_quirks[] = {
+static struct sysfw_id acer_quirks[] = {
{
- .callback = dmi_matched,
+ .callback = quirk_matched,
.ident = "Acer Aspire 1360",
.matches = {
- DMI_MATCH(DMI_SYS_VENDOR, "Acer"),
- DMI_MATCH(DMI_PRODUCT_NAME, "Aspire 1360"),
+ SYSFW_MATCH(SYSFW_SYS_VENDOR, "Acer"),
+ SYSFW_MATCH(SYSFW_PRODUCT_NAME, "Aspire 1360"),
},
.driver_data = &quirk_acer_aspire_1520,
},
{
- .callback = dmi_matched,
+ .callback = quirk_matched,
.ident = "Acer Aspire 1520",
.matches = {
- DMI_MATCH(DMI_SYS_VENDOR, "Acer"),
- DMI_MATCH(DMI_PRODUCT_NAME, "Aspire 1520"),
+ SYSFW_MATCH(SYSFW_SYS_VENDOR, "Acer"),
+ SYSFW_MATCH(SYSFW_PRODUCT_NAME, "Aspire 1520"),
},
.driver_data = &quirk_acer_aspire_1520,
},
{
- .callback = dmi_matched,
+ .callback = quirk_matched,
.ident = "Acer Aspire 3100",
.matches = {
- DMI_MATCH(DMI_SYS_VENDOR, "Acer"),
- DMI_MATCH(DMI_PRODUCT_NAME, "Aspire 3100"),
+ SYSFW_MATCH(SYSFW_SYS_VENDOR, "Acer"),
+ SYSFW_MATCH(SYSFW_PRODUCT_NAME, "Aspire 3100"),
},
.driver_data = &quirk_acer_travelmate_2490,
},
{
- .callback = dmi_matched,
+ .callback = quirk_matched,
.ident = "Acer Aspire 3610",
.matches = {
- DMI_MATCH(DMI_SYS_VENDOR, "Acer"),
- DMI_MATCH(DMI_PRODUCT_NAME, "Aspire 3610"),
+ SYSFW_MATCH(SYSFW_SYS_VENDOR, "Acer"),
+ SYSFW_MATCH(SYSFW_PRODUCT_NAME, "Aspire 3610"),
},
.driver_data = &quirk_acer_travelmate_2490,
},
{
- .callback = dmi_matched,
+ .callback = quirk_matched,
.ident = "Acer Aspire 5100",
.matches = {
- DMI_MATCH(DMI_SYS_VENDOR, "Acer"),
- DMI_MATCH(DMI_PRODUCT_NAME, "Aspire 5100"),
+ SYSFW_MATCH(SYSFW_SYS_VENDOR, "Acer"),
+ SYSFW_MATCH(SYSFW_PRODUCT_NAME, "Aspire 5100"),
},
.driver_data = &quirk_acer_travelmate_2490,
},
{
- .callback = dmi_matched,
+ .callback = quirk_matched,
.ident = "Acer Aspire 5610",
.matches = {
- DMI_MATCH(DMI_SYS_VENDOR, "Acer"),
- DMI_MATCH(DMI_PRODUCT_NAME, "Aspire 5610"),
+ SYSFW_MATCH(SYSFW_SYS_VENDOR, "Acer"),
+ SYSFW_MATCH(SYSFW_PRODUCT_NAME, "Aspire 5610"),
},
.driver_data = &quirk_acer_travelmate_2490,
},
{
- .callback = dmi_matched,
+ .callback = quirk_matched,
.ident = "Acer Aspire 5630",
.matches = {
- DMI_MATCH(DMI_SYS_VENDOR, "Acer"),
- DMI_MATCH(DMI_PRODUCT_NAME, "Aspire 5630"),
+ SYSFW_MATCH(SYSFW_SYS_VENDOR, "Acer"),
+ SYSFW_MATCH(SYSFW_PRODUCT_NAME, "Aspire 5630"),
},
.driver_data = &quirk_acer_travelmate_2490,
},
{
- .callback = dmi_matched,
+ .callback = quirk_matched,
.ident = "Acer Aspire 5650",
.matches = {
- DMI_MATCH(DMI_SYS_VENDOR, "Acer"),
- DMI_MATCH(DMI_PRODUCT_NAME, "Aspire 5650"),
+ SYSFW_MATCH(SYSFW_SYS_VENDOR, "Acer"),
+ SYSFW_MATCH(SYSFW_PRODUCT_NAME, "Aspire 5650"),
},
.driver_data = &quirk_acer_travelmate_2490,
},
{
- .callback = dmi_matched,
+ .callback = quirk_matched,
.ident = "Acer Aspire 5680",
.matches = {
- DMI_MATCH(DMI_SYS_VENDOR, "Acer"),
- DMI_MATCH(DMI_PRODUCT_NAME, "Aspire 5680"),
+ SYSFW_MATCH(SYSFW_SYS_VENDOR, "Acer"),
+ SYSFW_MATCH(SYSFW_PRODUCT_NAME, "Aspire 5680"),
},
.driver_data = &quirk_acer_travelmate_2490,
},
{
- .callback = dmi_matched,
+ .callback = quirk_matched,
.ident = "Acer Aspire 9110",
.matches = {
- DMI_MATCH(DMI_SYS_VENDOR, "Acer"),
- DMI_MATCH(DMI_PRODUCT_NAME, "Aspire 9110"),
+ SYSFW_MATCH(SYSFW_SYS_VENDOR, "Acer"),
+ SYSFW_MATCH(SYSFW_PRODUCT_NAME, "Aspire 9110"),
},
.driver_data = &quirk_acer_travelmate_2490,
},
{
- .callback = dmi_matched,
+ .callback = quirk_matched,
.ident = "Acer TravelMate 2490",
.matches = {
- DMI_MATCH(DMI_SYS_VENDOR, "Acer"),
- DMI_MATCH(DMI_PRODUCT_NAME, "TravelMate 2490"),
+ SYSFW_MATCH(SYSFW_SYS_VENDOR, "Acer"),
+ SYSFW_MATCH(SYSFW_PRODUCT_NAME, "TravelMate 2490"),
},
.driver_data = &quirk_acer_travelmate_2490,
},
{
- .callback = dmi_matched,
+ .callback = quirk_matched,
.ident = "Acer TravelMate 4200",
.matches = {
- DMI_MATCH(DMI_SYS_VENDOR, "Acer"),
- DMI_MATCH(DMI_PRODUCT_NAME, "TravelMate 4200"),
+ SYSFW_MATCH(SYSFW_SYS_VENDOR, "Acer"),
+ SYSFW_MATCH(SYSFW_PRODUCT_NAME, "TravelMate 4200"),
},
.driver_data = &quirk_acer_travelmate_2490,
},
{
- .callback = dmi_matched,
+ .callback = quirk_matched,
.ident = "Fujitsu Siemens Amilo Li 1718",
.matches = {
- DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU SIEMENS"),
- DMI_MATCH(DMI_PRODUCT_NAME, "AMILO Li 1718"),
+ SYSFW_MATCH(SYSFW_SYS_VENDOR, "FUJITSU SIEMENS"),
+ SYSFW_MATCH(SYSFW_PRODUCT_NAME, "AMILO Li 1718"),
},
.driver_data = &quirk_fujitsu_amilo_li_1718,
},
{
- .callback = dmi_matched,
+ .callback = quirk_matched,
.ident = "Medion MD 98300",
.matches = {
- DMI_MATCH(DMI_SYS_VENDOR, "MEDION"),
- DMI_MATCH(DMI_PRODUCT_NAME, "WAM2030"),
+ SYSFW_MATCH(SYSFW_SYS_VENDOR, "MEDION"),
+ SYSFW_MATCH(SYSFW_PRODUCT_NAME, "WAM2030"),
},
.driver_data = &quirk_medion_md_98300,
},
@@ -457,7 +458,7 @@ static struct dmi_system_id acer_quirks[] = {
static void find_quirks(void)
{
if (!force_series) {
- dmi_check_system(acer_quirks);
+ sysfw_callback(acer_quirks);
} else if (force_series == 2490) {
quirks = &quirk_acer_travelmate_2490;
}
@@ -848,16 +849,16 @@ static acpi_status WMID_set_u32(u32 value, u32 cap, struct wmi_interface *iface)
return WMI_execute_u32(method_id, (u32)value, NULL);
}
-static void type_aa_dmi_decode(const struct dmi_header *header, void *dummy)
+static int type_aa_smbios_decode(const union smbios_struct *ss, void *dummy)
{
struct hotkey_function_type_aa *type_aa;
/* We are looking for OEM-specific Type AAh */
- if (header->type != 0xAA)
- return;
+ if (ss->header.type != 0xAA)
+ return SMBIOS_WALK_CONTINUE;
has_type_aa = true;
- type_aa = (struct hotkey_function_type_aa *) header;
+ type_aa = (struct hotkey_function_type_aa *) &ss->header;
pr_info("Function bitmap for Communication Button: 0x%x\n",
type_aa->commun_func_bitmap);
@@ -868,6 +869,8 @@ static void type_aa_dmi_decode(const struct dmi_header *header, void *dummy)
interface->capability |= ACER_CAP_THREEG;
if (type_aa->commun_func_bitmap & ACER_WMID3_GDS_BLUETOOTH)
interface->capability |= ACER_CAP_BLUETOOTH;
+
+ return SMBIOS_WALK_STOP;
}
static acpi_status WMID_set_capabilities(void)
@@ -893,7 +896,7 @@ static acpi_status WMID_set_capabilities(void)
return AE_ERROR;
}
- dmi_walk(type_aa_dmi_decode, NULL);
+ smbios_walk(type_aa_smbios_decode, NULL);
if (!has_type_aa) {
interface->capability |= ACER_CAP_WIRELESS;
if (devices & 0x40)
@@ -1835,7 +1838,7 @@ static int __init acer_wmi_init(void)
pr_info("Acer Laptop ACPI-WMI Extras\n");
- if (dmi_check_system(acer_blacklist)) {
+ if (sysfw_callback(acer_blacklist)) {
pr_info("Blacklisted hardware detected - not loading\n");
return -ENODEV;
}
diff --git a/drivers/platform/x86/acerhdf.c b/drivers/platform/x86/acerhdf.c
index fca3489..3f951fc 100644
--- a/drivers/platform/x86/acerhdf.c
+++ b/drivers/platform/x86/acerhdf.c
@@ -35,7 +35,7 @@
#include <linux/kernel.h>
#include <linux/module.h>
-#include <linux/dmi.h>
+#include <linux/sysfw.h>
#include <linux/acpi.h>
#include <linux/thermal.h>
#include <linux/platform_device.h>
@@ -544,9 +544,9 @@ static int acerhdf_check_hardware(void)
const struct bios_settings_t *bt = NULL;
/* get BIOS data */
- vendor = dmi_get_system_info(DMI_SYS_VENDOR);
- version = dmi_get_system_info(DMI_BIOS_VERSION);
- product = dmi_get_system_info(DMI_PRODUCT_NAME);
+ vendor = sysfw_lookup(SYSFW_SYS_VENDOR);
+ version = sysfw_lookup(SYSFW_BIOS_VERSION);
+ product = sysfw_lookup(SYSFW_PRODUCT_NAME);
if (!vendor || !version || !product) {
pr_err("error getting hardware information\n");
@@ -712,6 +712,16 @@ MODULE_ALIAS("dmi:*:*Packard Bell*:pnAOA*:");
MODULE_ALIAS("dmi:*:*Packard Bell*:pnDOA*:");
MODULE_ALIAS("dmi:*:*Packard Bell*:pnDOTMU*:");
MODULE_ALIAS("dmi:*:*Packard Bell*:pnDOTMA*:");
+MODULE_ALIAS("sysfw:*:*Acer*:pnAOA*:");
+MODULE_ALIAS("sysfw:*:*Acer*:pnAspire 1410*:");
+MODULE_ALIAS("sysfw:*:*Acer*:pnAspire 1810*:");
+MODULE_ALIAS("sysfw:*:*Acer*:pnAO531*:");
+MODULE_ALIAS("sysfw:*:*Gateway*:pnAOA*:");
+MODULE_ALIAS("sysfw:*:*Gateway*:pnLT31*:");
+MODULE_ALIAS("sysfw:*:*Packard Bell*:pnAOA*:");
+MODULE_ALIAS("sysfw:*:*Packard Bell*:pnDOA*:");
+MODULE_ALIAS("sysfw:*:*Packard Bell*:pnDOTMU*:");
+MODULE_ALIAS("sysfw:*:*Packard Bell*:pnDOTMA*:");
module_init(acerhdf_init);
module_exit(acerhdf_exit);
diff --git a/drivers/platform/x86/asus-laptop.c b/drivers/platform/x86/asus-laptop.c
index d65df92..1841e01 100644
--- a/drivers/platform/x86/asus-laptop.c
+++ b/drivers/platform/x86/asus-laptop.c
@@ -50,7 +50,7 @@
#include <linux/input/sparse-keymap.h>
#include <linux/rfkill.h>
#include <linux/slab.h>
-#include <linux/dmi.h>
+#include <linux/sysfw.h>
#include <acpi/acpi_drivers.h>
#include <acpi/acpi_bus.h>
@@ -1401,19 +1401,16 @@ static int __devinit asus_acpi_init(struct asus_laptop *asus)
return result;
}
-static void __devinit asus_dmi_check(void)
-{
- const char *model;
-
- model = dmi_get_system_info(DMI_PRODUCT_NAME);
- if (!model)
- return;
-
- /* On L1400B WLED control the sound card, don't mess with it ... */
- if (strncmp(model, "L1400B", 6) == 0) {
- wlan_status = -1;
- }
-}
+static struct sysfw_id asus_wlan_table[] = {
+ {
+ .ident = "L1400B",
+ .matches = {
+ SYSFW_MATCH(SYSFW_PRODUCT_NAME, "L1400B"),
+ },
+ .exactmatch = 1,
+ },
+ {},
+};
static bool asus_device_present;
@@ -1433,7 +1430,9 @@ static int __devinit asus_acpi_add(struct acpi_device *device)
device->driver_data = asus;
asus->device = device;
- asus_dmi_check();
+ /* On L1400B WLED control the sound card, don't mess with it ... */
+ if (sysfw_callback(asus_wlan_table))
+ wlan_status = -1;
result = asus_acpi_init(asus);
if (result)
diff --git a/drivers/platform/x86/compal-laptop.c b/drivers/platform/x86/compal-laptop.c
index 8877b83..3d6e37e 100644
--- a/drivers/platform/x86/compal-laptop.c
+++ b/drivers/platform/x86/compal-laptop.c
@@ -46,7 +46,7 @@
*
* This driver might work on other laptops produced by Compal. If you
* want to try it you can pass force=1 as argument to the module which
- * will force it to load even when the DMI data doesn't identify the
+ * will force it to load even when the SMBIOS data doesn't identify the
* laptop as compatible.
*
* Lots of data available at:
@@ -74,7 +74,7 @@
#include <linux/kernel.h>
#include <linux/init.h>
#include <linux/acpi.h>
-#include <linux/dmi.h>
+#include <linux/sysfw.h>
#include <linux/backlight.h>
#include <linux/platform_device.h>
#include <linux/rfkill.h>
@@ -191,7 +191,7 @@ struct compal_data{
/* =============== */
static int force;
module_param(force, bool, 0);
-MODULE_PARM_DESC(force, "Force driver load, ignore DMI data");
+MODULE_PARM_DESC(force, "Force driver load, ignore SMBIOS data");
/* Support for the wake_on_XXX, hwmon and power_supply interface. Currently
* only gets enabled on a JHL90 board. Might work with the others too */
@@ -760,14 +760,14 @@ static struct rfkill *bt_rfkill;
/* Initialization & clean-up functions */
/* =================================== */
-static int dmi_check_cb(const struct dmi_system_id *id)
+static int id_check_cb(const struct sysfw_id *id)
{
pr_info("Identified laptop model '%s'\n", id->ident);
extra_features = false;
return 1;
}
-static int dmi_check_cb_extra(const struct dmi_system_id *id)
+static int id_check_cb_extra(const struct sysfw_id *id)
{
pr_info("Identified laptop model '%s', enabling extra features\n",
id->ident);
@@ -775,112 +775,112 @@ static int dmi_check_cb_extra(const struct dmi_system_id *id)
return 1;
}
-static struct dmi_system_id __initdata compal_dmi_table[] = {
+static struct sysfw_id __initdata compal_id_table[] = {
{
.ident = "FL90/IFL90",
.matches = {
- DMI_MATCH(DMI_BOARD_NAME, "IFL90"),
- DMI_MATCH(DMI_BOARD_VERSION, "IFT00"),
+ SYSFW_MATCH(SYSFW_BOARD_NAME, "IFL90"),
+ SYSFW_MATCH(SYSFW_BOARD_VERSION, "IFT00"),
},
- .callback = dmi_check_cb
+ .callback = id_check_cb
},
{
.ident = "FL90/IFL90",
.matches = {
- DMI_MATCH(DMI_BOARD_NAME, "IFL90"),
- DMI_MATCH(DMI_BOARD_VERSION, "REFERENCE"),
+ SYSFW_MATCH(SYSFW_BOARD_NAME, "IFL90"),
+ SYSFW_MATCH(SYSFW_BOARD_VERSION, "REFERENCE"),
},
- .callback = dmi_check_cb
+ .callback = id_check_cb
},
{
.ident = "FL91/IFL91",
.matches = {
- DMI_MATCH(DMI_BOARD_NAME, "IFL91"),
- DMI_MATCH(DMI_BOARD_VERSION, "IFT00"),
+ SYSFW_MATCH(SYSFW_BOARD_NAME, "IFL91"),
+ SYSFW_MATCH(SYSFW_BOARD_VERSION, "IFT00"),
},
- .callback = dmi_check_cb
+ .callback = id_check_cb
},
{
.ident = "FL92/JFL92",
.matches = {
- DMI_MATCH(DMI_BOARD_NAME, "JFL92"),
- DMI_MATCH(DMI_BOARD_VERSION, "IFT00"),
+ SYSFW_MATCH(SYSFW_BOARD_NAME, "JFL92"),
+ SYSFW_MATCH(SYSFW_BOARD_VERSION, "IFT00"),
},
- .callback = dmi_check_cb
+ .callback = id_check_cb
},
{
.ident = "FT00/IFT00",
.matches = {
- DMI_MATCH(DMI_BOARD_NAME, "IFT00"),
- DMI_MATCH(DMI_BOARD_VERSION, "IFT00"),
+ SYSFW_MATCH(SYSFW_BOARD_NAME, "IFT00"),
+ SYSFW_MATCH(SYSFW_BOARD_VERSION, "IFT00"),
},
- .callback = dmi_check_cb
+ .callback = id_check_cb
},
{
.ident = "Dell Mini 9",
.matches = {
- DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
- DMI_MATCH(DMI_PRODUCT_NAME, "Inspiron 910"),
+ SYSFW_MATCH(SYSFW_SYS_VENDOR, "Dell Inc."),
+ SYSFW_MATCH(SYSFW_PRODUCT_NAME, "Inspiron 910"),
},
- .callback = dmi_check_cb
+ .callback = id_check_cb
},
{
.ident = "Dell Mini 10",
.matches = {
- DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
- DMI_MATCH(DMI_PRODUCT_NAME, "Inspiron 1010"),
+ SYSFW_MATCH(SYSFW_SYS_VENDOR, "Dell Inc."),
+ SYSFW_MATCH(SYSFW_PRODUCT_NAME, "Inspiron 1010"),
},
- .callback = dmi_check_cb
+ .callback = id_check_cb
},
{
.ident = "Dell Mini 10v",
.matches = {
- DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
- DMI_MATCH(DMI_PRODUCT_NAME, "Inspiron 1011"),
+ SYSFW_MATCH(SYSFW_SYS_VENDOR, "Dell Inc."),
+ SYSFW_MATCH(SYSFW_PRODUCT_NAME, "Inspiron 1011"),
},
- .callback = dmi_check_cb
+ .callback = id_check_cb
},
{
.ident = "Dell Mini 1012",
.matches = {
- DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
- DMI_MATCH(DMI_PRODUCT_NAME, "Inspiron 1012"),
+ SYSFW_MATCH(SYSFW_SYS_VENDOR, "Dell Inc."),
+ SYSFW_MATCH(SYSFW_PRODUCT_NAME, "Inspiron 1012"),
},
- .callback = dmi_check_cb
+ .callback = id_check_cb
},
{
.ident = "Dell Inspiron 11z",
.matches = {
- DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
- DMI_MATCH(DMI_PRODUCT_NAME, "Inspiron 1110"),
+ SYSFW_MATCH(SYSFW_SYS_VENDOR, "Dell Inc."),
+ SYSFW_MATCH(SYSFW_PRODUCT_NAME, "Inspiron 1110"),
},
- .callback = dmi_check_cb
+ .callback = id_check_cb
},
{
.ident = "Dell Mini 12",
.matches = {
- DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
- DMI_MATCH(DMI_PRODUCT_NAME, "Inspiron 1210"),
+ SYSFW_MATCH(SYSFW_SYS_VENDOR, "Dell Inc."),
+ SYSFW_MATCH(SYSFW_PRODUCT_NAME, "Inspiron 1210"),
},
- .callback = dmi_check_cb
+ .callback = id_check_cb
},
{
.ident = "JHL90",
.matches = {
- DMI_MATCH(DMI_BOARD_NAME, "JHL90"),
- DMI_MATCH(DMI_BOARD_VERSION, "REFERENCE"),
+ SYSFW_MATCH(SYSFW_BOARD_NAME, "JHL90"),
+ SYSFW_MATCH(SYSFW_BOARD_VERSION, "REFERENCE"),
},
- .callback = dmi_check_cb_extra
+ .callback = id_check_cb_extra
},
{
.ident = "KHLB2",
.matches = {
- DMI_MATCH(DMI_BOARD_NAME, "KHLB2"),
- DMI_MATCH(DMI_BOARD_VERSION, "REFERENCE"),
+ SYSFW_MATCH(SYSFW_BOARD_NAME, "KHLB2"),
+ SYSFW_MATCH(SYSFW_BOARD_VERSION, "REFERENCE"),
},
- .callback = dmi_check_cb_extra
+ .callback = id_check_cb_extra
},
- { }
+ {}
};
static void initialize_power_supply_data(struct compal_data *data)
@@ -960,7 +960,7 @@ static int __init compal_init(void)
return -ENODEV;
}
- if (!force && !dmi_check_system(compal_dmi_table)) {
+ if (!force && !sysfw_callback(compal_id_table)) {
pr_err("Motherboard not recognized (You could try the module's force-parameter)\n");
return -ENODEV;
}
@@ -1110,3 +1110,15 @@ MODULE_ALIAS("dmi:*:svnDellInc.:pnInspiron1011:*");
MODULE_ALIAS("dmi:*:svnDellInc.:pnInspiron1012:*");
MODULE_ALIAS("dmi:*:svnDellInc.:pnInspiron1110:*");
MODULE_ALIAS("dmi:*:svnDellInc.:pnInspiron1210:*");
+MODULE_ALIAS("sysfw:*:rnIFL90:rvrIFT00:*");
+MODULE_ALIAS("sysfw:*:rnIFL90:rvrREFERENCE:*");
+MODULE_ALIAS("sysfw:*:rnIFL91:rvrIFT00:*");
+MODULE_ALIAS("sysfw:*:rnJFL92:rvrIFT00:*");
+MODULE_ALIAS("sysfw:*:rnIFT00:rvrIFT00:*");
+MODULE_ALIAS("sysfw:*:rnJHL90:rvrREFERENCE:*");
+MODULE_ALIAS("sysfw:*:svnDellInc.:pnInspiron910:*");
+MODULE_ALIAS("sysfw:*:svnDellInc.:pnInspiron1010:*");
+MODULE_ALIAS("sysfw:*:svnDellInc.:pnInspiron1011:*");
+MODULE_ALIAS("sysfw:*:svnDellInc.:pnInspiron1012:*");
+MODULE_ALIAS("sysfw:*:svnDellInc.:pnInspiron1110:*");
+MODULE_ALIAS("sysfw:*:svnDellInc.:pnInspiron1210:*");
diff --git a/drivers/platform/x86/dell-laptop.c b/drivers/platform/x86/dell-laptop.c
index e39ab1d..53a83a6 100644
--- a/drivers/platform/x86/dell-laptop.c
+++ b/drivers/platform/x86/dell-laptop.c
@@ -19,7 +19,8 @@
#include <linux/platform_device.h>
#include <linux/backlight.h>
#include <linux/err.h>
-#include <linux/dmi.h>
+#include <linux/smbios.h>
+#include <linux/sysfw.h>
#include <linux/io.h>
#include <linux/rfkill.h>
#include <linux/power_supply.h>
@@ -53,7 +54,7 @@ struct calling_interface_token {
};
struct calling_interface_structure {
- struct dmi_header header;
+ struct smbios_header header;
u16 cmdIOAddress;
u8 cmdIOCode;
u32 supportedCmds;
@@ -78,72 +79,73 @@ static struct rfkill *wifi_rfkill;
static struct rfkill *bluetooth_rfkill;
static struct rfkill *wwan_rfkill;
-static const struct dmi_system_id __initdata dell_device_table[] = {
+static const struct sysfw_id __initdata dell_device_table[] = {
{
.ident = "Dell laptop",
.matches = {
- DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
- DMI_MATCH(DMI_CHASSIS_TYPE, "8"),
+ SYSFW_MATCH(SYSFW_SYS_VENDOR, "Dell Inc."),
+ SYSFW_MATCH(SYSFW_CHASSIS_TYPE, "8"),
},
},
{
.matches = {
- DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
- DMI_MATCH(DMI_CHASSIS_TYPE, "9"), /*Laptop*/
+ SYSFW_MATCH(SYSFW_SYS_VENDOR, "Dell Inc."),
+ SYSFW_MATCH(SYSFW_CHASSIS_TYPE, "9"), /*Laptop*/
},
},
{
.ident = "Dell Computer Corporation",
.matches = {
- DMI_MATCH(DMI_SYS_VENDOR, "Dell Computer Corporation"),
- DMI_MATCH(DMI_CHASSIS_TYPE, "8"),
+ SYSFW_MATCH(SYSFW_SYS_VENDOR,
+ "Dell Computer Corporation"),
+ SYSFW_MATCH(SYSFW_CHASSIS_TYPE, "8"),
},
},
- { }
+ {}
};
-static struct dmi_system_id __devinitdata dell_blacklist[] = {
+static struct sysfw_id __devinitdata dell_blacklist[] = {
/* Supported by compal-laptop */
{
.ident = "Dell Mini 9",
.matches = {
- DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
- DMI_MATCH(DMI_PRODUCT_NAME, "Inspiron 910"),
+ SYSFW_MATCH(SYSFW_SYS_VENDOR, "Dell Inc."),
+ SYSFW_MATCH(SYSFW_PRODUCT_NAME, "Inspiron 910"),
},
},
{
.ident = "Dell Mini 10",
.matches = {
- DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
- DMI_MATCH(DMI_PRODUCT_NAME, "Inspiron 1010"),
+ SYSFW_MATCH(SYSFW_SYS_VENDOR, "Dell Inc."),
+ SYSFW_MATCH(SYSFW_PRODUCT_NAME, "Inspiron 1010"),
},
},
{
.ident = "Dell Mini 10v",
.matches = {
- DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
- DMI_MATCH(DMI_PRODUCT_NAME, "Inspiron 1011"),
+ SYSFW_MATCH(SYSFW_SYS_VENDOR, "Dell Inc."),
+ SYSFW_MATCH(SYSFW_PRODUCT_NAME, "Inspiron 1011"),
},
},
{
.ident = "Dell Mini 1012",
.matches = {
- DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
- DMI_MATCH(DMI_PRODUCT_NAME, "Inspiron 1012"),
+ SYSFW_MATCH(SYSFW_SYS_VENDOR, "Dell Inc."),
+ SYSFW_MATCH(SYSFW_PRODUCT_NAME, "Inspiron 1012"),
},
},
{
.ident = "Dell Inspiron 11z",
.matches = {
- DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
- DMI_MATCH(DMI_PRODUCT_NAME, "Inspiron 1110"),
+ SYSFW_MATCH(SYSFW_SYS_VENDOR, "Dell Inc."),
+ SYSFW_MATCH(SYSFW_PRODUCT_NAME, "Inspiron 1110"),
},
},
{
.ident = "Dell Mini 12",
.matches = {
- DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
- DMI_MATCH(DMI_PRODUCT_NAME, "Inspiron 1210"),
+ SYSFW_MATCH(SYSFW_SYS_VENDOR, "Dell Inc."),
+ SYSFW_MATCH(SYSFW_PRODUCT_NAME, "Inspiron 1210"),
},
},
{}
@@ -166,7 +168,7 @@ static void release_buffer(void)
mutex_unlock(&buffer_mutex);
}
-static void __init parse_da_table(const struct dmi_header *dm)
+static void __init parse_da_table(const struct smbios_header *dm)
{
/* Final token is a terminator, so we don't want to copy it */
int tokens = (dm->length-11)/sizeof(struct calling_interface_token)-1;
@@ -195,9 +197,9 @@ static void __init parse_da_table(const struct dmi_header *dm)
da_num_tokens += tokens;
}
-static void __init find_tokens(const struct dmi_header *dm, void *dummy)
+static int __init find_tokens(const union smbios_struct *ss, void *dummy)
{
- switch (dm->type) {
+ switch (ss->header.type) {
case 0xd4: /* Indexed IO */
break;
case 0xd5: /* Protected Area Type 1 */
@@ -205,9 +207,10 @@ static void __init find_tokens(const struct dmi_header *dm, void *dummy)
case 0xd6: /* Protected Area Type 2 */
break;
case 0xda: /* Calling interface */
- parse_da_table(dm);
+ parse_da_table(&ss->header);
break;
}
+ return SMBIOS_WALK_CONTINUE;
}
static int find_token_location(int tokenid)
@@ -415,7 +418,7 @@ static int __init dell_setup_rfkill(void)
int status;
int ret;
- if (dmi_check_system(dell_blacklist)) {
+ if (sysfw_callback(dell_blacklist)) {
pr_info("Blacklisted hardware detected - not enabling rfkill\n");
return 0;
}
@@ -581,10 +584,10 @@ static int __init dell_init(void)
int max_intensity = 0;
int ret;
- if (!dmi_check_system(dell_device_table))
+ if (!sysfw_callback(dell_device_table))
return -ENODEV;
- dmi_walk(find_tokens, NULL);
+ smbios_walk(find_tokens, NULL);
if (!da_tokens) {
pr_info("Unable to find dmi tokens\n");
@@ -714,3 +717,6 @@ MODULE_LICENSE("GPL");
MODULE_ALIAS("dmi:*svnDellInc.:*:ct8:*");
MODULE_ALIAS("dmi:*svnDellInc.:*:ct9:*");
MODULE_ALIAS("dmi:*svnDellComputerCorporation.:*:ct8:*");
+MODULE_ALIAS("sysfw:*svnDellInc.:*:ct8:*");
+MODULE_ALIAS("sysfw:*svnDellInc.:*:ct9:*");
+MODULE_ALIAS("sysfw:*svnDellComputerCorporation.:*:ct8:*");
diff --git a/drivers/platform/x86/dell-wmi.c b/drivers/platform/x86/dell-wmi.c
index ce79082..b71c908 100644
--- a/drivers/platform/x86/dell-wmi.c
+++ b/drivers/platform/x86/dell-wmi.c
@@ -35,7 +35,7 @@
#include <acpi/acpi_drivers.h>
#include <linux/acpi.h>
#include <linux/string.h>
-#include <linux/dmi.h>
+#include <linux/smbios.h>
MODULE_AUTHOR("Matthew Garrett <mjg@redhat.com>");
MODULE_DESCRIPTION("Dell laptop WMI hotkeys driver");
@@ -103,7 +103,7 @@ struct dell_bios_keymap_entry {
};
struct dell_bios_hotkey_table {
- struct dmi_header header;
+ struct smbios_header header;
struct dell_bios_keymap_entry keymap[];
};
@@ -261,13 +261,16 @@ static void dell_wmi_input_destroy(void)
input_unregister_device(dell_wmi_input_dev);
}
-static void __init find_hk_type(const struct dmi_header *dm, void *dummy)
+static int __init find_hk_type(const union smbios_struct *ss, void *dummy)
{
- if (dm->type == 0xb2 && dm->length > 6) {
+ if (ss->header.type == 0xb2 && ss->header.length > 6) {
dell_new_hk_type = true;
dell_bios_hotkey_table =
- container_of(dm, struct dell_bios_hotkey_table, header);
+ container_of(&ss->header, struct dell_bios_hotkey_table,
+ header);
+ return SMBIOS_WALK_STOP;
}
+ return SMBIOS_WALK_CONTINUE;
}
static int __init dell_wmi_init(void)
@@ -280,7 +283,7 @@ static int __init dell_wmi_init(void)
return -ENODEV;
}
- dmi_walk(find_hk_type, NULL);
+ smbios_walk(find_hk_type, NULL);
acpi_video = acpi_video_backlight_support();
err = dell_wmi_input_setup();
diff --git a/drivers/platform/x86/eeepc-laptop.c b/drivers/platform/x86/eeepc-laptop.c
index 1c45d92..8fcc6f5 100644
--- a/drivers/platform/x86/eeepc-laptop.c
+++ b/drivers/platform/x86/eeepc-laptop.c
@@ -37,7 +37,7 @@
#include <linux/pci.h>
#include <linux/pci_hotplug.h>
#include <linux/leds.h>
-#include <linux/dmi.h>
+#include <linux/sysfw.h>
#define EEEPC_LAPTOP_VERSION "0.1"
#define EEEPC_LAPTOP_NAME "Eee PC Hotkey Driver"
@@ -1296,11 +1296,54 @@ static void eeepc_acpi_notify(struct acpi_device *device, u32 event)
}
}
-static void eeepc_dmi_check(struct eeepc_laptop *eeepc)
+static struct sysfw_id eeepc_disable_cpufv_id[] = {
+ {
+ .ident = "701",
+ .matches = {
+ SYSFW_MATCH(SYSFW_PRODUCT_NAME, "701"),
+ },
+ .exactmatch = 1,
+ },
+ {
+ .ident = "702",
+ .matches = {
+ SYSFW_MATCH(SYSFW_PRODUCT_NAME, "702"),
+ },
+ .exactmatch = 1,
+ },
+ {},
+};
+
+static struct sysfw_id eeepc_wlan_hotplug_id[] = {
+ {
+ .ident = "1005HA",
+ .matches = {
+ SYSFW_MATCH(SYSFW_PRODUCT_NAME, "1005HA"),
+ },
+ .exactmatch = 1,
+ },
+ {
+ .ident = "1201N",
+ .matches = {
+ SYSFW_MATCH(SYSFW_PRODUCT_NAME, "1201N"),
+ },
+ .exactmatch = 1,
+ },
+ {
+ .ident = "1005PE",
+ .matches = {
+ SYSFW_MATCH(SYSFW_PRODUCT_NAME, "1005PE"),
+ },
+ .exactmatch = 1,
+ },
+ {},
+};
+
+static void eeepc_sysfw_check(struct eeepc_laptop *eeepc)
{
const char *model;
- model = dmi_get_system_info(DMI_PRODUCT_NAME);
+ model = sysfw_lookup(SYSFW_PRODUCT_NAME);
if (!model)
return;
@@ -1319,11 +1362,11 @@ static void eeepc_dmi_check(struct eeepc_laptop *eeepc)
*
* The hang has also been reported on a "702" (Model name "8G"?).
*
- * We avoid dmi_check_system() / dmi_match(), because they use
+ * We avoid sysfw_*() functions, because they use
* substring matching. We don't want to affect the "701SD"
* and "701SDX" models, because they do support S.H.E.
*/
- if (strcmp(model, "701") == 0 || strcmp(model, "702") == 0) {
+ if (sysfw_callback(eeepc_disable_cpufv_id)) {
eeepc->cpufv_disabled = true;
pr_info("model %s does not officially support setting cpu "
"speed\n", model);
@@ -1337,8 +1380,7 @@ static void eeepc_dmi_check(struct eeepc_laptop *eeepc)
* hotplug code. In fact, current hotplug code seems to unplug another
* device...
*/
- if (strcmp(model, "1005HA") == 0 || strcmp(model, "1201N") == 0 ||
- strcmp(model, "1005PE") == 0) {
+ if (sysfw_callback(eeepc_wlan_hotplug_id)) {
eeepc->hotplug_disabled = true;
pr_info("wlan hotplug disabled\n");
}
@@ -1427,7 +1469,7 @@ static int __devinit eeepc_acpi_add(struct acpi_device *device)
eeepc->hotplug_disabled = hotplug_disabled;
- eeepc_dmi_check(eeepc);
+ eeepc_sysfw_check(eeepc);
result = eeepc_acpi_init(eeepc);
if (result)
diff --git a/drivers/platform/x86/eeepc-wmi.c b/drivers/platform/x86/eeepc-wmi.c
index 4aa867a..8494074 100644
--- a/drivers/platform/x86/eeepc-wmi.c
+++ b/drivers/platform/x86/eeepc-wmi.c
@@ -31,7 +31,7 @@
#include <linux/init.h>
#include <linux/input.h>
#include <linux/input/sparse-keymap.h>
-#include <linux/dmi.h>
+#include <linux/sysfw.h>
#include <acpi/acpi_bus.h>
#include "asus-wmi.h"
@@ -116,14 +116,20 @@ static int eeepc_wmi_probe(struct platform_device *pdev)
return 0;
}
-static void eeepc_dmi_check(struct asus_wmi_driver *driver)
-{
- const char *model;
-
- model = dmi_get_system_info(DMI_PRODUCT_NAME);
- if (!model)
- return;
+static struct sysfw_id eeepc_wlan_hotplug_id[] = {
+ {
+ .ident = "Asus 1000H",
+ .matches = {
+ SYSFW_MATCH(SYSFW_PRODUCT_NAME, "1000H"),
+ },
+ .exactmatch = 1,
+ },
+ {},
+};
+static void eeepc_wmi_quirks(struct asus_wmi_driver *driver)
+{
+ driver->hotplug_wireless = hotplug_wireless;
/*
* Whitelist for wlan hotplug
*
@@ -132,18 +138,12 @@ static void eeepc_dmi_check(struct asus_wmi_driver *driver)
* it seems that most of the laptops supported by asus-wmi
* don't need to be on this list
*/
- if (strcmp(model, "1000H") == 0) {
+ if (sysfw_callback(eeepc_wlan_hotplug_id)) {
driver->hotplug_wireless = true;
pr_info("wlan hotplug enabled\n");
}
}
-static void eeepc_wmi_quirks(struct asus_wmi_driver *driver)
-{
- driver->hotplug_wireless = hotplug_wireless;
- eeepc_dmi_check(driver);
-}
-
static struct asus_wmi_driver asus_wmi_driver = {
.name = EEEPC_WMI_FILE,
.owner = THIS_MODULE,
diff --git a/drivers/platform/x86/fujitsu-laptop.c b/drivers/platform/x86/fujitsu-laptop.c
index 6b26666..819324d 100644
--- a/drivers/platform/x86/fujitsu-laptop.c
+++ b/drivers/platform/x86/fujitsu-laptop.c
@@ -62,7 +62,7 @@
#include <linux/kernel.h>
#include <linux/init.h>
#include <linux/acpi.h>
-#include <linux/dmi.h>
+#include <linux/sysfw.h>
#include <linux/backlight.h>
#include <linux/input.h>
#include <linux/kfifo.h>
@@ -584,7 +584,7 @@ static struct platform_driver fujitsupf_driver = {
}
};
-static void dmi_check_cb_common(const struct dmi_system_id *id)
+static void id_check_cb_common(const struct sysfw_id *id)
{
acpi_handle handle;
pr_info("Identified laptop model '%s'\n", id->ident);
@@ -599,53 +599,53 @@ static void dmi_check_cb_common(const struct dmi_system_id *id)
}
}
-static int dmi_check_cb_s6410(const struct dmi_system_id *id)
+static int id_check_cb_s6410(const struct sysfw_id *id)
{
- dmi_check_cb_common(id);
+ id_check_cb_common(id);
fujitsu->keycode1 = KEY_SCREENLOCK; /* "Lock" */
fujitsu->keycode2 = KEY_HELP; /* "Mobility Center" */
return 1;
}
-static int dmi_check_cb_s6420(const struct dmi_system_id *id)
+static int id_check_cb_s6420(const struct sysfw_id *id)
{
- dmi_check_cb_common(id);
+ id_check_cb_common(id);
fujitsu->keycode1 = KEY_SCREENLOCK; /* "Lock" */
fujitsu->keycode2 = KEY_HELP; /* "Mobility Center" */
return 1;
}
-static int dmi_check_cb_p8010(const struct dmi_system_id *id)
+static int id_check_cb_p8010(const struct sysfw_id *id)
{
- dmi_check_cb_common(id);
+ id_check_cb_common(id);
fujitsu->keycode1 = KEY_HELP; /* "Support" */
fujitsu->keycode3 = KEY_SWITCHVIDEOMODE; /* "Presentation" */
fujitsu->keycode4 = KEY_WWW; /* "Internet" */
return 1;
}
-static struct dmi_system_id fujitsu_dmi_table[] = {
+static struct sysfw_id fujitsu_id_table[] = {
{
.ident = "Fujitsu Siemens S6410",
.matches = {
- DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU SIEMENS"),
- DMI_MATCH(DMI_PRODUCT_NAME, "LIFEBOOK S6410"),
+ SYSFW_MATCH(SYSFW_SYS_VENDOR, "FUJITSU SIEMENS"),
+ SYSFW_MATCH(SYSFW_PRODUCT_NAME, "LIFEBOOK S6410"),
},
- .callback = dmi_check_cb_s6410},
+ .callback = id_check_cb_s6410},
{
.ident = "Fujitsu Siemens S6420",
.matches = {
- DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU SIEMENS"),
- DMI_MATCH(DMI_PRODUCT_NAME, "LIFEBOOK S6420"),
+ SYSFW_MATCH(SYSFW_SYS_VENDOR, "FUJITSU SIEMENS"),
+ SYSFW_MATCH(SYSFW_PRODUCT_NAME, "LIFEBOOK S6420"),
},
- .callback = dmi_check_cb_s6420},
+ .callback = id_check_cb_s6420},
{
.ident = "Fujitsu LifeBook P8010",
.matches = {
- DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU"),
- DMI_MATCH(DMI_PRODUCT_NAME, "LifeBook P8010"),
+ SYSFW_MATCH(SYSFW_SYS_VENDOR, "FUJITSU"),
+ SYSFW_MATCH(SYSFW_PRODUCT_NAME, "LifeBook P8010"),
},
- .callback = dmi_check_cb_p8010},
+ .callback = id_check_cb_p8010},
{}
};
@@ -1095,7 +1095,7 @@ static int __init fujitsu_init(void)
fujitsu->keycode2 = KEY_PROG2;
fujitsu->keycode3 = KEY_PROG3;
fujitsu->keycode4 = KEY_PROG4;
- dmi_check_system(fujitsu_dmi_table);
+ sysfw_callback(fujitsu_id_table);
result = acpi_bus_register_driver(&acpi_fujitsu_driver);
if (result < 0) {
@@ -1239,6 +1239,9 @@ MODULE_LICENSE("GPL");
MODULE_ALIAS("dmi:*:svnFUJITSUSIEMENS:*:pvr:rvnFUJITSU:rnFJNB1D3:*:cvrS6410:*");
MODULE_ALIAS("dmi:*:svnFUJITSUSIEMENS:*:pvr:rvnFUJITSU:rnFJNB1E6:*:cvrS6420:*");
MODULE_ALIAS("dmi:*:svnFUJITSU:*:pvr:rvnFUJITSU:rnFJNB19C:*:cvrS7020:*");
+MODULE_ALIAS("sysfw:*:svnFUJITSUSIEMENS:*:pvr:rvnFUJITSU:rnFJNB1D3:*:cvrS6410:*");
+MODULE_ALIAS("sysfw:*:svnFUJITSUSIEMENS:*:pvr:rvnFUJITSU:rnFJNB1E6:*:cvrS6420:*");
+MODULE_ALIAS("sysfw:*:svnFUJITSU:*:pvr:rvnFUJITSU:rnFJNB19C:*:cvrS7020:*");
static struct pnp_device_id pnp_ids[] __used = {
{.id = "FUJ02bf"},
diff --git a/drivers/platform/x86/hdaps.c b/drivers/platform/x86/hdaps.c
index 5a34973..d705002 100644
--- a/drivers/platform/x86/hdaps.c
+++ b/drivers/platform/x86/hdaps.c
@@ -35,7 +35,7 @@
#include <linux/mutex.h>
#include <linux/module.h>
#include <linux/timer.h>
-#include <linux/dmi.h>
+#include <linux/sysfw.h>
#include <linux/jiffies.h>
#include <linux/io.h>
@@ -479,62 +479,62 @@ static struct attribute_group hdaps_attribute_group = {
/* Module stuff */
-/* hdaps_dmi_match - found a match. return one, short-circuiting the hunt. */
-static int __init hdaps_dmi_match(const struct dmi_system_id *id)
+/* hdaps_id_match - found a match. return one, short-circuiting the hunt. */
+static int __init hdaps_id_match(const struct sysfw_id *id)
{
pr_info("%s detected\n", id->ident);
return 1;
}
-/* hdaps_dmi_match_invert - found an inverted match. */
-static int __init hdaps_dmi_match_invert(const struct dmi_system_id *id)
+/* hdaps_id_match_invert - found an inverted match. */
+static int __init hdaps_id_match_invert(const struct sysfw_id *id)
{
hdaps_invert = (unsigned long)id->driver_data;
pr_info("inverting axis (%u) readings\n", hdaps_invert);
- return hdaps_dmi_match(id);
+ return hdaps_id_match(id);
}
-#define HDAPS_DMI_MATCH_INVERT(vendor, model, axes) { \
+#define HDAPS_SYSFW_MATCH_INVERT(vendor, model, axes) { \
.ident = vendor " " model, \
- .callback = hdaps_dmi_match_invert, \
+ .callback = hdaps_id_match_invert, \
.driver_data = (void *)axes, \
.matches = { \
- DMI_MATCH(DMI_BOARD_VENDOR, vendor), \
- DMI_MATCH(DMI_PRODUCT_VERSION, model) \
+ SYSFW_MATCH(SYSFW_BOARD_VENDOR, vendor), \
+ SYSFW_MATCH(SYSFW_PRODUCT_VERSION, model) \
} \
}
-#define HDAPS_DMI_MATCH_NORMAL(vendor, model) \
- HDAPS_DMI_MATCH_INVERT(vendor, model, 0)
+#define HDAPS_SYSFW_MATCH_NORMAL(vendor, model) \
+ HDAPS_SYSFW_MATCH_INVERT(vendor, model, 0)
-/* Note that HDAPS_DMI_MATCH_NORMAL("ThinkPad T42") would match
+/* Note that HDAPS_SYSFW_MATCH_NORMAL("ThinkPad T42") would match
"ThinkPad T42p", so the order of the entries matters.
If your ThinkPad is not recognized, please update to latest
BIOS. This is especially the case for some R52 ThinkPads. */
-static struct dmi_system_id __initdata hdaps_whitelist[] = {
- HDAPS_DMI_MATCH_INVERT("IBM", "ThinkPad R50p", HDAPS_BOTH_AXES),
- HDAPS_DMI_MATCH_NORMAL("IBM", "ThinkPad R50"),
- HDAPS_DMI_MATCH_NORMAL("IBM", "ThinkPad R51"),
- HDAPS_DMI_MATCH_NORMAL("IBM", "ThinkPad R52"),
- HDAPS_DMI_MATCH_INVERT("LENOVO", "ThinkPad R61i", HDAPS_BOTH_AXES),
- HDAPS_DMI_MATCH_INVERT("LENOVO", "ThinkPad R61", HDAPS_BOTH_AXES),
- HDAPS_DMI_MATCH_INVERT("IBM", "ThinkPad T41p", HDAPS_BOTH_AXES),
- HDAPS_DMI_MATCH_NORMAL("IBM", "ThinkPad T41"),
- HDAPS_DMI_MATCH_INVERT("IBM", "ThinkPad T42p", HDAPS_BOTH_AXES),
- HDAPS_DMI_MATCH_NORMAL("IBM", "ThinkPad T42"),
- HDAPS_DMI_MATCH_NORMAL("IBM", "ThinkPad T43"),
- HDAPS_DMI_MATCH_INVERT("LENOVO", "ThinkPad T400", HDAPS_BOTH_AXES),
- HDAPS_DMI_MATCH_INVERT("LENOVO", "ThinkPad T60", HDAPS_BOTH_AXES),
- HDAPS_DMI_MATCH_INVERT("LENOVO", "ThinkPad T61p", HDAPS_BOTH_AXES),
- HDAPS_DMI_MATCH_INVERT("LENOVO", "ThinkPad T61", HDAPS_BOTH_AXES),
- HDAPS_DMI_MATCH_NORMAL("IBM", "ThinkPad X40"),
- HDAPS_DMI_MATCH_INVERT("IBM", "ThinkPad X41", HDAPS_Y_AXIS),
- HDAPS_DMI_MATCH_INVERT("LENOVO", "ThinkPad X60", HDAPS_BOTH_AXES),
- HDAPS_DMI_MATCH_INVERT("LENOVO", "ThinkPad X61s", HDAPS_BOTH_AXES),
- HDAPS_DMI_MATCH_INVERT("LENOVO", "ThinkPad X61", HDAPS_BOTH_AXES),
- HDAPS_DMI_MATCH_NORMAL("IBM", "ThinkPad Z60m"),
- HDAPS_DMI_MATCH_INVERT("LENOVO", "ThinkPad Z61m", HDAPS_BOTH_AXES),
- HDAPS_DMI_MATCH_INVERT("LENOVO", "ThinkPad Z61p", HDAPS_BOTH_AXES),
+static struct sysfw_id __initdata hdaps_whitelist[] = {
+ HDAPS_SYSFW_MATCH_INVERT("IBM", "ThinkPad R50p", HDAPS_BOTH_AXES),
+ HDAPS_SYSFW_MATCH_NORMAL("IBM", "ThinkPad R50"),
+ HDAPS_SYSFW_MATCH_NORMAL("IBM", "ThinkPad R51"),
+ HDAPS_SYSFW_MATCH_NORMAL("IBM", "ThinkPad R52"),
+ HDAPS_SYSFW_MATCH_INVERT("LENOVO", "ThinkPad R61i", HDAPS_BOTH_AXES),
+ HDAPS_SYSFW_MATCH_INVERT("LENOVO", "ThinkPad R61", HDAPS_BOTH_AXES),
+ HDAPS_SYSFW_MATCH_INVERT("IBM", "ThinkPad T41p", HDAPS_BOTH_AXES),
+ HDAPS_SYSFW_MATCH_NORMAL("IBM", "ThinkPad T41"),
+ HDAPS_SYSFW_MATCH_INVERT("IBM", "ThinkPad T42p", HDAPS_BOTH_AXES),
+ HDAPS_SYSFW_MATCH_NORMAL("IBM", "ThinkPad T42"),
+ HDAPS_SYSFW_MATCH_NORMAL("IBM", "ThinkPad T43"),
+ HDAPS_SYSFW_MATCH_INVERT("LENOVO", "ThinkPad T400", HDAPS_BOTH_AXES),
+ HDAPS_SYSFW_MATCH_INVERT("LENOVO", "ThinkPad T60", HDAPS_BOTH_AXES),
+ HDAPS_SYSFW_MATCH_INVERT("LENOVO", "ThinkPad T61p", HDAPS_BOTH_AXES),
+ HDAPS_SYSFW_MATCH_INVERT("LENOVO", "ThinkPad T61", HDAPS_BOTH_AXES),
+ HDAPS_SYSFW_MATCH_NORMAL("IBM", "ThinkPad X40"),
+ HDAPS_SYSFW_MATCH_INVERT("IBM", "ThinkPad X41", HDAPS_Y_AXIS),
+ HDAPS_SYSFW_MATCH_INVERT("LENOVO", "ThinkPad X60", HDAPS_BOTH_AXES),
+ HDAPS_SYSFW_MATCH_INVERT("LENOVO", "ThinkPad X61s", HDAPS_BOTH_AXES),
+ HDAPS_SYSFW_MATCH_INVERT("LENOVO", "ThinkPad X61", HDAPS_BOTH_AXES),
+ HDAPS_SYSFW_MATCH_NORMAL("IBM", "ThinkPad Z60m"),
+ HDAPS_SYSFW_MATCH_INVERT("LENOVO", "ThinkPad Z61m", HDAPS_BOTH_AXES),
+ HDAPS_SYSFW_MATCH_INVERT("LENOVO", "ThinkPad Z61p", HDAPS_BOTH_AXES),
{ .ident = NULL }
};
@@ -543,7 +543,7 @@ static int __init hdaps_init(void)
struct input_dev *idev;
int ret;
- if (!dmi_check_system(hdaps_whitelist)) {
+ if (!sysfw_callback(hdaps_whitelist)) {
pr_warn("supported laptop not found!\n");
ret = -ENODEV;
goto out;
diff --git a/drivers/platform/x86/hp_accel.c b/drivers/platform/x86/hp_accel.c
index 1b52d00..6a47d3e 100644
--- a/drivers/platform/x86/hp_accel.c
+++ b/drivers/platform/x86/hp_accel.c
@@ -24,7 +24,7 @@
#include <linux/kernel.h>
#include <linux/init.h>
-#include <linux/dmi.h>
+#include <linux/sysfw.h>
#include <linux/module.h>
#include <linux/types.h>
#include <linux/platform_device.h>
@@ -146,10 +146,10 @@ int lis3lv02d_acpi_write(struct lis3lv02d *lis3, int reg, u8 val)
return 0;
}
-static int lis3lv02d_dmi_matched(const struct dmi_system_id *dmi)
+static int lis3lv02d_id_matched(const struct sysfw_id *id)
{
- lis3_dev.ac = *((union axis_conversion *)dmi->driver_data);
- pr_info("hardware type %s found\n", dmi->ident);
+ lis3_dev.ac = *((union axis_conversion *)id->driver_data);
+ pr_info("hardware type %s found\n", id->ident);
return 1;
}
@@ -170,64 +170,64 @@ DEFINE_CONV(xy_swap_inverted, -2, -1, 3);
DEFINE_CONV(xy_rotated_right, 2, -1, 3);
DEFINE_CONV(xy_swap_yz_inverted, 2, -1, -3);
-#define AXIS_DMI_MATCH(_ident, _name, _axis) { \
+#define AXIS_SYSFW_MATCH(_ident, _name, _axis) { \
.ident = _ident, \
- .callback = lis3lv02d_dmi_matched, \
+ .callback = lis3lv02d_id_matched, \
.matches = { \
- DMI_MATCH(DMI_PRODUCT_NAME, _name) \
+ SYSFW_MATCH(SYSFW_PRODUCT_NAME, _name) \
}, \
.driver_data = &lis3lv02d_axis_##_axis \
}
-#define AXIS_DMI_MATCH2(_ident, _class1, _name1, \
- _class2, _name2, \
- _axis) { \
+#define AXIS_SYSFW_MATCH2(_ident, _class1, _name1, \
+ _class2, _name2, \
+ _axis) { \
.ident = _ident, \
- .callback = lis3lv02d_dmi_matched, \
+ .callback = lis3lv02d_id_matched, \
.matches = { \
- DMI_MATCH(DMI_##_class1, _name1), \
- DMI_MATCH(DMI_##_class2, _name2), \
+ SYSFW_MATCH(SYSFW_##_class1, _name1), \
+ SYSFW_MATCH(SYSFW_##_class2, _name2), \
}, \
.driver_data = &lis3lv02d_axis_##_axis \
}
-static struct dmi_system_id lis3lv02d_dmi_ids[] = {
+static struct sysfw_id lis3lv02d_ids[] = {
/* product names are truncated to match all kinds of a same model */
- AXIS_DMI_MATCH("NC64x0", "HP Compaq nc64", x_inverted),
- AXIS_DMI_MATCH("NC84x0", "HP Compaq nc84", z_inverted),
- AXIS_DMI_MATCH("NX9420", "HP Compaq nx9420", x_inverted),
- AXIS_DMI_MATCH("NW9440", "HP Compaq nw9440", x_inverted),
- AXIS_DMI_MATCH("NC2510", "HP Compaq 2510", y_inverted),
- AXIS_DMI_MATCH("NC2710", "HP Compaq 2710", xy_swap),
- AXIS_DMI_MATCH("NC8510", "HP Compaq 8510", xy_swap_inverted),
- AXIS_DMI_MATCH("HP2133", "HP 2133", xy_rotated_left),
- AXIS_DMI_MATCH("HP2140", "HP 2140", xy_swap_inverted),
- AXIS_DMI_MATCH("NC653x", "HP Compaq 653", xy_rotated_left_usd),
- AXIS_DMI_MATCH("NC6730b", "HP Compaq 6730b", xy_rotated_left_usd),
- AXIS_DMI_MATCH("NC6730s", "HP Compaq 6730s", xy_swap),
- AXIS_DMI_MATCH("NC651xx", "HP Compaq 651", xy_rotated_right),
- AXIS_DMI_MATCH("NC6710x", "HP Compaq 6710", xy_swap_yz_inverted),
- AXIS_DMI_MATCH("NC6715x", "HP Compaq 6715", y_inverted),
- AXIS_DMI_MATCH("NC693xx", "HP EliteBook 693", xy_rotated_right),
- AXIS_DMI_MATCH("NC693xx", "HP EliteBook 853", xy_swap),
+ AXIS_SYSFW_MATCH("NC64x0", "HP Compaq nc64", x_inverted),
+ AXIS_SYSFW_MATCH("NC84x0", "HP Compaq nc84", z_inverted),
+ AXIS_SYSFW_MATCH("NX9420", "HP Compaq nx9420", x_inverted),
+ AXIS_SYSFW_MATCH("NW9440", "HP Compaq nw9440", x_inverted),
+ AXIS_SYSFW_MATCH("NC2510", "HP Compaq 2510", y_inverted),
+ AXIS_SYSFW_MATCH("NC2710", "HP Compaq 2710", xy_swap),
+ AXIS_SYSFW_MATCH("NC8510", "HP Compaq 8510", xy_swap_inverted),
+ AXIS_SYSFW_MATCH("HP2133", "HP 2133", xy_rotated_left),
+ AXIS_SYSFW_MATCH("HP2140", "HP 2140", xy_swap_inverted),
+ AXIS_SYSFW_MATCH("NC653x", "HP Compaq 653", xy_rotated_left_usd),
+ AXIS_SYSFW_MATCH("NC6730b", "HP Compaq 6730b", xy_rotated_left_usd),
+ AXIS_SYSFW_MATCH("NC6730s", "HP Compaq 6730s", xy_swap),
+ AXIS_SYSFW_MATCH("NC651xx", "HP Compaq 651", xy_rotated_right),
+ AXIS_SYSFW_MATCH("NC6710x", "HP Compaq 6710", xy_swap_yz_inverted),
+ AXIS_SYSFW_MATCH("NC6715x", "HP Compaq 6715", y_inverted),
+ AXIS_SYSFW_MATCH("NC693xx", "HP EliteBook 693", xy_rotated_right),
+ AXIS_SYSFW_MATCH("NC693xx", "HP EliteBook 853", xy_swap),
/* Intel-based HP Pavilion dv5 */
- AXIS_DMI_MATCH2("HPDV5_I",
- PRODUCT_NAME, "HP Pavilion dv5",
- BOARD_NAME, "3603",
- x_inverted),
+ AXIS_SYSFW_MATCH2("HPDV5_I",
+ PRODUCT_NAME, "HP Pavilion dv5",
+ BOARD_NAME, "3603",
+ x_inverted),
/* AMD-based HP Pavilion dv5 */
- AXIS_DMI_MATCH2("HPDV5_A",
- PRODUCT_NAME, "HP Pavilion dv5",
- BOARD_NAME, "3600",
- y_inverted),
- AXIS_DMI_MATCH("DV7", "HP Pavilion dv7", x_inverted),
- AXIS_DMI_MATCH("HP8710", "HP Compaq 8710", y_inverted),
- AXIS_DMI_MATCH("HDX18", "HP HDX 18", x_inverted),
- AXIS_DMI_MATCH("HPB432x", "HP ProBook 432", xy_rotated_left),
- AXIS_DMI_MATCH("HPB442x", "HP ProBook 442", xy_rotated_left),
- AXIS_DMI_MATCH("HPB452x", "HP ProBook 452", y_inverted),
- AXIS_DMI_MATCH("HPB522x", "HP ProBook 522", xy_swap),
- AXIS_DMI_MATCH("HPB532x", "HP ProBook 532", y_inverted),
- AXIS_DMI_MATCH("Mini510x", "HP Mini 510", xy_rotated_left_usd),
+ AXIS_SYSFW_MATCH2("HPDV5_A",
+ PRODUCT_NAME, "HP Pavilion dv5",
+ BOARD_NAME, "3600",
+ y_inverted),
+ AXIS_SYSFW_MATCH("DV7", "HP Pavilion dv7", x_inverted),
+ AXIS_SYSFW_MATCH("HP8710", "HP Compaq 8710", y_inverted),
+ AXIS_SYSFW_MATCH("HDX18", "HP HDX 18", x_inverted),
+ AXIS_SYSFW_MATCH("HPB432x", "HP ProBook 432", xy_rotated_left),
+ AXIS_SYSFW_MATCH("HPB442x", "HP ProBook 442", xy_rotated_left),
+ AXIS_SYSFW_MATCH("HPB452x", "HP ProBook 452", y_inverted),
+ AXIS_SYSFW_MATCH("HPB522x", "HP ProBook 522", xy_swap),
+ AXIS_SYSFW_MATCH("HPB532x", "HP ProBook 532", y_inverted),
+ AXIS_SYSFW_MATCH("Mini510x", "HP Mini 510", xy_rotated_left_usd),
{ NULL, }
/* Laptop models without axis info (yet):
* "NC6910" "HP Compaq 6910"
@@ -307,7 +307,7 @@ static int lis3lv02d_add(struct acpi_device *device)
if (lis3_dev.ac.x && lis3_dev.ac.y && lis3_dev.ac.z) {
pr_info("Using custom axes %d,%d,%d\n",
lis3_dev.ac.x, lis3_dev.ac.y, lis3_dev.ac.z);
- } else if (dmi_check_system(lis3lv02d_dmi_ids) == 0) {
+ } else if (!sysfw_callback(lis3lv02d_ids)) {
pr_info("laptop model unknown, using default axes configuration\n");
lis3_dev.ac = lis3lv02d_axis_normal;
}
diff --git a/drivers/platform/x86/ibm_rtl.c b/drivers/platform/x86/ibm_rtl.c
index 811d436..570106c 100644
--- a/drivers/platform/x86/ibm_rtl.c
+++ b/drivers/platform/x86/ibm_rtl.c
@@ -29,14 +29,15 @@
#include <linux/module.h>
#include <linux/io.h>
#include <linux/sysdev.h>
-#include <linux/dmi.h>
#include <linux/efi.h>
#include <linux/mutex.h>
+#include <linux/sysfw.h>
+
#include <asm/bios_ebda.h>
static bool force;
module_param(force, bool, 0);
-MODULE_PARM_DESC(force, "Force driver load, ignore DMI data");
+MODULE_PARM_DESC(force, "Force driver load, ignore SMBIOS data");
static bool debug;
module_param(debug, bool, 0644);
@@ -237,14 +238,14 @@ static void rtl_teardown_sysfs(void) {
sysdev_class_unregister(&class_rtl);
}
-
-static struct dmi_system_id __initdata ibm_rtl_dmi_table[] = {
- { \
- .matches = { \
- DMI_MATCH(DMI_SYS_VENDOR, "IBM"), \
- }, \
+static struct sysfw_id __initdata ibm_rtl_smbios_table[] = {
+ {
+ .ident = "IBM",
+ .matches = {
+ SYSFW_MATCH(SYSFW_SYS_VENDOR, "IBM"),
+ },
},
- { }
+ {}
};
static int __init ibm_rtl_init(void) {
@@ -255,7 +256,7 @@ static int __init ibm_rtl_init(void) {
if (force)
pr_warn("module loaded by force\n");
/* first ensure that we are running on IBM HW */
- else if (efi_enabled || !dmi_check_system(ibm_rtl_dmi_table))
+ else if (efi_enabled || !sysfw_callback(ibm_rtl_smbios_table))
return -ENODEV;
/* Get the address for the Extended BIOS Data Area */
diff --git a/drivers/platform/x86/intel_oaktrail.c b/drivers/platform/x86/intel_oaktrail.c
index 7f88c79..76f1c9d 100644
--- a/drivers/platform/x86/intel_oaktrail.c
+++ b/drivers/platform/x86/intel_oaktrail.c
@@ -48,7 +48,7 @@
#include <linux/i2c.h>
#include <linux/backlight.h>
#include <linux/platform_device.h>
-#include <linux/dmi.h>
+#include <linux/sysfw.h>
#include <linux/rfkill.h>
#include <acpi/acpi_bus.h>
#include <acpi/acpi_drivers.h>
@@ -297,21 +297,21 @@ static struct platform_driver oaktrail_driver = {
.remove = __devexit_p(oaktrail_remove)
};
-static int dmi_check_cb(const struct dmi_system_id *id)
+static int system_check_cb(const struct sysfw_id *id)
{
pr_info("Identified model '%s'\n", id->ident);
return 0;
}
-static struct dmi_system_id __initdata oaktrail_dmi_table[] = {
+static struct sysfw_id __initdata oaktrail_system_table[] = {
{
.ident = "OakTrail platform",
.matches = {
- DMI_MATCH(DMI_PRODUCT_NAME, "OakTrail platform"),
+ SYSFW_MATCH(SYSFW_PRODUCT_NAME, "OakTrail platform"),
},
- .callback = dmi_check_cb
+ .callback = system_check_cb
},
- { }
+ {}
};
static int __init oaktrail_init(void)
@@ -323,7 +323,7 @@ static int __init oaktrail_init(void)
return -ENODEV;
}
- if (!force && !dmi_check_system(oaktrail_dmi_table)) {
+ if (!force && !sysfw_callback(oaktrail_system_table)) {
pr_err("Platform not recognized (You could try the module's force-parameter)");
return -ENODEV;
}
@@ -395,3 +395,4 @@ MODULE_DESCRIPTION("Intel Oaktrail Platform ACPI Extras");
MODULE_VERSION(DRIVER_VERSION);
MODULE_LICENSE("GPL");
MODULE_ALIAS("dmi:*:svnIntelCorporation:pnOakTrailplatform:*");
+MODULE_ALIAS("sysfw:*:svnIntelCorporation:pnOakTrailplatform:*");
diff --git a/drivers/platform/x86/msi-laptop.c b/drivers/platform/x86/msi-laptop.c
index 3ff629d..d636560 100644
--- a/drivers/platform/x86/msi-laptop.c
+++ b/drivers/platform/x86/msi-laptop.c
@@ -47,7 +47,7 @@
*
* This driver might work on other laptops produced by MSI. If you
* want to try it you can pass force=1 as argument to the module which
- * will force it to load even when the DMI data doesn't identify the
+ * will force it to load even when the SMBIOS data doesn't identify the
* laptop as MSI S270. YMMV.
*/
@@ -57,7 +57,7 @@
#include <linux/kernel.h>
#include <linux/init.h>
#include <linux/acpi.h>
-#include <linux/dmi.h>
+#include <linux/sysfw.h>
#include <linux/backlight.h>
#include <linux/platform_device.h>
#include <linux/rfkill.h>
@@ -91,7 +91,7 @@ static int msi_laptop_resume(struct platform_device *device);
static int force;
module_param(force, bool, 0);
-MODULE_PARM_DESC(force, "Force driver load, ignore DMI data");
+MODULE_PARM_DESC(force, "Force driver load, ignore SMBIOS data");
static int auto_brightness;
module_param(auto_brightness, int, 0);
@@ -445,100 +445,103 @@ static struct platform_device *msipf_device;
/* Initialization */
-static int dmi_check_cb(const struct dmi_system_id *id)
+static int id_check_cb(const struct sysfw_id *id)
{
pr_info("Identified laptop model '%s'\n", id->ident);
return 1;
}
-static struct dmi_system_id __initdata msi_dmi_table[] = {
+static struct sysfw_id __initdata msi_id_table[] = {
{
.ident = "MSI S270",
.matches = {
- DMI_MATCH(DMI_SYS_VENDOR, "MICRO-STAR INT'L CO.,LTD"),
- DMI_MATCH(DMI_PRODUCT_NAME, "MS-1013"),
- DMI_MATCH(DMI_PRODUCT_VERSION, "0131"),
- DMI_MATCH(DMI_CHASSIS_VENDOR,
- "MICRO-STAR INT'L CO.,LTD")
+ SYSFW_MATCH(SYSFW_SYS_VENDOR,
+ "MICRO-STAR INT'L CO.,LTD"),
+ SYSFW_MATCH(SYSFW_PRODUCT_NAME, "MS-1013"),
+ SYSFW_MATCH(SYSFW_PRODUCT_VERSION, "0131"),
+ SYSFW_MATCH(SYSFW_CHASSIS_VENDOR,
+ "MICRO-STAR INT'L CO.,LTD")
},
- .callback = dmi_check_cb
+ .callback = id_check_cb
},
{
.ident = "MSI S271",
.matches = {
- DMI_MATCH(DMI_SYS_VENDOR, "Micro-Star International"),
- DMI_MATCH(DMI_PRODUCT_NAME, "MS-1058"),
- DMI_MATCH(DMI_PRODUCT_VERSION, "0581"),
- DMI_MATCH(DMI_BOARD_NAME, "MS-1058")
+ SYSFW_MATCH(SYSFW_SYS_VENDOR,
+ "Micro-Star International"),
+ SYSFW_MATCH(SYSFW_PRODUCT_NAME, "MS-1058"),
+ SYSFW_MATCH(SYSFW_PRODUCT_VERSION, "0581"),
+ SYSFW_MATCH(SYSFW_BOARD_NAME, "MS-1058")
},
- .callback = dmi_check_cb
+ .callback = id_check_cb
},
{
.ident = "MSI S420",
.matches = {
- DMI_MATCH(DMI_SYS_VENDOR, "Micro-Star International"),
- DMI_MATCH(DMI_PRODUCT_NAME, "MS-1412"),
- DMI_MATCH(DMI_BOARD_VENDOR, "MSI"),
- DMI_MATCH(DMI_BOARD_NAME, "MS-1412")
+ SYSFW_MATCH(SYSFW_SYS_VENDOR,
+ "Micro-Star International"),
+ SYSFW_MATCH(SYSFW_PRODUCT_NAME, "MS-1412"),
+ SYSFW_MATCH(SYSFW_BOARD_VENDOR, "MSI"),
+ SYSFW_MATCH(SYSFW_BOARD_NAME, "MS-1412")
},
- .callback = dmi_check_cb
+ .callback = id_check_cb
},
{
.ident = "Medion MD96100",
.matches = {
- DMI_MATCH(DMI_SYS_VENDOR, "NOTEBOOK"),
- DMI_MATCH(DMI_PRODUCT_NAME, "SAM2000"),
- DMI_MATCH(DMI_PRODUCT_VERSION, "0131"),
- DMI_MATCH(DMI_CHASSIS_VENDOR,
- "MICRO-STAR INT'L CO.,LTD")
+ SYSFW_MATCH(SYSFW_SYS_VENDOR, "NOTEBOOK"),
+ SYSFW_MATCH(SYSFW_PRODUCT_NAME, "SAM2000"),
+ SYSFW_MATCH(SYSFW_PRODUCT_VERSION, "0131"),
+ SYSFW_MATCH(SYSFW_CHASSIS_VENDOR,
+ "MICRO-STAR INT'L CO.,LTD")
},
- .callback = dmi_check_cb
+ .callback = id_check_cb
},
- { }
+ {}
};
-static struct dmi_system_id __initdata msi_load_scm_models_dmi_table[] = {
+static struct sysfw_id __initdata msi_load_scm_models_id_table[] = {
{
.ident = "MSI N034",
.matches = {
- DMI_MATCH(DMI_SYS_VENDOR,
- "MICRO-STAR INTERNATIONAL CO., LTD"),
- DMI_MATCH(DMI_PRODUCT_NAME, "MS-N034"),
- DMI_MATCH(DMI_CHASSIS_VENDOR,
- "MICRO-STAR INTERNATIONAL CO., LTD")
+ SYSFW_MATCH(SYSFW_SYS_VENDOR,
+ "MICRO-STAR INTERNATIONAL CO., LTD"),
+ SYSFW_MATCH(SYSFW_PRODUCT_NAME, "MS-N034"),
+ SYSFW_MATCH(SYSFW_CHASSIS_VENDOR,
+ "MICRO-STAR INTERNATIONAL CO., LTD")
},
- .callback = dmi_check_cb
+ .callback = id_check_cb
},
{
.ident = "MSI N051",
.matches = {
- DMI_MATCH(DMI_SYS_VENDOR,
- "MICRO-STAR INTERNATIONAL CO., LTD"),
- DMI_MATCH(DMI_PRODUCT_NAME, "MS-N051"),
- DMI_MATCH(DMI_CHASSIS_VENDOR,
- "MICRO-STAR INTERNATIONAL CO., LTD")
+ SYSFW_MATCH(SYSFW_SYS_VENDOR,
+ "MICRO-STAR INTERNATIONAL CO., LTD"),
+ SYSFW_MATCH(SYSFW_PRODUCT_NAME, "MS-N051"),
+ SYSFW_MATCH(SYSFW_CHASSIS_VENDOR,
+ "MICRO-STAR INTERNATIONAL CO., LTD")
},
- .callback = dmi_check_cb
+ .callback = id_check_cb
},
{
.ident = "MSI N014",
.matches = {
- DMI_MATCH(DMI_SYS_VENDOR,
- "MICRO-STAR INTERNATIONAL CO., LTD"),
- DMI_MATCH(DMI_PRODUCT_NAME, "MS-N014"),
+ SYSFW_MATCH(SYSFW_SYS_VENDOR,
+ "MICRO-STAR INTERNATIONAL CO., LTD"),
+ SYSFW_MATCH(SYSFW_PRODUCT_NAME, "MS-N014"),
},
- .callback = dmi_check_cb
+ .callback = id_check_cb
},
{
.ident = "MSI CR620",
.matches = {
- DMI_MATCH(DMI_SYS_VENDOR,
- "Micro-Star International"),
- DMI_MATCH(DMI_PRODUCT_NAME, "CR620"),
+ SYSFW_MATCH(SYSFW_SYS_VENDOR,
+ "Micro-Star International"),
+ SYSFW_MATCH(SYSFW_PRODUCT_NAME, "CR620"),
},
- .callback = dmi_check_cb
+ .callback = id_check_cb
},
- { }
+ {}
};
static int rfkill_bluetooth_set(void *data, bool blocked)
@@ -860,13 +863,13 @@ static int __init msi_init(void)
if (acpi_disabled)
return -ENODEV;
- if (force || dmi_check_system(msi_dmi_table))
+ if (force || sysfw_callback(msi_id_table))
old_ec_model = 1;
if (!old_ec_model)
get_threeg_exists();
- if (!old_ec_model && dmi_check_system(msi_load_scm_models_dmi_table))
+ if (!old_ec_model && sysfw_callback(msi_load_scm_models_id_table))
load_scm_model = 1;
if (auto_brightness < 0 || auto_brightness > 2)
@@ -996,3 +999,11 @@ MODULE_ALIAS("dmi:*:svnMICRO-STARINTERNATIONAL*:pnMS-N034:*");
MODULE_ALIAS("dmi:*:svnMICRO-STARINTERNATIONAL*:pnMS-N051:*");
MODULE_ALIAS("dmi:*:svnMICRO-STARINTERNATIONAL*:pnMS-N014:*");
MODULE_ALIAS("dmi:*:svnMicro-StarInternational*:pnCR620:*");
+MODULE_ALIAS("sysfw:*:svnMICRO-STARINT'LCO.,LTD:pnMS-1013:pvr0131*:cvnMICRO-STARINT'LCO.,LTD:ct10:*");
+MODULE_ALIAS("sysfw:*:svnMicro-StarInternational:pnMS-1058:pvr0581:rvnMSI:rnMS-1058:*:ct10:*");
+MODULE_ALIAS("sysfw:*:svnMicro-StarInternational:pnMS-1412:*:rvnMSI:rnMS-1412:*:cvnMICRO-STARINT'LCO.,LTD:ct10:*");
+MODULE_ALIAS("sysfw:*:svnNOTEBOOK:pnSAM2000:pvr0131*:cvnMICRO-STARINT'LCO.,LTD:ct10:*");
+MODULE_ALIAS("sysfw:*:svnMICRO-STARINTERNATIONAL*:pnMS-N034:*");
+MODULE_ALIAS("sysfw:*:svnMICRO-STARINTERNATIONAL*:pnMS-N051:*");
+MODULE_ALIAS("sysfw:*:svnMICRO-STARINTERNATIONAL*:pnMS-N014:*");
+MODULE_ALIAS("sysfw:*:svnMicro-StarInternational*:pnCR620:*");
diff --git a/drivers/platform/x86/samsung-laptop.c b/drivers/platform/x86/samsung-laptop.c
index d347116..80456c1 100644
--- a/drivers/platform/x86/samsung-laptop.c
+++ b/drivers/platform/x86/samsung-laptop.c
@@ -18,9 +18,9 @@
#include <linux/pci.h>
#include <linux/backlight.h>
#include <linux/fb.h>
-#include <linux/dmi.h>
#include <linux/platform_device.h>
#include <linux/rfkill.h>
+#include <linux/sysfw.h>
/*
* This driver is needed because a number of Samsung laptops do not hook
@@ -230,7 +230,7 @@ static struct rfkill *rfk;
static int force;
module_param(force, bool, 0);
MODULE_PARM_DESC(force,
- "Disable the DMI check and forces the driver to be loaded");
+ "Disable the SMBIOS check and forces the driver to be loaded");
static int debug;
module_param(debug, bool, S_IRUGO | S_IWUSR);
@@ -492,183 +492,186 @@ static DEVICE_ATTR(performance_level, S_IWUSR | S_IRUGO,
get_performance_level, set_performance_level);
-static int __init dmi_check_cb(const struct dmi_system_id *id)
+static int __init samsung_check_cb(const struct sysfw_id *id)
{
- pr_info("found laptop model '%s'\n",
- id->ident);
+ pr_info("found laptop model '%s'\n", id->ident);
return 1;
}
-static struct dmi_system_id __initdata samsung_dmi_table[] = {
+static struct sysfw_id __initdata samsung_id_table[] = {
{
.ident = "N128",
.matches = {
- DMI_MATCH(DMI_SYS_VENDOR,
- "SAMSUNG ELECTRONICS CO., LTD."),
- DMI_MATCH(DMI_PRODUCT_NAME, "N128"),
- DMI_MATCH(DMI_BOARD_NAME, "N128"),
+ SYSFW_MATCH(SYSFW_SYS_VENDOR,
+ "SAMSUNG ELECTRONICS CO., LTD."),
+ SYSFW_MATCH(SYSFW_PRODUCT_NAME, "N128"),
+ SYSFW_MATCH(SYSFW_BOARD_NAME, "N128"),
},
- .callback = dmi_check_cb,
+ .callback = samsung_check_cb,
},
{
.ident = "N130",
.matches = {
- DMI_MATCH(DMI_SYS_VENDOR,
- "SAMSUNG ELECTRONICS CO., LTD."),
- DMI_MATCH(DMI_PRODUCT_NAME, "N130"),
- DMI_MATCH(DMI_BOARD_NAME, "N130"),
+ SYSFW_MATCH(SYSFW_SYS_VENDOR,
+ "SAMSUNG ELECTRONICS CO., LTD."),
+ SYSFW_MATCH(SYSFW_PRODUCT_NAME, "N130"),
+ SYSFW_MATCH(SYSFW_BOARD_NAME, "N130"),
},
- .callback = dmi_check_cb,
+ .callback = samsung_check_cb,
},
{
.ident = "X125",
.matches = {
- DMI_MATCH(DMI_SYS_VENDOR,
- "SAMSUNG ELECTRONICS CO., LTD."),
- DMI_MATCH(DMI_PRODUCT_NAME, "X125"),
- DMI_MATCH(DMI_BOARD_NAME, "X125"),
+ SYSFW_MATCH(SYSFW_SYS_VENDOR,
+ "SAMSUNG ELECTRONICS CO., LTD."),
+ SYSFW_MATCH(SYSFW_PRODUCT_NAME, "X125"),
+ SYSFW_MATCH(SYSFW_BOARD_NAME, "X125"),
},
- .callback = dmi_check_cb,
+ .callback = samsung_check_cb,
},
{
.ident = "X120/X170",
.matches = {
- DMI_MATCH(DMI_SYS_VENDOR,
- "SAMSUNG ELECTRONICS CO., LTD."),
- DMI_MATCH(DMI_PRODUCT_NAME, "X120/X170"),
- DMI_MATCH(DMI_BOARD_NAME, "X120/X170"),
+ SYSFW_MATCH(SYSFW_SYS_VENDOR,
+ "SAMSUNG ELECTRONICS CO., LTD."),
+ SYSFW_MATCH(SYSFW_PRODUCT_NAME, "X120/X170"),
+ SYSFW_MATCH(SYSFW_BOARD_NAME, "X120/X170"),
},
- .callback = dmi_check_cb,
+ .callback = samsung_check_cb,
},
{
.ident = "NC10",
.matches = {
- DMI_MATCH(DMI_SYS_VENDOR,
- "SAMSUNG ELECTRONICS CO., LTD."),
- DMI_MATCH(DMI_PRODUCT_NAME, "NC10"),
- DMI_MATCH(DMI_BOARD_NAME, "NC10"),
+ SYSFW_MATCH(SYSFW_SYS_VENDOR,
+ "SAMSUNG ELECTRONICS CO., LTD."),
+ SYSFW_MATCH(SYSFW_PRODUCT_NAME, "NC10"),
+ SYSFW_MATCH(SYSFW_BOARD_NAME, "NC10"),
},
- .callback = dmi_check_cb,
+ .callback = samsung_check_cb,
},
{
.ident = "NP-Q45",
.matches = {
- DMI_MATCH(DMI_SYS_VENDOR,
- "SAMSUNG ELECTRONICS CO., LTD."),
- DMI_MATCH(DMI_PRODUCT_NAME, "SQ45S70S"),
- DMI_MATCH(DMI_BOARD_NAME, "SQ45S70S"),
+ SYSFW_MATCH(SYSFW_SYS_VENDOR,
+ "SAMSUNG ELECTRONICS CO., LTD."),
+ SYSFW_MATCH(SYSFW_PRODUCT_NAME, "SQ45S70S"),
+ SYSFW_MATCH(SYSFW_BOARD_NAME, "SQ45S70S"),
},
- .callback = dmi_check_cb,
+ .callback = samsung_check_cb,
},
{
.ident = "X360",
.matches = {
- DMI_MATCH(DMI_SYS_VENDOR,
- "SAMSUNG ELECTRONICS CO., LTD."),
- DMI_MATCH(DMI_PRODUCT_NAME, "X360"),
- DMI_MATCH(DMI_BOARD_NAME, "X360"),
+ SYSFW_MATCH(SYSFW_SYS_VENDOR,
+ "SAMSUNG ELECTRONICS CO., LTD."),
+ SYSFW_MATCH(SYSFW_PRODUCT_NAME, "X360"),
+ SYSFW_MATCH(SYSFW_BOARD_NAME, "X360"),
},
- .callback = dmi_check_cb,
+ .callback = samsung_check_cb,
},
{
.ident = "R410 Plus",
.matches = {
- DMI_MATCH(DMI_SYS_VENDOR,
- "SAMSUNG ELECTRONICS CO., LTD."),
- DMI_MATCH(DMI_PRODUCT_NAME, "R410P"),
- DMI_MATCH(DMI_BOARD_NAME, "R460"),
+ SYSFW_MATCH(SYSFW_SYS_VENDOR,
+ "SAMSUNG ELECTRONICS CO., LTD."),
+ SYSFW_MATCH(SYSFW_PRODUCT_NAME, "R410P"),
+ SYSFW_MATCH(SYSFW_BOARD_NAME, "R460"),
},
- .callback = dmi_check_cb,
+ .callback = samsung_check_cb,
},
{
.ident = "R518",
.matches = {
- DMI_MATCH(DMI_SYS_VENDOR,
- "SAMSUNG ELECTRONICS CO., LTD."),
- DMI_MATCH(DMI_PRODUCT_NAME, "R518"),
- DMI_MATCH(DMI_BOARD_NAME, "R518"),
+ SYSFW_MATCH(SYSFW_SYS_VENDOR,
+ "SAMSUNG ELECTRONICS CO., LTD."),
+ SYSFW_MATCH(SYSFW_PRODUCT_NAME, "R518"),
+ SYSFW_MATCH(SYSFW_BOARD_NAME, "R518"),
},
- .callback = dmi_check_cb,
+ .callback = samsung_check_cb,
},
{
.ident = "R519/R719",
.matches = {
- DMI_MATCH(DMI_SYS_VENDOR,
- "SAMSUNG ELECTRONICS CO., LTD."),
- DMI_MATCH(DMI_PRODUCT_NAME, "R519/R719"),
- DMI_MATCH(DMI_BOARD_NAME, "R519/R719"),
+ SYSFW_MATCH(SYSFW_SYS_VENDOR,
+ "SAMSUNG ELECTRONICS CO., LTD."),
+ SYSFW_MATCH(SYSFW_PRODUCT_NAME, "R519/R719"),
+ SYSFW_MATCH(SYSFW_BOARD_NAME, "R519/R719"),
},
- .callback = dmi_check_cb,
+ .callback = samsung_check_cb,
},
{
.ident = "N150/N210/N220/N230",
.matches = {
- DMI_MATCH(DMI_SYS_VENDOR,
- "SAMSUNG ELECTRONICS CO., LTD."),
- DMI_MATCH(DMI_PRODUCT_NAME, "N150/N210/N220/N230"),
- DMI_MATCH(DMI_BOARD_NAME, "N150/N210/N220/N230"),
+ SYSFW_MATCH(SYSFW_SYS_VENDOR,
+ "SAMSUNG ELECTRONICS CO., LTD."),
+ SYSFW_MATCH(SYSFW_PRODUCT_NAME, "N150/N210/N220/N230"),
+ SYSFW_MATCH(SYSFW_BOARD_NAME, "N150/N210/N220/N230"),
},
- .callback = dmi_check_cb,
+ .callback = samsung_check_cb,
},
{
.ident = "N150P/N210P/N220P",
.matches = {
- DMI_MATCH(DMI_SYS_VENDOR,
- "SAMSUNG ELECTRONICS CO., LTD."),
- DMI_MATCH(DMI_PRODUCT_NAME, "N150P/N210P/N220P"),
- DMI_MATCH(DMI_BOARD_NAME, "N150P/N210P/N220P"),
+ SYSFW_MATCH(SYSFW_SYS_VENDOR,
+ "SAMSUNG ELECTRONICS CO., LTD."),
+ SYSFW_MATCH(SYSFW_PRODUCT_NAME, "N150P/N210P/N220P"),
+ SYSFW_MATCH(SYSFW_BOARD_NAME, "N150P/N210P/N220P"),
},
- .callback = dmi_check_cb,
+ .callback = samsung_check_cb,
},
{
.ident = "R530/R730",
.matches = {
- DMI_MATCH(DMI_SYS_VENDOR, "SAMSUNG ELECTRONICS CO., LTD."),
- DMI_MATCH(DMI_PRODUCT_NAME, "R530/R730"),
- DMI_MATCH(DMI_BOARD_NAME, "R530/R730"),
+ SYSFW_MATCH(SYSFW_SYS_VENDOR,
+ "SAMSUNG ELECTRONICS CO., LTD."),
+ SYSFW_MATCH(SYSFW_PRODUCT_NAME, "R530/R730"),
+ SYSFW_MATCH(SYSFW_BOARD_NAME, "R530/R730"),
},
- .callback = dmi_check_cb,
+ .callback = samsung_check_cb,
},
{
.ident = "NF110/NF210/NF310",
.matches = {
- DMI_MATCH(DMI_SYS_VENDOR, "SAMSUNG ELECTRONICS CO., LTD."),
- DMI_MATCH(DMI_PRODUCT_NAME, "NF110/NF210/NF310"),
- DMI_MATCH(DMI_BOARD_NAME, "NF110/NF210/NF310"),
+ SYSFW_MATCH(SYSFW_SYS_VENDOR,
+ "SAMSUNG ELECTRONICS CO., LTD."),
+ SYSFW_MATCH(SYSFW_PRODUCT_NAME, "NF110/NF210/NF310"),
+ SYSFW_MATCH(SYSFW_BOARD_NAME, "NF110/NF210/NF310"),
},
- .callback = dmi_check_cb,
+ .callback = samsung_check_cb,
},
{
.ident = "N145P/N250P/N260P",
.matches = {
- DMI_MATCH(DMI_SYS_VENDOR, "SAMSUNG ELECTRONICS CO., LTD."),
- DMI_MATCH(DMI_PRODUCT_NAME, "N145P/N250P/N260P"),
- DMI_MATCH(DMI_BOARD_NAME, "N145P/N250P/N260P"),
+ SYSFW_MATCH(SYSFW_SYS_VENDOR,
+ "SAMSUNG ELECTRONICS CO., LTD."),
+ SYSFW_MATCH(SYSFW_PRODUCT_NAME, "N145P/N250P/N260P"),
+ SYSFW_MATCH(SYSFW_BOARD_NAME, "N145P/N250P/N260P"),
},
- .callback = dmi_check_cb,
+ .callback = samsung_check_cb,
},
{
.ident = "R70/R71",
.matches = {
- DMI_MATCH(DMI_SYS_VENDOR,
- "SAMSUNG ELECTRONICS CO., LTD."),
- DMI_MATCH(DMI_PRODUCT_NAME, "R70/R71"),
- DMI_MATCH(DMI_BOARD_NAME, "R70/R71"),
+ SYSFW_MATCH(SYSFW_SYS_VENDOR,
+ "SAMSUNG ELECTRONICS CO., LTD."),
+ SYSFW_MATCH(SYSFW_PRODUCT_NAME, "R70/R71"),
+ SYSFW_MATCH(SYSFW_BOARD_NAME, "R70/R71"),
},
- .callback = dmi_check_cb,
+ .callback = samsung_check_cb,
},
{
.ident = "P460",
.matches = {
- DMI_MATCH(DMI_SYS_VENDOR, "SAMSUNG ELECTRONICS CO., LTD."),
- DMI_MATCH(DMI_PRODUCT_NAME, "P460"),
- DMI_MATCH(DMI_BOARD_NAME, "P460"),
+ SYSFW_MATCH(SYSFW_SYS_VENDOR,
+ "SAMSUNG ELECTRONICS CO., LTD."),
+ SYSFW_MATCH(SYSFW_PRODUCT_NAME, "P460"),
+ SYSFW_MATCH(SYSFW_BOARD_NAME, "P460"),
},
- .callback = dmi_check_cb,
+ .callback = samsung_check_cb,
},
- { },
+ {},
};
-MODULE_DEVICE_TABLE(dmi, samsung_dmi_table);
+MODULE_DEVICE_TABLE(sysfw, samsung_id_table);
static int find_signature(void __iomem *memcheck, const char *testStr)
{
@@ -700,7 +703,7 @@ static int __init samsung_init(void)
mutex_init(&sabi_mutex);
- if (!force && !dmi_check_system(samsung_dmi_table))
+ if (!force && !sysfw_callback(samsung_id_table))
return -ENODEV;
f0000_segment = ioremap_nocache(0xf0000, 0xffff);
diff --git a/drivers/platform/x86/sony-laptop.c b/drivers/platform/x86/sony-laptop.c
index bbd182e..b708f04 100644
--- a/drivers/platform/x86/sony-laptop.c
+++ b/drivers/platform/x86/sony-laptop.c
@@ -52,7 +52,7 @@
#include <linux/backlight.h>
#include <linux/platform_device.h>
#include <linux/err.h>
-#include <linux/dmi.h>
+#include <linux/sysfw.h>
#include <linux/pci.h>
#include <linux/interrupt.h>
#include <linux/delay.h>
@@ -3385,29 +3385,29 @@ static struct acpi_driver sony_pic_driver = {
},
};
-static struct dmi_system_id __initdata sonypi_dmi_table[] = {
+static struct sysfw_id __initdata sonypi_id_table[] = {
{
.ident = "Sony Vaio",
.matches = {
- DMI_MATCH(DMI_SYS_VENDOR, "Sony Corporation"),
- DMI_MATCH(DMI_PRODUCT_NAME, "PCG-"),
+ SYSFW_MATCH(SYSFW_SYS_VENDOR, "Sony Corporation"),
+ SYSFW_MATCH(SYSFW_PRODUCT_NAME, "PCG-"),
},
},
{
.ident = "Sony Vaio",
.matches = {
- DMI_MATCH(DMI_SYS_VENDOR, "Sony Corporation"),
- DMI_MATCH(DMI_PRODUCT_NAME, "VGN-"),
+ SYSFW_MATCH(SYSFW_SYS_VENDOR, "Sony Corporation"),
+ SYSFW_MATCH(SYSFW_PRODUCT_NAME, "VGN-"),
},
},
- { }
+ {}
};
static int __init sony_laptop_init(void)
{
int result;
- if (!no_spic && dmi_check_system(sonypi_dmi_table)) {
+ if (!no_spic && sysfw_callback(sonypi_id_table)) {
result = acpi_bus_register_driver(&sony_pic_driver);
if (result) {
pr_err("Unable to register SPIC driver\n");
diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c
index 26c5b11..58d3a42 100644
--- a/drivers/platform/x86/thinkpad_acpi.c
+++ b/drivers/platform/x86/thinkpad_acpi.c
@@ -76,7 +76,8 @@
#include <linux/rfkill.h>
#include <asm/uaccess.h>
-#include <linux/dmi.h>
+#include <linux/smbios.h>
+#include <linux/sysfw.h>
#include <linux/jiffies.h>
#include <linux/workqueue.h>
@@ -1775,7 +1776,7 @@ static const struct tpacpi_quirk tpacpi_bios_version_qtable[] __initconst = {
TPV_QL1('7', 'B', 'D', '7', '4', '0'), /* X60/s */
TPV_QL1('7', 'J', '3', '0', '1', '3'), /* X60t */
- /* (0) - older versions lack DMI EC fw string and functionality */
+ /* (0) - older versions lack SMBIOS EC fw string and functionality */
/* (1) - older versions known to lack functionality */
};
@@ -8587,7 +8588,6 @@ static bool __pure __init tpacpi_is_valid_fw_id(const char* const s,
static int __must_check __init get_thinkpad_model_data(
struct thinkpad_id_data *tp)
{
- const struct dmi_device *dev = NULL;
char ec_fw_string[18];
char const *s;
@@ -8596,14 +8596,14 @@ static int __must_check __init get_thinkpad_model_data(
memset(tp, 0, sizeof(*tp));
- if (dmi_name_in_vendors("IBM"))
+ if (sysfw_vendor_is("IBM"))
tp->vendor = PCI_VENDOR_ID_IBM;
- else if (dmi_name_in_vendors("LENOVO"))
+ else if (sysfw_vendor_is("LENOVO"))
tp->vendor = PCI_VENDOR_ID_LENOVO;
else
return 0;
- s = dmi_get_system_info(DMI_BIOS_VERSION);
+ s = sysfw_lookup(SYSFW_BIOS_VERSION);
tp->bios_version_str = kstrdup(s, GFP_KERNEL);
if (s && !tp->bios_version_str)
return -ENOMEM;
@@ -8624,41 +8624,37 @@ static int __must_check __init get_thinkpad_model_data(
*
* See http://thinkwiki.org/wiki/List_of_DMI_IDs
*/
- while ((dev = dmi_find_device(DMI_DEV_TYPE_OEM_STRING, NULL, dev))) {
- if (sscanf(dev->name,
- "IBM ThinkPad Embedded Controller -[%17c",
- ec_fw_string) == 1) {
- ec_fw_string[sizeof(ec_fw_string) - 1] = 0;
- ec_fw_string[strcspn(ec_fw_string, " ]")] = 0;
-
- tp->ec_version_str = kstrdup(ec_fw_string, GFP_KERNEL);
- if (!tp->ec_version_str)
- return -ENOMEM;
-
- if (tpacpi_is_valid_fw_id(ec_fw_string, 'H')) {
- tp->ec_model = ec_fw_string[0]
- | (ec_fw_string[1] << 8);
- tp->ec_release = (ec_fw_string[4] << 8)
- | ec_fw_string[5];
- } else {
- pr_notice("ThinkPad firmware release %s "
- "doesn't match the known patterns\n",
- ec_fw_string);
- pr_notice("please report this to %s\n",
- TPACPI_MAIL);
- }
- break;
+ s = smbios_match_oem_string("IBM ThinkPad Embedded Controller -[");
+ if (sscanf(s, "IBM ThinkPad Embedded Controller -[%17c",
+ ec_fw_string) == 1) {
+ ec_fw_string[sizeof(ec_fw_string) - 1] = 0;
+ ec_fw_string[strcspn(ec_fw_string, " ]")] = 0;
+
+ tp->ec_version_str = kstrdup(ec_fw_string, GFP_KERNEL);
+ if (!tp->ec_version_str)
+ return -ENOMEM;
+
+ if (tpacpi_is_valid_fw_id(ec_fw_string, 'H')) {
+ tp->ec_model = ec_fw_string[0]
+ | (ec_fw_string[1] << 8);
+ tp->ec_release = (ec_fw_string[4] << 8)
+ | ec_fw_string[5];
+ } else {
+ pr_notice("ThinkPad firmware release %s "
+ "doesn't match the known patterns\n",
+ ec_fw_string);
+ pr_notice("please report this to %s\n", TPACPI_MAIL);
}
}
- s = dmi_get_system_info(DMI_PRODUCT_VERSION);
+ s = sysfw_lookup(SYSFW_PRODUCT_VERSION);
if (s && !strnicmp(s, "ThinkPad", 8)) {
tp->model_str = kstrdup(s, GFP_KERNEL);
if (!tp->model_str)
return -ENOMEM;
}
- s = dmi_get_system_info(DMI_PRODUCT_NAME);
+ s = sysfw_lookup(SYSFW_PRODUCT_NAME);
tp->nummodel_str = kstrdup(s, GFP_KERNEL);
if (s && !tp->nummodel_str)
return -ENOMEM;
@@ -8678,7 +8674,7 @@ static int __init probe_for_thinkpad(void)
return -ENODEV;
/*
- * Non-ancient models have better DMI tagging, but very old models
+ * Non-ancient models have better SMBIOS tagging, but very old models
* don't. tpacpi_is_fw_known() is a cheat to help in that case.
*/
is_thinkpad = (thinkpad_id.model_str != NULL) ||
@@ -9133,7 +9129,7 @@ MODULE_ALIAS(TPACPI_DRVR_SHORTNAME);
MODULE_DEVICE_TABLE(acpi, ibm_htk_device_ids);
/*
- * DMI matching for module autoloading
+ * SMBIOS matching for module autoloading
*
* See http://thinkwiki.org/wiki/List_of_DMI_IDs
* See http://thinkwiki.org/wiki/BIOS_Upgrade_Downloads
--
1.6.5.2
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH 34/34] Remove old DMI & SMBIOS code and make SMBIOS default on
[not found] <1310994528-26276-1-git-send-email-prarit@redhat.com>
` (3 preceding siblings ...)
2011-07-18 13:08 ` [PATCH 21/34] drivers/platform " Prarit Bhargava
@ 2011-07-18 13:08 ` Prarit Bhargava
4 siblings, 0 replies; 7+ messages in thread
From: Prarit Bhargava @ 2011-07-18 13:08 UTC (permalink / raw)
To: linux-kernel
Cc: linux-ia64, linux-pci, dri-devel, platform-driver-x86,
grant.likely, linux-ide, linux-i2c, device-drivers-devel, abelay,
Prarit Bhargava, eric.piel, x86, lm-sensors, linux-acpi,
linux-input, linux-media, johnpol, linux-watchdog, rtc-linux, dz,
openipmi-developer, evel, netdev, linux-usb, rpurdie,
linux-crypto
This code has now been completely replaced by the new System Firmware
Interface (SYSFW) and SMBIOS code. It is no longer needed in the kernel.
Cc: linux-ia64@vger.kernel.org
Cc: x86@kernel.org
Cc: linux-acpi@vger.kernel.org
Cc: linux-ide@vger.kernel.org
Cc: openipmi-developer@lists.sourceforge.net
Cc: platform-driver-x86@vger.kernel.org
Cc: linux-crypto@vger.kernel.org
Cc: dri-devel@lists.freedesktop.org
Cc: lm-sensors@lm-sensors.org
Cc: linux-i2c@vger.kernel.org
Cc: linux-ide@vger.kernel.org
Cc: linux-input@vger.kernel.org
Cc: linux-media@vger.kernel.org
Cc: netdev@vger.kernel.org
Cc: linux-pci@vger.kernel.org
Cc: rtc-linux@googlegroups.com
Cc: evel@driverdev.osuosl.org
Cc: linux-usb@vger.kernel.org
Cc: device-drivers-devel@blackfin.uclinux.org
Cc: linux-watchdog@vger.kernel.org
Cc: grant.likely@secretlab.ca
Cc: dz@debian.org
Cc: rpurdie@rpsys.net
Cc: eric.piel@tremplin-utc.net
Cc: abelay@mit.edu
Cc: johnpol@2ka.mipt.ru
Signed-off-by: Prarit Bhargava <prarit@redhat.com>
---
arch/ia64/include/asm/dmi.h | 12 -
arch/x86/Kconfig | 9 -
arch/x86/include/asm/dmi.h | 19 -
drivers/firmware/Kconfig | 20 -
drivers/firmware/Makefile | 3 -
drivers/firmware/dmi-id.c | 245 -------------
drivers/firmware/dmi-sysfs.c | 696 ------------------------------------
drivers/firmware/dmi_scan.c | 751 ---------------------------------------
include/linux/dmi.h | 139 -------
include/linux/mod_devicetable.h | 55 ---
10 files changed, 0 insertions(+), 1949 deletions(-)
delete mode 100644 arch/ia64/include/asm/dmi.h
delete mode 100644 arch/x86/include/asm/dmi.h
delete mode 100644 drivers/firmware/dmi-id.c
delete mode 100644 drivers/firmware/dmi-sysfs.c
delete mode 100644 drivers/firmware/dmi_scan.c
delete mode 100644 include/linux/dmi.h
diff --git a/arch/ia64/include/asm/dmi.h b/arch/ia64/include/asm/dmi.h
deleted file mode 100644
index 1ed4c8f..0000000
--- a/arch/ia64/include/asm/dmi.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#ifndef _ASM_DMI_H
-#define _ASM_DMI_H 1
-
-#include <linux/slab.h>
-#include <asm/io.h>
-
-/* Use normal IO mappings for DMI */
-#define dmi_ioremap ioremap
-#define dmi_iounmap(x,l) iounmap(x)
-#define dmi_alloc(l) kmalloc(l, GFP_ATOMIC)
-
-#endif
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index e7cdde8..92ee12b 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -626,15 +626,6 @@ config APB_TIMER
# Mark as expert because too many people got it wrong.
# The code disables itself when not needed.
-config DMI
- default y
- bool "Enable DMI scanning" if EXPERT
- ---help---
- Enabled scanning of DMI to identify machine quirks. Say Y
- here unless you have verified that your setup is not
- affected by entries in the DMI blacklist. Required by PNP
- BIOS code.
-
config SMBIOS
depends on SYSTEM_FIRMWARE
bool "Enable SMBIOS scanning" if EXPERT
diff --git a/arch/x86/include/asm/dmi.h b/arch/x86/include/asm/dmi.h
deleted file mode 100644
index fd8f9e2..0000000
--- a/arch/x86/include/asm/dmi.h
+++ /dev/null
@@ -1,19 +0,0 @@
-#ifndef _ASM_X86_DMI_H
-#define _ASM_X86_DMI_H
-
-#include <linux/compiler.h>
-#include <linux/init.h>
-
-#include <asm/io.h>
-#include <asm/setup.h>
-
-static __always_inline __init void *dmi_alloc(unsigned len)
-{
- return extend_brk(len, sizeof(int));
-}
-
-/* Use early IO mappings for DMI because it's initialized early */
-#define dmi_ioremap early_ioremap
-#define dmi_iounmap early_iounmap
-
-#endif /* _ASM_X86_DMI_H */
diff --git a/drivers/firmware/Kconfig b/drivers/firmware/Kconfig
index 23066d8..a46c162 100644
--- a/drivers/firmware/Kconfig
+++ b/drivers/firmware/Kconfig
@@ -104,26 +104,6 @@ config DCDBAS
Say Y or M here to enable the driver for use by Dell systems
management software such as Dell OpenManage.
-config DMIID
- bool "Export DMI identification via sysfs to userspace"
- depends on DMI
- default y
- help
- Say Y here if you want to query SMBIOS/DMI system identification
- information from userspace through /sys/class/dmi/id/ or if you want
- DMI-based module auto-loading.
-
-config DMI_SYSFS
- tristate "DMI table support in sysfs"
- depends on SYSFS && DMI
- default n
- help
- Say Y or M here to enable the exporting of the raw DMI table
- data via sysfs. This is useful for consuming the data without
- requiring any access to /dev/mem at all. Tables are found
- under /sys/firmware/dmi when this option is enabled and
- loaded.
-
config ISCSI_IBFT_FIND
bool "iSCSI Boot Firmware Table Attributes"
depends on X86
diff --git a/drivers/firmware/Makefile b/drivers/firmware/Makefile
index 5c9d81f..f372289 100644
--- a/drivers/firmware/Makefile
+++ b/drivers/firmware/Makefile
@@ -1,14 +1,11 @@
#
# Makefile for the linux kernel.
#
-obj-$(CONFIG_DMI) += dmi_scan.o
-obj-$(CONFIG_DMI_SYSFS) += dmi-sysfs.o
obj-$(CONFIG_EDD) += edd.o
obj-$(CONFIG_EFI_VARS) += efivars.o
obj-$(CONFIG_EFI_PCDP) += pcdp.o
obj-$(CONFIG_DELL_RBU) += dell_rbu.o
obj-$(CONFIG_DCDBAS) += dcdbas.o
-obj-$(CONFIG_DMIID) += dmi-id.o
obj-$(CONFIG_ISCSI_IBFT_FIND) += iscsi_ibft_find.o
obj-$(CONFIG_ISCSI_IBFT) += iscsi_ibft.o
obj-$(CONFIG_FIRMWARE_MEMMAP) += memmap.o
diff --git a/drivers/firmware/dmi-id.c b/drivers/firmware/dmi-id.c
deleted file mode 100644
index 94a58a0..0000000
--- a/drivers/firmware/dmi-id.c
+++ /dev/null
@@ -1,245 +0,0 @@
-/*
- * Export SMBIOS/DMI info via sysfs to userspace
- *
- * Copyright 2007, Lennart Poettering
- *
- * Licensed under GPLv2
- */
-
-#include <linux/module.h>
-#include <linux/kernel.h>
-#include <linux/init.h>
-#include <linux/dmi.h>
-#include <linux/device.h>
-#include <linux/slab.h>
-
-struct dmi_device_attribute{
- struct device_attribute dev_attr;
- int field;
-};
-#define to_dmi_dev_attr(_dev_attr) \
- container_of(_dev_attr, struct dmi_device_attribute, dev_attr)
-
-static ssize_t sys_dmi_field_show(struct device *dev,
- struct device_attribute *attr,
- char *page)
-{
- int field = to_dmi_dev_attr(attr)->field;
- ssize_t len;
- len = scnprintf(page, PAGE_SIZE, "%s\n", dmi_get_system_info(field));
- page[len-1] = '\n';
- return len;
-}
-
-#define DMI_ATTR(_name, _mode, _show, _field) \
- { .dev_attr = __ATTR(_name, _mode, _show, NULL), \
- .field = _field }
-
-#define DEFINE_DMI_ATTR_WITH_SHOW(_name, _mode, _field) \
-static struct dmi_device_attribute sys_dmi_##_name##_attr = \
- DMI_ATTR(_name, _mode, sys_dmi_field_show, _field);
-
-DEFINE_DMI_ATTR_WITH_SHOW(bios_vendor, 0444, DMI_BIOS_VENDOR);
-DEFINE_DMI_ATTR_WITH_SHOW(bios_version, 0444, DMI_BIOS_VERSION);
-DEFINE_DMI_ATTR_WITH_SHOW(bios_date, 0444, DMI_BIOS_DATE);
-DEFINE_DMI_ATTR_WITH_SHOW(sys_vendor, 0444, DMI_SYS_VENDOR);
-DEFINE_DMI_ATTR_WITH_SHOW(product_name, 0444, DMI_PRODUCT_NAME);
-DEFINE_DMI_ATTR_WITH_SHOW(product_version, 0444, DMI_PRODUCT_VERSION);
-DEFINE_DMI_ATTR_WITH_SHOW(product_serial, 0400, DMI_PRODUCT_SERIAL);
-DEFINE_DMI_ATTR_WITH_SHOW(product_uuid, 0400, DMI_PRODUCT_UUID);
-DEFINE_DMI_ATTR_WITH_SHOW(board_vendor, 0444, DMI_BOARD_VENDOR);
-DEFINE_DMI_ATTR_WITH_SHOW(board_name, 0444, DMI_BOARD_NAME);
-DEFINE_DMI_ATTR_WITH_SHOW(board_version, 0444, DMI_BOARD_VERSION);
-DEFINE_DMI_ATTR_WITH_SHOW(board_serial, 0400, DMI_BOARD_SERIAL);
-DEFINE_DMI_ATTR_WITH_SHOW(board_asset_tag, 0444, DMI_BOARD_ASSET_TAG);
-DEFINE_DMI_ATTR_WITH_SHOW(chassis_vendor, 0444, DMI_CHASSIS_VENDOR);
-DEFINE_DMI_ATTR_WITH_SHOW(chassis_type, 0444, DMI_CHASSIS_TYPE);
-DEFINE_DMI_ATTR_WITH_SHOW(chassis_version, 0444, DMI_CHASSIS_VERSION);
-DEFINE_DMI_ATTR_WITH_SHOW(chassis_serial, 0400, DMI_CHASSIS_SERIAL);
-DEFINE_DMI_ATTR_WITH_SHOW(chassis_asset_tag, 0444, DMI_CHASSIS_ASSET_TAG);
-
-static void ascii_filter(char *d, const char *s)
-{
- /* Filter out characters we don't want to see in the modalias string */
- for (; *s; s++)
- if (*s > ' ' && *s < 127 && *s != ':')
- *(d++) = *s;
-
- *d = 0;
-}
-
-static ssize_t get_modalias(char *buffer, size_t buffer_size)
-{
- static const struct mafield {
- const char *prefix;
- int field;
- } fields[] = {
- { "bvn", DMI_BIOS_VENDOR },
- { "bvr", DMI_BIOS_VERSION },
- { "bd", DMI_BIOS_DATE },
- { "svn", DMI_SYS_VENDOR },
- { "pn", DMI_PRODUCT_NAME },
- { "pvr", DMI_PRODUCT_VERSION },
- { "rvn", DMI_BOARD_VENDOR },
- { "rn", DMI_BOARD_NAME },
- { "rvr", DMI_BOARD_VERSION },
- { "cvn", DMI_CHASSIS_VENDOR },
- { "ct", DMI_CHASSIS_TYPE },
- { "cvr", DMI_CHASSIS_VERSION },
- { NULL, DMI_NONE }
- };
-
- ssize_t l, left;
- char *p;
- const struct mafield *f;
-
- strcpy(buffer, "dmi");
- p = buffer + 3; left = buffer_size - 4;
-
- for (f = fields; f->prefix && left > 0; f++) {
- const char *c;
- char *t;
-
- c = dmi_get_system_info(f->field);
- if (!c)
- continue;
-
- t = kmalloc(strlen(c) + 1, GFP_KERNEL);
- if (!t)
- break;
- ascii_filter(t, c);
- l = scnprintf(p, left, ":%s%s", f->prefix, t);
- kfree(t);
-
- p += l;
- left -= l;
- }
-
- p[0] = ':';
- p[1] = 0;
-
- return p - buffer + 1;
-}
-
-static ssize_t sys_dmi_modalias_show(struct device *dev,
- struct device_attribute *attr, char *page)
-{
- ssize_t r;
- r = get_modalias(page, PAGE_SIZE-1);
- page[r] = '\n';
- page[r+1] = 0;
- return r+1;
-}
-
-static struct device_attribute sys_dmi_modalias_attr =
- __ATTR(modalias, 0444, sys_dmi_modalias_show, NULL);
-
-static struct attribute *sys_dmi_attributes[DMI_STRING_MAX+2];
-
-static struct attribute_group sys_dmi_attribute_group = {
- .attrs = sys_dmi_attributes,
-};
-
-static const struct attribute_group* sys_dmi_attribute_groups[] = {
- &sys_dmi_attribute_group,
- NULL
-};
-
-static int dmi_dev_uevent(struct device *dev, struct kobj_uevent_env *env)
-{
- ssize_t len;
-
- if (add_uevent_var(env, "MODALIAS="))
- return -ENOMEM;
- len = get_modalias(&env->buf[env->buflen - 1],
- sizeof(env->buf) - env->buflen);
- if (len >= (sizeof(env->buf) - env->buflen))
- return -ENOMEM;
- env->buflen += len;
- return 0;
-}
-
-static struct class dmi_class = {
- .name = "dmi",
- .dev_release = (void(*)(struct device *)) kfree,
- .dev_uevent = dmi_dev_uevent,
-};
-
-static struct device *dmi_dev;
-
-/* Initialization */
-
-#define ADD_DMI_ATTR(_name, _field) \
- if (dmi_get_system_info(_field)) \
- sys_dmi_attributes[i++] = &sys_dmi_##_name##_attr.dev_attr.attr;
-
-/* In a separate function to keep gcc 3.2 happy - do NOT merge this in
- dmi_id_init! */
-static void __init dmi_id_init_attr_table(void)
-{
- int i;
-
- /* Not necessarily all DMI fields are available on all
- * systems, hence let's built an attribute table of just
- * what's available */
- i = 0;
- ADD_DMI_ATTR(bios_vendor, DMI_BIOS_VENDOR);
- ADD_DMI_ATTR(bios_version, DMI_BIOS_VERSION);
- ADD_DMI_ATTR(bios_date, DMI_BIOS_DATE);
- ADD_DMI_ATTR(sys_vendor, DMI_SYS_VENDOR);
- ADD_DMI_ATTR(product_name, DMI_PRODUCT_NAME);
- ADD_DMI_ATTR(product_version, DMI_PRODUCT_VERSION);
- ADD_DMI_ATTR(product_serial, DMI_PRODUCT_SERIAL);
- ADD_DMI_ATTR(product_uuid, DMI_PRODUCT_UUID);
- ADD_DMI_ATTR(board_vendor, DMI_BOARD_VENDOR);
- ADD_DMI_ATTR(board_name, DMI_BOARD_NAME);
- ADD_DMI_ATTR(board_version, DMI_BOARD_VERSION);
- ADD_DMI_ATTR(board_serial, DMI_BOARD_SERIAL);
- ADD_DMI_ATTR(board_asset_tag, DMI_BOARD_ASSET_TAG);
- ADD_DMI_ATTR(chassis_vendor, DMI_CHASSIS_VENDOR);
- ADD_DMI_ATTR(chassis_type, DMI_CHASSIS_TYPE);
- ADD_DMI_ATTR(chassis_version, DMI_CHASSIS_VERSION);
- ADD_DMI_ATTR(chassis_serial, DMI_CHASSIS_SERIAL);
- ADD_DMI_ATTR(chassis_asset_tag, DMI_CHASSIS_ASSET_TAG);
- sys_dmi_attributes[i++] = &sys_dmi_modalias_attr.attr;
-}
-
-static int __init dmi_id_init(void)
-{
- int ret;
-
- if (!dmi_available)
- return -ENODEV;
-
- dmi_id_init_attr_table();
-
- ret = class_register(&dmi_class);
- if (ret)
- return ret;
-
- dmi_dev = kzalloc(sizeof(*dmi_dev), GFP_KERNEL);
- if (!dmi_dev) {
- ret = -ENOMEM;
- goto fail_class_unregister;
- }
-
- dmi_dev->class = &dmi_class;
- dev_set_name(dmi_dev, "id");
- dmi_dev->groups = sys_dmi_attribute_groups;
-
- ret = device_register(dmi_dev);
- if (ret)
- goto fail_free_dmi_dev;
-
- return 0;
-
-fail_free_dmi_dev:
- kfree(dmi_dev);
-fail_class_unregister:
-
- class_unregister(&dmi_class);
-
- return ret;
-}
-
-arch_initcall(dmi_id_init);
diff --git a/drivers/firmware/dmi-sysfs.c b/drivers/firmware/dmi-sysfs.c
deleted file mode 100644
index eb26d62..0000000
--- a/drivers/firmware/dmi-sysfs.c
+++ /dev/null
@@ -1,696 +0,0 @@
-/*
- * dmi-sysfs.c
- *
- * This module exports the DMI tables read-only to userspace through the
- * sysfs file system.
- *
- * Data is currently found below
- * /sys/firmware/dmi/...
- *
- * DMI attributes are presented in attribute files with names
- * formatted using %d-%d, so that the first integer indicates the
- * structure type (0-255), and the second field is the instance of that
- * entry.
- *
- * Copyright 2011 Google, Inc.
- */
-
-#include <linux/kernel.h>
-#include <linux/init.h>
-#include <linux/module.h>
-#include <linux/types.h>
-#include <linux/kobject.h>
-#include <linux/dmi.h>
-#include <linux/capability.h>
-#include <linux/slab.h>
-#include <linux/list.h>
-#include <linux/io.h>
-
-#define MAX_ENTRY_TYPE 255 /* Most of these aren't used, but we consider
- the top entry type is only 8 bits */
-
-struct dmi_sysfs_entry {
- struct dmi_header dh;
- struct kobject kobj;
- int instance;
- int position;
- struct list_head list;
- struct kobject *child;
-};
-
-/*
- * Global list of dmi_sysfs_entry. Even though this should only be
- * manipulated at setup and teardown, the lazy nature of the kobject
- * system means we get lazy removes.
- */
-static LIST_HEAD(entry_list);
-static DEFINE_SPINLOCK(entry_list_lock);
-
-/* dmi_sysfs_attribute - Top level attribute. used by all entries. */
-struct dmi_sysfs_attribute {
- struct attribute attr;
- ssize_t (*show)(struct dmi_sysfs_entry *entry, char *buf);
-};
-
-#define DMI_SYSFS_ATTR(_entry, _name) \
-struct dmi_sysfs_attribute dmi_sysfs_attr_##_entry##_##_name = { \
- .attr = {.name = __stringify(_name), .mode = 0400}, \
- .show = dmi_sysfs_##_entry##_##_name, \
-}
-
-/*
- * dmi_sysfs_mapped_attribute - Attribute where we require the entry be
- * mapped in. Use in conjunction with dmi_sysfs_specialize_attr_ops.
- */
-struct dmi_sysfs_mapped_attribute {
- struct attribute attr;
- ssize_t (*show)(struct dmi_sysfs_entry *entry,
- const struct dmi_header *dh,
- char *buf);
-};
-
-#define DMI_SYSFS_MAPPED_ATTR(_entry, _name) \
-struct dmi_sysfs_mapped_attribute dmi_sysfs_attr_##_entry##_##_name = { \
- .attr = {.name = __stringify(_name), .mode = 0400}, \
- .show = dmi_sysfs_##_entry##_##_name, \
-}
-
-/*************************************************
- * Generic DMI entry support.
- *************************************************/
-static void dmi_entry_free(struct kobject *kobj)
-{
- kfree(kobj);
-}
-
-static struct dmi_sysfs_entry *to_entry(struct kobject *kobj)
-{
- return container_of(kobj, struct dmi_sysfs_entry, kobj);
-}
-
-static struct dmi_sysfs_attribute *to_attr(struct attribute *attr)
-{
- return container_of(attr, struct dmi_sysfs_attribute, attr);
-}
-
-static ssize_t dmi_sysfs_attr_show(struct kobject *kobj,
- struct attribute *_attr, char *buf)
-{
- struct dmi_sysfs_entry *entry = to_entry(kobj);
- struct dmi_sysfs_attribute *attr = to_attr(_attr);
-
- /* DMI stuff is only ever admin visible */
- if (!capable(CAP_SYS_ADMIN))
- return -EACCES;
-
- return attr->show(entry, buf);
-}
-
-static const struct sysfs_ops dmi_sysfs_attr_ops = {
- .show = dmi_sysfs_attr_show,
-};
-
-typedef ssize_t (*dmi_callback)(struct dmi_sysfs_entry *,
- const struct dmi_header *dh, void *);
-
-struct find_dmi_data {
- struct dmi_sysfs_entry *entry;
- dmi_callback callback;
- void *private;
- int instance_countdown;
- ssize_t ret;
-};
-
-static void find_dmi_entry_helper(const struct dmi_header *dh,
- void *_data)
-{
- struct find_dmi_data *data = _data;
- struct dmi_sysfs_entry *entry = data->entry;
-
- /* Is this the entry we want? */
- if (dh->type != entry->dh.type)
- return;
-
- if (data->instance_countdown != 0) {
- /* try the next instance? */
- data->instance_countdown--;
- return;
- }
-
- /*
- * Don't ever revisit the instance. Short circuit later
- * instances by letting the instance_countdown run negative
- */
- data->instance_countdown--;
-
- /* Found the entry */
- data->ret = data->callback(entry, dh, data->private);
-}
-
-/* State for passing the read parameters through dmi_find_entry() */
-struct dmi_read_state {
- char *buf;
- loff_t pos;
- size_t count;
-};
-
-static ssize_t find_dmi_entry(struct dmi_sysfs_entry *entry,
- dmi_callback callback, void *private)
-{
- struct find_dmi_data data = {
- .entry = entry,
- .callback = callback,
- .private = private,
- .instance_countdown = entry->instance,
- .ret = -EIO, /* To signal the entry disappeared */
- };
- int ret;
-
- ret = dmi_walk(find_dmi_entry_helper, &data);
- /* This shouldn't happen, but just in case. */
- if (ret)
- return -EINVAL;
- return data.ret;
-}
-
-/*
- * Calculate and return the byte length of the dmi entry identified by
- * dh. This includes both the formatted portion as well as the
- * unformatted string space, including the two trailing nul characters.
- */
-static size_t dmi_entry_length(const struct dmi_header *dh)
-{
- const char *p = (const char *)dh;
-
- p += dh->length;
-
- while (p[0] || p[1])
- p++;
-
- return 2 + p - (const char *)dh;
-}
-
-/*************************************************
- * Support bits for specialized DMI entry support
- *************************************************/
-struct dmi_entry_attr_show_data {
- struct attribute *attr;
- char *buf;
-};
-
-static ssize_t dmi_entry_attr_show_helper(struct dmi_sysfs_entry *entry,
- const struct dmi_header *dh,
- void *_data)
-{
- struct dmi_entry_attr_show_data *data = _data;
- struct dmi_sysfs_mapped_attribute *attr;
-
- attr = container_of(data->attr,
- struct dmi_sysfs_mapped_attribute, attr);
- return attr->show(entry, dh, data->buf);
-}
-
-static ssize_t dmi_entry_attr_show(struct kobject *kobj,
- struct attribute *attr,
- char *buf)
-{
- struct dmi_entry_attr_show_data data = {
- .attr = attr,
- .buf = buf,
- };
- /* Find the entry according to our parent and call the
- * normalized show method hanging off of the attribute */
- return find_dmi_entry(to_entry(kobj->parent),
- dmi_entry_attr_show_helper, &data);
-}
-
-static const struct sysfs_ops dmi_sysfs_specialize_attr_ops = {
- .show = dmi_entry_attr_show,
-};
-
-/*************************************************
- * Specialized DMI entry support.
- *************************************************/
-
-/*** Type 15 - System Event Table ***/
-
-#define DMI_SEL_ACCESS_METHOD_IO8 0x00
-#define DMI_SEL_ACCESS_METHOD_IO2x8 0x01
-#define DMI_SEL_ACCESS_METHOD_IO16 0x02
-#define DMI_SEL_ACCESS_METHOD_PHYS32 0x03
-#define DMI_SEL_ACCESS_METHOD_GPNV 0x04
-
-struct dmi_system_event_log {
- struct dmi_header header;
- u16 area_length;
- u16 header_start_offset;
- u16 data_start_offset;
- u8 access_method;
- u8 status;
- u32 change_token;
- union {
- struct {
- u16 index_addr;
- u16 data_addr;
- } io;
- u32 phys_addr32;
- u16 gpnv_handle;
- u32 access_method_address;
- };
- u8 header_format;
- u8 type_descriptors_supported_count;
- u8 per_log_type_descriptor_length;
- u8 supported_log_type_descriptos[0];
-} __packed;
-
-#define DMI_SYSFS_SEL_FIELD(_field) \
-static ssize_t dmi_sysfs_sel_##_field(struct dmi_sysfs_entry *entry, \
- const struct dmi_header *dh, \
- char *buf) \
-{ \
- struct dmi_system_event_log sel; \
- if (sizeof(sel) > dmi_entry_length(dh)) \
- return -EIO; \
- memcpy(&sel, dh, sizeof(sel)); \
- return sprintf(buf, "%u\n", sel._field); \
-} \
-static DMI_SYSFS_MAPPED_ATTR(sel, _field)
-
-DMI_SYSFS_SEL_FIELD(area_length);
-DMI_SYSFS_SEL_FIELD(header_start_offset);
-DMI_SYSFS_SEL_FIELD(data_start_offset);
-DMI_SYSFS_SEL_FIELD(access_method);
-DMI_SYSFS_SEL_FIELD(status);
-DMI_SYSFS_SEL_FIELD(change_token);
-DMI_SYSFS_SEL_FIELD(access_method_address);
-DMI_SYSFS_SEL_FIELD(header_format);
-DMI_SYSFS_SEL_FIELD(type_descriptors_supported_count);
-DMI_SYSFS_SEL_FIELD(per_log_type_descriptor_length);
-
-static struct attribute *dmi_sysfs_sel_attrs[] = {
- &dmi_sysfs_attr_sel_area_length.attr,
- &dmi_sysfs_attr_sel_header_start_offset.attr,
- &dmi_sysfs_attr_sel_data_start_offset.attr,
- &dmi_sysfs_attr_sel_access_method.attr,
- &dmi_sysfs_attr_sel_status.attr,
- &dmi_sysfs_attr_sel_change_token.attr,
- &dmi_sysfs_attr_sel_access_method_address.attr,
- &dmi_sysfs_attr_sel_header_format.attr,
- &dmi_sysfs_attr_sel_type_descriptors_supported_count.attr,
- &dmi_sysfs_attr_sel_per_log_type_descriptor_length.attr,
- NULL,
-};
-
-
-static struct kobj_type dmi_system_event_log_ktype = {
- .release = dmi_entry_free,
- .sysfs_ops = &dmi_sysfs_specialize_attr_ops,
- .default_attrs = dmi_sysfs_sel_attrs,
-};
-
-typedef u8 (*sel_io_reader)(const struct dmi_system_event_log *sel,
- loff_t offset);
-
-static DEFINE_MUTEX(io_port_lock);
-
-static u8 read_sel_8bit_indexed_io(const struct dmi_system_event_log *sel,
- loff_t offset)
-{
- u8 ret;
-
- mutex_lock(&io_port_lock);
- outb((u8)offset, sel->io.index_addr);
- ret = inb(sel->io.data_addr);
- mutex_unlock(&io_port_lock);
- return ret;
-}
-
-static u8 read_sel_2x8bit_indexed_io(const struct dmi_system_event_log *sel,
- loff_t offset)
-{
- u8 ret;
-
- mutex_lock(&io_port_lock);
- outb((u8)offset, sel->io.index_addr);
- outb((u8)(offset >> 8), sel->io.index_addr + 1);
- ret = inb(sel->io.data_addr);
- mutex_unlock(&io_port_lock);
- return ret;
-}
-
-static u8 read_sel_16bit_indexed_io(const struct dmi_system_event_log *sel,
- loff_t offset)
-{
- u8 ret;
-
- mutex_lock(&io_port_lock);
- outw((u16)offset, sel->io.index_addr);
- ret = inb(sel->io.data_addr);
- mutex_unlock(&io_port_lock);
- return ret;
-}
-
-static sel_io_reader sel_io_readers[] = {
- [DMI_SEL_ACCESS_METHOD_IO8] = read_sel_8bit_indexed_io,
- [DMI_SEL_ACCESS_METHOD_IO2x8] = read_sel_2x8bit_indexed_io,
- [DMI_SEL_ACCESS_METHOD_IO16] = read_sel_16bit_indexed_io,
-};
-
-static ssize_t dmi_sel_raw_read_io(struct dmi_sysfs_entry *entry,
- const struct dmi_system_event_log *sel,
- char *buf, loff_t pos, size_t count)
-{
- ssize_t wrote = 0;
-
- sel_io_reader io_reader = sel_io_readers[sel->access_method];
-
- while (count && pos < sel->area_length) {
- count--;
- *(buf++) = io_reader(sel, pos++);
- wrote++;
- }
-
- return wrote;
-}
-
-static ssize_t dmi_sel_raw_read_phys32(struct dmi_sysfs_entry *entry,
- const struct dmi_system_event_log *sel,
- char *buf, loff_t pos, size_t count)
-{
- u8 __iomem *mapped;
- ssize_t wrote = 0;
-
- mapped = ioremap(sel->access_method_address, sel->area_length);
- if (!mapped)
- return -EIO;
-
- while (count && pos < sel->area_length) {
- count--;
- *(buf++) = readb(mapped + pos++);
- wrote++;
- }
-
- iounmap(mapped);
- return wrote;
-}
-
-static ssize_t dmi_sel_raw_read_helper(struct dmi_sysfs_entry *entry,
- const struct dmi_header *dh,
- void *_state)
-{
- struct dmi_read_state *state = _state;
- struct dmi_system_event_log sel;
-
- if (sizeof(sel) > dmi_entry_length(dh))
- return -EIO;
-
- memcpy(&sel, dh, sizeof(sel));
-
- switch (sel.access_method) {
- case DMI_SEL_ACCESS_METHOD_IO8:
- case DMI_SEL_ACCESS_METHOD_IO2x8:
- case DMI_SEL_ACCESS_METHOD_IO16:
- return dmi_sel_raw_read_io(entry, &sel, state->buf,
- state->pos, state->count);
- case DMI_SEL_ACCESS_METHOD_PHYS32:
- return dmi_sel_raw_read_phys32(entry, &sel, state->buf,
- state->pos, state->count);
- case DMI_SEL_ACCESS_METHOD_GPNV:
- pr_info("dmi-sysfs: GPNV support missing.\n");
- return -EIO;
- default:
- pr_info("dmi-sysfs: Unknown access method %02x\n",
- sel.access_method);
- return -EIO;
- }
-}
-
-static ssize_t dmi_sel_raw_read(struct file *filp, struct kobject *kobj,
- struct bin_attribute *bin_attr,
- char *buf, loff_t pos, size_t count)
-{
- struct dmi_sysfs_entry *entry = to_entry(kobj->parent);
- struct dmi_read_state state = {
- .buf = buf,
- .pos = pos,
- .count = count,
- };
-
- return find_dmi_entry(entry, dmi_sel_raw_read_helper, &state);
-}
-
-static struct bin_attribute dmi_sel_raw_attr = {
- .attr = {.name = "raw_event_log", .mode = 0400},
- .read = dmi_sel_raw_read,
-};
-
-static int dmi_system_event_log(struct dmi_sysfs_entry *entry)
-{
- int ret;
-
- entry->child = kzalloc(sizeof(*entry->child), GFP_KERNEL);
- if (!entry->child)
- return -ENOMEM;
- ret = kobject_init_and_add(entry->child,
- &dmi_system_event_log_ktype,
- &entry->kobj,
- "system_event_log");
- if (ret)
- goto out_free;
-
- ret = sysfs_create_bin_file(entry->child, &dmi_sel_raw_attr);
- if (ret)
- goto out_del;
-
- return 0;
-
-out_del:
- kobject_del(entry->child);
-out_free:
- kfree(entry->child);
- return ret;
-}
-
-/*************************************************
- * Generic DMI entry support.
- *************************************************/
-
-static ssize_t dmi_sysfs_entry_length(struct dmi_sysfs_entry *entry, char *buf)
-{
- return sprintf(buf, "%d\n", entry->dh.length);
-}
-
-static ssize_t dmi_sysfs_entry_handle(struct dmi_sysfs_entry *entry, char *buf)
-{
- return sprintf(buf, "%d\n", entry->dh.handle);
-}
-
-static ssize_t dmi_sysfs_entry_type(struct dmi_sysfs_entry *entry, char *buf)
-{
- return sprintf(buf, "%d\n", entry->dh.type);
-}
-
-static ssize_t dmi_sysfs_entry_instance(struct dmi_sysfs_entry *entry,
- char *buf)
-{
- return sprintf(buf, "%d\n", entry->instance);
-}
-
-static ssize_t dmi_sysfs_entry_position(struct dmi_sysfs_entry *entry,
- char *buf)
-{
- return sprintf(buf, "%d\n", entry->position);
-}
-
-static DMI_SYSFS_ATTR(entry, length);
-static DMI_SYSFS_ATTR(entry, handle);
-static DMI_SYSFS_ATTR(entry, type);
-static DMI_SYSFS_ATTR(entry, instance);
-static DMI_SYSFS_ATTR(entry, position);
-
-static struct attribute *dmi_sysfs_entry_attrs[] = {
- &dmi_sysfs_attr_entry_length.attr,
- &dmi_sysfs_attr_entry_handle.attr,
- &dmi_sysfs_attr_entry_type.attr,
- &dmi_sysfs_attr_entry_instance.attr,
- &dmi_sysfs_attr_entry_position.attr,
- NULL,
-};
-
-static ssize_t dmi_entry_raw_read_helper(struct dmi_sysfs_entry *entry,
- const struct dmi_header *dh,
- void *_state)
-{
- struct dmi_read_state *state = _state;
- size_t entry_length;
-
- entry_length = dmi_entry_length(dh);
-
- return memory_read_from_buffer(state->buf, state->count,
- &state->pos, dh, entry_length);
-}
-
-static ssize_t dmi_entry_raw_read(struct file *filp,
- struct kobject *kobj,
- struct bin_attribute *bin_attr,
- char *buf, loff_t pos, size_t count)
-{
- struct dmi_sysfs_entry *entry = to_entry(kobj);
- struct dmi_read_state state = {
- .buf = buf,
- .pos = pos,
- .count = count,
- };
-
- return find_dmi_entry(entry, dmi_entry_raw_read_helper, &state);
-}
-
-static const struct bin_attribute dmi_entry_raw_attr = {
- .attr = {.name = "raw", .mode = 0400},
- .read = dmi_entry_raw_read,
-};
-
-static void dmi_sysfs_entry_release(struct kobject *kobj)
-{
- struct dmi_sysfs_entry *entry = to_entry(kobj);
- sysfs_remove_bin_file(&entry->kobj, &dmi_entry_raw_attr);
- spin_lock(&entry_list_lock);
- list_del(&entry->list);
- spin_unlock(&entry_list_lock);
- kfree(entry);
-}
-
-static struct kobj_type dmi_sysfs_entry_ktype = {
- .release = dmi_sysfs_entry_release,
- .sysfs_ops = &dmi_sysfs_attr_ops,
- .default_attrs = dmi_sysfs_entry_attrs,
-};
-
-static struct kobject *dmi_kobj;
-static struct kset *dmi_kset;
-
-/* Global count of all instances seen. Only for setup */
-static int __initdata instance_counts[MAX_ENTRY_TYPE + 1];
-
-/* Global positional count of all entries seen. Only for setup */
-static int __initdata position_count;
-
-static void __init dmi_sysfs_register_handle(const struct dmi_header *dh,
- void *_ret)
-{
- struct dmi_sysfs_entry *entry;
- int *ret = _ret;
-
- /* If a previous entry saw an error, short circuit */
- if (*ret)
- return;
-
- /* Allocate and register a new entry into the entries set */
- entry = kzalloc(sizeof(*entry), GFP_KERNEL);
- if (!entry) {
- *ret = -ENOMEM;
- return;
- }
-
- /* Set the key */
- memcpy(&entry->dh, dh, sizeof(*dh));
- entry->instance = instance_counts[dh->type]++;
- entry->position = position_count++;
-
- entry->kobj.kset = dmi_kset;
- *ret = kobject_init_and_add(&entry->kobj, &dmi_sysfs_entry_ktype, NULL,
- "%d-%d", dh->type, entry->instance);
-
- if (*ret) {
- kfree(entry);
- return;
- }
-
- /* Thread on the global list for cleanup */
- spin_lock(&entry_list_lock);
- list_add_tail(&entry->list, &entry_list);
- spin_unlock(&entry_list_lock);
-
- /* Handle specializations by type */
- switch (dh->type) {
- case DMI_ENTRY_SYSTEM_EVENT_LOG:
- *ret = dmi_system_event_log(entry);
- break;
- default:
- /* No specialization */
- break;
- }
- if (*ret)
- goto out_err;
-
- /* Create the raw binary file to access the entry */
- *ret = sysfs_create_bin_file(&entry->kobj, &dmi_entry_raw_attr);
- if (*ret)
- goto out_err;
-
- return;
-out_err:
- kobject_put(entry->child);
- kobject_put(&entry->kobj);
- return;
-}
-
-static void cleanup_entry_list(void)
-{
- struct dmi_sysfs_entry *entry, *next;
-
- /* No locks, we are on our way out */
- list_for_each_entry_safe(entry, next, &entry_list, list) {
- kobject_put(entry->child);
- kobject_put(&entry->kobj);
- }
-}
-
-static int __init dmi_sysfs_init(void)
-{
- int error = -ENOMEM;
- int val;
-
- /* Set up our directory */
- dmi_kobj = kobject_create_and_add("dmi", firmware_kobj);
- if (!dmi_kobj)
- goto err;
-
- dmi_kset = kset_create_and_add("entries", NULL, dmi_kobj);
- if (!dmi_kset)
- goto err;
-
- val = 0;
- error = dmi_walk(dmi_sysfs_register_handle, &val);
- if (error)
- goto err;
- if (val) {
- error = val;
- goto err;
- }
-
- pr_debug("dmi-sysfs: loaded.\n");
-
- return 0;
-err:
- cleanup_entry_list();
- kset_unregister(dmi_kset);
- kobject_put(dmi_kobj);
- return error;
-}
-
-/* clean up everything. */
-static void __exit dmi_sysfs_exit(void)
-{
- pr_debug("dmi-sysfs: unloading.\n");
- cleanup_entry_list();
- kset_unregister(dmi_kset);
- kobject_put(dmi_kobj);
-}
-
-module_init(dmi_sysfs_init);
-module_exit(dmi_sysfs_exit);
-
-MODULE_AUTHOR("Mike Waychison <mikew@google.com>");
-MODULE_DESCRIPTION("DMI sysfs support");
-MODULE_LICENSE("GPL");
diff --git a/drivers/firmware/dmi_scan.c b/drivers/firmware/dmi_scan.c
deleted file mode 100644
index bcb1126..0000000
--- a/drivers/firmware/dmi_scan.c
+++ /dev/null
@@ -1,751 +0,0 @@
-#include <linux/types.h>
-#include <linux/string.h>
-#include <linux/init.h>
-#include <linux/module.h>
-#include <linux/ctype.h>
-#include <linux/dmi.h>
-#include <linux/efi.h>
-#include <linux/bootmem.h>
-#include <asm/dmi.h>
-
-/*
- * DMI stands for "Desktop Management Interface". It is part
- * of and an antecedent to, SMBIOS, which stands for System
- * Management BIOS. See further: http://www.dmtf.org/standards
- */
-static char dmi_empty_string[] = " ";
-
-/*
- * Catch too early calls to dmi_check_system():
- */
-static int dmi_initialized;
-
-static const char * __init dmi_string_nosave(const struct dmi_header *dm, u8 s)
-{
- const u8 *bp = ((u8 *) dm) + dm->length;
-
- if (s) {
- s--;
- while (s > 0 && *bp) {
- bp += strlen(bp) + 1;
- s--;
- }
-
- if (*bp != 0) {
- size_t len = strlen(bp)+1;
- size_t cmp_len = len > 8 ? 8 : len;
-
- if (!memcmp(bp, dmi_empty_string, cmp_len))
- return dmi_empty_string;
- return bp;
- }
- }
-
- return "";
-}
-
-static char * __init dmi_string(const struct dmi_header *dm, u8 s)
-{
- const char *bp = dmi_string_nosave(dm, s);
- char *str;
- size_t len;
-
- if (bp == dmi_empty_string)
- return dmi_empty_string;
-
- len = strlen(bp) + 1;
- str = dmi_alloc(len);
- if (str != NULL)
- strcpy(str, bp);
- else
- printk(KERN_ERR "dmi_string: cannot allocate %Zu bytes.\n", len);
-
- return str;
-}
-
-/*
- * We have to be cautious here. We have seen BIOSes with DMI pointers
- * pointing to completely the wrong place for example
- */
-static void dmi_table(u8 *buf, int len, int num,
- void (*decode)(const struct dmi_header *, void *),
- void *private_data)
-{
- u8 *data = buf;
- int i = 0;
-
- /*
- * Stop when we see all the items the table claimed to have
- * OR we run off the end of the table (also happens)
- */
- while ((i < num) && (data - buf + sizeof(struct dmi_header)) <= len) {
- const struct dmi_header *dm = (const struct dmi_header *)data;
-
- /*
- * We want to know the total length (formatted area and
- * strings) before decoding to make sure we won't run off the
- * table in dmi_decode or dmi_string
- */
- data += dm->length;
- while ((data - buf < len - 1) && (data[0] || data[1]))
- data++;
- if (data - buf < len - 1)
- decode(dm, private_data);
- data += 2;
- i++;
- }
-}
-
-static u32 dmi_base;
-static u16 dmi_len;
-static u16 dmi_num;
-
-static int __init dmi_walk_early(void (*decode)(const struct dmi_header *,
- void *))
-{
- u8 *buf;
-
- buf = dmi_ioremap(dmi_base, dmi_len);
- if (buf == NULL)
- return -1;
-
- dmi_table(buf, dmi_len, dmi_num, decode, NULL);
-
- dmi_iounmap(buf, dmi_len);
- return 0;
-}
-
-static int __init dmi_checksum(const u8 *buf)
-{
- u8 sum = 0;
- int a;
-
- for (a = 0; a < 15; a++)
- sum += buf[a];
-
- return sum == 0;
-}
-
-static char *dmi_ident[DMI_STRING_MAX];
-static LIST_HEAD(dmi_devices);
-int dmi_available;
-
-/*
- * Save a DMI string
- */
-static void __init dmi_save_ident(const struct dmi_header *dm, int slot, int string)
-{
- const char *d = (const char*) dm;
- char *p;
-
- if (dmi_ident[slot])
- return;
-
- p = dmi_string(dm, d[string]);
- if (p == NULL)
- return;
-
- dmi_ident[slot] = p;
-}
-
-static void __init dmi_save_uuid(const struct dmi_header *dm, int slot, int index)
-{
- const u8 *d = (u8*) dm + index;
- char *s;
- int is_ff = 1, is_00 = 1, i;
-
- if (dmi_ident[slot])
- return;
-
- for (i = 0; i < 16 && (is_ff || is_00); i++) {
- if(d[i] != 0x00) is_ff = 0;
- if(d[i] != 0xFF) is_00 = 0;
- }
-
- if (is_ff || is_00)
- return;
-
- s = dmi_alloc(16*2+4+1);
- if (!s)
- return;
-
- sprintf(s, "%pUB", d);
-
- dmi_ident[slot] = s;
-}
-
-static void __init dmi_save_type(const struct dmi_header *dm, int slot, int index)
-{
- const u8 *d = (u8*) dm + index;
- char *s;
-
- if (dmi_ident[slot])
- return;
-
- s = dmi_alloc(4);
- if (!s)
- return;
-
- sprintf(s, "%u", *d & 0x7F);
- dmi_ident[slot] = s;
-}
-
-static void __init dmi_save_one_device(int type, const char *name)
-{
- struct dmi_device *dev;
-
- /* No duplicate device */
- if (dmi_find_device(type, name, NULL))
- return;
-
- dev = dmi_alloc(sizeof(*dev) + strlen(name) + 1);
- if (!dev) {
- printk(KERN_ERR "dmi_save_one_device: out of memory.\n");
- return;
- }
-
- dev->type = type;
- strcpy((char *)(dev + 1), name);
- dev->name = (char *)(dev + 1);
- dev->device_data = NULL;
- list_add(&dev->list, &dmi_devices);
-}
-
-static void __init dmi_save_devices(const struct dmi_header *dm)
-{
- int i, count = (dm->length - sizeof(struct dmi_header)) / 2;
-
- for (i = 0; i < count; i++) {
- const char *d = (char *)(dm + 1) + (i * 2);
-
- /* Skip disabled device */
- if ((*d & 0x80) == 0)
- continue;
-
- dmi_save_one_device(*d & 0x7f, dmi_string_nosave(dm, *(d + 1)));
- }
-}
-
-static void __init dmi_save_oem_strings_devices(const struct dmi_header *dm)
-{
- int i, count = *(u8 *)(dm + 1);
- struct dmi_device *dev;
-
- for (i = 1; i <= count; i++) {
- char *devname = dmi_string(dm, i);
-
- if (devname == dmi_empty_string)
- continue;
-
- dev = dmi_alloc(sizeof(*dev));
- if (!dev) {
- printk(KERN_ERR
- "dmi_save_oem_strings_devices: out of memory.\n");
- break;
- }
-
- dev->type = DMI_DEV_TYPE_OEM_STRING;
- dev->name = devname;
- dev->device_data = NULL;
-
- list_add(&dev->list, &dmi_devices);
- }
-}
-
-static void __init dmi_save_ipmi_device(const struct dmi_header *dm)
-{
- struct dmi_device *dev;
- void * data;
-
- data = dmi_alloc(dm->length);
- if (data == NULL) {
- printk(KERN_ERR "dmi_save_ipmi_device: out of memory.\n");
- return;
- }
-
- memcpy(data, dm, dm->length);
-
- dev = dmi_alloc(sizeof(*dev));
- if (!dev) {
- printk(KERN_ERR "dmi_save_ipmi_device: out of memory.\n");
- return;
- }
-
- dev->type = DMI_DEV_TYPE_IPMI;
- dev->name = "IPMI controller";
- dev->device_data = data;
-
- list_add_tail(&dev->list, &dmi_devices);
-}
-
-static void __init dmi_save_dev_onboard(int instance, int segment, int bus,
- int devfn, const char *name)
-{
- struct dmi_dev_onboard *onboard_dev;
-
- onboard_dev = dmi_alloc(sizeof(*onboard_dev) + strlen(name) + 1);
- if (!onboard_dev) {
- printk(KERN_ERR "dmi_save_dev_onboard: out of memory.\n");
- return;
- }
- onboard_dev->instance = instance;
- onboard_dev->segment = segment;
- onboard_dev->bus = bus;
- onboard_dev->devfn = devfn;
-
- strcpy((char *)&onboard_dev[1], name);
- onboard_dev->dev.type = DMI_DEV_TYPE_DEV_ONBOARD;
- onboard_dev->dev.name = (char *)&onboard_dev[1];
- onboard_dev->dev.device_data = onboard_dev;
-
- list_add(&onboard_dev->dev.list, &dmi_devices);
-}
-
-static void __init dmi_save_extended_devices(const struct dmi_header *dm)
-{
- const u8 *d = (u8*) dm + 5;
-
- /* Skip disabled device */
- if ((*d & 0x80) == 0)
- return;
-
- dmi_save_dev_onboard(*(d+1), *(u16 *)(d+2), *(d+4), *(d+5),
- dmi_string_nosave(dm, *(d-1)));
- dmi_save_one_device(*d & 0x7f, dmi_string_nosave(dm, *(d - 1)));
-}
-
-/*
- * Process a DMI table entry. Right now all we care about are the BIOS
- * and machine entries. For 2.5 we should pull the smbus controller info
- * out of here.
- */
-static void __init dmi_decode(const struct dmi_header *dm, void *dummy)
-{
- switch(dm->type) {
- case 0: /* BIOS Information */
- dmi_save_ident(dm, DMI_BIOS_VENDOR, 4);
- dmi_save_ident(dm, DMI_BIOS_VERSION, 5);
- dmi_save_ident(dm, DMI_BIOS_DATE, 8);
- break;
- case 1: /* System Information */
- dmi_save_ident(dm, DMI_SYS_VENDOR, 4);
- dmi_save_ident(dm, DMI_PRODUCT_NAME, 5);
- dmi_save_ident(dm, DMI_PRODUCT_VERSION, 6);
- dmi_save_ident(dm, DMI_PRODUCT_SERIAL, 7);
- dmi_save_uuid(dm, DMI_PRODUCT_UUID, 8);
- break;
- case 2: /* Base Board Information */
- dmi_save_ident(dm, DMI_BOARD_VENDOR, 4);
- dmi_save_ident(dm, DMI_BOARD_NAME, 5);
- dmi_save_ident(dm, DMI_BOARD_VERSION, 6);
- dmi_save_ident(dm, DMI_BOARD_SERIAL, 7);
- dmi_save_ident(dm, DMI_BOARD_ASSET_TAG, 8);
- break;
- case 3: /* Chassis Information */
- dmi_save_ident(dm, DMI_CHASSIS_VENDOR, 4);
- dmi_save_type(dm, DMI_CHASSIS_TYPE, 5);
- dmi_save_ident(dm, DMI_CHASSIS_VERSION, 6);
- dmi_save_ident(dm, DMI_CHASSIS_SERIAL, 7);
- dmi_save_ident(dm, DMI_CHASSIS_ASSET_TAG, 8);
- break;
- case 10: /* Onboard Devices Information */
- dmi_save_devices(dm);
- break;
- case 11: /* OEM Strings */
- dmi_save_oem_strings_devices(dm);
- break;
- case 38: /* IPMI Device Information */
- dmi_save_ipmi_device(dm);
- break;
- case 41: /* Onboard Devices Extended Information */
- dmi_save_extended_devices(dm);
- }
-}
-
-static void __init print_filtered(const char *info)
-{
- const char *p;
-
- if (!info)
- return;
-
- for (p = info; *p; p++)
- if (isprint(*p))
- printk(KERN_CONT "%c", *p);
- else
- printk(KERN_CONT "\\x%02x", *p & 0xff);
-}
-
-static void __init dmi_dump_ids(void)
-{
- const char *board; /* Board Name is optional */
-
- printk(KERN_DEBUG "DMI: ");
- print_filtered(dmi_get_system_info(DMI_SYS_VENDOR));
- printk(KERN_CONT " ");
- print_filtered(dmi_get_system_info(DMI_PRODUCT_NAME));
- board = dmi_get_system_info(DMI_BOARD_NAME);
- if (board) {
- printk(KERN_CONT "/");
- print_filtered(board);
- }
- printk(KERN_CONT ", BIOS ");
- print_filtered(dmi_get_system_info(DMI_BIOS_VERSION));
- printk(KERN_CONT " ");
- print_filtered(dmi_get_system_info(DMI_BIOS_DATE));
- printk(KERN_CONT "\n");
-}
-
-static int __init dmi_present(const char __iomem *p)
-{
- u8 buf[15];
-
- memcpy_fromio(buf, p, 15);
- if ((memcmp(buf, "_DMI_", 5) == 0) && dmi_checksum(buf)) {
- dmi_num = (buf[13] << 8) | buf[12];
- dmi_len = (buf[7] << 8) | buf[6];
- dmi_base = (buf[11] << 24) | (buf[10] << 16) |
- (buf[9] << 8) | buf[8];
-
- /*
- * DMI version 0.0 means that the real version is taken from
- * the SMBIOS version, which we don't know at this point.
- */
- if (buf[14] != 0)
- printk(KERN_INFO "DMI %d.%d present.\n",
- buf[14] >> 4, buf[14] & 0xF);
- else
- printk(KERN_INFO "DMI present.\n");
- if (dmi_walk_early(dmi_decode) == 0) {
- dmi_dump_ids();
- return 0;
- }
- }
- return 1;
-}
-
-void __init dmi_scan_machine(void)
-{
- char __iomem *p, *q;
- int rc;
-
- if (efi_enabled) {
- if (efi.smbios == EFI_INVALID_TABLE_ADDR)
- goto error;
-
- /* This is called as a core_initcall() because it isn't
- * needed during early boot. This also means we can
- * iounmap the space when we're done with it.
- */
- p = dmi_ioremap(efi.smbios, 32);
- if (p == NULL)
- goto error;
-
- rc = dmi_present(p + 0x10); /* offset of _DMI_ string */
- dmi_iounmap(p, 32);
- if (!rc) {
- dmi_available = 1;
- goto out;
- }
- }
- else {
- /*
- * no iounmap() for that ioremap(); it would be a no-op, but
- * it's so early in setup that sucker gets confused into doing
- * what it shouldn't if we actually call it.
- */
- p = dmi_ioremap(0xF0000, 0x10000);
- if (p == NULL)
- goto error;
-
- for (q = p; q < p + 0x10000; q += 16) {
- rc = dmi_present(q);
- if (!rc) {
- dmi_available = 1;
- dmi_iounmap(p, 0x10000);
- goto out;
- }
- }
- dmi_iounmap(p, 0x10000);
- }
- error:
- printk(KERN_INFO "DMI not present or invalid.\n");
- out:
- dmi_initialized = 1;
-}
-
-/**
- * dmi_matches - check if dmi_system_id structure matches system DMI data
- * @dmi: pointer to the dmi_system_id structure to check
- */
-static bool dmi_matches(const struct dmi_system_id *dmi)
-{
- int i;
-
- WARN(!dmi_initialized, KERN_ERR "dmi check: not initialized yet.\n");
-
- for (i = 0; i < ARRAY_SIZE(dmi->matches); i++) {
- int s = dmi->matches[i].slot;
- if (s == DMI_NONE)
- break;
- if (dmi_ident[s]
- && strstr(dmi_ident[s], dmi->matches[i].substr))
- continue;
- /* No match */
- return false;
- }
- return true;
-}
-
-/**
- * dmi_is_end_of_table - check for end-of-table marker
- * @dmi: pointer to the dmi_system_id structure to check
- */
-static bool dmi_is_end_of_table(const struct dmi_system_id *dmi)
-{
- return dmi->matches[0].slot == DMI_NONE;
-}
-
-/**
- * dmi_check_system - check system DMI data
- * @list: array of dmi_system_id structures to match against
- * All non-null elements of the list must match
- * their slot's (field index's) data (i.e., each
- * list string must be a substring of the specified
- * DMI slot's string data) to be considered a
- * successful match.
- *
- * Walk the blacklist table running matching functions until someone
- * returns non zero or we hit the end. Callback function is called for
- * each successful match. Returns the number of matches.
- */
-int dmi_check_system(const struct dmi_system_id *list)
-{
- int count = 0;
- const struct dmi_system_id *d;
-
- for (d = list; !dmi_is_end_of_table(d); d++)
- if (dmi_matches(d)) {
- count++;
- if (d->callback && d->callback(d))
- break;
- }
-
- return count;
-}
-EXPORT_SYMBOL(dmi_check_system);
-
-/**
- * dmi_first_match - find dmi_system_id structure matching system DMI data
- * @list: array of dmi_system_id structures to match against
- * All non-null elements of the list must match
- * their slot's (field index's) data (i.e., each
- * list string must be a substring of the specified
- * DMI slot's string data) to be considered a
- * successful match.
- *
- * Walk the blacklist table until the first match is found. Return the
- * pointer to the matching entry or NULL if there's no match.
- */
-const struct dmi_system_id *dmi_first_match(const struct dmi_system_id *list)
-{
- const struct dmi_system_id *d;
-
- for (d = list; !dmi_is_end_of_table(d); d++)
- if (dmi_matches(d))
- return d;
-
- return NULL;
-}
-EXPORT_SYMBOL(dmi_first_match);
-
-/**
- * dmi_get_system_info - return DMI data value
- * @field: data index (see enum dmi_field)
- *
- * Returns one DMI data value, can be used to perform
- * complex DMI data checks.
- */
-const char *dmi_get_system_info(int field)
-{
- return dmi_ident[field];
-}
-EXPORT_SYMBOL(dmi_get_system_info);
-
-/**
- * dmi_name_in_serial - Check if string is in the DMI product serial information
- * @str: string to check for
- */
-int dmi_name_in_serial(const char *str)
-{
- int f = DMI_PRODUCT_SERIAL;
- if (dmi_ident[f] && strstr(dmi_ident[f], str))
- return 1;
- return 0;
-}
-
-/**
- * dmi_name_in_vendors - Check if string is anywhere in the DMI vendor information.
- * @str: Case sensitive Name
- */
-int dmi_name_in_vendors(const char *str)
-{
- static int fields[] = { DMI_BIOS_VENDOR, DMI_BIOS_VERSION, DMI_SYS_VENDOR,
- DMI_PRODUCT_NAME, DMI_PRODUCT_VERSION, DMI_BOARD_VENDOR,
- DMI_BOARD_NAME, DMI_BOARD_VERSION, DMI_NONE };
- int i;
- for (i = 0; fields[i] != DMI_NONE; i++) {
- int f = fields[i];
- if (dmi_ident[f] && strstr(dmi_ident[f], str))
- return 1;
- }
- return 0;
-}
-EXPORT_SYMBOL(dmi_name_in_vendors);
-
-/**
- * dmi_find_device - find onboard device by type/name
- * @type: device type or %DMI_DEV_TYPE_ANY to match all device types
- * @name: device name string or %NULL to match all
- * @from: previous device found in search, or %NULL for new search.
- *
- * Iterates through the list of known onboard devices. If a device is
- * found with a matching @vendor and @device, a pointer to its device
- * structure is returned. Otherwise, %NULL is returned.
- * A new search is initiated by passing %NULL as the @from argument.
- * If @from is not %NULL, searches continue from next device.
- */
-const struct dmi_device * dmi_find_device(int type, const char *name,
- const struct dmi_device *from)
-{
- const struct list_head *head = from ? &from->list : &dmi_devices;
- struct list_head *d;
-
- for(d = head->next; d != &dmi_devices; d = d->next) {
- const struct dmi_device *dev =
- list_entry(d, struct dmi_device, list);
-
- if (((type == DMI_DEV_TYPE_ANY) || (dev->type == type)) &&
- ((name == NULL) || (strcmp(dev->name, name) == 0)))
- return dev;
- }
-
- return NULL;
-}
-EXPORT_SYMBOL(dmi_find_device);
-
-/**
- * dmi_get_date - parse a DMI date
- * @field: data index (see enum dmi_field)
- * @yearp: optional out parameter for the year
- * @monthp: optional out parameter for the month
- * @dayp: optional out parameter for the day
- *
- * The date field is assumed to be in the form resembling
- * [mm[/dd]]/yy[yy] and the result is stored in the out
- * parameters any or all of which can be omitted.
- *
- * If the field doesn't exist, all out parameters are set to zero
- * and false is returned. Otherwise, true is returned with any
- * invalid part of date set to zero.
- *
- * On return, year, month and day are guaranteed to be in the
- * range of [0,9999], [0,12] and [0,31] respectively.
- */
-bool dmi_get_date(int field, int *yearp, int *monthp, int *dayp)
-{
- int year = 0, month = 0, day = 0;
- bool exists;
- const char *s, *y;
- char *e;
-
- s = dmi_get_system_info(field);
- exists = s;
- if (!exists)
- goto out;
-
- /*
- * Determine year first. We assume the date string resembles
- * mm/dd/yy[yy] but the original code extracted only the year
- * from the end. Keep the behavior in the spirit of no
- * surprises.
- */
- y = strrchr(s, '/');
- if (!y)
- goto out;
-
- y++;
- year = simple_strtoul(y, &e, 10);
- if (y != e && year < 100) { /* 2-digit year */
- year += 1900;
- if (year < 1996) /* no dates < spec 1.0 */
- year += 100;
- }
- if (year > 9999) /* year should fit in %04d */
- year = 0;
-
- /* parse the mm and dd */
- month = simple_strtoul(s, &e, 10);
- if (s == e || *e != '/' || !month || month > 12) {
- month = 0;
- goto out;
- }
-
- s = e + 1;
- day = simple_strtoul(s, &e, 10);
- if (s == y || s == e || *e != '/' || day > 31)
- day = 0;
-out:
- if (yearp)
- *yearp = year;
- if (monthp)
- *monthp = month;
- if (dayp)
- *dayp = day;
- return exists;
-}
-EXPORT_SYMBOL(dmi_get_date);
-
-/**
- * dmi_walk - Walk the DMI table and get called back for every record
- * @decode: Callback function
- * @private_data: Private data to be passed to the callback function
- *
- * Returns -1 when the DMI table can't be reached, 0 on success.
- */
-int dmi_walk(void (*decode)(const struct dmi_header *, void *),
- void *private_data)
-{
- u8 *buf;
-
- if (!dmi_available)
- return -1;
-
- buf = ioremap(dmi_base, dmi_len);
- if (buf == NULL)
- return -1;
-
- dmi_table(buf, dmi_len, dmi_num, decode, private_data);
-
- iounmap(buf);
- return 0;
-}
-EXPORT_SYMBOL_GPL(dmi_walk);
-
-/**
- * dmi_match - compare a string to the dmi field (if exists)
- * @f: DMI field identifier
- * @str: string to compare the DMI field to
- *
- * Returns true if the requested field equals to the str (including NULL).
- */
-bool dmi_match(enum dmi_field f, const char *str)
-{
- const char *info = dmi_get_system_info(f);
-
- if (info == NULL || str == NULL)
- return info == str;
-
- return !strcmp(info, str);
-}
-EXPORT_SYMBOL_GPL(dmi_match);
diff --git a/include/linux/dmi.h b/include/linux/dmi.h
deleted file mode 100644
index f156cca..0000000
--- a/include/linux/dmi.h
+++ /dev/null
@@ -1,139 +0,0 @@
-#ifndef __DMI_H__
-#define __DMI_H__
-
-#include <linux/list.h>
-#include <linux/mod_devicetable.h>
-
-/* enum dmi_field is in mod_devicetable.h */
-
-enum dmi_device_type {
- DMI_DEV_TYPE_ANY = 0,
- DMI_DEV_TYPE_OTHER,
- DMI_DEV_TYPE_UNKNOWN,
- DMI_DEV_TYPE_VIDEO,
- DMI_DEV_TYPE_SCSI,
- DMI_DEV_TYPE_ETHERNET,
- DMI_DEV_TYPE_TOKENRING,
- DMI_DEV_TYPE_SOUND,
- DMI_DEV_TYPE_PATA,
- DMI_DEV_TYPE_SATA,
- DMI_DEV_TYPE_SAS,
- DMI_DEV_TYPE_IPMI = -1,
- DMI_DEV_TYPE_OEM_STRING = -2,
- DMI_DEV_TYPE_DEV_ONBOARD = -3,
-};
-
-enum dmi_entry_type {
- DMI_ENTRY_BIOS = 0,
- DMI_ENTRY_SYSTEM,
- DMI_ENTRY_BASEBOARD,
- DMI_ENTRY_CHASSIS,
- DMI_ENTRY_PROCESSOR,
- DMI_ENTRY_MEM_CONTROLLER,
- DMI_ENTRY_MEM_MODULE,
- DMI_ENTRY_CACHE,
- DMI_ENTRY_PORT_CONNECTOR,
- DMI_ENTRY_SYSTEM_SLOT,
- DMI_ENTRY_ONBOARD_DEVICE,
- DMI_ENTRY_OEMSTRINGS,
- DMI_ENTRY_SYSCONF,
- DMI_ENTRY_BIOS_LANG,
- DMI_ENTRY_GROUP_ASSOC,
- DMI_ENTRY_SYSTEM_EVENT_LOG,
- DMI_ENTRY_PHYS_MEM_ARRAY,
- DMI_ENTRY_MEM_DEVICE,
- DMI_ENTRY_32_MEM_ERROR,
- DMI_ENTRY_MEM_ARRAY_MAPPED_ADDR,
- DMI_ENTRY_MEM_DEV_MAPPED_ADDR,
- DMI_ENTRY_BUILTIN_POINTING_DEV,
- DMI_ENTRY_PORTABLE_BATTERY,
- DMI_ENTRY_SYSTEM_RESET,
- DMI_ENTRY_HW_SECURITY,
- DMI_ENTRY_SYSTEM_POWER_CONTROLS,
- DMI_ENTRY_VOLTAGE_PROBE,
- DMI_ENTRY_COOLING_DEV,
- DMI_ENTRY_TEMP_PROBE,
- DMI_ENTRY_ELECTRICAL_CURRENT_PROBE,
- DMI_ENTRY_OOB_REMOTE_ACCESS,
- DMI_ENTRY_BIS_ENTRY,
- DMI_ENTRY_SYSTEM_BOOT,
- DMI_ENTRY_MGMT_DEV,
- DMI_ENTRY_MGMT_DEV_COMPONENT,
- DMI_ENTRY_MGMT_DEV_THRES,
- DMI_ENTRY_MEM_CHANNEL,
- DMI_ENTRY_IPMI_DEV,
- DMI_ENTRY_SYS_POWER_SUPPLY,
- DMI_ENTRY_ADDITIONAL,
- DMI_ENTRY_ONBOARD_DEV_EXT,
- DMI_ENTRY_MGMT_CONTROLLER_HOST,
- DMI_ENTRY_INACTIVE = 126,
- DMI_ENTRY_END_OF_TABLE = 127,
-};
-
-struct dmi_header {
- u8 type;
- u8 length;
- u16 handle;
-};
-
-struct dmi_device {
- struct list_head list;
- int type;
- const char *name;
- void *device_data; /* Type specific data */
-};
-
-#ifdef CONFIG_DMI
-
-struct dmi_dev_onboard {
- struct dmi_device dev;
- int instance;
- int segment;
- int bus;
- int devfn;
-};
-
-extern int dmi_check_system(const struct dmi_system_id *list);
-const struct dmi_system_id *dmi_first_match(const struct dmi_system_id *list);
-extern const char * dmi_get_system_info(int field);
-extern const struct dmi_device * dmi_find_device(int type, const char *name,
- const struct dmi_device *from);
-extern void dmi_scan_machine(void);
-extern bool dmi_get_date(int field, int *yearp, int *monthp, int *dayp);
-extern int dmi_name_in_vendors(const char *str);
-extern int dmi_name_in_serial(const char *str);
-extern int dmi_available;
-extern int dmi_walk(void (*decode)(const struct dmi_header *, void *),
- void *private_data);
-extern bool dmi_match(enum dmi_field f, const char *str);
-
-#else
-
-static inline int dmi_check_system(const struct dmi_system_id *list) { return 0; }
-static inline const char * dmi_get_system_info(int field) { return NULL; }
-static inline const struct dmi_device * dmi_find_device(int type, const char *name,
- const struct dmi_device *from) { return NULL; }
-static inline void dmi_scan_machine(void) { return; }
-static inline bool dmi_get_date(int field, int *yearp, int *monthp, int *dayp)
-{
- if (yearp)
- *yearp = 0;
- if (monthp)
- *monthp = 0;
- if (dayp)
- *dayp = 0;
- return false;
-}
-static inline int dmi_name_in_vendors(const char *s) { return 0; }
-static inline int dmi_name_in_serial(const char *s) { return 0; }
-#define dmi_available 0
-static inline int dmi_walk(void (*decode)(const struct dmi_header *, void *),
- void *private_data) { return -1; }
-static inline bool dmi_match(enum dmi_field f, const char *str)
- { return false; }
-static inline const struct dmi_system_id *
- dmi_first_match(const struct dmi_system_id *list) { return NULL; }
-
-#endif
-
-#endif /* __DMI_H__ */
diff --git a/include/linux/mod_devicetable.h b/include/linux/mod_devicetable.h
index 89153ad..5e8d1bc 100644
--- a/include/linux/mod_devicetable.h
+++ b/include/linux/mod_devicetable.h
@@ -427,61 +427,6 @@ struct spi_device_id {
__attribute__((aligned(sizeof(kernel_ulong_t))));
};
-/* dmi */
-enum dmi_field {
- DMI_NONE,
- DMI_BIOS_VENDOR,
- DMI_BIOS_VERSION,
- DMI_BIOS_DATE,
- DMI_SYS_VENDOR,
- DMI_PRODUCT_NAME,
- DMI_PRODUCT_VERSION,
- DMI_PRODUCT_SERIAL,
- DMI_PRODUCT_UUID,
- DMI_BOARD_VENDOR,
- DMI_BOARD_NAME,
- DMI_BOARD_VERSION,
- DMI_BOARD_SERIAL,
- DMI_BOARD_ASSET_TAG,
- DMI_CHASSIS_VENDOR,
- DMI_CHASSIS_TYPE,
- DMI_CHASSIS_VERSION,
- DMI_CHASSIS_SERIAL,
- DMI_CHASSIS_ASSET_TAG,
- DMI_STRING_MAX,
-};
-
-struct dmi_strmatch {
- unsigned char slot;
- char substr[79];
-};
-
-#ifndef __KERNEL__
-struct dmi_system_id {
- kernel_ulong_t callback;
- kernel_ulong_t ident;
- struct dmi_strmatch matches[4];
- kernel_ulong_t driver_data
- __attribute__((aligned(sizeof(kernel_ulong_t))));
-};
-#else
-struct dmi_system_id {
- int (*callback)(const struct dmi_system_id *);
- const char *ident;
- struct dmi_strmatch matches[4];
- void *driver_data;
-};
-/*
- * struct dmi_device_id appears during expansion of
- * "MODULE_DEVICE_TABLE(dmi, x)". Compiler doesn't look inside it
- * but this is enough for gcc 3.4.6 to error out:
- * error: storage size of '__mod_dmi_device_table' isn't known
- */
-#define dmi_device_id dmi_system_id
-#endif
-
-#define DMI_MATCH(a, b) { a, b }
-
/*
* sysfw field - right now these are based on x86/ia64's SMBIOS fields. But
* other arches are certainly welcome to add additional fields. The
--
1.6.5.2
^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [lm-sensors] [PATCH 01/34] System Firmware Interface
[not found] ` <1310994528-26276-2-git-send-email-prarit-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
@ 2011-07-25 19:03 ` Jean Delvare
0 siblings, 0 replies; 7+ messages in thread
From: Jean Delvare @ 2011-07-25 19:03 UTC (permalink / raw)
To: Prarit Bhargava
Cc: linux-kernel-u79uwXL29TY76Z2rM5mHXA,
linux-ia64-u79uwXL29TY76Z2rM5mHXA,
linux-pci-u79uwXL29TY76Z2rM5mHXA,
dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW,
platform-driver-x86-u79uwXL29TY76Z2rM5mHXA,
grant.likely-s3s/WqlpOiPyB63q8FvJNQ,
linux-ide-u79uwXL29TY76Z2rM5mHXA,
linux-i2c-u79uwXL29TY76Z2rM5mHXA,
device-drivers-devel-ZG0+EudsQA8dtHy/vicBwGD2FQJk+8+b,
abelay-3s7WtUTddSA, eric.piel-VkQ1JFuSMpfAbQlEx87xDw,
x86-DgEjT+Ai2ygdnm+yROfE0A, lm-sensors-GZX6beZjE8VD60Wz+7aTrA,
linux-acpi-u79uwXL29TY76Z2rM5mHXA,
linux-input-u79uwXL29TY76Z2rM5mHXA,
linux-media-u79uwXL29TY76Z2rM5mHXA,
johnpol-9fLWQ3dKdXwox3rIn2DAYQ,
linux-watchdog-u79uwXL29TY76Z2rM5mHXA,
rtc-linux-/JYPxA39Uh5TLH3MbocFFw, dz-8fiUuRrzOP0dnm+yROfE0A,
openipmi-developer-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f,
evel-gWbeCf7V1WCQmaza687I9mD2FQJk+8+b,
netdev-u79uwXL29TY76Z2rM5mHXA, linux-usb-u79uwXL29TY76Z2rM5mHXA,
rpurdie-Fm38FmjxZ/leoWH0uzbU5w,
linux-crypto-u79uwXL29TY76Z2rM5mHXA
On Mon, 18 Jul 2011 09:08:15 -0400, Prarit Bhargava wrote:
> This patch introduces a general System Firmware interface to the kernel, called
> sysfw.
>
> Inlcluded in this interface is the ability to search a standard set of fields,
> sysfw_lookup(). The fields are currently based upon the x86 and ia64 SMBIOS
> fields but exapandable to fields that other arches may introduce. Also
> included is the ability to search and match against those fields, and run
> a callback function against the matches, sysfw_callback().
>
> Modify module code to use sysfw instead of old DMI interface.
This is a HUGE patch set. You'd need to have a good reason for such a
big and intrusive change, yet I see no such reason explained. I
understand that we _can_ abstract system information interfaces, but
just because we can doesn't mean we have to. I would at least wait for
a second DMI-like interface to be widely implemented and support before
any attempt to abstract, otherwise your design is bound to be missing
the target. And even then, you'd still need to convince me that there
is a need for a unified interface to access both backends at once. I
would guess that you know what backend is present on a system when you
try to identify it.
At this point, I see the work needed to review your patches, the risk
of regressions due to the large size of the patch set, but I don't see
any immediate benefit. Thus I am not going to look into it at all,
sorry.
--
Jean Delvare
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 21/34] drivers/platform changes for SMBIOS and System Firmware
2011-07-18 13:08 ` [PATCH 21/34] drivers/platform " Prarit Bhargava
@ 2011-08-11 4:30 ` Jonathan Woithe
0 siblings, 0 replies; 7+ messages in thread
From: Jonathan Woithe @ 2011-08-11 4:30 UTC (permalink / raw)
To: Prarit Bhargava; +Cc: linux-kernel, platform-driver-x86, jwoithe
On Mon, Jul 18, 2011 at 09:08:35AM -0400, Prarit Bhargava wrote:
> - Replace old dmi* structures and functions with new sysfw* and smbios*
> structures and functions in individual drivers
> - cleanup sysfw_id lookup tables
> - add exactmatch functionality
> - edit udev notifiers
> - cleanup of includes for dmi.h and mod_devicetable.h which were included in
> some files that did not need them
>
> [v2]: Re-exported dmi MODULE_ALIAS
> :
> drivers/platform/x86/fujitsu-laptop.c | 41 ++++----
> :
In-so-far as I can tell with a quick inspection, this looks ok for the
fujitsu-laptop.c module.
Acked-by: Jonathan Woithe <jwoithe@physics.adelaide.edu.au>
At the risk of looking ill-informed, I assume the DMI infrastructure has
been deprecated by the more general sysfw.
Regards
jonathan
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2011-08-11 4:53 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <1310994528-26276-1-git-send-email-prarit@redhat.com>
2011-07-18 13:08 ` [PATCH 01/34] System Firmware Interface Prarit Bhargava
[not found] ` <1310994528-26276-2-git-send-email-prarit-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
2011-07-25 19:03 ` [lm-sensors] " Jean Delvare
[not found] ` <1310994528-26276-1-git-send-email-prarit-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
2011-07-18 13:08 ` [PATCH 02/34] New SMBIOS driver for x86 and ia64 Prarit Bhargava
2011-07-18 13:08 ` [PATCH 07/34] drivers/char changes for SMBIOS and System Firmware Prarit Bhargava
2011-07-18 13:08 ` [PATCH 21/34] drivers/platform " Prarit Bhargava
2011-08-11 4:30 ` Jonathan Woithe
2011-07-18 13:08 ` [PATCH 34/34] Remove old DMI & SMBIOS code and make SMBIOS default on Prarit Bhargava
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox