microcode, AMD: Cleanup code a bit
PATCH 1/1 microcode, AMD: Cleanup code a bit
get_ucode_data is a memcpy() wrapper which always returns 0. Move it into the header and make it an inline. Remove all code checking its return value and turn it into a void.
There should be no functionality change resulting from this patch.
--- arch/x86/include/asm/microcode.h | 6 ++++++ arch/x86/kernel/microcode_amd.c | 25 +++++-------------------- 2 files changed, 11 insertions(+), 20 deletions(-)
arch/x86/include/asm/microcode.h +6 -0
@@ -48,6 +48,12 @@ static inline struct microcode_ops * __init init_intel_microcode(void)#ifdef CONFIG_MICROCODE_AMD extern struct microcode_ops *__init init_amd_microcode (void ); + +static inline void get_ucode_data (void *to,const u8 *from,size_t n) +{ +memcpy (to, from, n); +} +#else static inline struct microcode_ops *__init init_amd_microcode (void ) {
arch/x86/kernel/microcode_amd.c +5 -20
@@ -155,12 +155,6 @@ static int apply_microcode_amd(int cpu)return 0 ; } -static int get_ucode_data (void *to,const u8 *from,size_t n) -{ -memcpy (to, from, n); -return 0 ; -} -static void *get_next_ucode (const u8 *buf,unsigned int size,unsigned int *mc_size) {
@@ -168,8 +162,7 @@ get_next_ucode(const u8 *buf, unsigned int size, unsigned int *mc_size)u8 section_hdr[UCODE_CONTAINER_SECTION_HDR ];void *mc; -if (get_ucode_data (section_hdr, buf,UCODE_CONTAINER_SECTION_HDR )) -return NULL ; +get_ucode_data (section_hdr, buf,UCODE_CONTAINER_SECTION_HDR );if (section_hdr[0 ] !=UCODE_UCODE_TYPE ) {pr_err ("error: invalid type field in container file section header\n" );
@@ -187,12 +180,8 @@ get_next_ucode(const u8 *buf, unsigned int size, unsigned int *mc_size)if (!mc)return NULL ; -if (get_ucode_data (mc, buf +UCODE_CONTAINER_SECTION_HDR , total_size)) { -vfree (mc); - mc =NULL ; - }else { - *mc_size = total_size +UCODE_CONTAINER_SECTION_HDR ; - } +get_ucode_data (mc, buf +UCODE_CONTAINER_SECTION_HDR , total_size); + *mc_size = total_size +UCODE_CONTAINER_SECTION_HDR ;return mc; }
@@ -203,8 +192,7 @@ static int install_equiv_cpu_table(const u8 *buf)unsigned int *buf_pos = (unsigned int *)container_hdr;unsigned long size; -if (get_ucode_data (&container_hdr, buf,UCODE_CONTAINER_HEADER_SIZE )) -return 0 ; +get_ucode_data (&container_hdr, buf,UCODE_CONTAINER_HEADER_SIZE ); size = buf_pos[2 ];
@@ -220,10 +208,7 @@ static int install_equiv_cpu_table(const u8 *buf) } buf +=UCODE_CONTAINER_HEADER_SIZE ; -if (get_ucode_data (equiv_cpu_table, buf, size)) { -vfree (equiv_cpu_table); -return 0 ; - } +get_ucode_data (equiv_cpu_table, buf, size);return size +UCODE_CONTAINER_HEADER_SIZE ;/* add header length */ }
Signature · 12 lines
1.7.3.1.50.g1e633 -- Regards/Gruss, Boris. Advanced Micro Devices GmbH Einsteinring 24, 85609 Dornach General Managers: Alberto Bozzo, Andrew Bowd Registration: Dornach, Gemeinde Aschheim, Landkreis Muenchen Registergericht Muenchen, HRB Nr. 43632
Quoted 11 lines · Borislav Petkov
get_ucode_datais amemcpy()wrapper which always returns 0. Move it into the header and make it an inline. Remove all code checking its return value and turn it into a void.There should be no functionality change resulting from this patch.
Signed-off-by Borislav Petkov <[email protected]>--- arch/x86/include/asm/microcode.h | 6 ++++++ arch/x86/kernel/microcode_amd.c | 25 +++++-------------------- 2 files changed, 11 insertions(+), 20 deletions(-)
Hm, what tree is this against - it doesnt apply here:
Hunk #3 FAILED at 180.
Hunk #4 succeeded at 195 (offset -1 lines).
Hunk #5 succeeded at 211 (offset -1 lines).
1 out of 5 hunks FAILED -- rejects in file arch/x86/kernel/microcode_amd.c
Thanks,
Ingo
Quoted 1 line · Ingo Molnar
Hm, what tree is this against - it doesnt apply here:
Ah, there's this one other patch that goes before that, sorry for not mentioning it to you - I guess you still cannot read minds :-)
http://marc.info/?l=linux-kernel&m=128864852428104
Anyway, I've applied the two ontop of tip/x86/microcode and uploaded them to
git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp.git tip-microcode
Thanks.
Signature · 8 lines
Regards/Gruss, Boris. Advanced Micro Devices GmbH Einsteinring 24, 85609 Dornach General Managers: Alberto Bozzo, Andrew Bowd Registration: Dornach, Gemeinde Aschheim, Landkreis Muenchen Registergericht Muenchen, HRB Nr. 43632
Ingo Molnar
Acked-by Borislav PetkovQuoted 6 lines · Borislav Petkov
Quoted 1 line · Ingo Molnar
Hm, what tree is this against - it doesnt apply here:
Ah, there's this one other patch that goes before that, sorry for not mentioning it to you - I guess you still cannot read minds :-)
Quoted 6 lines
http://marc.info/?l=linux-kernel&m=128864852428104
Anyway, I've applied the two ontop of tip/x86/microcode and uploaded them to
git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp.gittip-microcode
Ok, good. Please fix commit 35dc0ff46f77 if you want me to pull it, you should be in the signoff chain as a submaintainer who pushes bits, i.e. your entry should be:
not:
Also, while touching up details, please remove the colon after the sentence:
35dc0ff46f77: microcode, AMD: Prefer vzalloc() over calls to vmalloc()+memset().
All arch/x86 commit titles are open-ended sentences that start with a verb.
Also, please use a 'x86, microcode, AMD: ' prefix.
Thanks,
Ingo
Quoted 10 lines · Ingo Molnar
Quoted 1 line
git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp.gittip-microcodeOk, good. Please fix commit
35dc0ff46f77if you want me to pull it, you should be in the signoff chain as a submaintainer who pushes bits, i.e. your entry should be:Signed-off-by Borislav Petkov <[email protected]>not:
Acked-by Borislav Petkov <[email protected]>
done,
Quoted 3 lines
Also, while touching up details, please remove the colon after the sentence:
35dc0ff46f77: microcode, AMD: Prefervzalloc()over calls to vmalloc()+memset().
done (simplified commit message, while at it),
Quoted 3 lines
All
arch/x86commit titles are open-ended sentences that start with a verb.Also, please use a 'x86, microcode, AMD: ' prefix.
and done. Branch updated.
Thanks.
Signature · 8 lines
Regards/Gruss, Boris. Advanced Micro Devices GmbH Einsteinring 24, 85609 Dornach General Managers: Alberto Bozzo, Andrew Bowd Registration: Dornach, Gemeinde Aschheim, Landkreis Muenchen Registergericht Muenchen, HRB Nr. 43632
Quoted 18 lines · Borislav Petkov
Quoted 10 lines · Ingo Molnar
Quoted 1 line
git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp.gittip-microcodeOk, good. Please fix commit
35dc0ff46f77if you want me to pull it, you should be in the signoff chain as a submaintainer who pushes bits, i.e. your entry should be:Signed-off-by Borislav Petkov <[email protected]>not:
Acked-by Borislav Petkov <[email protected]>done,
Quoted 3 lines
Also, while touching up details, please remove the colon after the sentence:
35dc0ff46f77: microcode, AMD: Prefervzalloc()over calls to vmalloc()+memset().
Quoted 7 lines
done (simplified commit message, while at it),
Quoted 3 lines
All
arch/x86commit titles are open-ended sentences that start with a verb.Also, please use a 'x86, microcode, AMD: ' prefix.
and done. Branch updated.
Pulled, thanks Boris!
Ingo