lkml.org 
[lkml]   [2010]   [May]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[049/117] edac, mce: Fix wrong mask and macro usage
    2.6.33-stable review patch.  If anyone has any objections, please let us know.

    ------------------

    From: Borislav Petkov <borislav.petkov@amd.com>

    commit 35d824b28fc5544d1eb7c1e3db15a1740df8ec4b upstream.

    Correct two mishaps which prevented reporting error type (CECC vs UECC)
    and extended error description.

    Signed-off-by: Borislav Petkov <borislav.petkov@amd.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

    ---
    drivers/edac/edac_mce_amd.c | 5 ++---
    1 file changed, 2 insertions(+), 3 deletions(-)

    --- a/drivers/edac/edac_mce_amd.c
    +++ b/drivers/edac/edac_mce_amd.c
    @@ -294,7 +294,6 @@ wrong_ls_mce:
    void amd_decode_nb_mce(int node_id, struct err_regs *regs, int handle_errors)
    {
    u32 ec = ERROR_CODE(regs->nbsl);
    - u32 xec = EXT_ERROR_CODE(regs->nbsl);

    if (!handle_errors)
    return;
    @@ -324,7 +323,7 @@ void amd_decode_nb_mce(int node_id, stru
    pr_cont("\n");
    }

    - pr_emerg("%s.\n", EXT_ERR_MSG(xec));
    + pr_emerg("%s.\n", EXT_ERR_MSG(regs->nbsl));

    if (BUS_ERROR(ec) && nb_bus_decoder)
    nb_bus_decoder(node_id, regs);
    @@ -374,7 +373,7 @@ static int amd_decode_mce(struct notifie
    ((m->status & MCI_STATUS_PCC) ? "yes" : "no"));

    /* do the two bits[14:13] together */
    - ecc = m->status & (3ULL << 45);
    + ecc = (m->status >> 45) & 0x3;
    if (ecc)
    pr_cont(", %sECC Error", ((ecc == 2) ? "C" : "U"));




    \
     
     \ /
      Last update: 2010-05-12 10:11    [W:4.181 / U:0.060 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site