| Message ID | 1421327077-19894-2-git-send-email-jiang.liu@linux.intel.com |
|---|---|
| State | Not Applicable |
| Headers | show |
On Thu, Jan 15, 2015 at 09:04:35PM +0800, Jiang Liu wrote: > Commit b81975eade8c ("x86, irq: Clean up irqdomain transition code") > breaks xen IRQ allocation because xen_smp_prepare_cpus() doesn't invoke > setup_IO_APIC(), so no irqdomains created for IOAPICs and > mp_map_pin_to_irq() fails at the very beginning. > > Currently Xen Domain0 has special treatment for ACPI SCI interrupt, > that is initialize irq for ACPI SCI at early stage in a special way as: > xen_init_IRQ() > ->pci_xen_initial_domain() > ->xen_setup_acpi_sci() > Allocate and initialize irq for ACPI SCI > > Function xen_setup_acpi_sci() calls acpi_gsi_to_irq() to get an irq > number for ACPI SCI. But unfortunately acpi_gsi_to_irq() depends on > IOAPIC irqdomains through following path > acpi_gsi_to_irq() > ->mp_map_gsi_to_irq() > ->mp_map_pin_to_irq() > ->check IOAPIC irqdomain > > For PV domains, it uses Xen event based interrupt manangement and > doesn't make uses of native IOAPIC, so no irqdomains created for IOAPIC. > This causes Xen domain0 fails to install interrupt handler for ACPI SCI > and all ACPI events will be lost. Please refer to: > https://lkml.org/lkml/2014/12/19/178 > > So the fix is to get rid of special treatment for ACPI SCI, just treat > ACPI SCI as normal GSI interrupt as: > acpi_gsi_to_irq() > ->acpi_register_gsi() > ->acpi_register_gsi_xen() > ->xen_register_gsi() > > With above change, there's no need for xen_setup_acpi_sci() anymore. > The above change also works with bare metal kernel too. > > Note: we need to test this patch on those special AMD systems which > override normal SCI GSI (9) with strange GSI (20). [ 0.000000] DMI: Supermicro X8DTN/X8DTN, BIOS 2.1c 10/28/2011 .. 0.000000] ACPI: INT_SRC_OVR (bus 0 bus_irq 0 global_irq 2 dfl dfl) [ 0.000000] ACPI: INT_SRC_OVR (bus 0 bus_irq 9 global_irq 20 low level) [ 0.000000] ACPI: IRQ0 used by override. .. 6.358737] xen: registering gsi 20 triggering 0 polarity 1 [ 6.358756] xen: --> pirq=20 -> irq=20 (gsi=20) ... -bash-4.1# cat /proc/interrupts |grep acpi 20: 0 0 0 xen-pirq-ioapic-level acpi -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 2015/1/17 2:13, Konrad Rzeszutek Wilk wrote: > On Thu, Jan 15, 2015 at 09:04:35PM +0800, Jiang Liu wrote: <snit> >> >> Note: we need to test this patch on those special AMD systems which >> override normal SCI GSI (9) with strange GSI (20). > > [ 0.000000] DMI: Supermicro X8DTN/X8DTN, BIOS 2.1c 10/28/2011 > .. > 0.000000] ACPI: INT_SRC_OVR (bus 0 bus_irq 0 global_irq 2 dfl dfl) > [ 0.000000] ACPI: INT_SRC_OVR (bus 0 bus_irq 9 global_irq 20 low level) > [ 0.000000] ACPI: IRQ0 used by override. > .. > 6.358737] xen: registering gsi 20 triggering 0 polarity 1 > [ 6.358756] xen: --> pirq=20 -> irq=20 (gsi=20) > ... > -bash-4.1# cat /proc/interrupts |grep acpi > 20: 0 0 0 xen-pirq-ioapic-level acpi > Thanks Konrad, it works as expected. Previously IRQ9 was assigned to ACPI SCI GSI 20, now it assigns IRQ20. But that's OK, ACPI has no special requirement about the assigned IRQ number, we could assign any valid IRQ number for ACPI SCI GSI. Thanks! Gerry -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 2015/1/17 2:13, Konrad Rzeszutek Wilk wrote: > On Thu, Jan 15, 2015 at 09:04:35PM +0800, Jiang Liu wrote: <snit> >> >> Note: we need to test this patch on those special AMD systems which >> override normal SCI GSI (9) with strange GSI (20). > > [ 0.000000] DMI: Supermicro X8DTN/X8DTN, BIOS 2.1c 10/28/2011 > .. > 0.000000] ACPI: INT_SRC_OVR (bus 0 bus_irq 0 global_irq 2 dfl dfl) > [ 0.000000] ACPI: INT_SRC_OVR (bus 0 bus_irq 9 global_irq 20 low level) > [ 0.000000] ACPI: IRQ0 used by override. > .. > 6.358737] xen: registering gsi 20 triggering 0 polarity 1 > [ 6.358756] xen: --> pirq=20 -> irq=20 (gsi=20) > ... > -bash-4.1# cat /proc/interrupts |grep acpi > 20: 0 0 0 xen-pirq-ioapic-level acpi Hi Konrad, May I assume an Tested-by from you here? Thanks! Gerry -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Mon, Jan 19, 2015 at 12:41:24PM +0800, Jiang Liu wrote: > > On 2015/1/17 2:13, Konrad Rzeszutek Wilk wrote: > > On Thu, Jan 15, 2015 at 09:04:35PM +0800, Jiang Liu wrote: > <snit> > >> > >> Note: we need to test this patch on those special AMD systems which > >> override normal SCI GSI (9) with strange GSI (20). > > > > [ 0.000000] DMI: Supermicro X8DTN/X8DTN, BIOS 2.1c 10/28/2011 > > .. > > 0.000000] ACPI: INT_SRC_OVR (bus 0 bus_irq 0 global_irq 2 dfl dfl) > > [ 0.000000] ACPI: INT_SRC_OVR (bus 0 bus_irq 9 global_irq 20 low level) > > [ 0.000000] ACPI: IRQ0 used by override. > > .. > > 6.358737] xen: registering gsi 20 triggering 0 polarity 1 > > [ 6.358756] xen: --> pirq=20 -> irq=20 (gsi=20) > > ... > > -bash-4.1# cat /proc/interrupts |grep acpi > > 20: 0 0 0 xen-pirq-ioapic-level acpi > Hi Konrad, > May I assume an Tested-by from you here? Yes for this particular use case. I hadn't yet tried to push the ACPI buttons (this printout was from an server in a basement). > Thanks! > Gerry -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c index 4433a4be8171..395c4c615293 100644 --- a/arch/x86/kernel/acpi/boot.c +++ b/arch/x86/kernel/acpi/boot.c @@ -611,20 +611,20 @@ void __init acpi_pic_sci_set_trigger(unsigned int irq, u16 trigger) int acpi_gsi_to_irq(u32 gsi, unsigned int *irqp) { - int irq; - - if (acpi_irq_model == ACPI_IRQ_MODEL_PIC) { - *irqp = gsi; - } else { - mutex_lock(&acpi_ioapic_lock); - irq = mp_map_gsi_to_irq(gsi, - IOAPIC_MAP_ALLOC | IOAPIC_MAP_CHECK); - mutex_unlock(&acpi_ioapic_lock); - if (irq < 0) - return -1; - *irqp = irq; + int rc, irq, trigger, polarity; + + rc = acpi_get_override_irq(gsi, &trigger, &polarity); + if (rc == 0) { + trigger = trigger ? ACPI_LEVEL_SENSITIVE : ACPI_EDGE_SENSITIVE; + polarity = polarity ? ACPI_ACTIVE_LOW : ACPI_ACTIVE_HIGH; + irq = acpi_register_gsi(NULL, gsi, trigger, polarity); + if (irq >= 0) { + *irqp = irq; + return 0; + } } - return 0; + + return -1; } EXPORT_SYMBOL_GPL(acpi_gsi_to_irq); diff --git a/arch/x86/pci/xen.c b/arch/x86/pci/xen.c index c489ef2c1a39..6e5e89c3c644 100644 --- a/arch/x86/pci/xen.c +++ b/arch/x86/pci/xen.c @@ -471,52 +471,6 @@ int __init pci_xen_hvm_init(void) } #ifdef CONFIG_XEN_DOM0 -static __init void xen_setup_acpi_sci(void) -{ - int rc; - int trigger, polarity; - int gsi = acpi_sci_override_gsi; - int irq = -1; - int gsi_override = -1; - - if (!gsi) - return; - - rc = acpi_get_override_irq(gsi, &trigger, &polarity); - if (rc) { - printk(KERN_WARNING "xen: acpi_get_override_irq failed for acpi" - " sci, rc=%d\n", rc); - return; - } - trigger = trigger ? ACPI_LEVEL_SENSITIVE : ACPI_EDGE_SENSITIVE; - polarity = polarity ? ACPI_ACTIVE_LOW : ACPI_ACTIVE_HIGH; - - printk(KERN_INFO "xen: sci override: global_irq=%d trigger=%d " - "polarity=%d\n", gsi, trigger, polarity); - - /* Before we bind the GSI to a Linux IRQ, check whether - * we need to override it with bus_irq (IRQ) value. Usually for - * IRQs below IRQ_LEGACY_IRQ this holds IRQ == GSI, as so: - * ACPI: INT_SRC_OVR (bus 0 bus_irq 9 global_irq 9 low level) - * but there are oddballs where the IRQ != GSI: - * ACPI: INT_SRC_OVR (bus 0 bus_irq 9 global_irq 20 low level) - * which ends up being: gsi_to_irq[9] == 20 - * (which is what acpi_gsi_to_irq ends up calling when starting the - * the ACPI interpreter and keels over since IRQ 9 has not been - * setup as we had setup IRQ 20 for it). - */ - if (acpi_gsi_to_irq(gsi, &irq) == 0) { - /* Use the provided value if it's valid. */ - if (irq >= 0) - gsi_override = irq; - } - - gsi = xen_register_gsi(gsi, gsi_override, trigger, polarity); - printk(KERN_INFO "xen: acpi sci %d\n", gsi); - - return; -} - int __init pci_xen_initial_domain(void) { int irq; @@ -527,7 +481,6 @@ int __init pci_xen_initial_domain(void) x86_msi.restore_msi_irqs = xen_initdom_restore_msi_irqs; pci_msi_ignore_mask = 1; #endif - xen_setup_acpi_sci(); __acpi_register_gsi = acpi_register_gsi_xen; /* Pre-allocate legacy irqs */ for (irq = 0; irq < nr_legacy_irqs(); irq++) {
Commit b81975eade8c ("x86, irq: Clean up irqdomain transition code") breaks xen IRQ allocation because xen_smp_prepare_cpus() doesn't invoke setup_IO_APIC(), so no irqdomains created for IOAPICs and mp_map_pin_to_irq() fails at the very beginning. Currently Xen Domain0 has special treatment for ACPI SCI interrupt, that is initialize irq for ACPI SCI at early stage in a special way as: xen_init_IRQ() ->pci_xen_initial_domain() ->xen_setup_acpi_sci() Allocate and initialize irq for ACPI SCI Function xen_setup_acpi_sci() calls acpi_gsi_to_irq() to get an irq number for ACPI SCI. But unfortunately acpi_gsi_to_irq() depends on IOAPIC irqdomains through following path acpi_gsi_to_irq() ->mp_map_gsi_to_irq() ->mp_map_pin_to_irq() ->check IOAPIC irqdomain For PV domains, it uses Xen event based interrupt manangement and doesn't make uses of native IOAPIC, so no irqdomains created for IOAPIC. This causes Xen domain0 fails to install interrupt handler for ACPI SCI and all ACPI events will be lost. Please refer to: https://lkml.org/lkml/2014/12/19/178 So the fix is to get rid of special treatment for ACPI SCI, just treat ACPI SCI as normal GSI interrupt as: acpi_gsi_to_irq() ->acpi_register_gsi() ->acpi_register_gsi_xen() ->xen_register_gsi() With above change, there's no need for xen_setup_acpi_sci() anymore. The above change also works with bare metal kernel too. Note: we need to test this patch on those special AMD systems which override normal SCI GSI (9) with strange GSI (20). Signed-off-by: Jiang Liu <jiang.liu@linux.intel.com> --- arch/x86/kernel/acpi/boot.c | 26 ++++++++++++------------ arch/x86/pci/xen.c | 47 ------------------------------------------- 2 files changed, 13 insertions(+), 60 deletions(-)