1 files changed, 25 insertions, 0 deletions

diff --git a/drivers/edac/edac_mce_amd.c b/drivers/edac/edac_mce_amd.c
index e1f32c36248d..228482855362 100644
--- a/drivers/edac/edac_mce_amd.c
+++ b/drivers/edac/edac_mce_amd.c
@@ -270,6 +270,27 @@ wrong_bu_mce:
         pr_warning("Corrupted BU MCE info?\n");
 }
 
+static void amd_decode_ls_mce(u64 mc3_status)
+{
+        u32 ec  = mc3_status & 0xffff;
+        u32 xec = (mc3_status >> 16) & 0xf;
+
+        pr_emerg(" Load Store Error");
+
+        if (xec == 0x0) {
+                u8 rrrr = (ec >> 4) & 0xf;
+
+                if (!BUS_ERROR(ec) || (rrrr != 0x3 && rrrr != 0x4))
+                        goto wrong_ls_mce;
+
+                pr_cont(" during %s.\n", RRRR_MSG(ec));
+        }
+        return;
+
+wrong_ls_mce:
+        pr_warning("Corrupted LS MCE info?\n");
+}
+
 void amd_decode_nb_mce(int node_id, struct err_regs *regs, int handle_errors)
 {
         u32 ec  = ERROR_CODE(regs->nbsl);
@@ -366,6 +387,10 @@ void decode_mce(struct mce *m)
                 amd_decode_bu_mce(m->status);
                 break;
 
+        case 3:
+                amd_decode_ls_mce(m->status);
+                break;
+
         case 4:
                 regs.nbsl  = (u32) m->status;
                 regs.nbsh  = (u32)(m->status >> 32);