lkml.org 
[lkml]   [2008]   [Sep]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Date
Subject[RESEND] [PATCH] x86, microcode rework, v2, renaming cont.
Renaming based on patch from Dmitry Adamushko.

Further clarification by renaming define and variable related to
microcode container file.

Signed-off-by: Peter Oruba <peter.oruba@amd.com>


---
arch/x86/kernel/microcode_amd.c | 17 ++++++++---------
1 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/arch/x86/kernel/microcode_amd.c b/arch/x86/kernel/microcode_amd.c
index 8d97840..113be63 100644
--- a/arch/x86/kernel/microcode_amd.c
+++ b/arch/x86/kernel/microcode_amd.c
@@ -233,21 +233,20 @@ static void * get_next_ucode(u8 *buf, unsigned int size,
unsigned int *mc_size)
{
unsigned int total_size;
-#define UCODE_UNKNOWN_HDR 8
- u8 hdr[UCODE_UNKNOWN_HDR];
+#define UCODE_CONTAINER_SECTION_HDR 8
+ u8 section_hdr[UCODE_CONTAINER_SECTION_HDR];
void *mc;

- if (get_ucode_data(hdr, buf, UCODE_UNKNOWN_HDR))
+ if (get_ucode_data(section_hdr, buf, UCODE_CONTAINER_SECTION_HDR))
return NULL;

- if (hdr[0] != UCODE_UCODE_TYPE) {
+ if (section_hdr[0] != UCODE_UCODE_TYPE) {
printk(KERN_ERR "microcode: error! "
"Wrong microcode payload type field\n");
return NULL;
}

- /* FIXME! dimm: Why not by means of get_totalsize(hdr)? */
- total_size = (unsigned long) (hdr[4] + (hdr[5] << 8));
+ total_size = (unsigned long) (section_hdr[4] + (section_hdr[5] << 8));

printk(KERN_INFO "microcode: size %u, total_size %u\n",
size, total_size);
@@ -260,13 +259,13 @@ static void * get_next_ucode(u8 *buf, unsigned int size,
mc = vmalloc(UCODE_MAX_SIZE);
if (mc) {
memset(mc, 0, UCODE_MAX_SIZE);
- if (get_ucode_data(mc, buf + UCODE_UNKNOWN_HDR, total_size)) {
+ if (get_ucode_data(mc, buf + UCODE_CONTAINER_SECTION_HDR, total_size)) {
vfree(mc);
mc = NULL;
} else
- *mc_size = total_size + UCODE_UNKNOWN_HDR;
+ *mc_size = total_size + UCODE_CONTAINER_SECTION_HDR;
}
-#undef UCODE_UNKNOWN_HDR
+#undef UCODE_CONTAINER_SECTION_HDR
return mc;
}

--
1.5.4.1


\
 
 \ /
  Last update: 2008-09-23 15:43    [W:0.209 / U:0.508 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site