Commit 3ec98b4c authored by Len Brown's avatar Len Brown Committed by Len Brown

[ACPI] platform_rename_gsi() is no longer limited to ACPI specific code,

so call it ioapic_renumber_irq().

A note to google:
GSI is a Global System Interrupt -- a flat, linear, global IRQ number.

Suggested-by: Linus Torvalds
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent 3bcdc7f1
...@@ -42,6 +42,8 @@ ...@@ -42,6 +42,8 @@
#include "io_ports.h" #include "io_ports.h"
int (*ioapic_renumber_irq)(int ioapic, int irq);
static spinlock_t ioapic_lock = SPIN_LOCK_UNLOCKED; static spinlock_t ioapic_lock = SPIN_LOCK_UNLOCKED;
/* /*
...@@ -1069,11 +1071,13 @@ static int pin_2_irq(int idx, int apic, int pin) ...@@ -1069,11 +1071,13 @@ static int pin_2_irq(int idx, int apic, int pin)
while (i < apic) while (i < apic)
irq += nr_ioapic_registers[i++]; irq += nr_ioapic_registers[i++];
irq += pin; 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) if (ioapic_renumber_irq)
irq = platform_rename_gsi(apic, irq); irq = ioapic_renumber_irq(apic, irq);
break; break;
} }
default: default:
......
...@@ -808,8 +808,6 @@ void __init find_smp_config (void) ...@@ -808,8 +808,6 @@ void __init find_smp_config (void)
smp_scan_config(address, 0x400); smp_scan_config(address, 0x400);
} }
int (*platform_rename_gsi)(int ioapic, int gsi);
/* -------------------------------------------------------------------------- /* --------------------------------------------------------------------------
ACPI-based MP Configuration ACPI-based MP Configuration
-------------------------------------------------------------------------- */ -------------------------------------------------------------------------- */
...@@ -1076,8 +1074,8 @@ void mp_register_gsi (u32 gsi, int edge_level, int active_high_low) ...@@ -1076,8 +1074,8 @@ void mp_register_gsi (u32 gsi, int edge_level, int active_high_low)
ioapic_pin = gsi - mp_ioapic_routing[ioapic].gsi_base; ioapic_pin = gsi - mp_ioapic_routing[ioapic].gsi_base;
if (platform_rename_gsi) if (ioapic_renumber_irq)
gsi = platform_rename_gsi(ioapic, gsi); gsi = ioapic_renumber_irq(ioapic, gsi);
/* /*
* Avoid pin reprogramming. PRTs typically include entries * Avoid pin reprogramming. PRTs typically include entries
......
...@@ -139,7 +139,7 @@ parse_unisys_oem (char *oemptr, int oem_entries) ...@@ -139,7 +139,7 @@ parse_unisys_oem (char *oemptr, int oem_entries)
} else { } else {
printk("\nEnabling ES7000 specific features...\n"); printk("\nEnabling ES7000 specific features...\n");
es7000_plat = 1; es7000_plat = 1;
platform_rename_gsi = es7000_rename_gsi; ioapic_renumber_irq = es7000_rename_gsi;
} }
return es7000_plat; return es7000_plat;
} }
......
...@@ -162,8 +162,6 @@ static inline void check_acpi_pci(void) { } ...@@ -162,8 +162,6 @@ static inline void check_acpi_pci(void) { }
#endif #endif
extern int (*platform_rename_gsi)(int ioapic, int gsi);
#ifdef CONFIG_ACPI_PCI #ifdef CONFIG_ACPI_PCI
static inline void acpi_noirq_set(void) { acpi_noirq = 1; } static inline void acpi_noirq_set(void) { acpi_noirq = 1; }
static inline void acpi_disable_pci(void) static inline void acpi_disable_pci(void)
......
...@@ -204,6 +204,8 @@ extern int io_apic_get_redir_entries (int ioapic); ...@@ -204,6 +204,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); extern int io_apic_set_pci_routing (int ioapic, int pin, int irq, int edge_level, int active_high_low);
#endif /*CONFIG_ACPI_BOOT*/ #endif /*CONFIG_ACPI_BOOT*/
extern int (*ioapic_renumber_irq)(int ioapic, int irq);
#else /* !CONFIG_X86_IO_APIC */ #else /* !CONFIG_X86_IO_APIC */
#define io_apic_assign_pci_irqs 0 #define io_apic_assign_pci_irqs 0
#endif #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