diff options
| author | Eric W. Biederman <ebiederm@xmission.com> | 2010-03-30 10:07:04 +0200 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2010-05-04 22:34:30 +0200 |
| commit | 414d3448dbcb40807a1265ace64b2576ef919fbe (patch) | |
| tree | 6410ffc3435366a7e1d1677b3b2dade291ed42ee /drivers/acpi/pci_irq.c | |
| parent | x86, acpi/irq: Teach acpi_get_override_irq to take a gsi not an isa_irq (diff) | |
| download | linux-414d3448dbcb40807a1265ace64b2576ef919fbe.tar.xz linux-414d3448dbcb40807a1265ace64b2576ef919fbe.zip | |
x86, acpi/irq: pci device dev->irq is an isa irq not a gsi
Strictly speaking on x86 (where acpi is used) dev->irq must be
a dual i8259 irq input aka an isa irq. Therefore we should translate
that isa irq into a gsi before passing it to a function that
takes a gsi.
Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
LKML-Reference: <1269936436-7039-3-git-send-email-ebiederm@xmission.com>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'drivers/acpi/pci_irq.c')
| -rw-r--r-- | drivers/acpi/pci_irq.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/acpi/pci_irq.c b/drivers/acpi/pci_irq.c index b0a71ecee682..e4804fb05e23 100644 --- a/drivers/acpi/pci_irq.c +++ b/drivers/acpi/pci_irq.c @@ -401,11 +401,13 @@ int acpi_pci_irq_enable(struct pci_dev *dev) * driver reported one, then use it. Exit in any case. */ if (gsi < 0) { + u32 dev_gsi; dev_warn(&dev->dev, "PCI INT %c: no GSI", pin_name(pin)); /* Interrupt Line values above 0xF are forbidden */ - if (dev->irq > 0 && (dev->irq <= 0xF)) { - printk(" - using IRQ %d\n", dev->irq); - acpi_register_gsi(&dev->dev, dev->irq, + if (dev->irq > 0 && (dev->irq <= 0xF) && + (acpi_isa_irq_to_gsi(dev->irq, &dev_gsi) == 0)) { + printk(" - using ISA IRQ %d\n", dev->irq); + acpi_register_gsi(&dev->dev, dev_gsi, ACPI_LEVEL_SENSITIVE, ACPI_ACTIVE_LOW); return 0; |