Commit f7eca374 authored by Sinan Kaya's avatar Sinan Kaya Committed by Rafael J. Wysocki

ACPI,PCI,IRQ: separate ISA penalty calculation

Since commit 103544d8 (ACPI,PCI,IRQ: reduce resource requirements)
the penalty values are calculated on the fly rather than at boot time.

This works fine for PCI interrupts but not so well for ISA interrupts.

The information on whether or not an ISA interrupt is in use is not
available to the pci_link.c code directly.  That information is
obtained from the outside via acpi_penalize_isa_irq().  [If its
"active" argument is true, then the IRQ is in use by ISA.]

Since the current code relies on PCI Link objects for determination
of penalties, we are factoring in the PCI penalty twice after
acpi_penalize_isa_irq() function is called.

To avoid that, limit the newly added functionality to just PCI
interrupts so that old behavior is still maintained.

Fixes: 103544d8 (ACPI,PCI,IRQ: reduce resource requirements)
Signed-off-by: default avatarSinan Kaya <okaya@codeaurora.org>
Tested-by: default avatarWim Osterholt <wim@djo.tudelft.nl>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 487cf917
...@@ -496,9 +496,6 @@ static int acpi_irq_get_penalty(int irq) ...@@ -496,9 +496,6 @@ static int acpi_irq_get_penalty(int irq)
{ {
int penalty = 0; int penalty = 0;
if (irq < ACPI_MAX_ISA_IRQS)
penalty += acpi_isa_irq_penalty[irq];
/* /*
* Penalize IRQ used by ACPI SCI. If ACPI SCI pin attributes conflict * 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 * with PCI IRQ attributes, mark ACPI SCI as ISA_ALWAYS so it won't be
...@@ -513,6 +510,9 @@ static int acpi_irq_get_penalty(int irq) ...@@ -513,6 +510,9 @@ static int acpi_irq_get_penalty(int irq)
penalty += PIRQ_PENALTY_PCI_USING; penalty += PIRQ_PENALTY_PCI_USING;
} }
if (irq < ACPI_MAX_ISA_IRQS)
return penalty + acpi_isa_irq_penalty[irq];
penalty += acpi_irq_pci_sharing_penalty(irq); penalty += acpi_irq_pci_sharing_penalty(irq);
return penalty; return penalty;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment