x86/mce/amd: Collect valid address before logging an error
authorAravind Gopalakrishnan <Aravind.Gopalakrishnan@amd.com>
Wed, 6 May 2015 11:58:54 +0000 (06:58 -0500)
committerBorislav Petkov <bp@suse.de>
Wed, 6 May 2015 17:49:31 +0000 (19:49 +0200)
amd_decode_mce() needs value in m->addr so it can report the error
address correctly. This should be setup in __log_error() before we call
mce_log(). We do this because the error address is an important bit of
information which should be conveyed to userspace.

The correct output then reports proper address, like this:

  [Hardware Error]: Corrected error, no action required.
  [Hardware Error]: CPU:0 (15:60:0) MC0_STATUS [-|CE|-|-|AddrV|-|-|CECC]: 0x840041000028017b
  [Hardware Error]: MC0 Error Address: 0x00001f808f0ff040

Signed-off-by: Aravind Gopalakrishnan <Aravind.Gopalakrishnan@amd.com>
Cc: Tony Luck <tony.luck@intel.com>
Cc: x86-ml <x86@kernel.org>
Cc: linux-edac <linux-edac@vger.kernel.org>
Link: http://lkml.kernel.org/r/1430913538-1415-3-git-send-email-Aravind.Gopalakrishnan@amd.com
Signed-off-by: Borislav Petkov <bp@suse.de>
arch/x86/kernel/cpu/mcheck/mce_amd.c

index 5f25de20db3687719e4985fbd9add9881c731db2..607075726e105971e1b7d22d9ce9b71d841fcd95 100644 (file)
@@ -277,11 +277,14 @@ static void __log_error(unsigned int bank, bool threshold_err, u64 misc)
 
        m.status = status;
        m.bank = bank;
+
        if (threshold_err)
                m.misc = misc;
 
-       mce_log(&m);
+       if (m.status & MCI_STATUS_ADDRV)
+               rdmsrl(MSR_IA32_MCx_ADDR(bank), m.addr);
 
+       mce_log(&m);
        wrmsrl(MSR_IA32_MCx_STATUS(bank), 0);
 }