From c86da67436827c25919a2f5966049485a58fc984 Mon Sep 17 00:00:00 2001
From: Elyes HAOUAS <ehaouas@noos.fr>
Date: Mon, 20 Jun 2016 21:19:55 +0200
Subject: [PATCH] arch/x86/smbios: Correct manufacturer ID

Correct standard manufacturer's identification code.

Change-Id: I273711e121a61a91176c15cd4cab75420f1f5a39
Signed-off-by: Elyes HAOUAS <ehaouas@noos.fr>
Reviewed-on: https://review.coreboot.org/15271
Tested-by: build bot (Jenkins)
Reviewed-by: Martin Roth <martinroth@google.com>
---
 src/arch/x86/smbios.c | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/src/arch/x86/smbios.c b/src/arch/x86/smbios.c
index 80185c9383..21ea2c1f4f 100644
--- a/src/arch/x86/smbios.c
+++ b/src/arch/x86/smbios.c
@@ -15,6 +15,13 @@
  * GNU General Public License for more details.
  */
 
+/*
+ * Standard Manufacturer’s Identification Code
+ * JEP106AS (Revision of JEP106AR, October 2015)
+ * MAY 2016
+ * http://www.jedec.org/standards-documents/results/JEP106AS
+ */
+
 #include <stdlib.h>
 #include <string.h>
 #include <smbios.h>
@@ -127,7 +134,7 @@ static int smbios_processor_name(char *start)
 void smbios_fill_dimm_manufacturer_from_id(uint16_t mod_id, struct smbios_type17 *t)
 {
 	switch (mod_id) {
-		case 0x2c80:
+		case 0x9b05:
 			t->manufacturer = smbios_add_string(t->eos,
 							    "Crucial");
 			break;
@@ -143,7 +150,7 @@ void smbios_fill_dimm_manufacturer_from_id(uint16_t mod_id, struct smbios_type17
 			t->manufacturer = smbios_add_string(t->eos,
 							    "Kingston");
 			break;
-		case 0x987f:
+		case 0xad00:
 			t->manufacturer = smbios_add_string(t->eos,
 							    "Hynix");
 			break;
@@ -155,11 +162,7 @@ void smbios_fill_dimm_manufacturer_from_id(uint16_t mod_id, struct smbios_type17
 			t->manufacturer = smbios_add_string(t->eos,
 							    "OCZ");
 			break;
-		case 0xad80:
-			t->manufacturer = smbios_add_string(t->eos,
-							    "Hynix/Hyundai");
-			break;
-		case 0xb502:
+		case 0x3406:
 			t->manufacturer = smbios_add_string(t->eos,
 							    "SuperTalent");
 			break;
@@ -167,7 +170,7 @@ void smbios_fill_dimm_manufacturer_from_id(uint16_t mod_id, struct smbios_type17
 			t->manufacturer = smbios_add_string(t->eos,
 							    "GSkill");
 			break;
-		case 0xce80:
+		case 0xce00:
 			t->manufacturer = smbios_add_string(t->eos,
 							    "Samsung");
 			break;
@@ -175,7 +178,7 @@ void smbios_fill_dimm_manufacturer_from_id(uint16_t mod_id, struct smbios_type17
 			t->manufacturer = smbios_add_string(t->eos,
 							    "Elpida");
 			break;
-		case 0xff2c:
+		case 0x2c00:
 			t->manufacturer = smbios_add_string(t->eos,
 							    "Micron");
 			break;