diff options
| author | Jeff Roberson <jeff@FreeBSD.org> | 2009-01-29 09:22:56 +0000 |
|---|---|---|
| committer | Jeff Roberson <jeff@FreeBSD.org> | 2009-01-29 09:22:56 +0000 |
| commit | 9c8e8e3aa72a8ab18e79fa854dbce83f3599438c (patch) | |
| tree | fa945772aa04bce5c6c8468c1d79e8f54e54ea21 /sys/i386/include | |
| parent | 9bad6e2c6da5b509a5df80f7be6ff4267ffc577c (diff) | |
Notes
Diffstat (limited to 'sys/i386/include')
| -rw-r--r-- | sys/i386/include/apicvar.h | 15 | ||||
| -rw-r--r-- | sys/i386/include/intr_machdep.h | 2 |
2 files changed, 10 insertions, 7 deletions
diff --git a/sys/i386/include/apicvar.h b/sys/i386/include/apicvar.h index c33c0a97ba11..c64dae3ca51b 100644 --- a/sys/i386/include/apicvar.h +++ b/sys/i386/include/apicvar.h @@ -187,14 +187,17 @@ inthand_t IDTVEC(apic_isr7), IDTVEC(spuriousint), IDTVEC(timerint); extern vm_paddr_t lapic_paddr; +extern int apic_cpuids[]; -u_int apic_alloc_vector(u_int irq); -u_int apic_alloc_vectors(u_int *irqs, u_int count, u_int align); -void apic_disable_vector(u_int vector); -void apic_enable_vector(u_int vector); -void apic_free_vector(u_int vector, u_int irq); -u_int apic_idt_to_irq(u_int vector); +u_int apic_alloc_vector(u_int apic_id, u_int irq); +u_int apic_alloc_vectors(u_int apic_id, u_int *irqs, u_int count, + u_int align); +void apic_disable_vector(u_int apic_id, u_int vector); +void apic_enable_vector(u_int apic_id, u_int vector); +void apic_free_vector(u_int apic_id, u_int vector, u_int irq); +u_int apic_idt_to_irq(u_int apic_id, u_int vector); void apic_register_enumerator(struct apic_enumerator *enumerator); +u_int apic_cpuid(u_int apic_id); void *ioapic_create(vm_paddr_t addr, int32_t apic_id, int intbase); int ioapic_disable_pin(void *cookie, u_int pin); int ioapic_get_vector(void *cookie, u_int pin); diff --git a/sys/i386/include/intr_machdep.h b/sys/i386/include/intr_machdep.h index 2aeb0c9932a8..4593077af758 100644 --- a/sys/i386/include/intr_machdep.h +++ b/sys/i386/include/intr_machdep.h @@ -47,7 +47,7 @@ * IRQ values beyond 256 are used by MSI. We leave 255 unused to avoid * confusion since 255 is used in PCI to indicate an invalid IRQ. */ -#define NUM_MSI_INTS 128 +#define NUM_MSI_INTS 512 #define FIRST_MSI_INT 256 #define NUM_IO_INTS (FIRST_MSI_INT + NUM_MSI_INTS) |