Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 98756f53 authored by Sinan Kaya's avatar Sinan Kaya Committed by Rafael J. Wysocki
Browse files

ACPI/PCI: pci_link: Include PIRQ_PENALTY_PCI_USING for ISA IRQs 



Commit 103544d8 ("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 f7eca374
("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: f7eca374 (ACPI,PCI,IRQ: separate ISA penalty calculation)
Signed-off-by: default avatarSinan Kaya <okaya@codeaurora.org>
Acked-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Tested-by: default avatarJonathan Liu <net147@gmail.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent f1caa61d

drivers/acpi/pci_link.c

+4 −0
Original line number Diff line number Diff line
@@ -608,6 +608,10 @@ static int acpi_pci_link_allocate(struct acpi_pci_link *link) 
			    acpi_device_bid(link->device));

		return -ENODEV;

	} 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",

		       acpi_device_name(link->device),

		       acpi_device_bid(link->device), link->irq.active);