X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=ccan%2Fcpuid%2Fcpuid.h;h=d5efb3f55b805787e8f6fc2895908956fb4a2625;hp=0a9fc9d91ac84bb1d98cc27e80bb1b5ae5a914da;hb=92b6e205441e5ead73b1dba53e8431aa1002086c;hpb=a87884aabba198a1d44e22f89c5477f1b8167ffd diff --git a/ccan/cpuid/cpuid.h b/ccan/cpuid/cpuid.h index 0a9fc9d9..d5efb3f5 100644 --- a/ccan/cpuid/cpuid.h +++ b/ccan/cpuid/cpuid.h @@ -26,7 +26,7 @@ #include /** - * enum cpuid - stuff to get information on from the CPU. + * enum cpuid - stuff to get information about from the CPU. * * This is used as a parameter in cpuid(). * @@ -76,25 +76,64 @@ typedef enum cpuid { CPU_VIRT_PHYS_ADDR_SIZES = 0x80000008 } cpuid_t; -#define CF_MMX 0 -#define CF_SSE 1 -#define CF_SSE2 2 -#define CF_SSE3 3 -#define CF_FPU 4 -#define CF_TSC 5 -#define CF_MSR 6 -#define CF_SSSE3 7 -#define CF_AVX 8 -#define CF_FMA 9 +enum { + CPUID_FEAT_ECX_SSE3 = 1 << 0, + CPUID_FEAT_ECX_PCLMUL = 1 << 1, + CPUID_FEAT_ECX_DTES64 = 1 << 2, + CPUID_FEAT_ECX_MONITOR = 1 << 3, + CPUID_FEAT_ECX_DS_CPL = 1 << 4, + CPUID_FEAT_ECX_VMX = 1 << 5, + CPUID_FEAT_ECX_SMX = 1 << 6, + CPUID_FEAT_ECX_EST = 1 << 7, + CPUID_FEAT_ECX_TM2 = 1 << 8, + CPUID_FEAT_ECX_SSSE3 = 1 << 9, + CPUID_FEAT_ECX_CID = 1 << 10, + CPUID_FEAT_ECX_FMA = 1 << 12, + CPUID_FEAT_ECX_CX16 = 1 << 13, + CPUID_FEAT_ECX_ETPRD = 1 << 14, + CPUID_FEAT_ECX_PDCM = 1 << 15, + CPUID_FEAT_ECX_DCA = 1 << 18, + CPUID_FEAT_ECX_SSE4_1 = 1 << 19, + CPUID_FEAT_ECX_SSE4_2 = 1 << 20, + CPUID_FEAT_ECX_x2APIC = 1 << 21, + CPUID_FEAT_ECX_MOVBE = 1 << 22, + CPUID_FEAT_ECX_POPCNT = 1 << 23, + CPUID_FEAT_ECX_AES = 1 << 25, + CPUID_FEAT_ECX_XSAVE = 1 << 26, + CPUID_FEAT_ECX_OSXSAVE = 1 << 27, + CPUID_FEAT_ECX_AVX = 1 << 28, -#define CEF_x64 10 -#define CEF_FPU 11 -#define CEF_DE 12 -#define CEF_SYSCALLRET 13 -#define CEF_CMOV 14 -#define CEF_SSE4a 15 -#define CEF_FMA4 16 -#define CEF_XOP 17 + CPUID_FEAT_EDX_FPU = 1 << 0, + CPUID_FEAT_EDX_VME = 1 << 1, + CPUID_FEAT_EDX_DE = 1 << 2, + CPUID_FEAT_EDX_PSE = 1 << 3, + CPUID_FEAT_EDX_TSC = 1 << 4, + CPUID_FEAT_EDX_MSR = 1 << 5, + CPUID_FEAT_EDX_PAE = 1 << 6, + CPUID_FEAT_EDX_MCE = 1 << 7, + CPUID_FEAT_EDX_CX8 = 1 << 8, + CPUID_FEAT_EDX_APIC = 1 << 9, + CPUID_FEAT_EDX_SEP = 1 << 11, + CPUID_FEAT_EDX_MTRR = 1 << 12, + CPUID_FEAT_EDX_PGE = 1 << 13, + CPUID_FEAT_EDX_MCA = 1 << 14, + CPUID_FEAT_EDX_CMOV = 1 << 15, + CPUID_FEAT_EDX_PAT = 1 << 16, + CPUID_FEAT_EDX_PSE36 = 1 << 17, + CPUID_FEAT_EDX_PSN = 1 << 18, + CPUID_FEAT_EDX_CLF = 1 << 19, + CPUID_FEAT_EDX_DTES = 1 << 21, + CPUID_FEAT_EDX_ACPI = 1 << 22, + CPUID_FEAT_EDX_MMX = 1 << 23, + CPUID_FEAT_EDX_FXSR = 1 << 24, + CPUID_FEAT_EDX_SSE = 1 << 25, + CPUID_FEAT_EDX_SSE2 = 1 << 26, + CPUID_FEAT_EDX_SS = 1 << 27, + CPUID_FEAT_EDX_HTT = 1 << 28, + CPUID_FEAT_EDX_TM1 = 1 << 29, + CPUID_FEAT_EDX_IA64 = 1 << 30, + CPUID_FEAT_EDX_PBE = 1 << 31 +}; typedef enum cputype { CT_NONE, @@ -124,14 +163,17 @@ typedef enum cputype { * * See also: cpuid_get_cpu_type_string() */ +#define is_intel_cpu() cpuid_get_cpu_type() == CT_INTEL +#define is_amd_cpu() cpuid_get_cpu_type() == CT_AMDK5 || cpuid_get_cpu_type() == CT_AMD cputype_t cpuid_get_cpu_type(void); /** - * cpuid_get_cpu_type_string - Get CPU Type string + * cpuid_sprintf_cputype - Get CPU Type string + * @cputype: a char of atleast 12 bytes in it. * - * Returns the CPU type string based off cputype_t. + * Returns true on success, false on failure */ -const char *cpuid_get_cpu_type_string(const cputype_t cputype); +bool cpuid_sprintf_cputype(const cputype_t cputype, char *buf); /** * cpuid_is_supported - test if the CPUID instruction is supported @@ -170,17 +212,17 @@ uint32_t cpuid_highest_ext_func_supported(void); * Returns a string into buf. * * For CPU_PROCINFO_AND_FEATUREBITS: - * buf[0]: - * - 3:0 - Stepping - * - 7:4 - Model - * - 11:8 - Family - * - 13:12 - Processor Type - * - 19:16 - Extended Model - * - 27:20 - Extended family - * buf[1] and buf[2]: + * buf[0]: Stepping + * buf[1]: Model + * buf[2]: Family + * buf[3]: Extended Model + * buf[4]: Extended Family + * buf[5] and buf[6]: * Feature flags - * buf[3]: - * Additional feature information. + * buf[7]: Brand Index + * buf[8]: CL Flush Line Size + * buf[9]: Logical Processors + * buf[10]: Initial APICID * * For CPU_L1_CACHE_AND_TLB_IDS: * buf[0]: (eax): @@ -205,8 +247,14 @@ uint32_t cpuid_highest_ext_func_supported(void); * For CPU_EXTENDED_PROC_INFO_FEATURE_BITS: * Returns them in buf[0] and buf[1]. * + * For CPU_EXTENDED_L2_CACHE_FEATURES: + * buf[0]: Line size + * buf[1]: Associativity + * buf[2]: Cache size. + * * For CPU_VIRT_PHYS_ADDR_SIZES: - * Returns it as an integer in *buf. + * buf[0]: Physical + * buf[1]: Virtual * * For CPU_PROC_BRAND_STRING: * Have a char array with at least 48 bytes assigned to it. @@ -232,27 +280,13 @@ 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 - * 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 + * Use cpuid_has_ecxfeature() for *_ECX* features and + * cpuid_has_edxfeature() for *_EDX* features. * * Returns true if the feature is available, false otherwise. */ -#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); +bool cpuid_has_ecxfeature(int feature); +bool cpuid_has_edxfeature(int feature); #else #include @@ -269,4 +303,3 @@ bool cpuid_has_feature(int feature, bool extended); #endif #endif -