X-Git-Url: https://git.ozlabs.org/?a=blobdiff_plain;f=ccan%2Fcpuid%2Fcpuid.h;h=86f200d635e42c097eeb91ea7d90bc4ad06b93e8;hb=2ecac63d9f74577011a2fd859fab76b4851747f3;hp=a3e127e628c4ae7876acd8213b2ebd29630f9ec1;hpb=dbbefec6973725d9a16c82747e0c7ce8e5e6c4f2;p=ccan diff --git a/ccan/cpuid/cpuid.h b/ccan/cpuid/cpuid.h index a3e127e6..86f200d6 100644 --- a/ccan/cpuid/cpuid.h +++ b/ccan/cpuid/cpuid.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Ahmed Samy + * Copyright (c) 2013, 2015 Ahmed Samy * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -158,6 +158,60 @@ enum { | CPUID_FEAT_EDX_TM1 | CPUID_FEAT_EDX_IA64 | CPUID_FEAT_EDX_PBE }; +enum { + CPUID_EXTFEAT_ECX_LAHF_LM = 1 << 0, + CPUID_EXTFEAT_ECX_CMP_LEGACY = 1 << 1, + CPUID_EXTFEAT_ECX_SVM = 1 << 2, + CPUID_EXTFEAT_ECX_EXTAPIC = 1 << 3, + CPUID_EXTFEAT_ECX_CR8_LEGACY = 1 << 4, + CPUID_EXTFEAT_ECX_ABM = 1 << 5, + CPUID_EXTFEAT_ECX_SSE4A = 1 << 6, + CPUID_EXTFEAT_ECX_MISALIGNSSE = 1 << 7, + CPUID_EXTFEAT_ECX_3DNOWPREFETCH = 1 << 8, + CPUID_EXTFEAT_ECX_OSVW = 1 << 9, + CPUID_EXTFEAT_ECX_IBS = 1 << 10, + CPUID_EXTFEAT_ECX_XOP = 1 << 11, + CPUID_EXTFEAT_ECX_SKINIT = 1 << 12, + CPUID_EXTFEAT_ECX_WDT = 1 << 13, + CPUID_EXTFEAT_ECX_LWP = 1 << 15, + CPUID_EXTFEAT_ECX_FMA4 = 1 << 16, + CPUID_EXTFEAT_ECX_TCE = 1 << 17, + CPUID_EXTFEAT_ECX_NODEIDE_MSR = 1 << 19, + CPUID_EXTFEAT_ECX_TBM = 1 << 21, + CPUID_EXTFEAT_ECX_TOPOEXT = 1 << 22, + CPUID_EXTFEAT_ECX_PERFXTR_CORE = 1 << 23, + CPUID_EXTFEAT_ECX_PERFCTR_NB = 1 << 24, + + CPUID_EXTFEAT_EDX_FPU = 1 << 0, + CPUID_EXTFEAT_EDX_VME = 1 << 1, + CPUID_EXTFEAT_EDX_DE = 1 << 2, + CPUID_EXTFEAT_EDX_PSE = 1 << 3, + CPUID_EXTFEAT_EDX_TSC = 1 << 4, + CPUID_EXTFEAT_EDX_MSR = 1 << 5, + CPUID_EXTFEAT_EDX_PAE = 1 << 6, + CPUID_EXTFEAT_EDX_MCE = 1 << 7, + CPUID_EXTFEAT_EDX_CX8 = 1 << 8, + CPUID_EXTFEAT_EDX_APIC = 1 << 9, + CPUID_EXTFEAT_EDX_SYSCALL = 1 << 11, + CPUID_EXTFEAT_EDX_MTRR = 1 << 12, + CPUID_EXTFEAT_EDX_PGE = 1 << 13, + CPUID_EXTFEAT_EDX_MCA = 1 << 14, + CPUID_EXTFEAT_EDX_CMOV = 1 << 15, + CPUID_EXTFEAT_EDX_PAT = 1 << 16, + CPUID_EXTFEAT_EDX_PSE36 = 1 << 17, + CPUID_EXTFEAT_EDX_MP = 1 << 19, + CPUID_EXTFEAT_EDX_NX = 1 << 20, + CPUID_EXTFEAT_EDX_MMXEXT = 1 << 22, + CPUID_EXTFEAT_EDX_MMX = 1 << 23, + CPUID_EXTFEAT_EDX_FXSR = 1 << 24, + CPUID_EXTFEAT_EDX_FXSR_OPT = 1 << 25, + CPUID_EXTFEAT_EDX_PDPE1GB = 1 << 26, + CPUID_EXTFEAT_EDX_RDTSCP = 1 << 27, + CPUID_EXTFEAT_EDX_LM = 1 << 29, + CPUID_EXTFEAT_EDX_3DNOWEXT = 1 << 30, + CPUID_EXTFEAT_EDX_3DNOW = 1 << 31 +}; + typedef enum cputype { CT_NONE, CT_AMDK5, @@ -176,6 +230,25 @@ typedef enum cputype { CT_KVM } cputype_t; +static char const *const c_cpunames[] = { + "Nooooooooone", + "AMDisbetter!", + "AuthenticAMD", + "CentaurHauls", + "CyrixInstead", + "GenuineIntel", + "TransmetaCPU", + "GeniuneTMx86", + "Geode by NSC", + "NexGenDriven", + "RiseRiseRise", + "SiS SiS SiS ", + "UMC UMC UMC ", + "VIA VIA VIA ", + "Vortex86 SoC", + "KVMKVMKVMKVM" +}; + #if defined(__i386__) || defined(__i386) || defined(__x86_64) \ || defined(_M_AMD64) || defined(__M_X64) @@ -186,17 +259,22 @@ 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_sprintf_cputype - Get CPU Type string - * @cputype: a char of atleast 12 bytes in it. - * - * Returns true on success, false on failure - */ -bool cpuid_sprintf_cputype(const cputype_t cputype, char *buf); +static inline bool is_intel_cpu(void) +{ + return cpuid_get_cpu_type() == CT_INTEL; +} + +static inline bool is_amd_cpu(void) +{ + return cpuid_get_cpu_type() == CT_AMDK5 || cpuid_get_cpu_type() == CT_AMD; +} + +static inline const char *cpuid_get_name(void) +{ + return c_cpunames[(int)cpuid_get_cpu_type()]; +} /** * cpuid_is_supported - test if the CPUID instruction is supported @@ -287,7 +365,7 @@ uint32_t cpuid_highest_ext_func_supported(void); * * If an invalid flag has been passed a 0xbaadf00d is returned in *buf. */ -void cpuid(cpuid_t info, uint32_t *buf); +void cpuid(cpuid_t request, uint32_t *buf); /** * cpuid_write_info - Write specified CPU information to a file. @@ -322,14 +400,32 @@ bool cpuid_test_feature(cpuid_t feature); * cpuid_has_feature - Test if @feature is supported * * Test if the CPU supports MMX/SSE* etc. - * Use cpuid_has_ecxfeature() for *_ECX* features and - * cpuid_has_edxfeature() for *_EDX* features. + * This is split into two parts: + * cpuid_has_ecxfeature and + * cpuid_has_edxfeature. + * See the enum for more information. + * * * Returns true if the feature is available, false otherwise. */ bool cpuid_has_ecxfeature(int feature); bool cpuid_has_edxfeature(int feature); +/** + * cpuid_has_extfeature - Test if @extfeature is supported + * @extfeature: the extended feature to test. + * + * This is split into two parts: + * cpuid_has_ecxfeature_ext and + * cpuid_has_edxfeature_ext. + * See the enum for more information. + * + * Test if the CPU supports this feature. + * Returns true on success, false otherwise. + */ +bool cpuid_has_ecxfeature_ext(int extfeature); +bool cpuid_has_edxfeature_ext(int extfeature); + #else #include