diff options
| author | Michael Brown <mcb30@ipxe.org> | 2017-01-25 20:57:18 +0000 |
|---|---|---|
| committer | Michael Brown <mcb30@ipxe.org> | 2017-01-25 20:57:18 +0000 |
| commit | d37e025b81cb6fd0e7833b927ed138b42a628bc8 (patch) | |
| tree | 33a97b8235f1acc3ab197f43bb4d4e1f0e4c0324 /src/arch/x86/include | |
| parent | 70fc25ad6e71a99b5802eb92b95c26407acbe990 (diff) | |
| download | ipxe-d37e025b81cb6fd0e7833b927ed138b42a628bc8.tar.gz | |
[cpuid] Provide cpuid_supported() to test for supported functions
Signed-off-by: Michael Brown <mcb30@ipxe.org>
Diffstat (limited to 'src/arch/x86/include')
| -rw-r--r-- | src/arch/x86/include/bits/errfile.h | 1 | ||||
| -rw-r--r-- | src/arch/x86/include/ipxe/cpuid.h | 8 |
2 files changed, 5 insertions, 4 deletions
diff --git a/src/arch/x86/include/bits/errfile.h b/src/arch/x86/include/bits/errfile.h index f4816e62a..105cdf5d2 100644 --- a/src/arch/x86/include/bits/errfile.h +++ b/src/arch/x86/include/bits/errfile.h @@ -25,6 +25,7 @@ FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL ); #define ERRFILE_gdbmach ( ERRFILE_ARCH | ERRFILE_CORE | 0x000e0000 ) #define ERRFILE_rtc_entropy ( ERRFILE_ARCH | ERRFILE_CORE | 0x000f0000 ) #define ERRFILE_acpipwr ( ERRFILE_ARCH | ERRFILE_CORE | 0x00100000 ) +#define ERRFILE_cpuid ( ERRFILE_ARCH | ERRFILE_CORE | 0x00110000 ) #define ERRFILE_bootsector ( ERRFILE_ARCH | ERRFILE_IMAGE | 0x00000000 ) #define ERRFILE_bzimage ( ERRFILE_ARCH | ERRFILE_IMAGE | 0x00010000 ) diff --git a/src/arch/x86/include/ipxe/cpuid.h b/src/arch/x86/include/ipxe/cpuid.h index da85d0b88..2e2cc7c1a 100644 --- a/src/arch/x86/include/ipxe/cpuid.h +++ b/src/arch/x86/include/ipxe/cpuid.h @@ -60,22 +60,22 @@ struct x86_features { /** * Issue CPUID instruction * - * @v operation CPUID operation + * @v function CPUID function * @v eax Output via %eax * @v ebx Output via %ebx * @v ecx Output via %ecx * @v edx Output via %edx */ static inline __attribute__ (( always_inline )) void -cpuid ( uint32_t operation, uint32_t *eax, uint32_t *ebx, uint32_t *ecx, +cpuid ( uint32_t function, uint32_t *eax, uint32_t *ebx, uint32_t *ecx, uint32_t *edx ) { __asm__ ( "cpuid" : "=a" ( *eax ), "=b" ( *ebx ), "=c" ( *ecx ), "=d" ( *edx ) - : "0" ( operation ) ); + : "0" ( function ) ); } -extern int cpuid_is_supported ( void ); +extern int cpuid_supported ( uint32_t function ); extern void x86_features ( struct x86_features *features ); #endif /* _IPXE_CPUID_H */ |