lkml.org 
[lkml]   [2016]   [Aug]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[RFC PATCH v2 05/20] x86: Add the Secure Memory Encryption cpu feature
    Date
    Update the cpu features to include identifying and reporting on the
    Secure Memory Encryption feature.

    Signed-off-by: Tom Lendacky <thomas.lendacky@amd.com>
    ---
    arch/x86/include/asm/cpufeature.h | 7 +++++--
    arch/x86/include/asm/cpufeatures.h | 5 ++++-
    arch/x86/include/asm/disabled-features.h | 3 ++-
    arch/x86/include/asm/required-features.h | 3 ++-
    arch/x86/kernel/cpu/scattered.c | 1 +
    5 files changed, 14 insertions(+), 5 deletions(-)

    diff --git a/arch/x86/include/asm/cpufeature.h b/arch/x86/include/asm/cpufeature.h
    index 1d2b69f..de5bdb1 100644
    --- a/arch/x86/include/asm/cpufeature.h
    +++ b/arch/x86/include/asm/cpufeature.h
    @@ -28,6 +28,7 @@ enum cpuid_leafs
    CPUID_8000_000A_EDX,
    CPUID_7_ECX,
    CPUID_8000_0007_EBX,
    + CPUID_8000_001F_EAX,
    };

    #ifdef CONFIG_X86_FEATURE_NAMES
    @@ -78,8 +79,9 @@ extern const char * const x86_bug_flags[NBUGINTS*32];
    CHECK_BIT_IN_MASK_WORD(REQUIRED_MASK, 15, feature_bit) || \
    CHECK_BIT_IN_MASK_WORD(REQUIRED_MASK, 16, feature_bit) || \
    CHECK_BIT_IN_MASK_WORD(REQUIRED_MASK, 17, feature_bit) || \
    + CHECK_BIT_IN_MASK_WORD(REQUIRED_MASK, 18, feature_bit) || \
    REQUIRED_MASK_CHECK || \
    - BUILD_BUG_ON_ZERO(NCAPINTS != 18))
    + BUILD_BUG_ON_ZERO(NCAPINTS != 19))

    #define DISABLED_MASK_BIT_SET(feature_bit) \
    ( CHECK_BIT_IN_MASK_WORD(DISABLED_MASK, 0, feature_bit) || \
    @@ -100,8 +102,9 @@ extern const char * const x86_bug_flags[NBUGINTS*32];
    CHECK_BIT_IN_MASK_WORD(DISABLED_MASK, 15, feature_bit) || \
    CHECK_BIT_IN_MASK_WORD(DISABLED_MASK, 16, feature_bit) || \
    CHECK_BIT_IN_MASK_WORD(DISABLED_MASK, 17, feature_bit) || \
    + CHECK_BIT_IN_MASK_WORD(DISABLED_MASK, 18, feature_bit) || \
    DISABLED_MASK_CHECK || \
    - BUILD_BUG_ON_ZERO(NCAPINTS != 18))
    + BUILD_BUG_ON_ZERO(NCAPINTS != 19))

    #define cpu_has(c, bit) \
    (__builtin_constant_p(bit) && REQUIRED_MASK_BIT_SET(bit) ? 1 : \
    diff --git a/arch/x86/include/asm/cpufeatures.h b/arch/x86/include/asm/cpufeatures.h
    index 92a8308..8babbd8 100644
    --- a/arch/x86/include/asm/cpufeatures.h
    +++ b/arch/x86/include/asm/cpufeatures.h
    @@ -12,7 +12,7 @@
    /*
    * Defines x86 CPU feature bits
    */
    -#define NCAPINTS 18 /* N 32-bit words worth of info */
    +#define NCAPINTS 19 /* N 32-bit words worth of info */
    #define NBUGINTS 1 /* N 32-bit bug flags */

    /*
    @@ -286,6 +286,9 @@
    #define X86_FEATURE_SUCCOR (17*32+1) /* Uncorrectable error containment and recovery */
    #define X86_FEATURE_SMCA (17*32+3) /* Scalable MCA */

    +/* AMD SME Feature Identification, CPUID level 0x8000001f (eax), word 18 */
    +#define X86_FEATURE_SME (18*32+ 0) /* Secure Memory Encryption */
    +
    /*
    * BUG word(s)
    */
    diff --git a/arch/x86/include/asm/disabled-features.h b/arch/x86/include/asm/disabled-features.h
    index 85599ad..8b45e08 100644
    --- a/arch/x86/include/asm/disabled-features.h
    +++ b/arch/x86/include/asm/disabled-features.h
    @@ -57,6 +57,7 @@
    #define DISABLED_MASK15 0
    #define DISABLED_MASK16 (DISABLE_PKU|DISABLE_OSPKE)
    #define DISABLED_MASK17 0
    -#define DISABLED_MASK_CHECK BUILD_BUG_ON_ZERO(NCAPINTS != 18)
    +#define DISABLED_MASK18 0
    +#define DISABLED_MASK_CHECK BUILD_BUG_ON_ZERO(NCAPINTS != 19)

    #endif /* _ASM_X86_DISABLED_FEATURES_H */
    diff --git a/arch/x86/include/asm/required-features.h b/arch/x86/include/asm/required-features.h
    index fac9a5c..6847d85 100644
    --- a/arch/x86/include/asm/required-features.h
    +++ b/arch/x86/include/asm/required-features.h
    @@ -100,6 +100,7 @@
    #define REQUIRED_MASK15 0
    #define REQUIRED_MASK16 0
    #define REQUIRED_MASK17 0
    -#define REQUIRED_MASK_CHECK BUILD_BUG_ON_ZERO(NCAPINTS != 18)
    +#define REQUIRED_MASK18 0
    +#define REQUIRED_MASK_CHECK BUILD_BUG_ON_ZERO(NCAPINTS != 19)

    #endif /* _ASM_X86_REQUIRED_FEATURES_H */
    diff --git a/arch/x86/kernel/cpu/scattered.c b/arch/x86/kernel/cpu/scattered.c
    index 8cb57df..d86d9a5 100644
    --- a/arch/x86/kernel/cpu/scattered.c
    +++ b/arch/x86/kernel/cpu/scattered.c
    @@ -37,6 +37,7 @@ void init_scattered_cpuid_features(struct cpuinfo_x86 *c)
    { X86_FEATURE_HW_PSTATE, CR_EDX, 7, 0x80000007, 0 },
    { X86_FEATURE_CPB, CR_EDX, 9, 0x80000007, 0 },
    { X86_FEATURE_PROC_FEEDBACK, CR_EDX,11, 0x80000007, 0 },
    + { X86_FEATURE_SME, CR_EAX, 0, 0x8000001f, 0 },
    { 0, 0, 0, 0, 0 }
    };

    \
     
     \ /
      Last update: 2016-09-17 09:57    [W:4.197 / U:0.160 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site