x86, microcode rework, v2, renaming cont.
A message that is not in the archive (sent off-list or not yet received): [email protected]
PATCH RESEND 1/1 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.
--- arch/x86/kernel/microcode_amd.c | 17 ++++++++--------- 1 files changed, 8 insertions(+), 9 deletions(-)
arch/x86/kernel/microcode_amd.c +8 -9
@@ -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_HDRreturn mc; }
Signature · 1 line
1.5.4.1
Ingo Molnar
AppliedQuoted 6 lines · Peter Oruba
Renaming based on patch from Dmitry Adamushko.
Further clarification by renaming define and variable related to microcode container file.
Signed-off-by Peter Oruba <[email protected]>
applied to tip/x86/microcode, thanks Peter!
Arjan: could you check whether latest tip/master fixes the microcode initrd problem you reported?
Ingo
PATCH RESEND 1/1 x86, microcode rework, v2, renaming
In reply to a message not in the archiveRenaming based on patch from Dmitry Adamushko.
Made code more readable by renaming define and variables related to microcode _container_file_ header to make it distinguishable from microcode _patch_ header.
--- arch/x86/kernel/microcode_amd.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-)
arch/x86/kernel/microcode_amd.c +7 -7
@@ -274,12 +274,12 @@ static void * get_next_ucode(u8 *buf, unsigned int size,static int install_equiv_cpu_table (u8 *buf,int (*get_ucode_data)(void *,const void *,size_t )) { -#define UCODE_HEADER_SIZE 12 -u8 *hdr[UCODE_HEADER_SIZE ]; -unsigned int *buf_pos = (unsigned int *)hdr; +#define UCODE_CONTAINER_HEADER_SIZE 12 +u8 *container_hdr[UCODE_CONTAINER_HEADER_SIZE ]; +unsigned int *buf_pos = (unsigned int *)container_hdr;unsigned long size; -if (get_ucode_data (&hdr, buf,UCODE_HEADER_SIZE )) +if (get_ucode_data (&container_hdr, buf,UCODE_CONTAINER_HEADER_SIZE ))return 0 ; size = buf_pos[2 ];
@@ -296,14 +296,14 @@ static int install_equiv_cpu_table(u8 *buf,return 0 ; } - buf +=UCODE_HEADER_SIZE ; + buf +=UCODE_CONTAINER_HEADER_SIZE ;if (get_ucode_data (equiv_cpu_table, buf, size)) {vfree (equiv_cpu_table);return 0 ; } -return size +UCODE_HEADER_SIZE ;/* add header length */ -#undef UCODE_HEADER_SIZE +return size +UCODE_CONTAINER_HEADER_SIZE ;/* add header length */ +#undef UCODE_CONTAINER_HEADER_SIZE }static void free_equiv_cpu_table (void )
Signature · 1 line
1.5.4.1