From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1762231AbZE0Hme (ORCPT ); Wed, 27 May 2009 03:42:34 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1762137AbZE0HiN (ORCPT ); Wed, 27 May 2009 03:38:13 -0400 Received: from claw.goop.org ([74.207.240.146]:41718 "EHLO claw.goop.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1761866AbZE0HiM (ORCPT ); Wed, 27 May 2009 03:38:12 -0400 From: Jeremy Fitzhardinge To: Ingo Molnar Cc: the arch/x86 maintainers , Linux Kernel Mailing List , Xen-devel , Greg KH , Jens Axboe , Chris Wright , kurt.hackel@oracle.com, Andrew Morton , Ky Srinivasan , Beulich , Linus Torvalds , Avi Kivity , Jeremy Fitzhardinge Subject: [PATCH 12/17] xen: use acpi_get_override_irq() to get triggering for legacy irqs Date: Wed, 27 May 2009 00:37:25 -0700 Message-Id: <1243409850-21577-13-git-send-email-jeremy@goop.org> X-Mailer: git-send-email 1.6.0.6 In-Reply-To: <1243409850-21577-1-git-send-email-jeremy@goop.org> References: <1243409850-21577-1-git-send-email-jeremy@goop.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Jeremy Fitzhardinge We need to set up proper IO apic entries for legacy irqs, which are not normally configured by either normal acpi interrupt routing or PNP. This also generalizes the acpi interrupt setup, so we can remove it as a special case. [ Impact: compatibility with legacy/ISA hardware ] Signed-off-by: Jeremy Fitzhardinge --- arch/x86/xen/pci.c | 24 ++++++++++-------------- 1 files changed, 10 insertions(+), 14 deletions(-) diff --git a/arch/x86/xen/pci.c b/arch/x86/xen/pci.c index 00ad6df..db0c74c 100644 --- a/arch/x86/xen/pci.c +++ b/arch/x86/xen/pci.c @@ -65,19 +65,15 @@ void __init xen_setup_pirqs(void) { int irq; -#ifdef CONFIG_ACPI - /* - * Set up acpi interrupt in acpi_gbl_FADT.sci_interrupt. - */ - if (acpi_gbl_FADT.sci_interrupt > 0) { - irq = xen_allocate_pirq(acpi_gbl_FADT.sci_interrupt); - - printk(KERN_INFO "xen: allocated irq %d for acpi %d\n", - irq, acpi_gbl_FADT.sci_interrupt); - } -#endif - /* Pre-allocate legacy irqs */ - for (irq = 0; irq < NR_IRQS_LEGACY; irq++) - xen_allocate_pirq(irq); + for (irq = 0; irq < NR_IRQS_LEGACY; irq++) { + int trigger, polarity; + + if (acpi_get_override_irq(irq, &trigger, &polarity) == -1) + continue; + + xen_register_gsi(irq, + trigger ? ACPI_LEVEL_SENSITIVE : ACPI_EDGE_SENSITIVE, + polarity ? ACPI_ACTIVE_LOW : ACPI_ACTIVE_HIGH); + } } -- 1.6.0.6