From patchwork Tue Mar 8 12:24:30 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luis Henriques X-Patchwork-Id: 594102 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) by ozlabs.org (Postfix) with ESMTP id 56E311400CB; Tue, 8 Mar 2016 23:27:24 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1adGjR-0007kn-9J; Tue, 08 Mar 2016 12:27:21 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.76) (envelope-from ) id 1adGgh-0006P9-9p for kernel-team@lists.ubuntu.com; Tue, 08 Mar 2016 12:24:31 +0000 Received: from av-217-129-142-138.netvisao.pt ([217.129.142.138] helo=localhost) by youngberry.canonical.com with esmtpsa (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.76) (envelope-from ) id 1adGgg-0005NB-UU; Tue, 08 Mar 2016 12:24:31 +0000 From: Luis Henriques To: Luis Henriques Subject: [3.16.y-ckt stable] Patch "Revert "firmware: dmi_scan: Fix UUID endianness for SMBIOS >= 2.6"" has been added to the 3.16.y-ckt tree Date: Tue, 8 Mar 2016 12:24:30 +0000 Message-Id: <1457439870-18559-1-git-send-email-luis.henriques@canonical.com> X-Extended-Stable: 3.16 Cc: kernel-team@lists.ubuntu.com X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.14 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: kernel-team-bounces@lists.ubuntu.com This is a note to let you know that I have just added a patch titled Revert "firmware: dmi_scan: Fix UUID endianness for SMBIOS >= 2.6" to the linux-3.16.y-queue branch of the 3.16.y-ckt extended stable tree which can be found at: http://kernel.ubuntu.com/git/ubuntu/linux.git/log/?h=linux-3.16.y-queue This patch is scheduled to be released in version 3.16.7-ckt26. If you, or anyone else, feels it should not be added to this tree, please reply to this email. For more information about the 3.16.y-ckt tree, see https://wiki.ubuntu.com/Kernel/Dev/ExtendedStable Thanks. -Luis ---8<------------------------------------------------------------ From 6b90ca7b36fc7903de7b8cc371f87bb993c6b8c4 Mon Sep 17 00:00:00 2001 From: Luis Henriques Date: Thu, 3 Mar 2016 11:45:37 +0000 Subject: Revert "firmware: dmi_scan: Fix UUID endianness for SMBIOS >= 2.6" This reverts commit 0f7b4f7914e450b1bcffdbd26bbf35ee304cbfea, which was commit ff4319dc7cd58c92b389960e375038335d157a60 upstream. This commit introduced a regression in this kernel. Commit 95be58df74a5 ("firmware: dmi_scan: Use full dmi version for SMBIOS3") added support for SMBIOS3. However, this was not backport to this kernel version, and thus commit ff4319dc7cd5 should have not been applied. BugLink: https://bugs.launchpad.net/bugs/1551419 Signed-off-by: Luis Henriques --- drivers/firmware/dmi_scan.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/firmware/dmi_scan.c b/drivers/firmware/dmi_scan.c index 48142b88e672..35286fe52823 100644 --- a/drivers/firmware/dmi_scan.c +++ b/drivers/firmware/dmi_scan.c @@ -493,7 +493,6 @@ static int __init dmi_present(const u8 *buf) dmi_ver = smbios_ver; else dmi_ver = (buf[14] & 0xF0) << 4 | (buf[14] & 0x0F); - dmi_ver <<= 8; dmi_num = (buf[13] << 8) | buf[12]; dmi_len = (buf[7] << 8) | buf[6]; dmi_base = (buf[11] << 24) | (buf[10] << 16) | @@ -502,10 +501,10 @@ static int __init dmi_present(const u8 *buf) if (dmi_walk_early(dmi_decode) == 0) { if (smbios_ver) { pr_info("SMBIOS %d.%d present.\n", - dmi_ver >> 16, (dmi_ver >> 8) & 0xFF); + dmi_ver >> 8, dmi_ver & 0xFF); } else { pr_info("Legacy DMI %d.%d present.\n", - dmi_ver >> 16, (dmi_ver >> 8) & 0xFF); + dmi_ver >> 8, dmi_ver & 0xFF); } dmi_format_ids(dmi_ids_string, sizeof(dmi_ids_string)); printk(KERN_DEBUG "DMI: %s\n", dmi_ids_string);