X-Git-Url: https://git.ozlabs.org/?a=blobdiff_plain;f=ccan%2Fcpuid%2Fcpuid.h;h=0a9fc9d91ac84bb1d98cc27e80bb1b5ae5a914da;hb=e6f6fe38773914f732d1e0003859a4bd36f26292;hp=2861394608313dede06e863900189af6dd8dafef;hpb=3119b7e07ae595a256e42cb99ffb7ea6857a88cb;p=ccan diff --git a/ccan/cpuid/cpuid.h b/ccan/cpuid/cpuid.h index 28613946..0a9fc9d9 100644 --- a/ccan/cpuid/cpuid.h +++ b/ccan/cpuid/cpuid.h @@ -22,6 +22,9 @@ #ifndef CCAN_CPUID_H #define CCAN_CPUID_H +#include +#include + /** * enum cpuid - stuff to get information on from the CPU. * @@ -66,7 +69,7 @@ typedef enum cpuid { CPU_HIGHEST_EXTENDED_FUNCTION_SUPPORTED = 0x80000000, CPU_EXTENDED_PROC_INFO_FEATURE_BITS = 0x80000001, - CPU_PROC_BRAND_STRING = 0x80000002, + CPU_PROC_BRAND_STRING = 0x80000002, CPU_L1_CACHE_AND_TLB_IDS = 0x80000005, CPU_EXTENDED_L2_CACHE_FEATURES = 0x80000006, CPU_ADV_POWER_MGT_INFO = 0x80000007, @@ -111,6 +114,9 @@ typedef enum cputype { CT_KVM } cputype_t; +#if defined(__i386__) || defined(__i386) || defined(__x86_64) \ + || defined(_M_AMD64) || defined(__M_X64) + /** * cpuid_get_cpu_type - Get CPU Type * @@ -132,11 +138,11 @@ const char *cpuid_get_cpu_type_string(const cputype_t cputype); * * CPUID is not supported by old CPUS. * - * Returns 1 if the cpuid instruction is supported, 0 otherwise. + * Returns true if the cpuid instruction is supported, false otherwise. * * See also: cpuid() */ -int cpuid_is_supported(void); +bool cpuid_is_supported(void); /** * cpuid_highest_ext_func_supported - Get the highest extended function supported @@ -152,7 +158,7 @@ int cpuid_is_supported(void); * * See also: cpuid() */ -int cpuid_highest_ext_func_supported(void); +uint32_t cpuid_highest_ext_func_supported(void); /** * cpuid - Get Some information from the CPU. @@ -176,6 +182,23 @@ int cpuid_highest_ext_func_supported(void); * buf[3]: * Additional feature information. * + * For CPU_L1_CACHE_AND_TLB_IDS: + * buf[0]: (eax): + * - 7..0 Number of times to exec cpuid to get all descriptors. + * - 15..8 Instruction TLB: 4K Pages, 4-way set associtive, 128 entries. + * - 23..16 Data TLB: 4k Pages, 4-way set associtive, 128 entries. + * - 24..31 Instruction TLB: 4K Pages, 4-way set associtive, 2 entries. + * buf[1]: (ebx): + * - 7..0 64-byte prefetching + * - 8..31 Null descriptor + * buf[2]: (ecx): + * - 0..31 Null descriptor + * buf[3]: (edx): + * - 7..0 2nd-level cache, 2M, 8-way set associtive, 64-byte line size + * - 15..8 1st-level instruction cache: 32K, 8-way set associtive, 64 byte line size + * - 16..23 Data TLB: 4M Pages, 4-way set associtive, 8 entires. + * - 24..31 1st-level data cache: 32K, 8-way set associtive, 64 byte line size + * * For CPU_HIGHEST_EXTENDED_FUNCTION_SUPPORTED: * Returns the highest supported function in *buf (expects an integer ofc) * @@ -188,45 +211,62 @@ int cpuid_highest_ext_func_supported(void); * For CPU_PROC_BRAND_STRING: * Have a char array with at least 48 bytes assigned to it. * + * Here's a page which will help you parse the data provided by this function. + * http://www.flounder.com/cpuid_explorer2.htm + * * If an invalid flag has been passed a 0xbaadf00d is returned in *buf. */ -void cpuid(cpuid_t info, void *buf); +void cpuid(cpuid_t info, uint32_t *buf); /** * cpuid_test_feature - Test if @feature is available * - * Returns 1 if feature is supported, 0 otherwise. + * Returns true if feature is supported, false otherwise. * * The feature parameter must be >= CPU_EXTENDED_PROC_INFO_FEATURE_BITS * and <= CPU_VIRT_PHYS_ADDR_SIZES. */ -int cpuid_test_feature(cpuid_t feature); +bool cpuid_test_feature(cpuid_t feature); /** * cpuid_has_feature - Test if @feature is supported * * Test if the CPU supports MMX/SSE* etc. * For the extended parameter, usually you want to pass it as - * 0 if you're not passing CEF_*. + * false if you're not passing CEF_*. * * For more information about the CPU extended features, have a look * at: * http://en.wikipedia.org/wiki/CPUID * - * Returns 1 if the feature is available, 0 otherwise. + * Returns true if the feature is available, false otherwise. */ -#define cpuid_has_mmx() cpuid_has_feature(CF_MMX, 0) -#define cpuid_has_sse() cpuid_has_feature(CF_SSE, 0) -#define cpuid_has_sse2() cpuid_has_feature(CF_SSE2, 0) -#define cpuid_has_sse3() cpuid_has_feature(CF_SSE3, 0) -#define cpuid_has_ssse3() cpuid_has_feature(CF_SSSE3, 0) -#define cpuid_has_avx() cpuid_has_feature(CF_AVX, 0) -#define cpuid_has_fma() cpuid_has_feature(CF_FMA, 0) -#define cpuid_has_x64() cpuid_has_feature(CEF_x64, 1) -#define cpuid_has_sse4a() cpuid_has_feature(CEF_SSE4a, 1) -#define cpuid_has_fma4() cpuid_has_feature(CEF_FMA4, 1) -#define cpuid_has_xop() cpuid_has_feature(CEF_XOP, 1) -int cpuid_has_feature(int feature, int extended); +#define cpuid_has_mmx() cpuid_has_feature(CF_MMX, false) +#define cpuid_has_sse() cpuid_has_feature(CF_SSE, false) +#define cpuid_has_sse2() cpuid_has_feature(CF_SSE2, false) +#define cpuid_has_sse3() cpuid_has_feature(CF_SSE3, false) +#define cpuid_has_ssse3() cpuid_has_feature(CF_SSSE3, false) +#define cpuid_has_avx() cpuid_has_feature(CF_AVX, false) +#define cpuid_has_fma() cpuid_has_feature(CF_FMA, false) +#define cpuid_has_x64() cpuid_has_feature(CEF_x64, true) +#define cpuid_has_sse4a() cpuid_has_feature(CEF_SSE4a, true) +#define cpuid_has_fma4() cpuid_has_feature(CEF_FMA4, true) +#define cpuid_has_xop() cpuid_has_feature(CEF_XOP, true) +bool cpuid_has_feature(int feature, bool extended); + +#else +#include +#define cpuid_get_cpu_type() BUILD_ASSERT_OR_ZERO(0) +#define cpuid_get_cpu_type_string() BUILD_ASSERT_OR_ZERO(0) + +#define cpuid_is_supported() BUILD_ASSERT_OR_ZERO(0) +#define cpuid(info, buf) BUILD_ASSERT_OR_ZERO(0) + +#define cpuid_highest_ext_func_supported() BUILD_ASSERT_OR_ZERO(0) +#define cpuid_test_feature(feature) BUILD_ASSERT_OR_ZERO(0) +#define cpuid_has_feature(feature, ext) BUILD_ASSERT_OR_ZERO(0) + +#endif #endif