Merge branch 'x86/x2apic' into irq/sparseirq
Reason: Avoid conflicts with the x2apic modifications Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
This commit is contained in:
commit
8ffcfa4e2d
|
@ -3,4 +3,31 @@
|
|||
|
||||
#define IRTE_DEST(dest) ((x2apic_mode) ? dest : dest << 8)
|
||||
|
||||
#ifdef CONFIG_INTR_REMAP
|
||||
static inline void prepare_irte(struct irte *irte, int vector,
|
||||
unsigned int dest)
|
||||
{
|
||||
memset(irte, 0, sizeof(*irte));
|
||||
|
||||
irte->present = 1;
|
||||
irte->dst_mode = apic->irq_dest_mode;
|
||||
/*
|
||||
* Trigger mode in the IRTE will always be edge, and for IO-APIC, the
|
||||
* actual level or edge trigger will be setup in the IO-APIC
|
||||
* RTE. This will help simplify level triggered irq migration.
|
||||
* For more details, see the comments (in io_apic.c) explainig IO-APIC
|
||||
* irq migration in the presence of interrupt-remapping.
|
||||
*/
|
||||
irte->trigger_mode = 0;
|
||||
irte->dlvry_mode = apic->irq_delivery_mode;
|
||||
irte->vector = vector;
|
||||
irte->dest_id = IRTE_DEST(dest);
|
||||
irte->redir_hint = 1;
|
||||
}
|
||||
#else
|
||||
static void prepare_irte(struct irte *irte, int vector, unsigned int dest)
|
||||
{
|
||||
}
|
||||
#endif
|
||||
|
||||
#endif /* _ASM_X86_IRQ_REMAPPING_H */
|
||||
|
|
|
@ -1665,10 +1665,7 @@ int __init APIC_init_uniprocessor(void)
|
|||
}
|
||||
#endif
|
||||
|
||||
#ifndef CONFIG_SMP
|
||||
enable_IR_x2apic();
|
||||
default_setup_apic_routing();
|
||||
#endif
|
||||
|
||||
verify_local_APIC();
|
||||
connect_bsp_APIC();
|
||||
|
|
|
@ -1377,21 +1377,7 @@ int setup_ioapic_entry(int apic_id, int irq,
|
|||
if (index < 0)
|
||||
panic("Failed to allocate IRTE for ioapic %d\n", apic_id);
|
||||
|
||||
memset(&irte, 0, sizeof(irte));
|
||||
|
||||
irte.present = 1;
|
||||
irte.dst_mode = apic->irq_dest_mode;
|
||||
/*
|
||||
* Trigger mode in the IRTE will always be edge, and the
|
||||
* actual level or edge trigger will be setup in the IO-APIC
|
||||
* RTE. This will help simplify level triggered irq migration.
|
||||
* For more details, see the comments above explainig IO-APIC
|
||||
* irq migration in the presence of interrupt-remapping.
|
||||
*/
|
||||
irte.trigger_mode = 0;
|
||||
irte.dlvry_mode = apic->irq_delivery_mode;
|
||||
irte.vector = vector;
|
||||
irte.dest_id = IRTE_DEST(destination);
|
||||
prepare_irte(&irte, vector, destination);
|
||||
|
||||
/* Set source-id of interrupt request */
|
||||
set_ioapic_sid(&irte, apic_id);
|
||||
|
@ -3335,14 +3321,7 @@ static int msi_compose_msg(struct pci_dev *pdev, unsigned int irq,
|
|||
ir_index = map_irq_to_irte_handle(irq, &sub_handle);
|
||||
BUG_ON(ir_index == -1);
|
||||
|
||||
memset (&irte, 0, sizeof(irte));
|
||||
|
||||
irte.present = 1;
|
||||
irte.dst_mode = apic->irq_dest_mode;
|
||||
irte.trigger_mode = 0; /* edge */
|
||||
irte.dlvry_mode = apic->irq_delivery_mode;
|
||||
irte.vector = cfg->vector;
|
||||
irte.dest_id = IRTE_DEST(dest);
|
||||
prepare_irte(&irte, cfg->vector, dest);
|
||||
|
||||
/* Set source-id of interrupt request */
|
||||
if (pdev)
|
||||
|
|
|
@ -54,6 +54,9 @@ static int apicid_phys_pkg_id(int initial_apic_id, int index_msb)
|
|||
*/
|
||||
void __init default_setup_apic_routing(void)
|
||||
{
|
||||
|
||||
enable_IR_x2apic();
|
||||
|
||||
#ifdef CONFIG_X86_X2APIC
|
||||
if (x2apic_mode
|
||||
#ifdef CONFIG_X86_UV
|
||||
|
|
|
@ -1109,8 +1109,6 @@ void __init native_smp_prepare_cpus(unsigned int max_cpus)
|
|||
}
|
||||
set_cpu_sibling_map(0);
|
||||
|
||||
enable_IR_x2apic();
|
||||
default_setup_apic_routing();
|
||||
|
||||
if (smp_sanity_check(max_cpus) < 0) {
|
||||
printk(KERN_INFO "SMP disabled\n");
|
||||
|
@ -1118,6 +1116,8 @@ void __init native_smp_prepare_cpus(unsigned int max_cpus)
|
|||
goto out;
|
||||
}
|
||||
|
||||
default_setup_apic_routing();
|
||||
|
||||
preempt_disable();
|
||||
if (read_apic_id() != boot_cpu_physical_apicid) {
|
||||
panic("Boot APIC ID in local APIC unexpected (%d vs %d)",
|
||||
|
|
Loading…
Reference in New Issue