x86, acpi/irq: pci device dev->irq is an isa irq not a gsi (414d3448) · Commits · 戴 / test

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>

drivers/acpi/pci_irq.c

+5 −3

Original line number	Diff line number	Diff line
		@@ -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;

Admin message