Skip to content

Commit 98756f5

Browse files
Sinan Kayarafaeljw
authored andcommitted
ACPI/PCI: pci_link: Include PIRQ_PENALTY_PCI_USING for ISA IRQs
Commit 103544d ("ACPI,PCI,IRQ: reduce resource requirements") replaced the addition of PIRQ_PENALTY_PCI_USING in acpi_pci_link_allocate() with an addition in acpi_irq_pci_sharing_penalty(), but f7eca37 ("ACPI,PCI,IRQ: separate ISA penalty calculation") removed the use of acpi_irq_pci_sharing_penalty() for ISA IRQs. Therefore, PIRQ_PENALTY_PCI_USING is missing from ISA IRQs used by interrupt links. Include that penalty by adding it in the acpi_pci_link_allocate() path. Fixes: f7eca37 (ACPI,PCI,IRQ: separate ISA penalty calculation) Signed-off-by: Sinan Kaya <okaya@codeaurora.org> Acked-by: Bjorn Helgaas <bhelgaas@google.com> Tested-by: Jonathan Liu <net147@gmail.com> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
1 parent f1caa61 commit 98756f5

1 file changed

Lines changed: 4 additions & 0 deletions

File tree

drivers/acpi/pci_link.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -608,6 +608,10 @@ static int acpi_pci_link_allocate(struct acpi_pci_link *link)
608608
acpi_device_bid(link->device));
609609
return -ENODEV;
610610
} else {
611+
if (link->irq.active < ACPI_MAX_ISA_IRQS)
612+
acpi_isa_irq_penalty[link->irq.active] +=
613+
PIRQ_PENALTY_PCI_USING;
614+
611615
printk(KERN_WARNING PREFIX "%s [%s] enabled at IRQ %d\n",
612616
acpi_device_name(link->device),
613617
acpi_device_bid(link->device), link->irq.active);

0 commit comments

Comments
 (0)