lkml.org 
[lkml]   [2022]   [Dec]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v6 3/4] x86/mce: Define function to extract ErrorAddr from MCA_ADDR
    Date
    From: Smita Koralahalli <Smita.KoralahalliChannabasappa@amd.com>

    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>
    Reviewed-by: Yazen Ghannam <yazen.ghannam@amd.com>
    ---

    Link:
    https://lore.kernel.org/r/20220412154038.261750-2-Smita.KoralahalliChannabasappa@amd.com

    v2:
    No change.
    v3:
    Rebased on the latest tip tree. No functional changes.
    v4:
    Commit description change to be void of the patch linearity.
    v5:
    Extract entire function including comments.
    Define smca_extract_err_addr() in mce/internal.h
    v6:
    No functional change. Removed old link.

    arch/x86/kernel/cpu/mce/amd.c | 10 +---------
    arch/x86/kernel/cpu/mce/core.c | 10 +---------
    arch/x86/kernel/cpu/mce/internal.h | 15 +++++++++++++++
    3 files changed, 17 insertions(+), 18 deletions(-)

    diff --git a/arch/x86/kernel/cpu/mce/amd.c b/arch/x86/kernel/cpu/mce/amd.c
    index b80472a52ad8..85977ca07825 100644
    --- a/arch/x86/kernel/cpu/mce/amd.c
    +++ b/arch/x86/kernel/cpu/mce/amd.c
    @@ -740,15 +740,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 9efd6d010e2d..757cc46298d3 100644
    --- 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 7e03f5b7f6bd..6dcb94fe0f65 100644
    --- 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
    --
    2.34.1
    \
     
     \ /
      Last update: 2022-12-06 18:38    [W:3.872 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site