Iranna D Ankad reported that IBM x3950 systems have boot problems after this commit: | | commit b9c61b70075c87a8612624736faf4a2de5b1ed30 | | x86/pci: update pirq_enable_irq() to setup io apic routing | ACPI: IOAPIC (id[0x10] address[0xfecff000] gsi_base[0]) IOAPIC[0]: apic_id 16, version 0, address 0xfecff000, GSI 0-2 ACPI: IOAPIC (id[0x0f] address[0xfec00000] gsi_base[3]) IOAPIC[1]: apic_id 15, version 0, address 0xfec00000, GSI 3-38 ACPI: IOAPIC (id[0x0e] address[0xfec01000] gsi_base[39]) IOAPIC[2]: apic_id 14, version 0, address 0xfec01000, GSI 39-74 As explained in the previous patch ("x86: Fix out of order gsi) need to remap those gsis This patch adds boot_ioapic_idx and gsi_to_irq/irq_to_gsi So we could make sure for those kind of system will have irq: 0 - 15 for legacy irq irq: 16 after will be gsi + 16 -v13: move gsi_to_irq/irq_to_gsi to acpi/boot.c Reported-by: Iranna D Ankad <iranna.ankad@xxxxxxxxxx> Bisected-by: Iranna D Ankad <iranna.ankad@xxxxxxxxxx> Tested-by: Gary Hade <garyhade@xxxxxxxxxx> Signed-off-by: Yinghai Lu <yinghai@xxxxxxxxxx> Cc: Thomas Renninger <trenn@xxxxxxx> Cc: Eric W. Biederman <ebiederm@xxxxxxxxxxxx> Cc: Suresh Siddha <suresh.b.siddha@xxxxxxxxx> Cc: len.brown@xxxxxxxxx --- arch/x86/include/asm/io_apic.h | 2 +- arch/x86/include/asm/mpspec.h | 14 ++++++++ arch/x86/kernel/acpi/boot.c | 64 +++++++++++++++++++++++++++++------ arch/x86/kernel/apic/io_apic.c | 72 +++++++++++++++++++++++++++++---------- drivers/pnp/pnpacpi/rsparser.c | 4 ++ 5 files changed, 125 insertions(+), 31 deletions(-) diff --git a/arch/x86/include/asm/io_apic.h b/arch/x86/include/asm/io_apic.h index 35832a0..c4683b9 100644 --- a/arch/x86/include/asm/io_apic.h +++ b/arch/x86/include/asm/io_apic.h @@ -158,7 +158,7 @@ extern int io_apic_get_redir_entries(int ioapic); struct io_apic_irq_attr; extern int io_apic_set_pci_routing(struct device *dev, int irq, struct io_apic_irq_attr *irq_attr); -void setup_IO_APIC_irq_extra(u32 gsi); +void setup_IO_APIC_irq_extra(u32 gsi, unsigned int *irq); extern int (*ioapic_renumber_irq)(int ioapic, int irq); extern void ioapic_init_mappings(void); extern void ioapic_insert_resources(void); diff --git a/arch/x86/include/asm/mpspec.h b/arch/x86/include/asm/mpspec.h index d8bf23a..1a221e0 100644 --- a/arch/x86/include/asm/mpspec.h +++ b/arch/x86/include/asm/mpspec.h @@ -109,6 +109,9 @@ extern int acpi_probe_gsi(void); #ifdef CONFIG_X86_IO_APIC extern int mp_find_ioapic(int gsi); extern int mp_find_ioapic_pin(int ioapic, int gsi); +extern int gsi_delta; +int gsi_to_irq(unsigned int gsi); +unsigned int irq_to_gsi(int irq); #endif #else /* !CONFIG_ACPI: */ static inline int acpi_probe_gsi(void) @@ -117,6 +120,17 @@ static inline int acpi_probe_gsi(void) } #endif /* CONFIG_ACPI */ +#if !defined(CONFIG_ACPI) || !defined(CONFIG_X86_IO_APIC) +static inline int gsi_to_irq(unsigned int gsi) +{ + return gsi; +} +static inline unsigned int irq_to_gsi(int irq) +{ + return irq; +} +#endif + #define PHYSID_ARRAY_SIZE BITS_TO_LONGS(MAX_APICS) struct physid_mask { diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c index 37de00f..2450c95 100644 --- a/arch/x86/kernel/acpi/boot.c +++ b/arch/x86/kernel/acpi/boot.c @@ -311,7 +311,8 @@ acpi_parse_ioapic(struct acpi_subtable_header * header, const unsigned long end) /* * Parse Interrupt Source Override for the ACPI SCI */ -static void __init acpi_sci_ioapic_setup(u32 gsi, u16 polarity, u16 trigger) +static void __init +acpi_sci_ioapic_setup(u8 bus_irq, u32 gsi, u16 polarity, u16 trigger) { if (trigger == 0) /* compatible SCI trigger is level */ trigger = 3; @@ -331,7 +332,7 @@ static void __init acpi_sci_ioapic_setup(u32 gsi, u16 polarity, u16 trigger) * If GSI is < 16, this will update its flags, * else it will create a new mp_irqs[] entry. */ - mp_override_legacy_irq(gsi, polarity, trigger, gsi); + mp_override_legacy_irq(bus_irq, polarity, trigger, gsi); /* * stash over-ride to indicate we've been here @@ -355,7 +356,8 @@ acpi_parse_int_src_ovr(struct acpi_subtable_header * header, acpi_table_print_madt_entry(header); if (intsrc->source_irq == acpi_gbl_FADT.sci_interrupt) { - acpi_sci_ioapic_setup(intsrc->global_irq, + acpi_sci_ioapic_setup(intsrc->source_irq, + intsrc->global_irq, intsrc->inti_flags & ACPI_MADT_POLARITY_MASK, (intsrc->inti_flags & ACPI_MADT_TRIGGER_MASK) >> 2); return 0; @@ -446,11 +448,11 @@ void __init acpi_pic_sci_set_trigger(unsigned int irq, u16 trigger) int acpi_gsi_to_irq(u32 gsi, unsigned int *irq) { - *irq = gsi; + *irq = gsi_to_irq(gsi); #ifdef CONFIG_X86_IO_APIC if (acpi_irq_model == ACPI_IRQ_MODEL_IOAPIC) - setup_IO_APIC_irq_extra(gsi); + setup_IO_APIC_irq_extra(gsi, irq); #endif return 0; @@ -914,6 +916,40 @@ static void save_mp_irq(struct mpc_intsrc *m) panic("Max # of irq sources exceeded!!\n"); } +/* By default isa irqs are identity mapped to gsis */ +static unsigned int isa_irq_to_gsi[NR_IRQS_LEGACY] = { + 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15 +}; + +int gsi_delta; +int gsi_to_irq(unsigned int gsi) +{ + unsigned int irq = gsi; + unsigned int i; + + irq += gsi_delta; + for (i = 0; i < NR_IRQS_LEGACY; i++) { + if (isa_irq_to_gsi[i] == gsi) { + irq = i; + break; + } + } + + return irq; +} + +unsigned int irq_to_gsi(int irq) +{ + unsigned int gsi; + + if (irq < NR_IRQS_LEGACY) + gsi = isa_irq_to_gsi[irq]; + else + gsi = irq - gsi_delta; + + return gsi; +} + void __init mp_override_legacy_irq(u8 bus_irq, u8 polarity, u8 trigger, u32 gsi) { int ioapic; @@ -945,6 +981,8 @@ void __init mp_override_legacy_irq(u8 bus_irq, u8 polarity, u8 trigger, u32 gsi) mp_irq.dstirq = pin; /* INTIN# */ save_mp_irq(&mp_irq); + + isa_irq_to_gsi[bus_irq] = gsi; } void __init mp_config_acpi_legacy_irqs(void) @@ -974,7 +1012,7 @@ void __init mp_config_acpi_legacy_irqs(void) /* * Locate the IOAPIC that manages the ISA IRQs (0-15). */ - ioapic = mp_find_ioapic(0); + ioapic = mp_find_ioapic(irq_to_gsi(0)); if (ioapic < 0) return; dstapic = mp_ioapics[ioapic].apicid; @@ -1057,6 +1095,7 @@ int mp_register_gsi(struct device *dev, u32 gsi, int trigger, int polarity) { int ioapic; int ioapic_pin; + int irq; struct io_apic_irq_attr irq_attr; if (acpi_irq_model != ACPI_IRQ_MODEL_IOAPIC) @@ -1079,11 +1118,12 @@ int mp_register_gsi(struct device *dev, u32 gsi, int trigger, int polarity) gsi = ioapic_renumber_irq(ioapic, gsi); #endif + irq = gsi_to_irq(gsi); if (ioapic_pin > MP_MAX_IOAPIC_PIN) { printk(KERN_ERR "Invalid reference to IOAPIC pin " "%d-%d\n", mp_ioapics[ioapic].apicid, ioapic_pin); - return gsi; + return irq; } if (enable_update_mptable) @@ -1092,9 +1132,9 @@ int mp_register_gsi(struct device *dev, u32 gsi, int trigger, int polarity) set_io_apic_irq_attr(&irq_attr, ioapic, ioapic_pin, trigger == ACPI_EDGE_SENSITIVE ? 0 : 1, polarity == ACPI_ACTIVE_HIGH ? 0 : 1); - io_apic_set_pci_routing(dev, gsi, &irq_attr); + io_apic_set_pci_routing(dev, irq, &irq_attr); - return gsi; + return irq; } /* @@ -1151,8 +1191,10 @@ static int __init acpi_parse_madt_ioapic_entries(void) * If BIOS did not supply an INT_SRC_OVR for the SCI * pretend we got one so we can set the SCI flags. */ - if (!acpi_sci_override_gsi) - acpi_sci_ioapic_setup(acpi_gbl_FADT.sci_interrupt, 0, 0); + if (!acpi_sci_override_gsi) { + int irq = gsi_to_irq(acpi_gbl_FADT.sci_interrupt); + acpi_sci_ioapic_setup(irq, acpi_gbl_FADT.sci_interrupt, 0, 0); + } /* Fill in identity legacy mappings where no override */ mp_config_acpi_legacy_irqs(); diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c index a917fdf..61b59ef 100644 --- a/arch/x86/kernel/apic/io_apic.c +++ b/arch/x86/kernel/apic/io_apic.c @@ -97,6 +97,8 @@ int mp_irq_entries; /* GSI interrupts */ static int nr_irqs_gsi = NR_IRQS_LEGACY; +static int boot_ioapic_idx; + #if defined (CONFIG_MCA) || defined (CONFIG_EISA) int mp_bus_id_to_type[MAX_MP_BUSSES]; #endif @@ -1032,7 +1034,7 @@ static inline int irq_trigger(int idx) int (*ioapic_renumber_irq)(int ioapic, int irq); static int pin_2_irq(int idx, int apic, int pin) { - int irq, i; + int irq; int bus = mp_irqs[idx].srcbus; /* @@ -1044,18 +1046,28 @@ static int pin_2_irq(int idx, int apic, int pin) if (test_bit(bus, mp_bus_not_pci)) { irq = mp_irqs[idx].srcbusirq; } else { - /* - * PCI IRQs are mapped in order - */ - i = irq = 0; - while (i < apic) - irq += nr_ioapic_registers[i++]; - irq += pin; + unsigned int gsi; + if (!acpi_ioapic) { + int i; + /* + * PCI IRQs are mapped in order + */ + i = gsi = 0; + while (i < apic) + gsi += nr_ioapic_registers[i++]; + gsi += pin; + } else + gsi = pin + mp_gsi_routing[apic].gsi_base; + +#ifdef CONFIG_X86_32 /* * For MPS mode, so far only needed by ES7000 platform */ if (ioapic_renumber_irq) - irq = ioapic_renumber_irq(apic, irq); + gsi = ioapic_renumber_irq(apic, gsi); +#endif + + irq = gsi_to_irq(gsi); } #ifdef CONFIG_X86_32 @@ -1505,9 +1517,10 @@ static void __init setup_IO_APIC_irqs(void) struct irq_cfg *cfg; int node = cpu_to_node(boot_cpu_id); + apic_id = boot_ioapic_idx; + apic_printk(APIC_VERBOSE, KERN_DEBUG "init IO_APIC IRQs\n"); - for (apic_id = 0; apic_id < nr_ioapics; apic_id++) for (pin = 0; pin < nr_ioapic_registers[apic_id]; pin++) { idx = find_irq_entry(apic_id, pin, mp_INT); if (idx == -1) { @@ -1529,9 +1542,6 @@ static void __init setup_IO_APIC_irqs(void) irq = pin_2_irq(idx, apic_id, pin); - if ((apic_id > 0) && (irq > 16)) - continue; - /* * Skip the timer IRQ if there's a quirk handler * installed and if it returns 1: @@ -1565,7 +1575,7 @@ static void __init setup_IO_APIC_irqs(void) * but could not use acpi_register_gsi() * like some special sci in IBM x3330 */ -void setup_IO_APIC_irq_extra(u32 gsi) +void setup_IO_APIC_irq_extra(u32 gsi, unsigned int *pirq) { int apic_id = 0, pin, idx, irq; int node = cpu_to_node(boot_cpu_id); @@ -1585,6 +1595,7 @@ void setup_IO_APIC_irq_extra(u32 gsi) return; irq = pin_2_irq(idx, apic_id, pin); + *pirq = irq; #ifdef CONFIG_SPARSE_IRQ desc = irq_to_desc(irq); if (desc) @@ -2028,6 +2039,30 @@ void __init enable_IO_APIC(void) clear_IO_APIC(); } +static void __init probe_ioapic_i8259(void) +{ + /* probe boot ioapic idx */ + boot_ioapic_idx = ioapic_i8259.apic; + if (boot_ioapic_idx < 0) + boot_ioapic_idx = find_isa_irq_apic(0, mp_INT); +#ifdef CONFIG_ACPI + if (!acpi_disabled && acpi_ioapic && boot_ioapic_idx < 0) + boot_ioapic_idx = mp_find_ioapic(irq_to_gsi(0)); +#endif + if (boot_ioapic_idx < 0) + boot_ioapic_idx = 0; + +#ifdef CONFIG_ACPI + if (mp_gsi_routing[boot_ioapic_idx].gsi_base) { + gsi_delta = NR_IRQS_LEGACY; + nr_irqs_gsi += NR_IRQS_LEGACY; + printk(KERN_DEBUG "new nr_irqs_gsi: %d\n", nr_irqs_gsi); + } +#endif + + printk(KERN_INFO "boot_ioapic_idx: %d\n", boot_ioapic_idx); +} + /* * Not an __init, needed by the reboot code */ @@ -3045,7 +3080,7 @@ static inline void __init check_timer(void) legacy_pic->chip->unmask(0); } if (disable_timer_pin_1 > 0) - clear_IO_APIC_pin(0, pin1); + clear_IO_APIC_pin(apic1, pin1); goto out; } if (intr_remapping_enabled) @@ -3165,6 +3200,7 @@ void __init setup_IO_APIC(void) x86_init.mpparse.setup_ioapic_ids(); sync_Arb_IDs(); + probe_ioapic_i8259(); setup_IO_APIC_irqs(); init_IO_APIC_traps(); if (legacy_pic->nr_legacy_irqs) @@ -4156,16 +4192,14 @@ void __init setup_ioapic_dest(void) if (skip_ioapic_setup == 1) return; - for (ioapic = 0; ioapic < nr_ioapics; ioapic++) + ioapic = boot_ioapic_idx; + for (pin = 0; pin < nr_ioapic_registers[ioapic]; pin++) { irq_entry = find_irq_entry(ioapic, pin, mp_INT); if (irq_entry == -1) continue; irq = pin_2_irq(irq_entry, ioapic, pin); - if ((ioapic > 0) && (irq > 16)) - continue; - desc = irq_to_desc(irq); /* diff --git a/drivers/pnp/pnpacpi/rsparser.c b/drivers/pnp/pnpacpi/rsparser.c index 54514aa..1dcf64d 100644 --- a/drivers/pnp/pnpacpi/rsparser.c +++ b/drivers/pnp/pnpacpi/rsparser.c @@ -123,6 +123,10 @@ static void pnpacpi_parse_allocated_irqresource(struct pnp_dev *dev, } flags = irq_flags(triggering, polarity, shareable); +#ifdef CONFIG_X86 + /* bus_irq or gsi ? */ + gsi = irq_to_gsi(gsi); +#endif irq = acpi_register_gsi(&dev->dev, gsi, triggering, polarity); if (irq >= 0) pcibios_penalize_isa_irq(irq, 1); -- 1.6.4.2 -- To unsubscribe from this list: send the line "unsubscribe linux-arch" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html