diff options
-rw-r--r-- | xen/arch/x86/i8259.c | 2 | ||||
-rw-r--r-- | xen/arch/x86/io_apic.c | 2 | ||||
-rw-r--r-- | xen/arch/x86/irq.c | 14 | ||||
-rw-r--r-- | xen/arch/x86/smpboot.c | 9 | ||||
-rw-r--r-- | xen/include/asm-x86/irq.h | 2 | ||||
-rw-r--r-- | xen/include/asm-x86/mach-default/irq_vectors.h | 4 |
6 files changed, 22 insertions, 11 deletions
diff --git a/xen/arch/x86/i8259.c b/xen/arch/x86/i8259.c index 3c7fca28f5..ee291d3edf 100644 --- a/xen/arch/x86/i8259.c +++ b/xen/arch/x86/i8259.c @@ -402,7 +402,7 @@ void __init init_IRQ(void) desc->arch.vector = FIRST_LEGACY_VECTOR + irq; } - per_cpu(vector_irq, cpu)[FIRST_HIPRIORITY_VECTOR] = 0; + per_cpu(vector_irq, cpu)[IRQ0_VECTOR] = 0; apic_intr_init(); diff --git a/xen/arch/x86/io_apic.c b/xen/arch/x86/io_apic.c index 31f1541aea..72b32ce46b 100644 --- a/xen/arch/x86/io_apic.c +++ b/xen/arch/x86/io_apic.c @@ -1856,7 +1856,7 @@ static void __init check_timer(void) * get/set the timer IRQ vector: */ disable_8259A_irq(irq_to_desc(0)); - vector = FIRST_HIPRIORITY_VECTOR; + vector = IRQ0_VECTOR; clear_irq_vector(0); cpumask_setall(&mask_all); diff --git a/xen/arch/x86/irq.c b/xen/arch/x86/irq.c index 2e150bc05b..425af20387 100644 --- a/xen/arch/x86/irq.c +++ b/xen/arch/x86/irq.c @@ -764,6 +764,14 @@ void pirq_set_affinity(struct domain *d, int pirq, const cpumask_t *mask) DEFINE_PER_CPU(unsigned int, irq_count); +uint8_t alloc_hipriority_vector(void) +{ + static uint8_t next = FIRST_HIPRIORITY_VECTOR; + BUG_ON(next < FIRST_HIPRIORITY_VECTOR); + BUG_ON(next > LAST_HIPRIORITY_VECTOR); + return next++; +} + static void (*direct_apic_vector[NR_VECTORS])(struct cpu_user_regs *); void set_direct_apic_vector( uint8_t vector, void (*handler)(struct cpu_user_regs *)) @@ -775,14 +783,12 @@ void set_direct_apic_vector( void alloc_direct_apic_vector( uint8_t *vector, void (*handler)(struct cpu_user_regs *)) { - static uint8_t next = LAST_HIPRIORITY_VECTOR; static DEFINE_SPINLOCK(lock); spin_lock(&lock); if (*vector == 0) { - BUG_ON(next == FIRST_HIPRIORITY_VECTOR); - set_direct_apic_vector(next, handler); - *vector = next--; + *vector = alloc_hipriority_vector(); + set_direct_apic_vector(*vector, handler); } spin_unlock(&lock); } diff --git a/xen/arch/x86/smpboot.c b/xen/arch/x86/smpboot.c index 41bc32fd1d..675ca45121 100644 --- a/xen/arch/x86/smpboot.c +++ b/xen/arch/x86/smpboot.c @@ -1005,13 +1005,13 @@ void __init smp_cpus_done(void) void __init smp_intr_init(void) { - int irq, seridx, cpu = smp_processor_id(); + int irq, vector, seridx, cpu = smp_processor_id(); /* * IRQ0 must be given a fixed assignment and initialized, * because it's used before the IO-APIC is set up. */ - irq_to_desc(0)->arch.vector = FIRST_HIPRIORITY_VECTOR; + irq_to_desc(0)->arch.vector = IRQ0_VECTOR; /* * Also ensure serial interrupts are high priority. We do not @@ -1021,8 +1021,9 @@ void __init smp_intr_init(void) { if ( (irq = serial_irq(seridx)) < 0 ) continue; - per_cpu(vector_irq, cpu)[FIRST_HIPRIORITY_VECTOR + seridx + 1] = irq; - irq_to_desc(irq)->arch.vector = FIRST_HIPRIORITY_VECTOR + seridx + 1; + vector = alloc_hipriority_vector(); + per_cpu(vector_irq, cpu)[vector] = irq; + irq_to_desc(irq)->arch.vector = vector; cpumask_copy(irq_to_desc(irq)->arch.cpu_mask, &cpu_online_map); } diff --git a/xen/include/asm-x86/irq.h b/xen/include/asm-x86/irq.h index 396f7ded82..ffa3e8f261 100644 --- a/xen/include/asm-x86/irq.h +++ b/xen/include/asm-x86/irq.h @@ -88,6 +88,8 @@ void pmu_apic_interrupt(struct cpu_user_regs *regs); void spurious_interrupt(struct cpu_user_regs *regs); void irq_move_cleanup_interrupt(struct cpu_user_regs *regs); +uint8_t alloc_hipriority_vector(void); + void set_direct_apic_vector( uint8_t vector, void (*handler)(struct cpu_user_regs *)); void alloc_direct_apic_vector( diff --git a/xen/include/asm-x86/mach-default/irq_vectors.h b/xen/include/asm-x86/mach-default/irq_vectors.h index 6b9cde66d1..992e00c44b 100644 --- a/xen/include/asm-x86/mach-default/irq_vectors.h +++ b/xen/include/asm-x86/mach-default/irq_vectors.h @@ -13,8 +13,10 @@ * High-priority dynamically-allocated vectors. For interrupts that * must be higher priority than any guest-bound interrupt. */ -#define FIRST_HIPRIORITY_VECTOR 0xf0 +#define FIRST_HIPRIORITY_VECTOR 0xf1 #define LAST_HIPRIORITY_VECTOR 0xf8 +/* IRQ0 (timer) is statically allocated but must be high priority. */ +#define IRQ0_VECTOR 0xf0 /* Legacy PIC uses vectors 0xe0-0xef. */ #define FIRST_LEGACY_VECTOR 0xe0 |