ACPI/PCI: pci_link: Include PIRQ_PENALTY_PCI_USING for ISA IRQs
Commitsteinar/wifi_calib_4_9_kernel103544d869
("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(), butf7eca374f0
("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:f7eca374f0
(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>
parent
f1caa61df2
commit
98756f5319
|
@ -608,6 +608,10 @@ static int acpi_pci_link_allocate(struct acpi_pci_link *link)
|
||||||
acpi_device_bid(link->device));
|
acpi_device_bid(link->device));
|
||||||
return -ENODEV;
|
return -ENODEV;
|
||||||
} else {
|
} else {
|
||||||
|
if (link->irq.active < ACPI_MAX_ISA_IRQS)
|
||||||
|
acpi_isa_irq_penalty[link->irq.active] +=
|
||||||
|
PIRQ_PENALTY_PCI_USING;
|
||||||
|
|
||||||
printk(KERN_WARNING PREFIX "%s [%s] enabled at IRQ %d\n",
|
printk(KERN_WARNING PREFIX "%s [%s] enabled at IRQ %d\n",
|
||||||
acpi_device_name(link->device),
|
acpi_device_name(link->device),
|
||||||
acpi_device_bid(link->device), link->irq.active);
|
acpi_device_bid(link->device), link->irq.active);
|
||||||
|
|
Loading…
Reference in New Issue