Skip to content

Commit 88c7511

Browse files
committed
dmidecode: Decode processor ID of Core M, Athlon X4, Opteron X1000/X2000
When these processors were added from SMBIOS specification version 3.0.0, I forgot to update dmi_processor_id accordingly. Do it now and add a comment so that it does not happen again. Signed-off-by: Jean Delvare <[email protected]> Fixes: a0edbb4 ("dmidecode: Add enums from the SMBIOS 3.0.0 specification")
1 parent adbd050 commit 88c7511

File tree

2 files changed

+11
-1
lines changed

2 files changed

+11
-1
lines changed

CHANGELOG

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
2017-04-10 Jean Delvare <[email protected]>
2+
3+
* dmidecode.c: Decode the processor ID of the Intel Core M, AMD
4+
Athlon X4 and AMD Opteron X1000/X2000 processors (DMI type 4).
5+
16
2017-01-20 Jean Delvare <[email protected]>
27

38
* biosdecode.c: Decode the entry point defined in the Intel

dmidecode.c

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -894,6 +894,10 @@ static const char *dmi_processor_family(const struct dmi_header *h, u16 ver)
894894
{ 0x15E, "DSP" },
895895
{ 0x1F4, "Video Processor" },
896896
};
897+
/*
898+
* Note to developers: when adding entries to this list, check if
899+
* function dmi_processor_id below needs updating too.
900+
*/
897901

898902
/* Special case for ambiguous value 0x30 (SMBIOS 2.0 only) */
899903
if (ver == 0x0200 && data[0x06] == 0x30 && h->length >= 0x08)
@@ -1030,7 +1034,7 @@ static void dmi_processor_id(u8 type, const u8 *p, const char *version, const ch
10301034
}
10311035
}
10321036
else if ((type >= 0x0B && type <= 0x15) /* Intel, Cyrix */
1033-
|| (type >= 0x28 && type <= 0x2B) /* Intel */
1037+
|| (type >= 0x28 && type <= 0x2C) /* Intel */
10341038
|| (type >= 0xA1 && type <= 0xB3) /* Intel */
10351039
|| type == 0xB5 /* Intel */
10361040
|| (type >= 0xB9 && type <= 0xC7) /* Intel */
@@ -1042,6 +1046,7 @@ static void dmi_processor_id(u8 type, const u8 *p, const char *version, const ch
10421046
|| type == 0x1F /* AMD */
10431047
|| (type >= 0x38 && type <= 0x3F) /* AMD */
10441048
|| (type >= 0x46 && type <= 0x4F) /* AMD */
1049+
|| (type >= 0x66 && type <= 0x68) /* AMD */
10451050
|| (type >= 0x83 && type <= 0x8F) /* AMD */
10461051
|| (type >= 0xB6 && type <= 0xB7) /* AMD */
10471052
|| (type >= 0xE4 && type <= 0xEF)) /* AMD */

0 commit comments

Comments
 (0)