Skip to content

L
linux
Commit efa2559f authored by Yinghai Lu's avatar Yinghai Lu Committed by Ingo Molnar
Browse files
Options

x86: order variables in io_apic_xx.c 

move first_system_vector to apic_64.c.

also add #ifdef CONFIG_INTR_REMAP to prepare 32 bit to use
same file.
Signed-off-by: default avatarYinghai Lu <yhlu.kernel@gmail.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 8ea5371b
Hide whitespace changes
Inline Side-by-side
Showing with 127 additions and 117 deletions
arch/x86/kernel/apic_64.c
View file @ efa2559f
...@@ -33,6 +33,7 @@ ...@@ -33,6 +33,7 @@
#include <asm/smp.h> #include <asm/smp.h>
#include <asm/mtrr.h> #include <asm/mtrr.h>
#include <asm/mpspec.h> #include <asm/mpspec.h>
#include <asm/desc.h>
#include <asm/hpet.h> #include <asm/hpet.h>
#include <asm/pgalloc.h> #include <asm/pgalloc.h>
#include <asm/nmi.h> #include <asm/nmi.h>
...@@ -59,6 +60,10 @@ int x2apic_preenabled; ...@@ -59,6 +60,10 @@ int x2apic_preenabled;
int local_apic_timer_c2_ok; int local_apic_timer_c2_ok;
EXPORT_SYMBOL_GPL(local_apic_timer_c2_ok); EXPORT_SYMBOL_GPL(local_apic_timer_c2_ok);
int first_system_vector = 0xfe;
char system_vectors[NR_VECTORS] = { [0 ... NR_VECTORS-1] = SYS_VECTOR_FREE};
/* /*
* Debug level, exported for io_apic.c * Debug level, exported for io_apic.c
*/ */
......
arch/x86/kernel/io_apic_32.c
View file @ efa2559f
...@@ -54,24 +54,22 @@ ...@@ -54,24 +54,22 @@
#define __apicdebuginit(type) static type __init #define __apicdebuginit(type) static type __init
int (*ioapic_renumber_irq)(int ioapic, int irq);
atomic_t irq_mis_count;
/* Where if anywhere is the i8259 connect in external int mode */
static struct { int pin, apic; } ioapic_i8259 = { -1, -1 };
static DEFINE_SPINLOCK(ioapic_lock);
static DEFINE_SPINLOCK(vector_lock);
int timer_through_8259 __initdata;
/* /*
* Is the SiS APIC rmw bug present ? * Is the SiS APIC rmw bug present ?
* -1 = don't know, 0 = no, 1 = yes * -1 = don't know, 0 = no, 1 = yes
*/ */
int sis_apic_bug = -1; int sis_apic_bug = -1;
static DEFINE_SPINLOCK(ioapic_lock);
static DEFINE_SPINLOCK(vector_lock);
int first_free_entry; int first_free_entry;
/*
* Rough estimation of how many shared IRQs there are, can
* be changed anytime.
*/
int pin_map_size;
/* /*
* # of IRQ routing registers * # of IRQ routing registers
*/ */
...@@ -93,7 +91,15 @@ int mp_bus_id_to_type[MAX_MP_BUSSES]; ...@@ -93,7 +91,15 @@ int mp_bus_id_to_type[MAX_MP_BUSSES];
DECLARE_BITMAP(mp_bus_not_pci, MAX_MP_BUSSES); DECLARE_BITMAP(mp_bus_not_pci, MAX_MP_BUSSES);
static int disable_timer_pin_1 __initdata; int skip_ioapic_setup;
static int __init parse_noapic(char *arg)
{
/* disable IO-APIC */
disable_ioapic_setup();
return 0;
}
early_param("noapic", parse_noapic);
struct irq_cfg; struct irq_cfg;
struct irq_pin_list; struct irq_pin_list;
...@@ -268,13 +274,6 @@ static struct irq_cfg *irq_cfg_alloc(unsigned int irq) ...@@ -268,13 +274,6 @@ static struct irq_cfg *irq_cfg_alloc(unsigned int irq)
return cfg; return cfg;
} }
static int assign_irq_vector(int irq, cpumask_t mask);
/*
* Rough estimation of how many shared IRQs there are, can
* be changed anytime.
*/
int pin_map_size;
/* /*
* This is performance-critical, we want to do it O(1) * This is performance-critical, we want to do it O(1)
* *
...@@ -465,6 +464,9 @@ static void __target_IO_APIC_irq(unsigned int irq, unsigned int dest, u8 vector) ...@@ -465,6 +464,9 @@ static void __target_IO_APIC_irq(unsigned int irq, unsigned int dest, u8 vector)
entry = entry->next; entry = entry->next;
} }
} }
static int assign_irq_vector(int irq, cpumask_t mask);
static void set_ioapic_affinity_irq(unsigned int irq, cpumask_t mask) static void set_ioapic_affinity_irq(unsigned int irq, cpumask_t mask)
{ {
struct irq_cfg *cfg; struct irq_cfg *cfg;
...@@ -677,7 +679,6 @@ void send_IPI_self(int vector) ...@@ -677,7 +679,6 @@ void send_IPI_self(int vector)
#define MAX_PIRQS 8 #define MAX_PIRQS 8
static int pirq_entries [MAX_PIRQS]; static int pirq_entries [MAX_PIRQS];
static int pirqs_enabled; static int pirqs_enabled;
int skip_ioapic_setup;
static int __init ioapic_pirq_setup(char *str) static int __init ioapic_pirq_setup(char *str)
{ {
...@@ -981,6 +982,7 @@ static inline int irq_trigger(int idx) ...@@ -981,6 +982,7 @@ static inline int irq_trigger(int idx)
return MPBIOS_trigger(idx); return MPBIOS_trigger(idx);
} }
int (*ioapic_renumber_irq)(int ioapic, int irq);
static int pin_2_irq(int idx, int apic, int pin) static int pin_2_irq(int idx, int apic, int pin)
{ {
int irq, i; int irq, i;
...@@ -1621,6 +1623,9 @@ __apicdebuginit(int) print_all_ICs(void) ...@@ -1621,6 +1623,9 @@ __apicdebuginit(int) print_all_ICs(void)
fs_initcall(print_all_ICs); fs_initcall(print_all_ICs);
/* Where if anywhere is the i8259 connect in external int mode */
static struct { int pin, apic; } ioapic_i8259 = { -1, -1 };
static void __init enable_IO_APIC(void) static void __init enable_IO_APIC(void)
{ {
union IO_APIC_reg_01 reg_01; union IO_APIC_reg_01 reg_01;
...@@ -1998,6 +2003,7 @@ static void ack_apic_edge(unsigned int irq) ...@@ -1998,6 +2003,7 @@ static void ack_apic_edge(unsigned int irq)
ack_APIC_irq(); ack_APIC_irq();
} }
atomic_t irq_mis_count;
static void ack_apic_level(unsigned int irq) static void ack_apic_level(unsigned int irq)
{ {
unsigned long v; unsigned long v;
...@@ -2208,6 +2214,17 @@ static inline void __init unlock_ExtINT_logic(void) ...@@ -2208,6 +2214,17 @@ static inline void __init unlock_ExtINT_logic(void)
ioapic_write_entry(apic, pin, entry0); ioapic_write_entry(apic, pin, entry0);
} }
static int disable_timer_pin_1 __initdata;
static int __init parse_disable_timer_pin_1(char *arg)
{
disable_timer_pin_1 = 1;
return 0;
}
early_param("disable_timer_pin_1", parse_disable_timer_pin_1);
int timer_through_8259 __initdata;
/* /*
* This code may look a bit paranoid, but it's supposed to cooperate with * This code may look a bit paranoid, but it's supposed to cooperate with
* a wide range of boards and BIOS bugs. Fortunately only the timer IRQ * a wide range of boards and BIOS bugs. Fortunately only the timer IRQ
...@@ -2983,28 +3000,6 @@ void __init setup_ioapic_dest(void) ...@@ -2983,28 +3000,6 @@ void __init setup_ioapic_dest(void)
} }
#endif #endif
static int __init parse_disable_timer_pin_1(char *arg)
{
disable_timer_pin_1 = 1;
return 0;
}
early_param("disable_timer_pin_1", parse_disable_timer_pin_1);
static int __init parse_enable_timer_pin_1(char *arg)
{
disable_timer_pin_1 = -1;
return 0;
}
early_param("enable_timer_pin_1", parse_enable_timer_pin_1);
static int __init parse_noapic(char *arg)
{
/* disable IO-APIC */
disable_ioapic_setup();
return 0;
}
early_param("noapic", parse_noapic);
void __init ioapic_init_mappings(void) void __init ioapic_init_mappings(void)
{ {
unsigned long ioapic_phys, idx = FIX_IO_APIC_BASE_0; unsigned long ioapic_phys, idx = FIX_IO_APIC_BASE_0;
......
arch/x86/kernel/io_apic_64.c
View file @ efa2559f
...@@ -57,6 +57,47 @@ ...@@ -57,6 +57,47 @@
#define __apicdebuginit(type) static type __init #define __apicdebuginit(type) static type __init
int ioapic_force;
int sis_apic_bug; /* not actually supported, dummy for compile */
static DEFINE_SPINLOCK(ioapic_lock);
static DEFINE_SPINLOCK(vector_lock);
int first_free_entry;
/*
* Rough estimation of how many shared IRQs there are, can
* be changed anytime.
*/
int pin_map_size;
/*
* # of IRQ routing registers
*/
int nr_ioapic_registers[MAX_IO_APICS];
/* I/O APIC entries */
struct mp_config_ioapic mp_ioapics[MAX_IO_APICS];
int nr_ioapics;
/* MP IRQ source entries */
struct mp_config_intsrc mp_irqs[MAX_IRQ_SOURCES];
/* # of MP IRQ source entries */
int mp_irq_entries;
DECLARE_BITMAP(mp_bus_not_pci, MAX_MP_BUSSES);
int skip_ioapic_setup;
static int __init parse_noapic(char *str)
{
disable_ioapic_setup();
return 0;
}
early_param("noapic", parse_noapic);
struct irq_cfg; struct irq_cfg;
struct irq_pin_list; struct irq_pin_list;
struct irq_cfg { struct irq_cfg {
...@@ -228,53 +269,6 @@ static struct irq_cfg *irq_cfg_alloc(unsigned int irq) ...@@ -228,53 +269,6 @@ static struct irq_cfg *irq_cfg_alloc(unsigned int irq)
return cfg; return cfg;
} }
static int assign_irq_vector(int irq, cpumask_t mask);
int first_system_vector = 0xfe;
char system_vectors[NR_VECTORS] = { [0 ... NR_VECTORS-1] = SYS_VECTOR_FREE};
int sis_apic_bug; /* not actually supported, dummy for compile */
static int no_timer_check;
static int disable_timer_pin_1 __initdata;
int timer_through_8259 __initdata;
/* Where if anywhere is the i8259 connect in external int mode */
static struct { int pin, apic; } ioapic_i8259 = { -1, -1 };
static DEFINE_SPINLOCK(ioapic_lock);
static DEFINE_SPINLOCK(vector_lock);
/*
* # of IRQ routing registers
*/
int nr_ioapic_registers[MAX_IO_APICS];
/* I/O APIC RTE contents at the OS boot up */
struct IO_APIC_route_entry *early_ioapic_entries[MAX_IO_APICS];
/* I/O APIC entries */
struct mp_config_ioapic mp_ioapics[MAX_IO_APICS];
int nr_ioapics;
/* MP IRQ source entries */
struct mp_config_intsrc mp_irqs[MAX_IRQ_SOURCES];
/* # of MP IRQ source entries */
int mp_irq_entries;
DECLARE_BITMAP(mp_bus_not_pci, MAX_MP_BUSSES);
/*
* Rough estimation of how many shared IRQs there are, can
* be changed anytime.
*/
int pin_map_size;
/* /*
* This is performance-critical, we want to do it O(1) * This is performance-critical, we want to do it O(1)
* *
...@@ -481,12 +475,16 @@ static void __target_IO_APIC_irq(unsigned int irq, unsigned int dest, u8 vector) ...@@ -481,12 +475,16 @@ static void __target_IO_APIC_irq(unsigned int irq, unsigned int dest, u8 vector)
apic = entry->apic; apic = entry->apic;
pin = entry->pin; pin = entry->pin;
#ifdef CONFIG_INTR_REMAP
/* /*
* With interrupt-remapping, destination information comes * With interrupt-remapping, destination information comes
* from interrupt-remapping table entry. * from interrupt-remapping table entry.
*/ */
if (!irq_remapped(irq)) if (!irq_remapped(irq))
io_apic_write(apic, 0x11 + pin*2, dest); io_apic_write(apic, 0x11 + pin*2, dest);
#else
io_apic_write(apic, 0x11 + pin*2, dest);
#endif
reg = io_apic_read(apic, 0x10 + pin*2); reg = io_apic_read(apic, 0x10 + pin*2);
reg &= ~IO_APIC_REDIR_VECTOR_MASK; reg &= ~IO_APIC_REDIR_VECTOR_MASK;
reg |= vector; reg |= vector;
...@@ -497,6 +495,8 @@ static void __target_IO_APIC_irq(unsigned int irq, unsigned int dest, u8 vector) ...@@ -497,6 +495,8 @@ static void __target_IO_APIC_irq(unsigned int irq, unsigned int dest, u8 vector)
} }
} }
static int assign_irq_vector(int irq, cpumask_t mask);
static void set_ioapic_affinity_irq(unsigned int irq, cpumask_t mask) static void set_ioapic_affinity_irq(unsigned int irq, cpumask_t mask)
{ {
struct irq_cfg *cfg = irq_cfg(irq); struct irq_cfg *cfg = irq_cfg(irq);
...@@ -533,7 +533,6 @@ static void set_ioapic_affinity_irq(unsigned int irq, cpumask_t mask) ...@@ -533,7 +533,6 @@ static void set_ioapic_affinity_irq(unsigned int irq, cpumask_t mask)
* shared ISA-space IRQs, so we have to support them. We are super * shared ISA-space IRQs, so we have to support them. We are super
* fast in the common case, and fast for shared ISA-space IRQs. * fast in the common case, and fast for shared ISA-space IRQs.
*/ */
int first_free_entry;
static void add_pin_to_irq(unsigned int irq, int apic, int pin) static void add_pin_to_irq(unsigned int irq, int apic, int pin)
{ {
struct irq_cfg *cfg; struct irq_cfg *cfg;
...@@ -679,6 +678,10 @@ static void clear_IO_APIC (void) ...@@ -679,6 +678,10 @@ static void clear_IO_APIC (void)
clear_IO_APIC_pin(apic, pin); clear_IO_APIC_pin(apic, pin);
} }
#ifdef CONFIG_INTR_REMAP
/* I/O APIC RTE contents at the OS boot up */
static struct IO_APIC_route_entry *early_ioapic_entries[MAX_IO_APICS];
/* /*
* Saves and masks all the unmasked IO-APIC RTE's * Saves and masks all the unmasked IO-APIC RTE's
*/ */
...@@ -741,25 +744,7 @@ void reinit_intr_remapped_IO_APIC(int intr_remapping) ...@@ -741,25 +744,7 @@ void reinit_intr_remapped_IO_APIC(int intr_remapping)
*/ */
restore_IO_APIC_setup(); restore_IO_APIC_setup();
} }
#endif
int skip_ioapic_setup;
int ioapic_force;
static int __init parse_noapic(char *str)
{
disable_ioapic_setup();
return 0;
}
early_param("noapic", parse_noapic);
/* Actually the next is obsolete, but keep it for paranoid reasons -AK */
static int __init disable_timer_pin_setup(char *arg)
{
disable_timer_pin_1 = 1;
return 1;
}
__setup("disable_timer_pin_1", disable_timer_pin_setup);
/* /*
* Find the IRQ entry number of a certain pin. * Find the IRQ entry number of a certain pin.
...@@ -1327,8 +1312,10 @@ static void __init setup_timer_IRQ0_pin(unsigned int apic, unsigned int pin, ...@@ -1327,8 +1312,10 @@ static void __init setup_timer_IRQ0_pin(unsigned int apic, unsigned int pin,
{ {
struct IO_APIC_route_entry entry; struct IO_APIC_route_entry entry;
#ifdef CONFIG_INTR_REMAP
if (intr_remapping_enabled) if (intr_remapping_enabled)
return; return;
#endif
memset(&entry, 0, sizeof(entry)); memset(&entry, 0, sizeof(entry));
...@@ -1601,6 +1588,9 @@ __apicdebuginit(int) print_all_ICs(void) ...@@ -1601,6 +1588,9 @@ __apicdebuginit(int) print_all_ICs(void)
fs_initcall(print_all_ICs); fs_initcall(print_all_ICs);
/* Where if anywhere is the i8259 connect in external int mode */
static struct { int pin, apic; } ioapic_i8259 = { -1, -1 };
void __init enable_IO_APIC(void) void __init enable_IO_APIC(void)
{ {
union IO_APIC_reg_01 reg_01; union IO_APIC_reg_01 reg_01;
...@@ -1695,6 +1685,15 @@ void disable_IO_APIC(void) ...@@ -1695,6 +1685,15 @@ void disable_IO_APIC(void)
disconnect_bsp_APIC(ioapic_i8259.pin != -1); disconnect_bsp_APIC(ioapic_i8259.pin != -1);
} }
static int no_timer_check;
static int __init notimercheck(char *s)
{
no_timer_check = 1;
return 1;
}
__setup("no_timer_check", notimercheck);
/* /*
* There is a nasty bug in some older SMP boards, their mptable lies * There is a nasty bug in some older SMP boards, their mptable lies
* about the timer IRQ. We do the following to work around the situation: * about the timer IRQ. We do the following to work around the situation:
...@@ -1708,6 +1707,9 @@ static int __init timer_irq_works(void) ...@@ -1708,6 +1707,9 @@ static int __init timer_irq_works(void)
unsigned long t1 = jiffies; unsigned long t1 = jiffies;
unsigned long flags; unsigned long flags;
if (no_timer_check)
return 1;
local_save_flags(flags); local_save_flags(flags);
local_irq_enable(); local_irq_enable();
/* Let ten ticks pass... */ /* Let ten ticks pass... */
...@@ -2239,6 +2241,17 @@ static inline void __init unlock_ExtINT_logic(void) ...@@ -2239,6 +2241,17 @@ static inline void __init unlock_ExtINT_logic(void)
ioapic_write_entry(apic, pin, entry0); ioapic_write_entry(apic, pin, entry0);
} }
static int disable_timer_pin_1 __initdata;
/* Actually the next is obsolete, but keep it for paranoid reasons -AK */
static int __init disable_timer_pin_setup(char *arg)
{
disable_timer_pin_1 = 1;
return 0;
}
early_param("disable_timer_pin_1", disable_timer_pin_setup);
int timer_through_8259 __initdata;
/* /*
* This code may look a bit paranoid, but it's supposed to cooperate with * This code may look a bit paranoid, but it's supposed to cooperate with
* a wide range of boards and BIOS bugs. Fortunately only the timer IRQ * a wide range of boards and BIOS bugs. Fortunately only the timer IRQ
...@@ -2286,8 +2299,10 @@ static inline void __init check_timer(void) ...@@ -2286,8 +2299,10 @@ static inline void __init check_timer(void)
* 8259A. * 8259A.
*/ */
if (pin1 == -1) { if (pin1 == -1) {
#ifdef CONFIG_INTR_REMAP
if (intr_remapping_enabled) if (intr_remapping_enabled)
panic("BIOS bug: timer not connected to IO-APIC"); panic("BIOS bug: timer not connected to IO-APIC");
#endif
pin1 = pin2; pin1 = pin2;
apic1 = apic2; apic1 = apic2;
no_pin1 = 1; no_pin1 = 1;
...@@ -2305,7 +2320,7 @@ static inline void __init check_timer(void) ...@@ -2305,7 +2320,7 @@ static inline void __init check_timer(void)
setup_timer_IRQ0_pin(apic1, pin1, cfg->vector); setup_timer_IRQ0_pin(apic1, pin1, cfg->vector);
} }
unmask_IO_APIC_irq(0); unmask_IO_APIC_irq(0);
if (!no_timer_check && timer_irq_works()) { if (timer_irq_works()) {
if (nmi_watchdog == NMI_IO_APIC) { if (nmi_watchdog == NMI_IO_APIC) {
setup_nmi(); setup_nmi();
enable_8259A_irq(0); enable_8259A_irq(0);
...@@ -2314,8 +2329,10 @@ static inline void __init check_timer(void) ...@@ -2314,8 +2329,10 @@ static inline void __init check_timer(void)
clear_IO_APIC_pin(0, pin1); clear_IO_APIC_pin(0, pin1);
goto out; goto out;
} }
#ifdef CONFIG_INTR_REMAP
if (intr_remapping_enabled) if (intr_remapping_enabled)
panic("timer doesn't work through Interrupt-remapped IO-APIC"); panic("timer doesn't work through Interrupt-remapped IO-APIC");
#endif
clear_IO_APIC_pin(apic1, pin1); clear_IO_APIC_pin(apic1, pin1);
if (!no_pin1) if (!no_pin1)
apic_printk(APIC_QUIET, KERN_ERR "..MP-BIOS bug: " apic_printk(APIC_QUIET, KERN_ERR "..MP-BIOS bug: "
...@@ -2391,13 +2408,6 @@ static inline void __init check_timer(void) ...@@ -2391,13 +2408,6 @@ static inline void __init check_timer(void)
local_irq_restore(flags); local_irq_restore(flags);
} }
static int __init notimercheck(char *s)
{
no_timer_check = 1;
return 1;
}
__setup("no_timer_check", notimercheck);
/* /*
* Traditionally ISA IRQ2 is the cascade IRQ, and is not available * Traditionally ISA IRQ2 is the cascade IRQ, and is not available
* to devices. However there may be an I/O APIC pin available for * to devices. However there may be an I/O APIC pin available for
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7