| Message ID | 1477283492-26657-4-git-send-email-okaya@codeaurora.org |
|---|---|
| State | Not Applicable |
| Headers | show |
On 24 October 2016 at 15:31, Sinan Kaya <okaya@codeaurora.org> wrote: > 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") > Signed-off-by: Sinan Kaya <okaya@codeaurora.org> > Acked-by: Bjorn Helgaas <bhelgaas@google.com> > --- > drivers/acpi/pci_link.c | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/drivers/acpi/pci_link.c b/drivers/acpi/pci_link.c > index 74bf96e..bc3d914 100644 > --- a/drivers/acpi/pci_link.c > +++ b/drivers/acpi/pci_link.c > @@ -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); > -- > 1.9.1 > This series fixes one or more network adapters not working in Linux 32-bit x86 guest running inside VirtualBox if I have 4 network adapters enabled. The following message no longer appears in the kernel log: ACPI: No IRQ available for PCI Interrupt Link [LNKD]. Try pci=noacpi or acpi=off Tested-by: Jonathan Liu <net147@gmail.com> -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Thanks Jonathan, On 10/24/2016 12:46 AM, Jonathan Liu wrote: >> 1.9.1 >> > > This series fixes one or more network adapters not working in Linux > 32-bit x86 guest running inside VirtualBox if I have 4 network > adapters enabled. > The following message no longer appears in the kernel log: > ACPI: No IRQ available for PCI Interrupt Link [LNKD]. Try pci=noacpi or acpi=off > > Tested-by: Jonathan Liu <net147@gmail.com> Can we also get some more testing coverage from the people in TO? We want to make sure that we fixed all outstanding ACPI PCI IRQ issues.
diff --git a/drivers/acpi/pci_link.c b/drivers/acpi/pci_link.c index 74bf96e..bc3d914 100644 --- a/drivers/acpi/pci_link.c +++ b/drivers/acpi/pci_link.c @@ -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);
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") Signed-off-by: Sinan Kaya <okaya@codeaurora.org> Acked-by: Bjorn Helgaas <bhelgaas@google.com> --- drivers/acpi/pci_link.c | 4 ++++ 1 file changed, 4 insertions(+)