From patchwork Wed Feb 4 17:06:03 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ivan Khoronzhuk X-Patchwork-Id: 44375 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wg0-f69.google.com (mail-wg0-f69.google.com [74.125.82.69]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 735F721173 for ; Wed, 4 Feb 2015 17:06:45 +0000 (UTC) Received: by mail-wg0-f69.google.com with SMTP id x12sf2192525wgg.0 for ; Wed, 04 Feb 2015 09:06:44 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:sender:precedence:list-id:x-original-sender :x-original-authentication-results:mailing-list:list-post:list-help :list-archive:list-unsubscribe; bh=IIYlM9rK6qUUe7Zu0j+NpuC17lxifxSSIyzRrREjzU4=; b=LTAxCpBWGhnThIsjd/tp42OKnTwaABziF0M6qVcXVyRDYVJNlund0fGixvPmI1SZ4q k4BdlJdj7acGWHyb39n01xEOi74qgl9mfM4TyM+AYeDSz+aiyfNdIpj7FJrTSuYjBAeb 3nl7QHD0hz3ixQQ2IwaMZAhKxzg7Vh0aDUEUOzCsG1wz1SrC/rGkXU8/d125/54hZN3C WiPUzjXgB3+0YDfRyttmb6JufvfAVz88b7oTcvY1LVtAWrE+err1JQ7cjjGvtYjo4jzp f6xY32W7E7Eus1OeqUSMYPNwZoMFk0TT4fQfU7QoKLrH3mkDYLxQUV4YHdg/EIqMHub+ xlHA== X-Gm-Message-State: ALoCoQndorYjRmGAcTvJyXVp/9TwlZ8FeSuOtQuVd+g+If3yewJQlNytVCM2Y5wirSTOyuFVBxbE X-Received: by 10.112.213.72 with SMTP id nq8mr4134017lbc.18.1423069604653; Wed, 04 Feb 2015 09:06:44 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.120.193 with SMTP id le1ls64392lab.11.gmail; Wed, 04 Feb 2015 09:06:44 -0800 (PST) X-Received: by 10.112.137.196 with SMTP id qk4mr31718264lbb.33.1423069604469; Wed, 04 Feb 2015 09:06:44 -0800 (PST) Received: from mail-lb0-f176.google.com (mail-lb0-f176.google.com. [209.85.217.176]) by mx.google.com with ESMTPS id li1si1819914lab.97.2015.02.04.09.06.44 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 04 Feb 2015 09:06:44 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.176 as permitted sender) client-ip=209.85.217.176; Received: by mail-lb0-f176.google.com with SMTP id z12so2629474lbi.7 for ; Wed, 04 Feb 2015 09:06:44 -0800 (PST) X-Received: by 10.112.144.164 with SMTP id sn4mr26406868lbb.2.1423069604312; Wed, 04 Feb 2015 09:06:44 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.35.133 with SMTP id h5csp618532lbj; Wed, 4 Feb 2015 09:06:43 -0800 (PST) X-Received: by 10.70.138.77 with SMTP id qo13mr6645507pdb.135.1423069602013; Wed, 04 Feb 2015 09:06:42 -0800 (PST) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id qy1si2013191pab.22.2015.02.04.09.06.41; Wed, 04 Feb 2015 09:06:41 -0800 (PST) Received-SPF: none (google.com: linux-kernel-owner@vger.kernel.org does not designate permitted sender hosts) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1161248AbbBDRGh (ORCPT + 29 others); Wed, 4 Feb 2015 12:06:37 -0500 Received: from mail-lb0-f177.google.com ([209.85.217.177]:44395 "EHLO mail-lb0-f177.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1161206AbbBDRGf (ORCPT ); Wed, 4 Feb 2015 12:06:35 -0500 Received: by mail-lb0-f177.google.com with SMTP id p9so2617966lbv.8 for ; Wed, 04 Feb 2015 09:06:34 -0800 (PST) X-Received: by 10.112.236.36 with SMTP id ur4mr3510189lbc.67.1423069593910; Wed, 04 Feb 2015 09:06:33 -0800 (PST) Received: from khorivan.itg.ti.com (152-172-94-178.pool.ukrtel.net. [178.94.172.152]) by mx.google.com with ESMTPSA id y11sm471182lba.5.2015.02.04.09.06.30 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 04 Feb 2015 09:06:32 -0800 (PST) From: Ivan Khoronzhuk To: linux-kernel@vger.kernel.org, ard.biesheuvel@linaro.org, grant.likely@linaro.org, matt.fleming@intel.com, linux-api@vger.kernel.org, linux-doc@vger.kernel.org Cc: dmidecode-devel@nongnu.org, leif.lindholm@linaro.org, msalter@redhat.com, Ivan Khoronzhuk Subject: [Patch v4] firmware: dmi-sysfs: add SMBIOS entry point area attribute Date: Wed, 4 Feb 2015 19:06:03 +0200 Message-Id: <1423069563-26467-1-git-send-email-ivan.khoronzhuk@linaro.org> X-Mailer: git-send-email 1.9.1 Sender: linux-kernel-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: ivan.khoronzhuk@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.176 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , Some utils, like dmidecode and smbios, need to access SMBIOS entry table area in order to get information like SMBIOS version, size, etc. Currently it's done via /dev/mem. But for situation when /dev/mem usage is disabled, the utils have to use dmi sysfs instead, which doesn't represent SMBIOS entry. So this patch adds SMBIOS area to dmi-sysfs in order to allow utils in question to work correctly with dmi sysfs interface. Reviewed-by: Ard Biesheuvel Signed-off-by: Ivan Khoronzhuk --- v1: https://lkml.org/lkml/2015/1/23/643 v2: https://lkml.org/lkml/2015/1/26/345 v3: https://lkml.org/lkml/2015/1/28/768 v4..v2: firmware: dmi_scan: add symbol to get SMBIOS entry area - used u8 type for smbios_header var firmware: dmi-sysfs: add SMBIOS entry point area attribute - replaced -ENODATA on -EINVAL v3..v2: firmware: dmi_scan: add symbol to get SMBIOS entry area firmware: dmi-sysfs: add SMBIOS entry point area attribute - combined in one patch - added SMBIOS information to ABI sysfs-dmi documentaton v2..v1: firmware: dmi_scan: add symbol to get SMBIOS entry area - used additional static var to hold SMBIOS raw table size - changed format of get_smbios_entry_area symbol returned pointer on const smbios table firmware: dmi-sysfs: add SMBIOS entry point area attribute - adopted to updated get_smbios_entry_area symbol - removed redundant array to save smbios table Documentation/ABI/testing/sysfs-firmware-dmi | 10 +++++++ drivers/firmware/dmi-sysfs.c | 42 ++++++++++++++++++++++++++++ drivers/firmware/dmi_scan.c | 26 +++++++++++++++++ include/linux/dmi.h | 3 ++ 4 files changed, 81 insertions(+) diff --git a/Documentation/ABI/testing/sysfs-firmware-dmi b/Documentation/ABI/testing/sysfs-firmware-dmi index c78f9ab..3a9ffe8 100644 --- a/Documentation/ABI/testing/sysfs-firmware-dmi +++ b/Documentation/ABI/testing/sysfs-firmware-dmi @@ -12,6 +12,16 @@ Description: cannot ensure that the data as exported to userland is without error either. + The firmware provides DMI structures as a packed list of + data referenced by a SMBIOS table entry point. The SMBIOS + entry point contains general information, like SMBIOS + version, DMI table size, etc. The structure, content and + size of SMBIOS entry point is dependent on SMBIOS version. + That's why SMBIOS entry point is represented in dmi sysfs + like a raw attribute and is accessible via + /sys/firmware/dmi/smbios_raw_header. The format of SMBIOS + entry point header can be read in SMBIOS specification. + DMI is structured as a large table of entries, where each entry has a common header indicating the type and length of the entry, as well as a firmware-provided diff --git a/drivers/firmware/dmi-sysfs.c b/drivers/firmware/dmi-sysfs.c index e0f1cb3..9b396d7 100644 --- a/drivers/firmware/dmi-sysfs.c +++ b/drivers/firmware/dmi-sysfs.c @@ -29,6 +29,8 @@ #define MAX_ENTRY_TYPE 255 /* Most of these aren't used, but we consider the top entry type is only 8 bits */ +static const u8 *smbios_raw_header; + struct dmi_sysfs_entry { struct dmi_header dh; struct kobject kobj; @@ -646,9 +648,37 @@ static void cleanup_entry_list(void) } } +static ssize_t smbios_entry_area_raw_read(struct file *filp, + struct kobject *kobj, + struct bin_attribute *bin_attr, + char *buf, loff_t pos, size_t count) +{ + ssize_t size; + + size = bin_attr->size; + + if (size > pos) + size -= pos; + else + return 0; + + if (count < size) + size = count; + + memcpy(buf, &smbios_raw_header[pos], size); + + return size; +} + +static struct bin_attribute smbios_raw_area_attr = { + .read = smbios_entry_area_raw_read, + .attr = {.name = "smbios_raw_header", .mode = 0400}, +}; + static int __init dmi_sysfs_init(void) { int error = -ENOMEM; + int size; int val; /* Set up our directory */ @@ -669,6 +699,18 @@ static int __init dmi_sysfs_init(void) goto err; } + smbios_raw_header = dmi_get_smbios_entry_area(&size); + if (!smbios_raw_header) { + pr_debug("dmi-sysfs: SMBIOS raw data is not available.\n"); + error = -EINVAL; + goto err; + } + + /* Create the raw binary file to access the entry area */ + smbios_raw_area_attr.size = size; + if (sysfs_create_bin_file(dmi_kobj, &smbios_raw_area_attr)) + goto err; + pr_debug("dmi-sysfs: loaded.\n"); return 0; diff --git a/drivers/firmware/dmi_scan.c b/drivers/firmware/dmi_scan.c index 420c8d8..99c5f6c 100644 --- a/drivers/firmware/dmi_scan.c +++ b/drivers/firmware/dmi_scan.c @@ -113,6 +113,8 @@ static void dmi_table(u8 *buf, int len, int num, } } +static u8 smbios_header[32]; +static int smbios_header_size; static phys_addr_t dmi_base; static u16 dmi_len; static u16 dmi_num; @@ -474,6 +476,8 @@ static int __init dmi_present(const u8 *buf) if (memcmp(buf, "_SM_", 4) == 0 && buf[5] < 32 && dmi_checksum(buf, buf[5])) { smbios_ver = get_unaligned_be16(buf + 6); + smbios_header_size = buf[5]; + memcpy(smbios_header, buf, smbios_header_size); /* Some BIOS report weird SMBIOS version, fix that up */ switch (smbios_ver) { @@ -505,6 +509,8 @@ static int __init dmi_present(const u8 *buf) pr_info("SMBIOS %d.%d present.\n", dmi_ver >> 8, dmi_ver & 0xFF); } else { + smbios_header_size = 15; + memcpy(smbios_header, buf, smbios_header_size); dmi_ver = (buf[14] & 0xF0) << 4 | (buf[14] & 0x0F); pr_info("Legacy DMI %d.%d present.\n", @@ -531,6 +537,8 @@ static int __init dmi_smbios3_present(const u8 *buf) dmi_ver &= 0xFFFFFF; dmi_len = get_unaligned_le32(buf + 12); dmi_base = get_unaligned_le64(buf + 16); + smbios_header_size = buf[6]; + memcpy(smbios_header, buf, smbios_header_size); /* * The 64-bit SMBIOS 3.0 entry point no longer has a field @@ -944,3 +952,21 @@ void dmi_memdev_name(u16 handle, const char **bank, const char **device) } } EXPORT_SYMBOL_GPL(dmi_memdev_name); + +/** + * dmi_get_smbios_entry_area - copy SMBIOS entry point area to array. + * @size - pointer to assign actual size of SMBIOS entry point area. + * + * returns NULL if table is not available, otherwise returns pointer on + * SMBIOS entry point area array. + */ +const u8 *dmi_get_smbios_entry_area(int *size) +{ + if (!smbios_header_size || !dmi_available) + return NULL; + + *size = smbios_header_size; + + return smbios_header; +} +EXPORT_SYMBOL_GPL(dmi_get_smbios_entry_area); diff --git a/include/linux/dmi.h b/include/linux/dmi.h index f820f0a..8e1a28d 100644 --- a/include/linux/dmi.h +++ b/include/linux/dmi.h @@ -109,6 +109,7 @@ 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); extern void dmi_memdev_name(u16 handle, const char **bank, const char **device); +const u8 *dmi_get_smbios_entry_area(int *size); #else @@ -140,6 +141,8 @@ static inline void dmi_memdev_name(u16 handle, const char **bank, const char **device) { } static inline const struct dmi_system_id * dmi_first_match(const struct dmi_system_id *list) { return NULL; } +static inline const u8 *dmi_get_smbios_entry_area(int *size) + { return NULL; } #endif