- Fix cache associativity mapping (was missing some commas)

This commit is contained in:
Jarod Wilson 2009-08-28 20:41:44 +00:00
parent 68313a1c68
commit 3aad219034
3 changed files with 46 additions and 35 deletions

View File

@ -1,23 +0,0 @@
--- dmidecode-2.10/dmidecode.c~ 2009-08-24 16:09:42.228443932 -0400
+++ dmidecode-2.10/dmidecode.c 2009-08-24 16:23:50.480316768 -0400
@@ -1541,12 +1541,18 @@ static const char *dmi_slot_type(u8 code
"PCI Express x2",
"PCI Express x4",
"PCI Express x8",
- "PCI Express x16" /* 0xAA */
+ "PCI Express x16", /* 0xAA */
+ "PCI Express Gen 2",
+ "PCI Express Gen 2 x1",
+ "PCI Express Gen 2 x2",
+ "PCI Express Gen 2 x4",
+ "PCI Express Gen 2 x8",
+ "PCI Express Gen 2 x16", /* 0xB0 */
};
if (code >= 0x01 && code <= 0x13)
return type[code - 0x01];
- if (code >= 0xA0 && code <= 0xAA)
+ if (code >= 0xA0 && code <= 0xB0)
return type_0xA0[code - 0xA0];
return out_of_spec;
}

View File

@ -1,5 +1,17 @@
--- dmidecode-2.10/dmidecode.c~ 2009-08-24 17:09:16.724316584 -0400
+++ dmidecode-2.10/dmidecode.c 2009-08-24 17:09:58.299317081 -0400
dmidecode: additions from smbios 2.6.1 spec update
Tested on an HP DL360G6 with LGA1366 socket cpus, PCI-E Gen 2 slots
and DDR3 memory, no longer returns any <OUT OF SPEC> info.
Signed-off-by: Jarod Wilson <jarod@redhat.com>
---
dmidecode.c | 49 ++++++++++++++++++++++++++++++++++++++++++-------
1 file changed, 42 insertions(+), 7 deletions(-)
diff -Naurp dmidecode-2.10.orig/dmidecode.c dmidecode-2.10/dmidecode.c
--- dmidecode-2.10.orig/dmidecode.c 2009-08-27 09:20:45.933991764 -0400
+++ dmidecode-2.10/dmidecode.c 2009-08-27 09:21:15.516869134 -0400
@@ -361,7 +361,7 @@ static void dmi_system_uuid(const u8 *p,
static const char *dmi_system_wake_up_type(u8 code)
@ -54,11 +66,11 @@
"Fully Associative",
"8-way Set-associative",
- "16-way Set-associative" /* 0x08 */
+ "16-way Set-associative"
+ "12-way Set-associative"
+ "24-way Set-associative"
+ "32-way Set-associative"
+ "48-way Set-associative"
+ "16-way Set-associative",
+ "12-way Set-associative",
+ "24-way Set-associative",
+ "32-way Set-associative",
+ "48-way Set-associative",
+ "64-way Set-associative" /* 0x0D */
};
@ -67,7 +79,28 @@
return type[code - 0x01];
return out_of_spec;
}
@@ -2126,10 +2150,15 @@ static const char *dmi_memory_device_typ
@@ -1544,12 +1568,18 @@ static const char *dmi_slot_type(u8 code
"PCI Express x2",
"PCI Express x4",
"PCI Express x8",
- "PCI Express x16" /* 0xAA */
+ "PCI Express x16", /* 0xAA */
+ "PCI Express Gen 2",
+ "PCI Express Gen 2 x1",
+ "PCI Express Gen 2 x2",
+ "PCI Express Gen 2 x4",
+ "PCI Express Gen 2 x8",
+ "PCI Express Gen 2 x16", /* 0xB0 */
};
if (code >= 0x01 && code <= 0x13)
return type[code - 0x01];
- if (code >= 0xA0 && code <= 0xAA)
+ if (code >= 0xA0 && code <= 0xB0)
return type_0xA0[code - 0xA0];
return out_of_spec;
}
@@ -2120,10 +2150,15 @@ static const char *dmi_memory_device_typ
"RDRAM",
"DDR",
"DDR2",

View File

@ -1,7 +1,7 @@
Summary: Tool to analyse BIOS DMI data
Name: dmidecode
Version: 2.10
Release: %(R="$Revision: 1.37 $"; RR="${R##: }"; echo ${RR%%?})%{?dist}
Release: %(R="$Revision: 1.38 $"; RR="${R##: }"; echo ${RR%%?})%{?dist}
Epoch: 1
Group: System Environment/Base
License: GPLv2+
@ -10,8 +10,7 @@ Patch0: dmidecode-add-hewlett-packard-to-dmioem.patch
Patch1: dmidecode-recognize-more-memory.patch
Patch2: dmidecode-add-socket-lga1366.patch
Patch3: dmidecode-warn-on-unsupported-smbios-version.patch
Patch4: dmidecode-pcie-v2-id.patch
Patch5: dmidecode-smbios-2.6.1-additions.patch
Patch4: dmidecode-smbios-2.6.1-updates.patch
URL: http://www.nongnu.org/dmidecode/
Buildroot: %{_tmppath}/%{name}-%{version}-root
BuildPreReq: /usr/bin/aclocal /usr/bin/automake /usr/bin/autoconf
@ -36,7 +35,6 @@ I/O ports (e.g. serial, parallel, USB).
%patch2 -p1
%patch3 -p1
%patch4 -p1
%patch5 -p1
%build
make CFLAGS="$RPM_OPT_FLAGS"
@ -60,6 +58,9 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man8/*
%changelog
* Fri Aug 28 2009 Jarod Wilson <jarod@redhat.com> - 1:2.10-1.39
- Fix cache associativity mapping (was missing some commas)
* Mon Aug 24 2009 Jarod Wilson <jarod@redhat.com> - 1:2.10-1.38
- Add support for newer sockets, processors and pcie slot types