From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.3 required=3.0 tests=DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 53170C432C0 for ; Wed, 27 Nov 2019 15:09:39 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2241F206F0 for ; Wed, 27 Nov 2019 15:09:39 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="XCZKNut6" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726970AbfK0PJi (ORCPT ); Wed, 27 Nov 2019 10:09:38 -0500 Received: from mail-wr1-f67.google.com ([209.85.221.67]:40584 "EHLO mail-wr1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726514AbfK0PJh (ORCPT ); Wed, 27 Nov 2019 10:09:37 -0500 Received: by mail-wr1-f67.google.com with SMTP id c14so2473889wrn.7; Wed, 27 Nov 2019 07:09:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=++Mav+f24+2FiNygNVgMuis0c5LbHs6cWbmxN1/hHkc=; b=XCZKNut6V6xUyG7fv9XYSvqdRL0xuQ4XycbgVT585vdzbXMl6htJUOsvaz3AhyyJgl Gj/Zhgp3zyjBQixqtQiqPH79vvDaOgM7d/tgOGxAbWsglB8Codo6LWIcgWZfJFg2FhGE t4i7bLxMMfk/DxsdJhFi95XTcb+Hh11QDkdyNjc8bawoplUnI11NsqtG4gFcgDSnNWr6 vHOJxDOKQUW2yjCEiGcqlZMhm0b3Y3NmlZBJLvtXxg/hPyyBCSFO0kxryrndW+Ov4h/2 OUnUyb6+vuYodIlQ9PBtYC7nKEhexfmS0jOkDeg07CFfl+1ynDON3tW+IWBMpiYKeD4U foqQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=++Mav+f24+2FiNygNVgMuis0c5LbHs6cWbmxN1/hHkc=; b=QH28Yc1vkDBylL9j+/7aqug1LqENEpfamcLtpgomnPeZwOGAW0V53XufbKniwOc5Jp VUqEFFv+rOjvYZZa1sOTQ7Eq4PPXgWQJ2hSiUf2sgP6ezb1mkbhe+x9z6XFV7ZDB/SrE efcbpx5QML/3B2VhOfUB9Ee+ds6gpJZTEdyEOLPxP0JCJWwGK2QuhV1eBp6v9aqKUEXF Orf783aDcLRgQQ6g6NJ0HK3byxaGJS4+y9zNmsC7uwGLx66TfMDQktTAMGmQlqXZEyyV ljlFh3GH6fmidUeCTtsKbHI8BOMr0OqhADXBQgtTR6ZYKTy0y3UFxLSgbiGa6hQ3jojV 6/Vg== X-Gm-Message-State: APjAAAVJS+3JLHN8cUFpo7cMJK7KAPSXy9KHYDVSTVh+B1HyGs4GyiQc pNLDlr7eJ5hckX2Xnc8yf9c= X-Google-Smtp-Source: APXvYqzaugOOjHykU2NX1PcqVZlHDpz5pLf7mRE/YdG6Q7ijSObTZilaMty/N8DnBsURdSbv19LK9w== X-Received: by 2002:a5d:630d:: with SMTP id i13mr27160300wru.369.1574867373374; Wed, 27 Nov 2019 07:09:33 -0800 (PST) Received: from t1700.criteois.lan ([91.199.242.236]) by smtp.gmail.com with ESMTPSA id o1sm4496500wrn.84.2019.11.27.07.09.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Nov 2019 07:09:32 -0800 (PST) From: Erwan Velu X-Google-Original-From: Erwan Velu Cc: Erwan Velu , Jean Delvare , Masahiro Yamada , Michal Marek , Mattias Jacobsson <2pi@mok.nu>, Andy Shevchenko , Bjorn Helgaas , "David S. Miller" , Changbin Du , "Robert P. J. Day" , Sumit Garg , linux-kernel@vger.kernel.org, linux-kbuild@vger.kernel.org Subject: [PATCH 1/2] firmware/dmi: Report DMI Bios release Date: Wed, 27 Nov 2019 16:07:25 +0100 Message-Id: <20191127150729.860625-1-e.velu@criteo.com> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20190918094323.17515-1-e.velu@criteo.com> References: <20190918094323.17515-1-e.velu@criteo.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit To: unlisted-recipients:; (no To-header on input) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Some vendors like HPe or Dell, encode the release version of their BIOS in the "System BIOS {Major|Minor} Release" fields of Type 0. This information is used to know which bios release actually runs. It could be used for some quirks, debugging sessions or inventory tasks. A typical output for a Dell system running the 65.27 bios is : [root@t1700 ~]# cat /sys/devices/virtual/dmi/id/bios_release 65.27 [root@t1700 ~]# This commit add dmi_save_release() function have the logic to check if the field is valid. If so, it reports the actual value. Signed-off-by: Erwan Velu --- drivers/firmware/dmi-id.c | 3 +++ drivers/firmware/dmi_scan.c | 29 +++++++++++++++++++++++++++++ include/linux/mod_devicetable.h | 1 + scripts/mod/file2alias.c | 1 + 4 files changed, 34 insertions(+) diff --git a/drivers/firmware/dmi-id.c b/drivers/firmware/dmi-id.c index ff39f64f2aae..a2aac65ff771 100644 --- a/drivers/firmware/dmi-id.c +++ b/drivers/firmware/dmi-id.c @@ -42,6 +42,7 @@ 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(bios_release, 0444, DMI_BIOS_RELEASE); 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); @@ -78,6 +79,7 @@ static ssize_t get_modalias(char *buffer, size_t buffer_size) { "bvn", DMI_BIOS_VENDOR }, { "bvr", DMI_BIOS_VERSION }, { "bd", DMI_BIOS_DATE }, + { "br", DMI_BIOS_RELEASE }, { "svn", DMI_SYS_VENDOR }, { "pn", DMI_PRODUCT_NAME }, { "pvr", DMI_PRODUCT_VERSION }, @@ -187,6 +189,7 @@ static void __init dmi_id_init_attr_table(void) 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(bios_release, DMI_BIOS_RELEASE); ADD_DMI_ATTR(sys_vendor, DMI_SYS_VENDOR); ADD_DMI_ATTR(product_name, DMI_PRODUCT_NAME); ADD_DMI_ATTR(product_version, DMI_PRODUCT_VERSION); diff --git a/drivers/firmware/dmi_scan.c b/drivers/firmware/dmi_scan.c index 1e21fc3e9851..d010c915c1ab 100644 --- a/drivers/firmware/dmi_scan.c +++ b/drivers/firmware/dmi_scan.c @@ -181,6 +181,34 @@ static void __init dmi_save_ident(const struct dmi_header *dm, int slot, dmi_ident[slot] = p; } +static void __init dmi_save_release(const struct dmi_header *dm, int slot, + int index) +{ + const u8 *minor, *major; + char *s; + + /* If the table doesn't have the field, let's return */ + if (dmi_ident[slot] || dm->length < index) + return; + + minor = (u8 *) dm + index; + major = (u8 *) dm + index - 1; + + /* As per the spec, if the system doesn't support this field, + * the value is FF + */ + if (major[0] == 0xFF && minor[0] == 0xFF) + return; + + s = dmi_alloc(4); + if (!s) + return; + + sprintf(s, "%u.%u", major[0], minor[0]); + + dmi_ident[slot] = s; +} + static void __init dmi_save_uuid(const struct dmi_header *dm, int slot, int index) { @@ -438,6 +466,7 @@ static void __init dmi_decode(const struct dmi_header *dm, void *dummy) dmi_save_ident(dm, DMI_BIOS_VENDOR, 4); dmi_save_ident(dm, DMI_BIOS_VERSION, 5); dmi_save_ident(dm, DMI_BIOS_DATE, 8); + dmi_save_release(dm, DMI_BIOS_RELEASE, 21); break; case 1: /* System Information */ dmi_save_ident(dm, DMI_SYS_VENDOR, 4); diff --git a/include/linux/mod_devicetable.h b/include/linux/mod_devicetable.h index 5714fd35a83c..618933d770e6 100644 --- a/include/linux/mod_devicetable.h +++ b/include/linux/mod_devicetable.h @@ -532,6 +532,7 @@ enum dmi_field { DMI_BIOS_VENDOR, DMI_BIOS_VERSION, DMI_BIOS_DATE, + DMI_BIOS_RELEASE, DMI_SYS_VENDOR, DMI_PRODUCT_NAME, DMI_PRODUCT_VERSION, diff --git a/scripts/mod/file2alias.c b/scripts/mod/file2alias.c index c91eba751804..cc48930cc02a 100644 --- a/scripts/mod/file2alias.c +++ b/scripts/mod/file2alias.c @@ -936,6 +936,7 @@ static const struct dmifield { { "bvn", DMI_BIOS_VENDOR }, { "bvr", DMI_BIOS_VERSION }, { "bd", DMI_BIOS_DATE }, + { "br", DMI_BIOS_RELEASE }, { "svn", DMI_SYS_VENDOR }, { "pn", DMI_PRODUCT_NAME }, { "pvr", DMI_PRODUCT_VERSION }, -- 2.23.0