2 files changed, 22 insertions, 1 deletions

diff --git a/arch/x86/kernel/cpu/mcheck/mce.c b/arch/x86/kernel/cpu/mcheck/mce.c
index 7d905e3d58a2..a7fdf453d895 100644
--- a/arch/x86/kernel/cpu/mcheck/mce.c
+++ b/arch/x86/kernel/cpu/mcheck/mce.c
@@ -588,6 +588,16 @@ static void mce_read_aux(struct mce *m, int i)
                         m->addr >>= shift;
                         m->addr <<= shift;
                 }
+
+                /*
+                 * Extract [55:<lsb>] where lsb is the least significant
+                 * *valid* bit of the address bits.
+                 */
+                if (mce_flags.smca) {
+                        u8 lsb = (m->addr >> 56) & 0x3f;
+
+                        m->addr &= GENMASK_ULL(55, lsb);
+                }
         }
 
         if (mce_flags.smca) {
diff --git a/arch/x86/kernel/cpu/mcheck/mce_amd.c b/arch/x86/kernel/cpu/mcheck/mce_amd.c
index d2f92ab5322f..9b5403462936 100644
--- a/arch/x86/kernel/cpu/mcheck/mce_amd.c
+++ b/arch/x86/kernel/cpu/mcheck/mce_amd.c
@@ -561,9 +561,20 @@ __log_error(unsigned int bank, bool deferred_err, bool threshold_err, u64 misc)
         if (threshold_err)
                 m.misc = misc;
 
-        if (m.status & MCI_STATUS_ADDRV)
+        if (m.status & MCI_STATUS_ADDRV) {
                 rdmsrl(msr_addr, m.addr);
 
+                /*
+                 * Extract [55:<lsb>] where lsb is the least significant
+                 * *valid* bit of the address bits.
+                 */
+                if (mce_flags.smca) {
+                        u8 lsb = (m.addr >> 56) & 0x3f;
+
+                        m.addr &= GENMASK_ULL(55, lsb);
+                }
+        }
+
         if (mce_flags.smca) {
                 rdmsrl(MSR_AMD64_SMCA_MCx_IPID(bank), m.ipid);