x86/mce: Define a function to extract ErrorAddr from MCA_ADDR

Move MCA_ADDR[ErrorAddr] extraction into a separate helper function. This
will be further refactored to support extended ErrorAddr bits in MCA_ADDR
in newer AMD CPUs.

  [ bp: Massage. ]

Signed-off-by: Smita Koralahalli <Smita.KoralahalliChannabasappa@amd.com>
Signed-off-by: Borislav Petkov <bp@suse.de>
Signed-off-by: Borislav Petkov (AMD) <bp@alien8.de>
Reviewed-by: Yazen Ghannam <yazen.ghannam@amd.com>
Link: https://lore.kernel.org/all/20220225193342.215780-3-Smita.KoralahalliChannabasappa@amd.com/

diff --git a/arch/x86/kernel/cpu/mce/amd.c b/arch/x86/kernel/cpu/mce/amd.c
index 10fb5b5c9efa4c7f29ed7da7a3eb57137458f034..c6b1fd5a34b83a402a5f8351a378f467f95ef7e8 100644 (file)
--- a/arch/x86/kernel/cpu/mce/amd.c
+++ b/arch/x86/kernel/cpu/mce/amd.c
@@ -736,15 +736,7 @@ static void __log_error(unsigned int bank, u64 status, u64 addr, u64 misc)
        if (m.status & MCI_STATUS_ADDRV) {
                m.addr = 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);
-               }
+               smca_extract_err_addr(&m);
        }
 
        if (mce_flags.smca) {

diff --git a/arch/x86/kernel/cpu/mce/core.c b/arch/x86/kernel/cpu/mce/core.c
index 2c8ec5c71712191486000cf3d0e34ebe24f18eb2..d0ade77c41f7aa4d0833d6bd00359d2fce18e741 100644 (file)
--- a/arch/x86/kernel/cpu/mce/core.c
+++ b/arch/x86/kernel/cpu/mce/core.c
@@ -633,15 +633,7 @@ static noinstr void mce_read_aux(struct mce *m, int i)
                        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);
-               }
+               smca_extract_err_addr(m);
        }
 
        if (mce_flags.smca) {

diff --git a/arch/x86/kernel/cpu/mce/internal.h b/arch/x86/kernel/cpu/mce/internal.h
index 7e03f5b7f6bd7d32641ef5ef083f1dcd33bc7733..6dcb94fe0f65dbe7ab4e279437c4283ac74fe581 100644 (file)
--- a/arch/x86/kernel/cpu/mce/internal.h
+++ b/arch/x86/kernel/cpu/mce/internal.h
@@ -189,8 +189,23 @@ extern bool filter_mce(struct mce *m);
 
 #ifdef CONFIG_X86_MCE_AMD
 extern bool amd_filter_mce(struct mce *m);
+
+/* Extract [55:<lsb>] where lsb is the LS-*valid* bit of the address bits. */
+static __always_inline void smca_extract_err_addr(struct mce *m)
+{
+       u8 lsb;
+
+       if (!mce_flags.smca)
+               return;
+
+       lsb = (m->addr >> 56) & 0x3f;
+
+       m->addr &= GENMASK_ULL(55, lsb);
+}
+
 #else
 static inline bool amd_filter_mce(struct mce *m) { return false; }
+static inline void smca_extract_err_addr(struct mce *m) { }
 #endif
 
 #ifdef CONFIG_X86_ANCIENT_MCE