Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9b7dc567 authored by Thomas Gleixner's avatar Thomas Gleixner Committed by Ingo Molnar
Browse files

x86: unify interrupt vector defines 



The interrupt vector defines are copied 4 times around with minimal
differences. Move them all into asm-x86/irq_vectors.h

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 2e088436

arch/x86/kernel/entry_32.S

+1 −1
Original line number Original line Diff line number Diff line
@@ -51,7 +51,7 @@ 
#include <asm/percpu.h>

#include <asm/percpu.h>

#include <asm/dwarf2.h>

#include <asm/dwarf2.h>

#include <asm/processor-flags.h>

#include <asm/processor-flags.h>

#include "irq_vectors.h"

#include <asm/irq_vectors.h>





/*

/*

 * We use macros for low-level operations which need to be overridden

 * We use macros for low-level operations which need to be overridden

arch/x86/kernel/vmiclock_32.c

+1 −2
Original line number Original line Diff line number Diff line
@@ -33,8 +33,7 @@ 
#include <asm/apic.h>

#include <asm/apic.h>

#include <asm/timer.h>

#include <asm/timer.h>

#include <asm/i8253.h>

#include <asm/i8253.h>



#include <asm/irq_vectors.h>

#include <irq_vectors.h>





#define VMI_ONESHOT  (VMI_ALARM_IS_ONESHOT  | VMI_CYCLES_REAL | vmi_get_alarm_wiring())

#define VMI_ONESHOT  (VMI_ALARM_IS_ONESHOT  | VMI_CYCLES_REAL | vmi_get_alarm_wiring())

#define VMI_PERIODIC (VMI_ALARM_IS_PERIODIC | VMI_CYCLES_REAL | vmi_get_alarm_wiring())

#define VMI_PERIODIC (VMI_ALARM_IS_PERIODIC | VMI_CYCLES_REAL | vmi_get_alarm_wiring())

arch/x86/mach-visws/visws_apic.c

+1 −2
Original line number Original line Diff line number Diff line
@@ -21,10 +21,9 @@ 
#include <asm/io.h>

#include <asm/io.h>

#include <asm/apic.h>

#include <asm/apic.h>

#include <asm/i8259.h>

#include <asm/i8259.h>

#include <asm/irq_vectors.h>





#include "cobalt.h"

#include "cobalt.h"

#include "irq_vectors.h"







static DEFINE_SPINLOCK(cobalt_lock);

static DEFINE_SPINLOCK(cobalt_lock);

include/asm-x86/hw_irq.h

+11 −1
Original line number Original line Diff line number Diff line
@@ -13,7 +13,7 @@ 
 * unified by tglx

 * unified by tglx

 */

 */





#define NMI_VECTOR		0x02

#include <asm/irq_vectors.h>





#ifndef __ASSEMBLY__

#ifndef __ASSEMBLY__
@@ -75,6 +75,16 @@ extern void send_IPI(int dest, int vector); 
extern atomic_t irq_err_count;

extern atomic_t irq_err_count;

extern atomic_t irq_mis_count;

extern atomic_t irq_mis_count;





/* Voyager functions */

extern asmlinkage void vic_cpi_interrupt(void);

extern asmlinkage void vic_sys_interrupt(void);

extern asmlinkage void vic_cmn_interrupt(void);

extern asmlinkage void qic_timer_interrupt(void);

extern asmlinkage void qic_invalidate_interrupt(void);

extern asmlinkage void qic_reschedule_interrupt(void);

extern asmlinkage void qic_enable_irq_interrupt(void);

extern asmlinkage void qic_call_function_interrupt(void);



#endif /* !ASSEMBLY_ */

#endif /* !ASSEMBLY_ */





#ifdef CONFIG_X86_32

#ifdef CONFIG_X86_32

include/asm-x86/hw_irq_64.h

+0 −71
Original line number Original line Diff line number Diff line 
/*

 * IDT vectors usable for external interrupt sources start

 * at 0x20:

 */

#define FIRST_EXTERNAL_VECTOR	0x20



#define IA32_SYSCALL_VECTOR	0x80





/* Reserve the lowest usable priority level 0x20 - 0x2f for triggering

 * cleanup after irq migration.

 */

#define IRQ_MOVE_CLEANUP_VECTOR	FIRST_EXTERNAL_VECTOR



/*

 * Vectors 0x30-0x3f are used for ISA interrupts.

 */

#define IRQ0_VECTOR		(FIRST_EXTERNAL_VECTOR + 0x10)

#define IRQ1_VECTOR		(IRQ0_VECTOR + 1)

#define IRQ2_VECTOR		(IRQ0_VECTOR + 2)

#define IRQ3_VECTOR		(IRQ0_VECTOR + 3)

#define IRQ4_VECTOR		(IRQ0_VECTOR + 4)

#define IRQ5_VECTOR		(IRQ0_VECTOR + 5)

#define IRQ6_VECTOR		(IRQ0_VECTOR + 6)

#define IRQ7_VECTOR		(IRQ0_VECTOR + 7)

#define IRQ8_VECTOR		(IRQ0_VECTOR + 8)

#define IRQ9_VECTOR		(IRQ0_VECTOR + 9)

#define IRQ10_VECTOR		(IRQ0_VECTOR + 10)

#define IRQ11_VECTOR		(IRQ0_VECTOR + 11)

#define IRQ12_VECTOR		(IRQ0_VECTOR + 12)

#define IRQ13_VECTOR		(IRQ0_VECTOR + 13)

#define IRQ14_VECTOR		(IRQ0_VECTOR + 14)

#define IRQ15_VECTOR		(IRQ0_VECTOR + 15)



/*

 * Special IRQ vectors used by the SMP architecture, 0xf0-0xff

 *

 *  some of the following vectors are 'rare', they are merged

 *  into a single vector (CALL_FUNCTION_VECTOR) to save vector space.

 *  TLB, reschedule and local APIC vectors are performance-critical.

 */

#define SPURIOUS_APIC_VECTOR	0xff

#define ERROR_APIC_VECTOR	0xfe

#define RESCHEDULE_VECTOR	0xfd

#define CALL_FUNCTION_VECTOR	0xfc

/* fb free - please don't readd KDB here because it's useless

   (hint - think what a NMI bit does to a vector) */

#define THERMAL_APIC_VECTOR	0xfa

#define THRESHOLD_APIC_VECTOR   0xf9

/* f8 free */

#define INVALIDATE_TLB_VECTOR_END	0xf7

#define INVALIDATE_TLB_VECTOR_START	0xf0	/* f0-f7 used for TLB flush */



#define NUM_INVALIDATE_TLB_VECTORS	8



/*

 * Local APIC timer IRQ vector is on a different priority level,

 * to work around the 'lost local interrupt if more than 2 IRQ

 * sources per level' errata.

 */

#define LOCAL_TIMER_VECTOR	0xef



/*

 * First APIC vector available to drivers: (vectors 0x30-0xee)

 * we start at 0x41 to spread out vectors evenly between priority

 * levels. (0x80 is the syscall vector)

 */

#define FIRST_DEVICE_VECTOR	(IRQ15_VECTOR + 2)

#define FIRST_SYSTEM_VECTOR	0xef   /* duplicated in irq.h */





#ifndef __ASSEMBLY__

#ifndef __ASSEMBLY__





typedef int vector_irq_t[NR_VECTORS];

typedef int vector_irq_t[NR_VECTORS];