From: Jacob Shin <jacob.shin@amd.com>
To: Borislav Petkov <bp@alien8.de>
Cc: "H. Peter Anvin" <hpa@zytor.com>, Ingo Molnar <mingo@redhat.com>,
Thomas Gleixner <tglx@linutronix.de>, <x86@kernel.org>,
Fenghua Yu <fenghua.yu@intel.com>,
Andreas Herrmann <herrmann.der.user@googlemail.com>,
<linux-kernel@vger.kernel.org>
Subject: Re: [PATCH 1/2] x86/microcode: vendor abstract out save_microcode_in_initrd()
Date: Thu, 23 May 2013 10:17:54 -0500 [thread overview]
Message-ID: <20130523151754.GA1476@jshin-Toonie> (raw)
In-Reply-To: <20130523075423.GA3977@pd.tnic>
On Thu, May 23, 2013 at 09:54:23AM +0200, Borislav Petkov wrote:
> On Wed, May 22, 2013 at 08:15:33PM -0500, Jacob Shin wrote:
> > Currently save_microcode_in_initrd() is declared in vendor neutural
> > microcode.h file, but defined in vendor specific
> > microcode_intel_early.c file. Vendor abstract it out to
> > microcode_core_early.c with a wrapper function.
> >
> > Signed-off-by: Jacob Shin <jacob.shin@amd.com>
> > ---
> > arch/x86/include/asm/microcode_intel.h | 2 ++
> > arch/x86/kernel/microcode_core_early.c | 10 ++++++++++
> > arch/x86/kernel/microcode_intel_early.c | 2 +-
> > 3 files changed, 13 insertions(+), 1 deletion(-)
> >
> > diff --git a/arch/x86/include/asm/microcode_intel.h b/arch/x86/include/asm/microcode_intel.h
> > index 5356f92..cf729eb 100644
> > --- a/arch/x86/include/asm/microcode_intel.h
> > +++ b/arch/x86/include/asm/microcode_intel.h
> > @@ -67,10 +67,12 @@ update_match_revision(struct microcode_header_intel *mc_header, int rev);
> > extern void __init load_ucode_intel_bsp(void);
> > extern void __cpuinit load_ucode_intel_ap(void);
> > extern void show_ucode_info_early(void);
> > +extern int __init save_microcode_in_initrd_intel(void);
> > #else
> > static inline __init void load_ucode_intel_bsp(void) {}
> > static inline __cpuinit void load_ucode_intel_ap(void) {}
> > static inline void show_ucode_info_early(void) {}
> > +static inline int __init save_microcode_in_initrd_intel(void) {}
>
> In file included from arch/x86/kernel/cpu/common.c:41:0:
> /w/kernel/linux-2.6/arch/x86/include/asm/microcode_intel.h: In function ‘save_microcode_in_initrd_intel’:
> /w/kernel/linux-2.6/arch/x86/include/asm/microcode_intel.h:75:1: warning: no return statement in function returning non-void [-Wreturn-type]
> In file included from arch/x86/kernel/microcode_intel_lib.c:30:0:
> /w/kernel/linux-2.6/arch/x86/include/asm/microcode_intel.h: In function ‘save_microcode_in_initrd_intel’:
> /w/kernel/linux-2.6/arch/x86/include/asm/microcode_intel.h:75:1: warning: no return statement in function returning non-void [-Wreturn-type]
> In file included from arch/x86/kernel/microcode_intel.c:82:0:
> /w/kernel/linux-2.6/arch/x86/include/asm/microcode_intel.h: In function ‘save_microcode_in_initrd_intel’:
> /w/kernel/linux-2.6/arch/x86/include/asm/microcode_intel.h:75:1: warning: no return statement in function returning non-void [-Wreturn-type]
> Setup is 15436 bytes (padded to 15872 bytes).
> System is 4268 kB
> CRC a330a73f
>
> You need:
>
> diff --git a/arch/x86/include/asm/microcode_intel.h b/arch/x86/include/asm/microcode_intel.h
> index cf729eb3beee..87a085333cbf 100644
> --- a/arch/x86/include/asm/microcode_intel.h
> +++ b/arch/x86/include/asm/microcode_intel.h
> @@ -72,7 +72,7 @@ extern int __init save_microcode_in_initrd_intel(void);
> static inline __init void load_ucode_intel_bsp(void) {}
> static inline __cpuinit void load_ucode_intel_ap(void) {}
> static inline void show_ucode_info_early(void) {}
> -static inline int __init save_microcode_in_initrd_intel(void) {}
> +static inline int __init save_microcode_in_initrd_intel(void) { return -EINVAL; }
Oops, sorry about that. Will fix,
> #endif
>
> #if defined(CONFIG_MICROCODE_INTEL_EARLY) && defined(CONFIG_HOTPLUG_CPU)
>
> Btw,
>
> could you pick up this trivial fix and add it to your set - I can't help
> myself when I see typos, especially in user-visible printks :)
Will do and send out a V2 today.
Thanks!
next prev parent reply other threads:[~2013-05-23 15:18 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-05-23 1:15 [PATCH 0/2] x86/microcode: early microcode patch loading support on AMD Jacob Shin
2013-05-23 1:15 ` [PATCH 1/2] x86/microcode: vendor abstract out save_microcode_in_initrd() Jacob Shin
2013-05-23 7:54 ` Borislav Petkov
2013-05-23 15:17 ` Jacob Shin [this message]
2013-05-23 1:15 ` [PATCH 2/2] x86/microcode: early microcode patch loading support on AMD Jacob Shin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20130523151754.GA1476@jshin-Toonie \
--to=jacob.shin@amd.com \
--cc=bp@alien8.de \
--cc=fenghua.yu@intel.com \
--cc=herrmann.der.user@googlemail.com \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=tglx@linutronix.de \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®