Commit 5ebc7603 authored by Jiang Liu's avatar Jiang Liu Committed by Rafael J. Wysocki
Browse files

ACPI, PCI, irq: Do not share PCI IRQ with ISA IRQ 



Avoid IRQs occupied by ISA IRQs when allocating IRQs for PCI link devices,
otherwise it may cause interrupt storm due to incompatible pin attributes.

This issue was triggered on a KVM virtual machine, which
 1) uses IRQ9 for SCI in high level mode.
 2) defines an PCI interrupt link device (LNKS) with IRQ9 as the only
    possible irq.
 3) has an PCI device referring to link device LNKS.
So it causes interrupt storm when enabling the PCI device because PCI IRQ
works in low level mode.

Signed-off-by: default avatarJiang Liu <jiang.liu@linux.intel.com>
Acked-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 1f93e4a9

drivers/acpi/pci_irq.c

+1 −0
Original line number Diff line number Diff line
@@ -372,6 +372,7 @@ static int acpi_isa_register_gsi(struct pci_dev *dev) 


	/* Interrupt Line values above 0xF are forbidden */

	if (dev->irq > 0 && (dev->irq <= 0xF) &&

	    acpi_isa_irq_available(dev->irq) &&

	    (acpi_isa_irq_to_gsi(dev->irq, &dev_gsi) == 0)) {

		dev_warn(&dev->dev, "PCI INT %c: no GSI - using ISA IRQ %d\n",

			 pin_name(dev->pin), dev->irq);

drivers/acpi/pci_link.c

+13 −0
Original line number Diff line number Diff line
@@ -553,6 +553,13 @@ static int acpi_pci_link_allocate(struct acpi_pci_link *link) 
				irq = link->irq.possible[i];

		}

	}

	if (acpi_irq_penalty[irq] >= PIRQ_PENALTY_ISA_ALWAYS) {

		printk(KERN_ERR PREFIX "No IRQ available for %s [%s]. "

			    "Try pci=noacpi or acpi=off\n",

			    acpi_device_name(link->device),

			    acpi_device_bid(link->device));

		return -ENODEV;

	}



	/* Attempt to enable the link device at this IRQ. */

	if (acpi_pci_link_set(link, irq)) {
@@ -821,6 +828,12 @@ void acpi_penalize_isa_irq(int irq, int active) 
	}

}



bool acpi_isa_irq_available(int irq)

{

	return irq >= 0 && (irq >= ARRAY_SIZE(acpi_irq_penalty) ||

			    acpi_irq_penalty[irq] < PIRQ_PENALTY_ISA_ALWAYS);

}



/*

 * Penalize IRQ used by ACPI SCI. If ACPI SCI pin attributes conflict with

 * PCI IRQ attributes, mark ACPI SCI as ISA_ALWAYS so it won't be use for

include/linux/acpi.h

+1 −0
Original line number Diff line number Diff line
@@ -217,6 +217,7 @@ struct pci_dev; 


int acpi_pci_irq_enable (struct pci_dev *dev);

void acpi_penalize_isa_irq(int irq, int active);

bool acpi_isa_irq_available(int irq);

void acpi_penalize_sci_irq(int irq, int trigger, int polarity);

void acpi_pci_irq_disable (struct pci_dev *dev);

CRA Git | Maintained and supported by SUSTech CRA and CCSE