Commit 6b90ca7b authored by Luis Henriques's avatar Luis Henriques

Revert "firmware: dmi_scan: Fix UUID endianness for SMBIOS >= 2.6"

This reverts commit 0f7b4f79, which was
commit ff4319dc upstream.

This commit introduced a regression in this kernel.  Commit 95be58df
("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 ff4319dc should have not been applied.

BugLink: https://bugs.launchpad.net/bugs/1551419Signed-off-by: default avatarLuis Henriques <luis.henriques@canonical.com>
parent 7f2a8840
...@@ -493,7 +493,6 @@ static int __init dmi_present(const u8 *buf) ...@@ -493,7 +493,6 @@ static int __init dmi_present(const u8 *buf)
dmi_ver = smbios_ver; dmi_ver = smbios_ver;
else else
dmi_ver = (buf[14] & 0xF0) << 4 | (buf[14] & 0x0F); dmi_ver = (buf[14] & 0xF0) << 4 | (buf[14] & 0x0F);
dmi_ver <<= 8;
dmi_num = (buf[13] << 8) | buf[12]; dmi_num = (buf[13] << 8) | buf[12];
dmi_len = (buf[7] << 8) | buf[6]; dmi_len = (buf[7] << 8) | buf[6];
dmi_base = (buf[11] << 24) | (buf[10] << 16) | dmi_base = (buf[11] << 24) | (buf[10] << 16) |
...@@ -502,10 +501,10 @@ static int __init dmi_present(const u8 *buf) ...@@ -502,10 +501,10 @@ static int __init dmi_present(const u8 *buf)
if (dmi_walk_early(dmi_decode) == 0) { if (dmi_walk_early(dmi_decode) == 0) {
if (smbios_ver) { if (smbios_ver) {
pr_info("SMBIOS %d.%d present.\n", pr_info("SMBIOS %d.%d present.\n",
dmi_ver >> 16, (dmi_ver >> 8) & 0xFF); dmi_ver >> 8, dmi_ver & 0xFF);
} else { } else {
pr_info("Legacy DMI %d.%d present.\n", 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)); dmi_format_ids(dmi_ids_string, sizeof(dmi_ids_string));
printk(KERN_DEBUG "DMI: %s\n", dmi_ids_string); printk(KERN_DEBUG "DMI: %s\n", dmi_ids_string);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment