Commit c502825f authored by Len Brown's avatar Len Brown

merge

parents e0e0b649 3ec98b4c
......@@ -42,6 +42,7 @@
#include "io_ports.h"
int (*ioapic_renumber_irq)(int ioapic, int irq);
atomic_t irq_mis_count;
static spinlock_t ioapic_lock = SPIN_LOCK_UNLOCKED;
......@@ -1069,11 +1070,13 @@ static int pin_2_irq(int idx, int apic, int pin)
while (i < apic)
irq += nr_ioapic_registers[i++];
irq += pin;
/*
* For MPS mode, so far only used by ES7000 platform
* For MPS mode, so far only needed by ES7000 platform
*/
if (platform_rename_gsi)
irq = platform_rename_gsi(apic, irq);
if (ioapic_renumber_irq)
irq = ioapic_renumber_irq(apic, irq);
break;
}
default:
......
......@@ -808,8 +808,6 @@ void __init find_smp_config (void)
smp_scan_config(address, 0x400);
}
int (*platform_rename_gsi)(int ioapic, int gsi);
/* --------------------------------------------------------------------------
ACPI-based MP Configuration
-------------------------------------------------------------------------- */
......@@ -1076,8 +1074,8 @@ int mp_register_gsi (u32 gsi, int edge_level, int active_high_low)
ioapic_pin = gsi - mp_ioapic_routing[ioapic].gsi_base;
if (platform_rename_gsi)
gsi = platform_rename_gsi(ioapic, gsi);
if (ioapic_renumber_irq)
gsi = ioapic_renumber_irq(ioapic, gsi);
/*
* Avoid pin reprogramming. PRTs typically include entries
......
......@@ -139,7 +139,7 @@ parse_unisys_oem (char *oemptr, int oem_entries)
} else {
printk("\nEnabling ES7000 specific features...\n");
es7000_plat = 1;
platform_rename_gsi = es7000_rename_gsi;
ioapic_renumber_irq = es7000_rename_gsi;
}
return es7000_plat;
}
......
......@@ -162,8 +162,6 @@ static inline void check_acpi_pci(void) { }
#endif
extern int (*platform_rename_gsi)(int ioapic, int gsi);
#ifdef CONFIG_ACPI_PCI
static inline void acpi_noirq_set(void) { acpi_noirq = 1; }
static inline void acpi_disable_pci(void)
......
......@@ -202,6 +202,8 @@ extern int io_apic_get_redir_entries (int ioapic);
extern int io_apic_set_pci_routing (int ioapic, int pin, int irq, int edge_level, int active_high_low);
#endif /*CONFIG_ACPI_BOOT*/
extern int (*ioapic_renumber_irq)(int ioapic, int irq);
#else /* !CONFIG_X86_IO_APIC */
#define io_apic_assign_pci_irqs 0
#endif
......
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