diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/arch/x86/include/arch/null_breakpoint.h | 7 | ||||
| -rw-r--r-- | src/arch/x86/null_breakpoint.c | 11 | ||||
| -rw-r--r-- | src/drivers/intel/fsp2_0/memory_init.c | 14 | ||||
| -rw-r--r-- | src/drivers/intel/fsp2_0/notify.c | 4 | ||||
| -rw-r--r-- | src/drivers/intel/fsp2_0/silicon_init.c | 4 |
5 files changed, 31 insertions, 9 deletions
diff --git a/src/arch/x86/include/arch/null_breakpoint.h b/src/arch/x86/include/arch/null_breakpoint.h index bc86dc03e4..9d69d3c0e4 100644 --- a/src/arch/x86/include/arch/null_breakpoint.h +++ b/src/arch/x86/include/arch/null_breakpoint.h @@ -7,10 +7,15 @@ /* Places data and instructions breakpoints at address zero. */ void null_breakpoint_init(void); +void null_breakpoint_disable(void); #else static inline void null_breakpoint_init(void) { - /* Not implemented */ + /* Not implemented */ +} +static inline void null_breakpoint_disable(void) +{ + /* Not implemented */ } #endif #endif /* _NULL_BREAKPOINT_H_ */ diff --git a/src/arch/x86/null_breakpoint.c b/src/arch/x86/null_breakpoint.c index 4da6d87ab1..70b94b6909 100644 --- a/src/arch/x86/null_breakpoint.c +++ b/src/arch/x86/null_breakpoint.c @@ -57,11 +57,16 @@ void null_breakpoint_init(void) create_instruction_breakpoint(); } -static void null_breakpoint_disable(void *unused) +void null_breakpoint_disable(void) { breakpoint_remove(null_fetch_bp); breakpoint_remove(null_deref_bp); } -BOOT_STATE_INIT_ENTRY(BS_OS_RESUME, BS_ON_ENTRY, null_breakpoint_disable, NULL); -BOOT_STATE_INIT_ENTRY(BS_PAYLOAD_BOOT, BS_ON_ENTRY, null_breakpoint_disable, NULL); +static void null_breakpoint_disable_hook(void *unused) +{ + null_breakpoint_disable(); +} + +BOOT_STATE_INIT_ENTRY(BS_OS_RESUME, BS_ON_ENTRY, null_breakpoint_disable_hook, NULL); +BOOT_STATE_INIT_ENTRY(BS_PAYLOAD_BOOT, BS_ON_ENTRY, null_breakpoint_disable_hook, NULL); diff --git a/src/drivers/intel/fsp2_0/memory_init.c b/src/drivers/intel/fsp2_0/memory_init.c index 4f954627e7..d6778b0846 100644 --- a/src/drivers/intel/fsp2_0/memory_init.c +++ b/src/drivers/intel/fsp2_0/memory_init.c @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0-or-later */ -#include <security/vboot/antirollback.h> +#include <arch/null_breakpoint.h> #include <arch/symbols.h> #include <assert.h> #include <cbfs.h> @@ -11,17 +11,18 @@ #include <fsp/api.h> #include <fsp/util.h> #include <memrange.h> +#include <mode_switch.h> #include <mrc_cache.h> #include <program_loading.h> #include <romstage_handoff.h> +#include <security/tpm/tspi.h> +#include <security/vboot/antirollback.h> +#include <security/vboot/vboot_common.h> #include <string.h> #include <symbols.h> #include <timestamp.h> -#include <security/vboot/vboot_common.h> -#include <security/tpm/tspi.h> -#include <vb2_api.h> #include <types.h> -#include <mode_switch.h> +#include <vb2_api.h> static uint8_t temp_ram[CONFIG_FSP_TEMP_RAM_SIZE] __aligned(sizeof(uint64_t)); @@ -293,6 +294,8 @@ static void do_fsp_memory_init(const struct fspm_context *context, bool s3wake) fsp_raminit = (void *)(uintptr_t)(hdr->image_base + hdr->fsp_memory_init_entry_offset); fsp_debug_before_memory_init(fsp_raminit, upd, &fspm_upd); + /* FSP disables the interrupt handler so remove debug exceptions temporarily */ + null_breakpoint_disable(); post_code(POST_FSP_MEMORY_INIT); timestamp_add_now(TS_FSP_MEMORY_INIT_START); if (ENV_X86_64 && CONFIG(PLATFORM_USES_FSP2_X86_32)) @@ -301,6 +304,7 @@ static void do_fsp_memory_init(const struct fspm_context *context, bool s3wake) (uintptr_t)fsp_get_hob_list_ptr()); else status = fsp_raminit(&fspm_upd, fsp_get_hob_list_ptr()); + null_breakpoint_init(); post_code(POST_FSP_MEMORY_EXIT); timestamp_add_now(TS_FSP_MEMORY_INIT_END); diff --git a/src/drivers/intel/fsp2_0/notify.c b/src/drivers/intel/fsp2_0/notify.c index 5cd63d8ec0..44e8795d91 100644 --- a/src/drivers/intel/fsp2_0/notify.c +++ b/src/drivers/intel/fsp2_0/notify.c @@ -1,5 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0-or-later */ +#include <arch/null_breakpoint.h> #include <bootstate.h> #include <console/console.h> #include <cpu/x86/mtrr.h> @@ -75,10 +76,13 @@ static void fsp_notify(enum fsp_notify_phase phase) timestamp_add_now(data->timestamp_before); post_code(data->post_code_before); + /* FSP disables the interrupt handler so remove debug exceptions temporarily */ + null_breakpoint_disable(); if (ENV_X86_64 && CONFIG(PLATFORM_USES_FSP2_X86_32)) ret = protected_mode_call_1arg(fspnotify, (uintptr_t)¬ify_params); else ret = fspnotify(¬ify_params); + null_breakpoint_init(); timestamp_add_now(data->timestamp_after); post_code(data->post_code_after); diff --git a/src/drivers/intel/fsp2_0/silicon_init.c b/src/drivers/intel/fsp2_0/silicon_init.c index 263ea3b46d..ae5d620737 100644 --- a/src/drivers/intel/fsp2_0/silicon_init.c +++ b/src/drivers/intel/fsp2_0/silicon_init.c @@ -1,5 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0-or-later */ +#include <arch/null_breakpoint.h> #include <bootsplash.h> #include <cbfs.h> #include <cbmem.h> @@ -133,10 +134,13 @@ static void do_silicon_init(struct fsp_header *hdr) timestamp_add_now(TS_FSP_SILICON_INIT_START); post_code(POST_FSP_SILICON_INIT); + /* FSP disables the interrupt handler so remove debug exceptions temporarily */ + null_breakpoint_disable(); if (ENV_X86_64 && CONFIG(PLATFORM_USES_FSP2_X86_32)) status = protected_mode_call_1arg(silicon_init, (uintptr_t)upd); else status = silicon_init(upd); + null_breakpoint_init(); printk(BIOS_INFO, "FSPS returned %x\n", status); |