Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Guard against IO-APICs with too many entries. We only support 64 entries because

Browse Source 
we use a 64 bit level triggered mask. In practice these don't exist as far as I
know. If we encounter them at a later stage we need to revisit the mask.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@41529 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Michael Lotz 2011-05-16 13:25:45 +00:00
parent fb5a1727f4
commit 22d72c8ee1
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/system/kernel/arch/x86/ioapic.cpp
View File

@ -84,6 +84,7 @@
#define IO_APIC_INTERRUPT_VECTOR_SHIFT 0 #define IO_APIC_INTERRUPT_VECTOR_SHIFT 0
#define IO_APIC_INTERRUPT_VECTOR_MASK 0xff #define IO_APIC_INTERRUPT_VECTOR_MASK 0xff
#define MAX_SUPPORTED_REDIRECTION_ENTRIES 64
#define ISA_INTERRUPT_COUNT 16 #define ISA_INTERRUPT_COUNT 16
@ -306,7 +307,7 @@ ioapic_map_ioapic(struct ioapic& ioapic, phys_addr_t physicalAddress)
return ioapic.register_area; return ioapic.register_area;
} }
dprintf("mapped io-apic %u to %p\n", ioapic.number, ioapic.registers); TRACE(("mapped io-apic %u to %p\n", ioapic.number, ioapic.registers));
ioapic.version = ioapic_read_32(ioapic, IO_APIC_VERSION); ioapic.version = ioapic_read_32(ioapic, IO_APIC_VERSION);
if (ioapic.version == 0xffffffff) { if (ioapic.version == 0xffffffff) {
@ -321,6 +322,12 @@ ioapic_map_ioapic(struct ioapic& ioapic, phys_addr_t physicalAddress)
ioapic.max_redirection_entry ioapic.max_redirection_entry
= ((ioapic.version >> IO_APIC_MAX_REDIRECTION_ENTRY_SHIFT) = ((ioapic.version >> IO_APIC_MAX_REDIRECTION_ENTRY_SHIFT)
& IO_APIC_MAX_REDIRECTION_ENTRY_MASK); & IO_APIC_MAX_REDIRECTION_ENTRY_MASK);
if (ioapic.max_redirection_entry >= MAX_SUPPORTED_REDIRECTION_ENTRIES) {
dprintf("io-apic %u entry count exceeds max supported, only using the "
"first %u entries", ioapic.number,
(uint8)MAX_SUPPORTED_REDIRECTION_ENTRIES);
ioapic.max_redirection_entry = MAX_SUPPORTED_REDIRECTION_ENTRIES - 1;
}
ioapic.global_interrupt_last ioapic.global_interrupt_last
= ioapic.global_interrupt_base + ioapic.max_redirection_entry; = ioapic.global_interrupt_base + ioapic.max_redirection_entry;