lkml.org 
[lkml]   [2016]   [May]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[tip:ras/core] x86/mce: Update AMD mcheck init to use cpu_has() facilities
    Commit-ID:  14cddfd5308b0880abd6e58b6660f5cc8e8020f9
    Gitweb: http://git.kernel.org/tip/14cddfd5308b0880abd6e58b6660f5cc8e8020f9
    Author: Yazen Ghannam <Yazen.Ghannam@amd.com>
    AuthorDate: Wed, 11 May 2016 14:58:27 +0200
    Committer: Ingo Molnar <mingo@kernel.org>
    CommitDate: Thu, 12 May 2016 09:08:22 +0200

    x86/mce: Update AMD mcheck init to use cpu_has() facilities

    Use cpu_has() facilities to find available RAS features rather than
    directly reading CPUID 0x80000007_EBX.

    Signed-off-by: Yazen Ghannam <Yazen.Ghannam@amd.com>
    [ Use the struct cpuinfo_x86 ptr instead. ]
    Signed-off-by: Borislav Petkov <bp@suse.de>
    Cc: Andy Lutomirski <luto@amacapital.net>
    Cc: Borislav Petkov <bp@alien8.de>
    Cc: Brian Gerst <brgerst@gmail.com>
    Cc: Denys Vlasenko <dvlasenk@redhat.com>
    Cc: H. Peter Anvin <hpa@zytor.com>
    Cc: Linus Torvalds <torvalds@linux-foundation.org>
    Cc: Peter Zijlstra <peterz@infradead.org>
    Cc: Thomas Gleixner <tglx@linutronix.de>
    Cc: Tony Luck <tony.luck@intel.com>
    Cc: linux-edac <linux-edac@vger.kernel.org>
    Link: http://lkml.kernel.org/r/1462971509-3856-6-git-send-email-bp@alien8.de
    Signed-off-by: Ingo Molnar <mingo@kernel.org>
    ---
    arch/x86/kernel/cpu/mcheck/mce.c | 8 +++-----
    1 file changed, 3 insertions(+), 5 deletions(-)

    diff --git a/arch/x86/kernel/cpu/mcheck/mce.c b/arch/x86/kernel/cpu/mcheck/mce.c
    index aeda446..92e5e37 100644
    --- a/arch/x86/kernel/cpu/mcheck/mce.c
    +++ b/arch/x86/kernel/cpu/mcheck/mce.c
    @@ -1683,11 +1683,9 @@ static void __mcheck_cpu_init_vendor(struct cpuinfo_x86 *c)
    break;

    case X86_VENDOR_AMD: {
    - u32 ebx = cpuid_ebx(0x80000007);
    -
    - mce_flags.overflow_recov = !!(ebx & BIT(0));
    - mce_flags.succor = !!(ebx & BIT(1));
    - mce_flags.smca = !!(ebx & BIT(3));
    + mce_flags.overflow_recov = !!cpu_has(c, X86_FEATURE_OVERFLOW_RECOV);
    + mce_flags.succor = !!cpu_has(c, X86_FEATURE_SUCCOR);
    + mce_flags.smca = !!cpu_has(c, X86_FEATURE_SMCA);

    /*
    * Install proper ops for Scalable MCA enabled processors
    \
     
     \ /
      Last update: 2016-05-12 12:41    [W:4.915 / U:0.296 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site