diff options
Diffstat (limited to 'src/cpu/x86')
| -rw-r--r-- | src/cpu/x86/sipi_vector.S | 7 | ||||
| -rw-r--r-- | src/cpu/x86/smm/smm_module_loader.c | 35 | ||||
| -rw-r--r-- | src/cpu/x86/smm/smm_stub.S | 43 |
3 files changed, 81 insertions, 4 deletions
diff --git a/src/cpu/x86/sipi_vector.S b/src/cpu/x86/sipi_vector.S index 1c5120763e..e65491507e 100644 --- a/src/cpu/x86/sipi_vector.S +++ b/src/cpu/x86/sipi_vector.S @@ -185,6 +185,13 @@ load_msr: and $~(CR0_CLEAR_FLAGS_CACHE_ENABLE), %eax mov %eax, %cr0 +#if IS_ENABLED(CONFIG_SSE) + /* Enable sse instructions. */ + mov %cr4, %eax + orl $(CR4_OSFXSR | CR4_OSXMMEXCPT), %eax + mov %eax, %cr4 +#endif + /* c_handler(cpu_num) */ push %esi /* cpu_num */ mov c_handler, %eax diff --git a/src/cpu/x86/smm/smm_module_loader.c b/src/cpu/x86/smm/smm_module_loader.c index a396b7df8f..b7de178bd9 100644 --- a/src/cpu/x86/smm/smm_module_loader.c +++ b/src/cpu/x86/smm/smm_module_loader.c @@ -19,6 +19,14 @@ #include <cpu/x86/cache.h> #include <console/console.h> +#define FXSAVE_SIZE 512 + +/* FXSAVE area during relocation. While it may not be strictly needed the + SMM stub code relies on the FXSAVE area being non-zero to enable SSE + instructions within SMM mode. */ +static uint8_t fxsave_area_relocation[CONFIG_MAX_CPUS][FXSAVE_SIZE] +__attribute__((aligned(16))); + /* * Components that make up the SMRAM: * 1. Save state - the total save state memory used @@ -36,6 +44,8 @@ struct smm_stub_params { u32 stack_top; u32 c_handler; u32 c_handler_arg; + u32 fxsave_area; + u32 fxsave_area_size; struct smm_runtime runtime; } __attribute__ ((packed)); @@ -164,7 +174,8 @@ static void smm_stub_place_staggered_entry_points(char *base, * concurrent areas requested. The save state always lives at the top of SMRAM * space, and the entry point is at offset 0x8000. */ -static int smm_module_setup_stub(void *smbase, struct smm_loader_params *params) +static int smm_module_setup_stub(void *smbase, struct smm_loader_params *params, + void *fxsave_area) { size_t total_save_state_size; size_t smm_stub_size; @@ -253,6 +264,8 @@ static int smm_module_setup_stub(void *smbase, struct smm_loader_params *params) stub_params->stack_size = params->per_cpu_stack_size; stub_params->c_handler = (uintptr_t)params->handler; stub_params->c_handler_arg = (uintptr_t)params->handler_arg; + stub_params->fxsave_area = (uintptr_t)fxsave_area; + stub_params->fxsave_area_size = FXSAVE_SIZE; stub_params->runtime.smbase = (uintptr_t)smbase; stub_params->runtime.save_state_size = params->per_cpu_save_state_size; @@ -293,7 +306,7 @@ int smm_setup_relocation_handler(struct smm_loader_params *params) if (params->num_concurrent_stacks == 0) params->num_concurrent_stacks = CONFIG_MAX_CPUS; - return smm_module_setup_stub(smram, params); + return smm_module_setup_stub(smram, params, fxsave_area_relocation); } /* The SMM module is placed within the provided region in the following @@ -320,6 +333,9 @@ int smm_load_module(void *smram, size_t size, struct smm_loader_params *params) size_t handler_size; size_t module_alignment; size_t alignment_size; + size_t fxsave_size; + void *fxsave_area; + size_t total_size; char *base; if (size <= SMM_DEFAULT_SIZE) @@ -350,8 +366,19 @@ int smm_load_module(void *smram, size_t size, struct smm_loader_params *params) base += alignment_size; } + fxsave_size = 0; + fxsave_area = NULL; + if (IS_ENABLED(CONFIG_SSE)) { + fxsave_size = FXSAVE_SIZE * params->num_concurrent_stacks; + /* FXSAVE area below all the stacks stack. */ + fxsave_area = params->stack_top; + fxsave_area -= total_stack_size + fxsave_size; + } + /* Does the required amount of memory exceed the SMRAM region size? */ - if ((total_stack_size + handler_size + SMM_DEFAULT_SIZE) > size) + total_size = total_stack_size + handler_size; + total_size += fxsave_size + SMM_DEFAULT_SIZE; + if (total_size > size) return -1; if (rmodule_load(base, &smm_mod)) @@ -360,5 +387,5 @@ int smm_load_module(void *smram, size_t size, struct smm_loader_params *params) params->handler = rmodule_entry(&smm_mod); params->handler_arg = rmodule_parameters(&smm_mod); - return smm_module_setup_stub(smram, params); + return smm_module_setup_stub(smram, params, fxsave_area); } diff --git a/src/cpu/x86/smm/smm_stub.S b/src/cpu/x86/smm/smm_stub.S index e1f6e5f9f2..824a26b858 100644 --- a/src/cpu/x86/smm/smm_stub.S +++ b/src/cpu/x86/smm/smm_stub.S @@ -36,6 +36,10 @@ c_handler: .long 0 c_handler_arg: .long 0 +fxsave_area: +.long 0 +fxsave_area_size: +.long 0 /* struct smm_runtime begins here. */ smm_runtime: smbase: @@ -122,6 +126,8 @@ smm_trampoline32: * not be assigned. Use the fallback stack and check this condition in * C handler. */ movl $(fallback_stack_top), %esp + /* Clear fxsave location as there will be no saving/restoring. */ + xor %edi, %edi jmp 2f 1: movl stack_size, %eax @@ -130,7 +136,33 @@ smm_trampoline32: subl %eax, %edx mov %edx, %esp + /* calculate fxsave location */ + mov fxsave_area, %edi + test %edi, %edi + jz 2f + movl fxsave_area_size, %eax + mul %ecx + add %eax, %edi + 2: + /* Save location of fxsave area. */ + push %edi + mov %esp, %ebp + test %edi, %edi + jz 1f + + /* Enable sse instructions. */ + mov %cr4, %eax + orl $(CR4_OSFXSR | CR4_OSXMMEXCPT), %eax + mov %eax, %cr4 + + /* Save FP state. */ + fxsave (%edi) + +1: + /* Align stack to 16 bytes. Another 16 bytes are pushed below. */ + andl $0xfffffff0, %esp + /* Call into the c-based SMM relocation function with the platform * parameters. Equivalent to: * struct arg = { c_handler_params, cpu_num, smm_runtime {; @@ -143,5 +175,16 @@ smm_trampoline32: mov c_handler, %eax call *%eax + /* Restore stack from call frame */ + mov %ebp, %esp + /* Retrieve fxsave location. */ + pop %edi + test %edi, %edi + jz 1f + + /* Restore FP state. */ + fxrstor (%edi) + +1: /* Exit from SM mode. */ rsm |