sravan/system76-coreboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ioapic: Factor out counting code to ioapic_interrupt_count

Browse Source 
No need to keep duplicate variants of counting ioapic interrupts.

Change-Id: I512860297309c46e05cc5379bf61479878817b1e
Signed-off-by: Patrick Georgi <patrick@georgi-clan.de>
Reviewed-on: http://review.coreboot.org/2185
Tested-by: build bot (Jenkins)
Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
This commit is contained in:
Patrick Georgi
2013-01-23 13:45:23 +01:00
parent dfff8a1631
commit d1de45e095
1 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/arch/x86/lib/ioapic.c
View File

@ -34,6 +34,20 @@ static void io_apic_write(u32 ioapic_base, u32 reg, u32 value)
write32(ioapic_base + 0x10, value); write32(ioapic_base + 0x10, value);
} }
static int ioapic_interrupt_count(int ioapic_base)
{
/* Read the available number of interrupts. */
int ioapic_interrupts = (io_apic_read(ioapic_base, 0x01) >> 16) & 0xff;
if (ioapic_interrupts == 0xff)
ioapic_interrupts = 23;
ioapic_interrupts += 1; /* Bits 23-16 specify the maximum redirection
entry, which is the number of interrupts
minus 1. */
printk(BIOS_DEBUG, "IOAPIC: %d interrupts\n", ioapic_interrupts);
return ioapic_interrupts;
}
void clear_ioapic(u32 ioapic_base) void clear_ioapic(u32 ioapic_base)
{ {
u32 low, high; u32 low, high;
@ -41,14 +55,7 @@ void clear_ioapic(u32 ioapic_base)
printk(BIOS_DEBUG, "IOAPIC: Clearing IOAPIC at 0x%08x\n", ioapic_base); printk(BIOS_DEBUG, "IOAPIC: Clearing IOAPIC at 0x%08x\n", ioapic_base);
/* Read the available number of interrupts. */ ioapic_interrupts = ioapic_interrupt_count(ioapic_base);
ioapic_interrupts = (io_apic_read(ioapic_base, 0x01) >> 16) & 0xff;
if (ioapic_interrupts == 0xff)
ioapic_interrupts = 23;
ioapic_interrupts += 1; /* Bits 23-16 specify the maximum redirection
entry, which is the number of interrupts
minus 1. */
printk(BIOS_DEBUG, "IOAPIC: %d interrupts\n", ioapic_interrupts);
low = DISABLED; low = DISABLED;
high = NONE; high = NONE;
@ -86,14 +93,7 @@ void setup_ioapic(u32 ioapic_base, u8 ioapic_id)
(ioapic_id << 24)); (ioapic_id << 24));
} }
/* Read the available number of interrupts. */ ioapic_interrupts = ioapic_interrupt_count(ioapic_base);
ioapic_interrupts = (io_apic_read(ioapic_base, 0x01) >> 16) & 0xff;
if (ioapic_interrupts == 0xff)
ioapic_interrupts = 23;
ioapic_interrupts += 1; /* Bits 23-16 specify the maximum redirection
entry, which is the number of interrupts
minus 1. */
printk(BIOS_DEBUG, "IOAPIC: %d interrupts\n", ioapic_interrupts);
#if CONFIG_IOAPIC_INTERRUPTS_ON_FSB #if CONFIG_IOAPIC_INTERRUPTS_ON_FSB
/* /*