From f9aebf59d7e09979de9f2c26ea721ace1b0899d26e664740ca0cf794bd8b434b Mon Sep 17 00:00:00 2001
From: Jean Delvare <jdelvare@suse.com>
Date: Mon, 13 Oct 2014 12:01:46 +0000
Subject: [PATCH] - dmidecode-1.181-decode-CPUID-recent-AMD.patch: Decode the
 CPUID   of recent AMD processors (DMI type 4). -
 dmidecode-1.182-decode-ddr4-memory-type.patch: Add support for   DDR4 memory
 type (DMI type 17).   https://savannah.nongnu.org/bugs/?43370

OBS-URL: https://build.opensuse.org/package/show/Base:System/dmidecode?expand=0&rev=26
---
 dmidecode-1.181-decode-CPUID-recent-AMD.patch | 23 ++++++++++++++++
 dmidecode-1.182-decode-ddr4-memory-type.patch | 26 +++++++++++++++++++
 dmidecode.changes                             |  9 +++++++
 dmidecode.spec                                |  4 +++
 4 files changed, 62 insertions(+)
 create mode 100644 dmidecode-1.181-decode-CPUID-recent-AMD.patch
 create mode 100644 dmidecode-1.182-decode-ddr4-memory-type.patch

diff --git a/dmidecode-1.181-decode-CPUID-recent-AMD.patch b/dmidecode-1.181-decode-CPUID-recent-AMD.patch
new file mode 100644
index 0000000..3a9a585
--- /dev/null
+++ b/dmidecode-1.181-decode-CPUID-recent-AMD.patch
@@ -0,0 +1,23 @@
+Subject: Decode the CPUID of recent AMD processors
+Upstream: yes, 1.181
+---
+ dmidecode.c |    6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+--- a/dmidecode.c
++++ b/dmidecode.c
+@@ -1012,11 +1012,11 @@ static void dmi_processor_id(u8 type, co
+ 		sig = 1;
+ 	else if ((type >= 0x18 && type <= 0x1D) /* AMD */
+ 	      || type == 0x1F /* AMD */
+-	      || (type >= 0x38 && type <= 0x3E) /* AMD */
+-	      || (type >= 0x46 && type <= 0x49) /* AMD */
++	      || (type >= 0x38 && type <= 0x3F) /* AMD */
++	      || (type >= 0x46 && type <= 0x4F) /* AMD */
+ 	      || (type >= 0x83 && type <= 0x8F) /* AMD */
+ 	      || (type >= 0xB6 && type <= 0xB7) /* AMD */
+-	      || (type >= 0xE6 && type <= 0xEF)) /* AMD */
++	      || (type >= 0xE4 && type <= 0xEF)) /* AMD */
+ 		sig = 2;
+ 	else if (type == 0x01 || type == 0x02)
+ 	{
diff --git a/dmidecode-1.182-decode-ddr4-memory-type.patch b/dmidecode-1.182-decode-ddr4-memory-type.patch
new file mode 100644
index 0000000..5cd1047
--- /dev/null
+++ b/dmidecode-1.182-decode-ddr4-memory-type.patch
@@ -0,0 +1,26 @@
+Subject: Add support for DDR4 memory type
+Upstream: yes, 1.182
+References: savannah#43370
+
+Patch from Tomohiro Kimura. The value was taken from preliminary SMBIOS
+specification version 3.0.0d. This closes bug #43370.
+---
+ dmidecode.c |    5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+--- a/dmidecode.c
++++ b/dmidecode.c
+@@ -2311,10 +2311,11 @@ static const char *dmi_memory_device_typ
+ 		"Reserved",
+ 		"Reserved",
+ 		"DDR3",
+-		"FBD2", /* 0x19 */
++		"FBD2",
++		"DDR4" /* 0x1A */
+ 	};
+ 
+-	if (code >= 0x01 && code <= 0x19)
++	if (code >= 0x01 && code <= 0x1A)
+ 		return type[code - 0x01];
+ 	return out_of_spec;
+ }
diff --git a/dmidecode.changes b/dmidecode.changes
index 864982e..bd5d6a4 100644
--- a/dmidecode.changes
+++ b/dmidecode.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Mon Oct 13 14:00:09 CEST 2014 - jdelvare@suse.de
+
+- dmidecode-1.181-decode-CPUID-recent-AMD.patch: Decode the CPUID
+  of recent AMD processors (DMI type 4).
+- dmidecode-1.182-decode-ddr4-memory-type.patch: Add support for
+  DDR4 memory type (DMI type 17).
+  https://savannah.nongnu.org/bugs/?43370
+
 -------------------------------------------------------------------
 Mon Jan 13 17:31:16 CET 2014 - jdelvare@suse.de
 
diff --git a/dmidecode.spec b/dmidecode.spec
index 94bfc4b..ec0c4e6 100644
--- a/dmidecode.spec
+++ b/dmidecode.spec
@@ -29,6 +29,8 @@ Patch1:         dmidecode-1.173-drop-cast.patch
 Patch2:         dmidecode-1.175-fix-SMBIOS-2.8.0.patch
 Patch3:         dmidecode-1.176-SMBIOS-2.8-is-supported.patch
 Patch4:         dmidecode-1.177-decode-pcie3-slot-id.patch
+Patch5:         dmidecode-1.181-decode-CPUID-recent-AMD.patch
+Patch6:         dmidecode-1.182-decode-ddr4-memory-type.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 ExclusiveArch:  %ix86 ia64 x86_64 %arm aarch64
 Obsoletes:      pmtools < 20071117
@@ -53,6 +55,8 @@ the BIOS told it to.
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
+%patch6 -p1
 
 %build
 make CFLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags}