]> git.ipfire.org Git - people/stevee/ipfire-3.x.git/blob - dmidecode/patches/dmidecode-2.10-smbios-updates.patch
atk: Fix running test suite
[people/stevee/ipfire-3.x.git] / dmidecode / patches / dmidecode-2.10-smbios-updates.patch
1 dmidecode: additions from smbios 2.6.1 spec update
2
3 Tested on an HP DL360G6 with LGA1366 socket cpus, PCI-E Gen 2 slots
4 and DDR3 memory, no longer returns any <OUT OF SPEC> info.
5
6 Signed-off-by: Jarod Wilson <jarod@redhat.com>
7
8 ---
9 dmidecode.c | 49 ++++++++++++++++++++++++++++++++++++++++++-------
10 1 file changed, 42 insertions(+), 7 deletions(-)
11
12 diff -Naurp dmidecode-2.10.orig/dmidecode.c dmidecode-2.10/dmidecode.c
13 --- dmidecode-2.10.orig/dmidecode.c 2009-08-27 09:20:45.933991764 -0400
14 +++ dmidecode-2.10/dmidecode.c 2009-08-27 09:21:15.516869134 -0400
15 @@ -361,7 +361,7 @@ static void dmi_system_uuid(const u8 *p,
16
17 static const char *dmi_system_wake_up_type(u8 code)
18 {
19 - /* 3.3.2.1 */
20 + /* 3.3.2.2 */
21 static const char *type[] = {
22 "Reserved", /* 0x00 */
23 "Other",
24 @@ -719,6 +719,12 @@ static const char *dmi_processor_family(
25 { 0xA9, "Quad-Core Xeon 5400" }, /* From CIM_Processor.Family */
26 { 0xAA, "Quad-Core Xeon" }, /* From CIM_Processor.Family */
27
28 + { 0xAB, "Dual-Core Xeon 5200" },
29 + { 0xAC, "Dual-Core Xeon 7200" },
30 + { 0xAD, "Quad-Core Xeon 7300" },
31 + { 0xAE, "Quad-Core Xeon 7400" },
32 + { 0xAF, "Multi-Core Xeon 7400" },
33 +
34 { 0xB0, "Pentium III Xeon" },
35 { 0xB1, "Pentium III Speedstep" },
36 { 0xB2, "Pentium 4" },
37 @@ -741,6 +747,8 @@ static const char *dmi_processor_family(
38 { 0xC3, "Core 2 Extreme Mobile" }, /* From CIM_Processor.Family */
39 { 0xC4, "Core 2 Duo Mobile" }, /* From CIM_Processor.Family */
40 { 0xC5, "Core 2 Solo Mobile" }, /* From CIM_Processor.Family */
41 + { 0xC6, "Core i7" },
42 + { 0xC7, "Dual-Core Celeron" },
43
44 { 0xC8, "IBM390" },
45 { 0xC9, "G4" },
46 @@ -753,6 +761,17 @@ static const char *dmi_processor_family(
47 { 0xD4, "C7" },
48 { 0xD5, "Eden" },
49
50 + { 0xD6, "Multi-Core Xeon" },
51 + { 0xD7, "Dual-Core Xeon 3xxx" },
52 + { 0xD8, "Quad-Core Xeon 3xxx" },
53 +
54 + { 0xDA, "Dual-Core Xeon 5xxx" },
55 + { 0xDB, "Quad-Core Xeon 5xxx" },
56 +
57 + { 0xDD, "Dual-Core Xeon 7xxx" },
58 + { 0xDD, "Quad-Core Xeon 7xxx" },
59 + { 0xDD, "Multi-Core Xeon 7xxx" },
60 +
61 { 0xE6, "Embedded Opteron Quad-Core" }, /* From CIM_Processor.Family */
62 { 0xE7, "Phenom Triple-Core" }, /* From CIM_Processor.Family */
63 { 0xE8, "Turion Ultra Dual-Core Mobile" }, /* From CIM_Processor.Family */
64 @@ -1383,10 +1402,15 @@ static const char *dmi_cache_associativi
65 "4-way Set-associative",
66 "Fully Associative",
67 "8-way Set-associative",
68 - "16-way Set-associative" /* 0x08 */
69 + "16-way Set-associative",
70 + "12-way Set-associative",
71 + "24-way Set-associative",
72 + "32-way Set-associative",
73 + "48-way Set-associative",
74 + "64-way Set-associative" /* 0x0D */
75 };
76
77 - if (code >= 0x01 && code <= 0x08)
78 + if (code >= 0x01 && code <= 0x0D)
79 return type[code - 0x01];
80 return out_of_spec;
81 }
82 @@ -1544,12 +1568,18 @@ static const char *dmi_slot_type(u8 code
83 "PCI Express x2",
84 "PCI Express x4",
85 "PCI Express x8",
86 - "PCI Express x16" /* 0xAA */
87 + "PCI Express x16", /* 0xAA */
88 + "PCI Express Gen 2",
89 + "PCI Express Gen 2 x1",
90 + "PCI Express Gen 2 x2",
91 + "PCI Express Gen 2 x4",
92 + "PCI Express Gen 2 x8",
93 + "PCI Express Gen 2 x16", /* 0xB0 */
94 };
95
96 if (code >= 0x01 && code <= 0x13)
97 return type[code - 0x01];
98 - if (code >= 0xA0 && code <= 0xAA)
99 + if (code >= 0xA0 && code <= 0xB0)
100 return type_0xA0[code - 0xA0];
101 return out_of_spec;
102 }
103 @@ -2120,10 +2150,15 @@ static const char *dmi_memory_device_typ
104 "RDRAM",
105 "DDR",
106 "DDR2",
107 - "DDR2 FB-DIMM" /* 0x14 */
108 + "DDR2 FB-DIMM",
109 + "Reserved",
110 + "Reserved",
111 + "Reserved",
112 + "DDR3",
113 + "FBD2", /* 0x19 */
114 };
115
116 - if (code >= 0x01 && code <= 0x14)
117 + if (code >= 0x01 && code <= 0x19)
118 return type[code - 0x01];
119 return out_of_spec;
120 }