ehmry/genode
ehmry/genode
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

hw_x86_64: Explicitly set all FPU-related CR flags

Browse Source 
Perform all FPU-related setup in the Cpu class' init_fpu function instead of
the general system bring-up assembly code.

Set all required control register 0 and 4 flags according to Intel SDM Vol. 3A,
sections 9.2 and 9.6 instead of only enabling FPU error reporting and OSFXSR.
This commit is contained in:
Adrian-Ken Rueegsegger 2015-04-21 23:09:01 +02:00 committed by Christian Helmuth
parent 5eb75e9e81
commit a0ec317753
2 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
repos/base-hw/src/core/include/spec/x86/cpu_support.h
View File

@ -256,10 +256,25 @@ class Genode::Cpu
static void _enable_fpu() { asm volatile ("clts"); } static void _enable_fpu() { asm volatile ("clts"); }
/** /**
* Initialize FPU without checking for pending unmasked floating-point * Initialize FPU with SSE extensions by setting required CR0 and CR4
* exceptions. * bits to configure the FPU environment according to Intel SDM Vol.
* 3A, sections 9.2 and 9.6.
*/ */
static void _init_fpu() { asm volatile ("fninit"); } static void _init_fpu()
{
Cr0::access_t cr0_value = Cr0::read();
Cr4::access_t cr4_value = Cr4::read();
Cr0::Mp::set(cr0_value);
Cr0::Em::clear(cr0_value);
Cr0::Ts::set(cr0_value);
Cr0::Ne::set(cr0_value);
Cr0::write(cr0_value);
Cr4::Osfxsr::set(cr4_value);
Cr4::Osxmmexcpt::set(cr4_value);
Cr4::write(cr4_value);
}
/** /**
* Returns True if the FPU is enabled. * Returns True if the FPU is enabled.

6
repos/base-hw/src/core/spec/x86_64/kernel/crt0.s
View File

@ -41,10 +41,9 @@
xor %eax, %eax xor %eax, %eax
rep stosl rep stosl
/* Enable PAE (prerequisite for IA-32e mode) and OSFXSR */ /* Enable PAE (prerequisite for IA-32e mode) */
movl %cr4, %eax movl %cr4, %eax
btsl $5, %eax btsl $5, %eax
btsl $9, %eax
movl %eax, %cr4 movl %eax, %cr4
/* Load initial pagetables */ /* Load initial pagetables */
@ -58,9 +57,8 @@
btsl $11, %eax btsl $11, %eax
wrmsr wrmsr
/* Enable paging, write protection, caching and FPU error reporting */ /* Enable paging, write protection and caching */
movl %cr0, %eax movl %cr0, %eax
btsl $5, %eax
btsl $16, %eax btsl $16, %eax
btrl $29, %eax btrl $29, %eax
btrl $30, %eax btrl $30, %eax