[coreboot-gerrit] Patch set updated for coreboot: 917208f cpu/amd (non-AGESA): Remove terminator from microcode blob

[Alexandru Gagniuc (mr.nuke.me@gmail.com)]

Alexandru Gagniuc (mr.nuke.me at gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/4534

-gerrit

commit 917208faee4017950690c14441d0446ab95a6d77
Author: Kyösti Mälkki <kyosti.malkki at gmail.com>
Date:   Mon Dec 16 07:19:09 2013 +0200

    cpu/amd (non-AGESA): Remove terminator from microcode blob
    
    Change-Id: I6370e971922dee5e8d476a883c5f0f32fbbc8911
    Signed-off-by: Kyösti Mälkki <kyosti.malkki at gmail.com>
    Signed-off-by: Alexandru Gagniuc <mr.nuke.me at gmail.com>
---
 src/cpu/amd/microcode/microcode.c        | 6 ++++--
 src/cpu/amd/model_10xxx/microcode_blob.c | 6 ------
 src/cpu/amd/model_fxx/microcode_blob.c   | 6 ------
 3 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/src/cpu/amd/microcode/microcode.c b/src/cpu/amd/microcode/microcode.c
index a5da75b..938f5f6 100644
--- a/src/cpu/amd/microcode/microcode.c
+++ b/src/cpu/amd/microcode/microcode.c
@@ -80,9 +80,11 @@ static void amd_update_microcode(const void *ucode,  size_t ucode_len,
 				 uint32_t equivalent_processor_rev_id)
 {
 	const struct microcode *m;
-	const void *c;
+	const uint8_t *c = ucode;
+	const uint8_t *ucode_end = (uint8_t*)ucode + ucode_len;
 
-	for(m = c = ucode; m->date_code;  m = c) {
+	while (c <= (ucode_end - 2048)) {
+		m = (struct microcode *)c;
 		if (m->processor_rev_id == equivalent_processor_rev_id) {
 			apply_microcode_patch(m);
 			break;
diff --git a/src/cpu/amd/model_10xxx/microcode_blob.c b/src/cpu/amd/model_10xxx/microcode_blob.c
index c2f93b5..524c484 100644
--- a/src/cpu/amd/model_10xxx/microcode_blob.c
+++ b/src/cpu/amd/model_10xxx/microcode_blob.c
@@ -6,10 +6,4 @@ unsigned char microcode[] __attribute__ ((aligned(16))) = {
 #include "mc_patch_010000b6.h"
 #include "mc_patch_010000bf.h"
 #include "mc_patch_010000c4.h"
-
-	/*  Dummy terminator  */
-        0x0, 0x0, 0x0, 0x0,
-        0x0, 0x0, 0x0, 0x0,
-        0x0, 0x0, 0x0, 0x0,
-        0x0, 0x0, 0x0, 0x0,
 };
diff --git a/src/cpu/amd/model_fxx/microcode_blob.c b/src/cpu/amd/model_fxx/microcode_blob.c
index 1b6b979..ad6e3ca 100644
--- a/src/cpu/amd/model_fxx/microcode_blob.c
+++ b/src/cpu/amd/model_fxx/microcode_blob.c
@@ -4,10 +4,4 @@ unsigned char microcode[] __attribute__ ((aligned(16))) = {
 	#include "microcode_rev_d.h"
 	#include "microcode_rev_e.h"
 #endif
-
-	/*  Dummy terminator  */
-        0x0, 0x0, 0x0, 0x0,
-        0x0, 0x0, 0x0, 0x0,
-        0x0, 0x0, 0x0, 0x0,
-        0x0, 0x0, 0x0, 0x0,
 };