diff options
| -rw-r--r-- | payloads/libpayload/arch/x86/apic.c | 23 | ||||
| -rw-r--r-- | payloads/libpayload/arch/x86/exception.c | 17 | ||||
| -rw-r--r-- | payloads/libpayload/include/x86/arch/apic.h | 2 |
3 files changed, 27 insertions, 15 deletions
diff --git a/payloads/libpayload/arch/x86/apic.c b/payloads/libpayload/arch/x86/apic.c index 048cc66fb8..3b294cbb94 100644 --- a/payloads/libpayload/arch/x86/apic.c +++ b/payloads/libpayload/arch/x86/apic.c @@ -58,6 +58,8 @@ #define APIC_TIMER_INIT_COUNT 0x380 #define APIC_TIMER_CUR_COUNT 0x390 #define APIC_TIMER_DIV_CFG 0x3E0 +#define APIC_ISR_0 0x100 +#define APIC_ISR_OFFSET 0x010 #define APIC_LVT_SIZE 0x010 @@ -141,11 +143,28 @@ static void timer_interrupt_handler(u8 vector) timer_waiting = 0; } -void apic_eoi(void) +void apic_eoi(uint8_t vector) { die_if(!apic_bar, "APIC is not initialized"); - apic_write32(APIC_EOI, 0); + /* + * Local and I/O APICs support 240 vectors (in the range of 16 to 255) + * as valid interrupts. + */ + if (vector <= 15) + return; + + /* Each bank handles 32 vectors */ + uint8_t bank = vector / 32; + + uint32_t offset = APIC_ISR_0 + bank * APIC_ISR_OFFSET; + + uint32_t mask = apic_read32(offset); + + uint8_t shift = vector % 32; + + if (mask & (1 << shift)) + apic_write32(APIC_EOI, 0); } static enum APIC_CAPABILITY apic_capabilities(void) diff --git a/payloads/libpayload/arch/x86/exception.c b/payloads/libpayload/arch/x86/exception.c index 2691c85329..3cd95bbde2 100644 --- a/payloads/libpayload/arch/x86/exception.c +++ b/payloads/libpayload/arch/x86/exception.c @@ -34,13 +34,6 @@ #include <arch/apic.h> #define IF_FLAG (1 << 9) -/* - * Local and I/O APICs support 240 vectors (in the range of 16 to 255) as valid - * interrupts. The Intel 64 and IA-32 architectures reserve vectors 16 - * through 31 for predefined interrupts, exceptions, and Intel-reserved - * encodings. -*/ -#define FIRST_USER_DEFINED_VECTOR 32 u32 exception_stack[0x400] __attribute__((aligned(8))); @@ -173,15 +166,15 @@ static void dump_exception_state(void) void exception_dispatch(void) { - u32 vec = exception_state->vector; + die_if(exception_state->vector >= ARRAY_SIZE(handlers), + "Invalid vector %u\n", exception_state->vector); - die_if(vec >= ARRAY_SIZE(handlers), "Invalid vector %u\n", vec); + u8 vec = exception_state->vector; if (handlers[vec]) { handlers[vec](vec); - if (IS_ENABLED(CONFIG_LP_ENABLE_APIC) - && vec >= FIRST_USER_DEFINED_VECTOR) - apic_eoi(); + if (IS_ENABLED(CONFIG_LP_ENABLE_APIC)) + apic_eoi(vec); return; } diff --git a/payloads/libpayload/include/x86/arch/apic.h b/payloads/libpayload/include/x86/arch/apic.h index c28fc0f5d1..1eb35089bd 100644 --- a/payloads/libpayload/include/x86/arch/apic.h +++ b/payloads/libpayload/include/x86/arch/apic.h @@ -38,7 +38,7 @@ void apic_init(void); uint8_t apic_id(void); /** Signal the end of the interrupt handler. */ -void apic_eoi(void); +void apic_eoi(uint8_t vector); void apic_delay(unsigned int usec); |