From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932190AbZEHAcV (ORCPT ); Thu, 7 May 2009 20:32:21 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1759932AbZEHAKx (ORCPT ); Thu, 7 May 2009 20:10:53 -0400 Received: from adsl-76-233-236-102.dsl.pltn13.sbcglobal.net ([76.233.236.102]:52714 "EHLO abulafia.goop.org" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1755866AbZEHAKA (ORCPT ); Thu, 7 May 2009 20:10:00 -0400 From: Jeremy Fitzhardinge To: Ingo Molnar Cc: the arch/x86 maintainers , Linux Kernel Mailing List , Xen-devel , Jeremy Fitzhardinge Subject: [PATCH 11/18] xen: use acpi_get_override_irq() to get triggering for legacy irqs Date: Thu, 7 May 2009 14:14:36 -0700 Message-Id: <1241730883-4917-12-git-send-email-jeremy@goop.org> X-Mailer: git-send-email 1.6.0.6 In-Reply-To: <1241730883-4917-1-git-send-email-jeremy@goop.org> References: <1241730883-4917-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 Impact: compatibility with legacy/ISA hardware 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. 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 e88f85e..f55532d 100644 --- a/arch/x86/xen/pci.c +++ b/arch/x86/xen/pci.c @@ -64,19 +64,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