Skip to contentSkip to conversation

Patch "ACPI/PCI: pci_link: Include PIRQ_PENALTY_PCI_USING for ISA IRQs" has been added to the 4.8-stable tree

PATCH [email protected] 1 participant 1 message Nov 17, 2016

Subsystems (3)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

ACPI/PCI: pci_link: Include PIRQ_PENALTY_PCI_USING for ISA IRQs

to the 4.8-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
acpi-pci-pci_link-include-pirq_penalty_pci_using-for-isa-irqs.patch
and it can be found in the queue-4.8 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From 98756f5319c64c883caa910dce702d9edefe7810 Mon Sep 17 00:00:00 2001

From: Sinan Kaya <[email protected]>
Date: Mon, 24 Oct 2016 00:31:32 -0400
Subject: ACPI/PCI: pci_link: Include PIRQ_PENALTY_PCI_USING for ISA IRQs

From: Sinan Kaya <[email protected]>

commit 98756f5319c64c883caa910dce702d9edefe7810 upstream.

Commit 103544d86976 ("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 f7eca374f000 ("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 f7eca374f000 (ACPI,PCI,IRQ: separate ISA penalty calculation)
---
 drivers/acpi/pci_link.c |    4 ++++
 1 file changed, 4 insertions(+)
drivers/acpi/pci_link.c +4 -0
@@ -608,6 +608,10 @@ static int acpi_pci_link_allocate(struct
 			    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);

Patches currently in stable-queue which might be from [email protected] are

queue-4.8/acpi-pci-pci_link-penalize-sci-correctly.patch queue-4.8/acpi-pci-irq-assign-isa-irq-directly-during-early-boot-stages.patch queue-4.8/acpi-pci-pci_link-include-pirq_penalty_pci_using-for-isa-irqs.patch