x86/apic for v2.6.32
Linus,
Please pull the latest x86-apic-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git x86-apic-for-linus
Thanks,
Ingo
------------------>
Bartlomiej Zolnierkiewicz (1):
x86: Remove superfluous NULL pointer check in destroy_irq()
Cyrill Gorcunov (7):
x86, ioapic: Introduce for_each_irq_pin() helper
x86, ioapic: Throw BUG instead of NULL dereference
x86, apic: Drop redundant bit assignment
x86, ioapic: Panic on irq-pin binding only if needed
x86, ioapic: Define IO_APIC_DEFAULT_PHYS_BASE constant
x86, ioapic: Get rid of needless check and simplify ioapic_setup_resources() x86, apic: Slim down stack usage in early_init_lapic_mapping()
Feng Tang (1):
ACPI, x86: expose some IO-APIC routines when CONFIG_ACPI=n
Gleb Natapov (1):
x86/apic: Enable x2APIC without interrupt remapping under KVM
Jeremy Fitzhardinge (12):
x86/acpi: acpi_parse_madt_ioapic_entries: remove redundant braces x86/ioapic.c: ioapic_modify_irq is too large to inline x86/ioapic.c: unify __mask_IO_APIC_irq()
x86/ioapic.c: remove #ifdef for 82093AA workaround x86/ioapic.c: remove redundant declaration of irq_pin_list x86/ioapic.c: move lost comment to what seems like appropriate place x86/ioapic.c: convert io_apic_level_ack_pending loop to normal for() loop x86/ioapic.c: simplify add_pin_to_irq_node()
x86/ioapic.c: convert replace_pin_at_irq_node to conventional for() loop x86/ioapic.c: clean up replace_pin_at_irq_node logic and comments x86/ioapic.c: convert __target_IO_APIC_irq to conventional for() loop x86/ioapic.c: unify ioapic_retrigger_irq()
Roel Kluin (1):
x86: Fix x86_model test in es7000_apic_is_cluster()
Yinghai Lu (1):
x86, apic: Move dmar_table_init() out of enable_IR()
arch/x86/include/asm/apic.h | 7 + arch/x86/include/asm/apicdef.h | 3 +- arch/x86/include/asm/io_apic.h | 13 ++- arch/x86/kernel/acpi/boot.c | 105 +------------ arch/x86/kernel/apic/apic.c | 110 +++++++------ arch/x86/kernel/apic/es7000_32.c | 2 +- arch/x86/kernel/apic/io_apic.c | 324 +++++++++++++++++++++----------------- arch/x86/kernel/apic/probe_64.c | 6 +- arch/x86/kernel/mpparse.c | 10 +- 9 files changed, 269 insertions(+), 311 deletions(-)
arch/x86/include/asm/apic.h +7 -0
@@ -183,6 +183,10 @@ static inline int x2apic_enabled(void) }#define x2apic_supported () (cpu_has_x2apic) +static inline void x2apic_force_phys (void ) +{ + x2apic_phys =1 ; +}#else static inline void check_x2apic (void ) {
@@ -194,6 +198,9 @@ static inline int x2apic_enabled(void) {return 0 ; } +static inline void x2apic_force_phys (void ) +{ +}#define x2apic_preenabled 0#define x2apic_supported () 0
arch/x86/include/asm/apicdef.h +2 -1
@@ -8,7 +8,8 @@* Ingo Molnar <[email protected]>, 1999, 2000 */ -#define APIC_DEFAULT_PHYS_BASE 0xfee00000 +#define IO_APIC_DEFAULT_PHYS_BASE 0xfec00000 +#define APIC_DEFAULT_PHYS_BASE 0xfee00000#define APIC_ID 0x20
arch/x86/include/asm/io_apic.h +11 -2
@@ -150,11 +150,10 @@ extern int timer_through_8259;#define io_apic_assign_pci_irqs \ (mp_irq_entries && !skip_ioapic_setup && io_apic_irqs) -#ifdef CONFIG_ACPI +extern u8 io_apic_unique_id (u8 id);extern int io_apic_get_unique_id (int ioapic,int apic_id);extern int io_apic_get_version (int ioapic);extern int io_apic_get_redir_entries (int ioapic); -#endif /* CONFIG_ACPI */ struct io_apic_irq_attr ; extern int io_apic_set_pci_routing(struct device *dev, int irq,
@@ -177,6 +176,16 @@ extern int setup_ioapic_entry(int apic, int irq, int polarity, int vector, int pin);extern void ioapic_write_entry (int apic,int pin,struct IO_APIC_route_entry e); + +struct mp_ioapic_gsi { +int gsi_base; +int gsi_end; +}; +extern struct mp_ioapic_gsi mp_gsi_routing[]; +int mp_find_ioapic (int gsi); +int mp_find_ioapic_pin (int ioapic,int gsi); +void __init mp_register_ioapic (int id,u32 address,u32 gsi_base); +#else /* !CONFIG_X86_IO_APIC */ #define io_apic_assign_pci_irqs 0static const int timer_through_8259 =0 ;
arch/x86/kernel/acpi/boot.c +2 -103
124 lines not on this page · raw message
arch/x86/kernel/apic/apic.c +59 -51
184 lines not on this page · raw message
arch/x86/kernel/apic/es7000_32.c +1 -1
@@ -167,7 +167,7 @@ static int es7000_apic_is_cluster(void) {/* MPENTIUMIII */ if (boot_cpu_data.x86 ==6 && - (boot_cpu_data.x86_model >=7 || boot_cpu_data.x86_model <=11 )) + (boot_cpu_data.x86_model >=7 && boot_cpu_data.x86_model <=11 ))return 1 ;return 0 ;
arch/x86/kernel/apic/io_apic.c +179 -145
538 lines not on this page · raw message
arch/x86/kernel/apic/probe_64.c +3 -3
@@ -50,11 +50,11 @@ static struct apic *apic_probe[] __initdata = {void __init default_setup_apic_routing (void ) {#ifdef CONFIG_X86_X2APIC -if (x2apic_mode && (apic != &apic_x2apic_phys && +if (x2apic_mode #ifdef CONFIG_X86_UV - apic != &apic_x2apic_uv_x && + && apic != &apic_x2apic_uv_x #endif - apic != &apic_x2apic_cluster)) { + ) {if (x2apic_phys) apic = &apic_x2apic_phys;else
arch/x86/kernel/mpparse.c +5 -5
@@ -482,11 +482,11 @@ static void __init construct_ioapic_table(int mpc_default_type)MP_bus_info (&bus); } - ioapic.type =MP_IOAPIC ; - ioapic.apicid =2 ; - ioapic.apicver = mpc_default_type >4 ?0x10 :0x01 ; - ioapic.flags =MPC_APIC_USABLE ; - ioapic.apicaddr =0xFEC00000 ; + ioapic.type =MP_IOAPIC ; + ioapic.apicid =2 ; + ioapic.apicver = mpc_default_type >4 ?0x10 :0x01 ; + ioapic.flags =MPC_APIC_USABLE ; + ioapic.apicaddr =IO_APIC_DEFAULT_PHYS_BASE ;MP_ioapic_info (&ioapic);/*