lkml.org 
[lkml]   [2011]   [May]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[RFC 4/9] MCE: Move ADDR/MISC reading code into common function
    Date
    From: Andi Kleen <andi@firstfloor.org>

    Used for next patch.

    Signed-off-by: Andi Kleen <ak@linux.intel.com>
    Signed-off-by: Tony Luck <tony.luck@intel.com>
    ---
    arch/x86/kernel/cpu/mcheck/mce.c | 21 +++++++++++++--------
    1 files changed, 13 insertions(+), 8 deletions(-)

    diff --git a/arch/x86/kernel/cpu/mcheck/mce.c b/arch/x86/kernel/cpu/mcheck/mce.c
    index ee3b14e..f4924dc 100644
    --- a/arch/x86/kernel/cpu/mcheck/mce.c
    +++ b/arch/x86/kernel/cpu/mcheck/mce.c
    @@ -525,6 +525,17 @@ static void mce_report_event(struct pt_regs *regs)
    #endif
    }

    +/*
    + * Read ADDR and MISC registers.
    + */
    +static void mce_read_aux(struct mce *m, int i)
    +{
    + if (m->status & MCI_STATUS_MISCV)
    + m->misc = mce_rdmsrl(MSR_IA32_MCx_MISC(i));
    + if (m->status & MCI_STATUS_ADDRV)
    + m->addr = mce_rdmsrl(MSR_IA32_MCx_ADDR(i));
    +}
    +
    DEFINE_PER_CPU(unsigned, mce_poll_count);

    /*
    @@ -576,10 +587,7 @@ void machine_check_poll(enum mcp_flags flags, mce_banks_t *b)
    (m.status & (mce_ser ? MCI_STATUS_S : MCI_STATUS_UC)))
    continue;

    - if (m.status & MCI_STATUS_MISCV)
    - m.misc = mce_rdmsrl(MSR_IA32_MCx_MISC(i));
    - if (m.status & MCI_STATUS_ADDRV)
    - m.addr = mce_rdmsrl(MSR_IA32_MCx_ADDR(i));
    + mce_read_aux(&m, i);

    if (!(flags & MCP_TIMESTAMP))
    m.tsc = 0;
    @@ -1023,10 +1031,7 @@ void do_machine_check(struct pt_regs *regs, long error_code)
    if (severity == MCE_AR_SEVERITY)
    kill_it = 1;

    - if (m.status & MCI_STATUS_MISCV)
    - m.misc = mce_rdmsrl(MSR_IA32_MCx_MISC(i));
    - if (m.status & MCI_STATUS_ADDRV)
    - m.addr = mce_rdmsrl(MSR_IA32_MCx_ADDR(i));
    + mce_read_aux(&m, i);

    /*
    * Action optional error. Queue address for later processing.
    --
    1.7.3.1


    \
     
     \ /
      Last update: 2011-05-24 00:15    [W:0.023 / U:182.068 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site