X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=ccan%2Fcpuid%2Fcpuid.c;h=2ea522b71d64c489f2db4f0b5df28fca4bb5e2a5;hp=bc44fcf2f9d7c264071cbc3cf67cf2e31022670c;hb=7cc246278949c8536dcfc51330a99e42f93fdc35;hpb=0e528772db367034b41b693336ffee8bc765a62f diff --git a/ccan/cpuid/cpuid.c b/ccan/cpuid/cpuid.c index bc44fcf2..2ea522b7 100644 --- a/ccan/cpuid/cpuid.c +++ b/ccan/cpuid/cpuid.c @@ -29,11 +29,10 @@ #include "cpuid.h" #include -#include enum { - CPU_PROC_BRAND_STRING_INTERNAL0 = 0x80000003, - CPU_PROC_BRAND_STRING_INTERNAL1 = 0x80000004 + CPUID_PROC_BRAND_STRING_INTERNAL0 = 0x80000003, + CPUID_PROC_BRAND_STRING_INTERNAL1 = 0x80000004 }; #ifndef _MSC_VER @@ -62,35 +61,6 @@ static void ___cpuid(cpuid_t info, uint32_t *eax, uint32_t *ebx, uint32_t *ecx, } #endif -static struct { - uint32_t feature; - uint32_t mask; - bool use_edx; /* ecx will be used if false. */ -} features[] = { - { CF_MMX, 1 << 23, true }, - { CF_SSE, 1 << 25, true }, - { CF_SSE2, 1 << 26, true }, - { CF_SSE3, 1 << 9, false }, - { CF_FPU, 1 << 0, true }, - - { CF_TSC, 1 << 4, true }, - { CF_MSR, 1 << 5, true }, - - { CF_SSSE3, 1 << 9, false }, - { CF_AVX, 1 << 28, false }, - - /* Extended ones. */ - { CEF_x64, 1 << 30, true }, - { CEF_FPU, 1 << 0, true }, - { CEF_DE, 1 << 2, true }, - { CEF_SYSCALLRET, 1 << 11, true }, - { CEF_CMOV, 1 << 15, true }, - - { CEF_SSE4a, 1 << 6, false }, - { CEF_FMA4, 1 << 16, false }, - { CEF_XOP, 1 << 11, false } -}; - bool cpuid_is_supported(void) { int ret = 0; @@ -161,8 +131,8 @@ bool cpuid_is_supported(void) pushfd pop eax xor eax, ecx - shr eax, 0x21 - and eax, 0x1 + shr eax, 21 + and eax, 1 push ecx popfd @@ -174,30 +144,54 @@ bool cpuid_is_supported(void) bool cpuid_test_feature(cpuid_t feature) { - if (feature > CPU_VIRT_PHYS_ADDR_SIZES || feature < CPU_EXTENDED_PROC_INFO_FEATURE_BITS) + if (feature > CPUID_VIRT_PHYS_ADDR_SIZES || feature < CPUID_EXTENDED_PROC_INFO_FEATURE_BITS) return false; return (feature <= cpuid_highest_ext_func_supported()); } -bool cpuid_has_feature(int feature, bool extended) +bool cpuid_has_ecxfeature(int feature) { - uint32_t eax, ebx, ecx, edx, i; - - if (!extended) - ___cpuid(CPU_PROCINFO_AND_FEATUREBITS, &eax, &ebx, &ecx, &edx); - else - ___cpuid(CPU_EXTENDED_PROC_INFO_FEATURE_BITS, &eax, &ebx, &ecx, &edx); - - for (i = 0; i < sizeof(features) / sizeof(features[0]); ++i) { - if (features[i].feature == feature) { - if (features[i].use_edx) - return (edx & features[i].mask); - else - return (ecx & features[i].mask); - } + static uint32_t _ecx; + if (_ecx == 0) { +#if defined(__GNUC__) || defined(__clang__) + asm volatile( + "cpuid\n\t" + : "=c" (_ecx) + : "a" (CPUID_PROCINFO_AND_FEATUREBITS) + ); +#elif defined _MSC_VER + __asm { + mov eax, CPUID_PROCINFO_AND_FEATUREBITS + cpuid + mov _ecx, ecx + }; +#endif + } + + return (_ecx & feature) == feature; +} + +bool cpuid_has_edxfeature(int feature) +{ + static uint32_t _edx; + if (_edx == 0) { +#if defined(__GNUC__) || defined(__clang__) + asm volatile( + "cpuid\n\t" + : "=d" (_edx) + : "a" (CPUID_PROCINFO_AND_FEATUREBITS) + ); +#elif defined _MSC_VER + __asm { + mov eax, CPUID_PROCINFO_AND_FEATUREBITS + cpuid + mov _edx, edx + }; +#endif } - return false; + + return (_edx & feature) == feature; } static const char *const cpuids[] = { @@ -229,7 +223,7 @@ cputype_t cpuid_get_cpu_type(void) } u; uint32_t i; - ___cpuid(CPU_VENDORID, &i, &u.bufu32[0], &u.bufu32[2], &u.bufu32[1]); + ___cpuid(CPUID_VENDORID, &i, &u.bufu32[0], &u.bufu32[2], &u.bufu32[1]); for (i = 0; i < sizeof(cpuids) / sizeof(cpuids[0]); ++i) { if (strncmp(cpuids[i], u.buf, 12) == 0) { cputype = (cputype_t)i; @@ -260,11 +254,11 @@ uint32_t cpuid_highest_ext_func_supported(void) asm volatile( "cpuid\n\t" : "=a" (highest) - : "a" (CPU_HIGHEST_EXTENDED_FUNCTION_SUPPORTED) + : "a" (CPUID_HIGHEST_EXTENDED_FUNCTION_SUPPORTED) ); #elif defined _MSC_VER __asm { - mov eax, CPU_HIGHEST_EXTENDED_FUNCTION_SUPPORTED + mov eax, CPUID_HIGHEST_EXTENDED_FUNCTION_SUPPORTED cpuid mov highest, eax }; @@ -279,23 +273,23 @@ void cpuid(cpuid_t info, uint32_t *buf) /* Sanity checks, make sure we're not trying to do something * invalid or we are trying to get information that isn't supported * by the CPU. */ - if (info > CPU_VIRT_PHYS_ADDR_SIZES || (info > CPU_HIGHEST_EXTENDED_FUNCTION_SUPPORTED + if (info > CPUID_VIRT_PHYS_ADDR_SIZES || (info > CPUID_HIGHEST_EXTENDED_FUNCTION_SUPPORTED && !cpuid_test_feature(info))) return; - if (info == CPU_PROC_BRAND_STRING) { + if (info == CPUID_PROC_BRAND_STRING) { static char cached[48] = { 0 }; if (cached[0] == '\0') { - ___cpuid(CPU_PROC_BRAND_STRING, &buf[0], &buf[1], &buf[2], &buf[3]); - ___cpuid(CPU_PROC_BRAND_STRING_INTERNAL0, &buf[4], &buf[5], &buf[6], &buf[7]); - ___cpuid(CPU_PROC_BRAND_STRING_INTERNAL1, &buf[8], &buf[9], &buf[10], &buf[11]); + ___cpuid(CPUID_PROC_BRAND_STRING, &buf[0], &buf[1], &buf[2], &buf[3]); + ___cpuid(CPUID_PROC_BRAND_STRING_INTERNAL0, &buf[4], &buf[5], &buf[6], &buf[7]); + ___cpuid(CPUID_PROC_BRAND_STRING_INTERNAL1, &buf[8], &buf[9], &buf[10], &buf[11]); memcpy(cached, buf, sizeof cached); } else buf = (uint32_t *)cached; return; - } else if (info == CPU_HIGHEST_EXTENDED_FUNCTION_SUPPORTED) { + } else if (info == CPUID_HIGHEST_EXTENDED_FUNCTION_SUPPORTED) { *buf = cpuid_highest_ext_func_supported(); return; } @@ -304,12 +298,12 @@ void cpuid(cpuid_t info, uint32_t *buf) ___cpuid(info, &eax, &ebx, &ecx, &edx); switch (info) { - case CPU_VENDORID: + case CPUID_VENDORID: buf[0] = ebx; buf[1] = edx; buf[2] = ecx; break; - case CPU_PROCINFO_AND_FEATUREBITS: + case CPUID_PROCINFO_AND_FEATUREBITS: buf[0] = (eax & 0x0F); /* Stepping */ buf[1] = (eax >> 4) & 0x0F; /* Model */ buf[2] = (eax >> 8) & 0x0F; /* Family */ @@ -318,33 +312,38 @@ void cpuid(cpuid_t info, uint32_t *buf) buf[5] = edx; /* Feature flags #1. */ buf[6] = ecx; /* Feature flags #2. */ - buf[7] = ebx; /* Additional feature information. */ + + /* Additional Feature information. */ + buf[7] = ebx & 0xFF; + buf[8] = (ebx >> 8) & 0xFF; + buf[9] = (ebx >> 16) & 0xFF; + buf[10] = (ebx >> 24) & 0xFF; break; - case CPU_CACHE_AND_TLBD_INFO: + case CPUID_CACHE_AND_TLBD_INFO: buf[0] = eax; buf[1] = ebx; buf[2] = ecx; buf[3] = edx; break; - case CPU_EXTENDED_PROC_INFO_FEATURE_BITS: + case CPUID_EXTENDED_PROC_INFO_FEATURE_BITS: buf[0] = edx; buf[1] = ecx; break; - case CPU_L1_CACHE_AND_TLB_IDS: + case CPUID_L1_CACHE_AND_TLB_IDS: buf[0] = eax; buf[1] = ebx; buf[2] = ecx; buf[3] = edx; break; - case CPU_EXTENDED_L2_CACHE_FEATURES: + case CPUID_EXTENDED_L2_CACHE_FEATURES: buf[0] = ecx & 0xFF; /* Line size. */ buf[1] = (ecx >> 12) & 0xFF; /* Associativity. */ buf[2] = ecx >> 16; /* Cache size. */ break; - case CPU_ADV_POWER_MGT_INFO: + case CPUID_ADV_POWER_MGT_INFO: *buf = edx; break; - case CPU_VIRT_PHYS_ADDR_SIZES: + case CPUID_VIRT_PHYS_ADDR_SIZES: buf[0] = eax & 0xFF; /* physical. */ buf[1] = (eax >> 8) & 0xFF; /* virtual. */ break;