diff options
| author | Martin Willi <martin@revosec.ch> | 2015-04-02 14:04:57 +0200 |
|---|---|---|
| committer | Martin Willi <martin@revosec.ch> | 2015-04-13 15:31:58 +0200 |
| commit | 793851856bb74191df7f5fd008dd46d83eca8ebc (patch) | |
| tree | 1ee5ae602b3ece5889be656266f31e07a51f2e02 | |
| parent | f155880eda515b8424e4984cb39cdf38946356f2 (diff) | |
| download | strongswan-793851856bb74191df7f5fd008dd46d83eca8ebc.tar.bz2 strongswan-793851856bb74191df7f5fd008dd46d83eca8ebc.tar.xz | |
cpu-feature: Support Via Padlock security features
| -rw-r--r-- | src/libstrongswan/utils/cpu_feature.c | 45 | ||||
| -rw-r--r-- | src/libstrongswan/utils/cpu_feature.h | 11 |
2 files changed, 56 insertions, 0 deletions
diff --git a/src/libstrongswan/utils/cpu_feature.c b/src/libstrongswan/utils/cpu_feature.c index b88cf2f9f..d86ca6bd8 100644 --- a/src/libstrongswan/utils/cpu_feature.c +++ b/src/libstrongswan/utils/cpu_feature.c @@ -30,6 +30,18 @@ typedef enum { CPUID1_ECX_AESNI = (1 << 25), CPUID1_ECX_AVX = (1 << 28), CPUID1_ECX_RDRAND = (1 << 30), + + /* For CentaurHauls cpuid(0xC0000001) */ + CPUIDC1_EDX_RNG_AVAILABLE = (1 << 2), + CPUIDC1_EDX_RNG_ENABLED = (1 << 3), + CPUIDC1_EDX_ACE_AVAILABLE = (1 << 6), + CPUIDC1_EDX_ACE_ENABLED = (1 << 7), + CPUIDC1_EDX_ACE2_AVAILABLE = (1 << 8), + CPUIDC1_EDX_ACE2_ENABLED = (1 << 9), + CPUIDC1_EDX_PHE_AVAILABLE = (1 << 10), + CPUIDC1_EDX_PHE_ENABLED = (1 << 11), + CPUIDC1_EDX_PMM_AVAILABLE = (1 << 12), + CPUIDC1_EDX_PMM_ENABLED = (1 << 13), } cpuid_flag_t; /** @@ -62,6 +74,30 @@ static inline cpu_feature_t f2f(u_int reg, cpuid_flag_t flag, cpu_feature_t f) } /** + * Get features for a Via "CentaurHauls" CPU + */ +static cpu_feature_t get_via_features() +{ + cpu_feature_t f = 0; + u_int a, b, c, d; + + cpuid(0xc0000001, &a, &b, &c, &d); + + f |= f2f(d, CPUIDC1_EDX_RNG_AVAILABLE, CPU_FEATURE_PADLOCK_RNG_AVAILABLE); + f |= f2f(d, CPUIDC1_EDX_RNG_ENABLED, CPU_FEATURE_PADLOCK_RNG_ENABLED); + f |= f2f(d, CPUIDC1_EDX_ACE_AVAILABLE, CPU_FEATURE_PADLOCK_ACE_AVAILABLE); + f |= f2f(d, CPUIDC1_EDX_ACE_ENABLED, CPU_FEATURE_PADLOCK_ACE_ENABLED); + f |= f2f(d, CPUIDC1_EDX_ACE2_AVAILABLE, CPU_FEATURE_PADLOCK_ACE2_AVAILABLE); + f |= f2f(d, CPUIDC1_EDX_ACE2_ENABLED, CPU_FEATURE_PADLOCK_ACE2_ENABLED); + f |= f2f(d, CPUIDC1_EDX_PHE_AVAILABLE, CPU_FEATURE_PADLOCK_PHE_AVAILABLE); + f |= f2f(d, CPUIDC1_EDX_PHE_ENABLED, CPU_FEATURE_PADLOCK_PHE_ENABLED); + f |= f2f(d, CPUIDC1_EDX_PMM_AVAILABLE, CPU_FEATURE_PADLOCK_PMM_AVAILABLE); + f |= f2f(d, CPUIDC1_EDX_PMM_ENABLED, CPU_FEATURE_PADLOCK_PMM_ENABLED); + + return f; +} + +/** * See header. */ cpu_feature_t cpu_feature_get_all() @@ -89,6 +125,15 @@ cpu_feature_t cpu_feature_get_all() f |= f2f(c, CPUID1_ECX_AVX, CPU_FEATURE_AVX); f |= f2f(c, CPUID1_ECX_RDRAND, CPU_FEATURE_RDRAND); + if (streq(vendor, "CentaurHauls")) + { + cpuid(0xc0000000, &a, &b, &c, &d); + /* check Centaur Extended Feature Flags */ + if (a >= 0xc0000001) + { + f |= get_via_features(); + } + } return f; } diff --git a/src/libstrongswan/utils/cpu_feature.h b/src/libstrongswan/utils/cpu_feature.h index d7300a30a..3a807fa2b 100644 --- a/src/libstrongswan/utils/cpu_feature.h +++ b/src/libstrongswan/utils/cpu_feature.h @@ -36,6 +36,17 @@ typedef enum { CPU_FEATURE_RDRAND = (1 << 8), CPU_FEATURE_AESNI = (1 << 9), CPU_FEATURE_PCLMULQDQ = (1 << 10), + /** Via Padlock Security features */ + CPU_FEATURE_PADLOCK_RNG_AVAILABLE = (1 << 22), + CPU_FEATURE_PADLOCK_RNG_ENABLED = (1 << 23), + CPU_FEATURE_PADLOCK_ACE_AVAILABLE = (1 << 24), + CPU_FEATURE_PADLOCK_ACE_ENABLED = (1 << 25), + CPU_FEATURE_PADLOCK_ACE2_AVAILABLE = (1 << 26), + CPU_FEATURE_PADLOCK_ACE2_ENABLED = (1 << 27), + CPU_FEATURE_PADLOCK_PHE_AVAILABLE = (1 << 28), + CPU_FEATURE_PADLOCK_PHE_ENABLED = (1 << 29), + CPU_FEATURE_PADLOCK_PMM_AVAILABLE = (1 << 30), + CPU_FEATURE_PADLOCK_PMM_ENABLED = (1 << 31), } cpu_feature_t; /** |