Mirrors/libhermit
1
0
Fork 0
mirror of https://github.com/hermitcore/libhermit.git synced 2025-03-09 00:00:03 +01:00
Code Issues Releases Wiki Activity

determin more cpu features

Browse source
This commit is contained in:
Stefan Lankes 2015-07-08 22:54:44 +02:00
parent 11ae987bae
commit 37f45b70d5
2 changed files with 28 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
hermit/arch/x86/include/asm/processor.h
View file

@ -25,7 +25,7 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
/**
/**
* @author Stefan Lankes
* @file arch/x86/include/asm/processor.h
* @brief CPU-specific functions
@ -52,6 +52,7 @@ extern "C" {
#define CPU_FEATURE_PAE (1 << 6)
#define CPU_FEATURE_APIC (1 << 9)
#define CPU_FEATURE_SEP (1 << 11)
#define CPU_FEATURE_FMA (1 << 12)
#define CPU_FEATURE_PGE (1 << 13)
#define CPU_FEATURE_PAT (1 << 16)
#define CPU_FEATURE_PSE36 (1 << 17)
@ -71,6 +72,9 @@ extern "C" {
#define CPU_FEATURE_1GBHP (1 << 26)
#define CPU_FEATURE_LM (1 << 29)
// feature list 4
#define CPU_FEATURE_AVX2 (1 << 5)
// x86 control registers
/// Protected Mode Enable
@ -165,7 +169,8 @@ extern "C" {
#define EFER_TCE (1 << 15)
typedef struct {
uint32_t feature1, feature2, feature3;
uint32_t feature1, feature2;
uint32_t feature3, feature4;
uint32_t addr_width;
} cpu_info_t;
@ -207,6 +212,10 @@ inline static uint32_t has_sep(void) {
return (cpu_info.feature1 & CPU_FEATURE_SEP);
}
inline static uint32_t has_fma(void) {
return (cpu_info.feature1 & CPU_FEATURE_FMA);
}
inline static uint32_t has_x2apic(void) {
return (cpu_info.feature2 & CPU_FEATURE_X2APIC);
}
@ -224,6 +233,9 @@ inline static uint32_t has_nx(void)
return (cpu_info.feature3 & CPU_FEATURE_NX);
}
inline static uint32_t has_avx2(void) {
return (cpu_info.feature4 & CPU_FEATURE_AVX2);
}
/** @brief Read out time stamp counter
*
* The rdtsc asm command puts a 64 bit time stamp value
@ -431,7 +443,7 @@ static inline uint32_t read_eflags(void)
/** @brief search the first most significant bit
*
* @param i source operand
* @return
* @return
* - first bit, which is set in the source operand
* - invalid value, if not bit ist set
*/
@ -449,7 +461,7 @@ static inline size_t msb(size_t i)
/** @brief search the least significant bit
*
* @param i source operand
* @return
* @return
* - first bit, which is set in the source operand
* - invalid value, if not bit ist set
*/
@ -468,7 +480,7 @@ static inline size_t lsb(size_t i)
#define NOP asm volatile ("nop")
/// The PAUSE instruction provides a hint to the processor that the code sequence is a spin-wait loop.
#define PAUSE asm volatile ("pause")
/// The HALT instruction stops the processor until the next interrupt arrives
/// The HALT instruction stops the processor until the next interrupt arrives
#define HALT asm volatile ("hlt")
/** @brief Init several subsystems

13
hermit/arch/x86/kernel/processor.c
View file

@ -34,7 +34,7 @@
extern void isrsyscall(void);
cpu_info_t cpu_info = { 0, 0, 0, 0};
cpu_info_t cpu_info = { 0, 0, 0, 0, 0};
extern uint32_t cpu_freq;
static void default_mb(void)
@ -140,6 +140,9 @@ int cpu_detection(void) {
cpuid(0x80000001, &a, &b, &c, &cpu_info.feature3);
cpuid(0x80000008, &cpu_info.addr_width, &b, &c, &d);
a = c = d = 0;
cpuid(7, &a, &cpu_info.feature4, &c, &d);
}
if (first_time) {
@ -189,6 +192,12 @@ int cpu_detection(void) {
if (first_time && has_avx())
kprintf("The CPU owns the Advanced Vector Extensions (AVX). However, HermitCore doesn't support AVX!\n");
if (first_time && has_avx2())
kprintf("The CPU owns the Advanced Vector Extensions (AVX2). However, HermitCore doesn't support AVX2!\n");
if (first_time && has_fma())
kprintf("The CPU supports Fused Multiply-Add!\n");
if (has_fpu()) {
if (first_time)
kputs("Found and initialized FPU!\n");
@ -221,7 +230,7 @@ int cpu_detection(void) {
}
uint32_t get_cpu_frequency(void)
{
{
if (cpu_freq > 0)
return cpu_freq;