UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

Revert "PCI/portdrv: Do not setup up IRQs if there are no users" 

This reverts commit 0e8ae5a6ff.

0e8ae5a6ff ("PCI/portdrv: Do not setup up IRQs if there are no users")
reduced usage of IRQs when we don't think we need them.  But Joey, Sergiu,
and David reported choppy GUI rendering, systems that became unresponsive
every few seconds, incorrect values reported by cpufreq, and high IRQ 16
CPU usage.

Joey bisected the issues to 0e8ae5a6ff, so revert it until we figure out
a better solution.

Link: https://lore.kernel.org/r/20220210222717.GA658201@bhelgaas
Link: https://bugzilla.kernel.org/show_bug.cgi?id=215533
Link: https://bugzilla.kernel.org/show_bug.cgi?id=215546
Reported-by: Joey Corleone <joey.corleone@mail.ru>
Reported-by: Sergiu Deitsch <sergiu.deitsch@gmail.com>
Reported-by: David Spencer <dspencer577@gmail.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Cc: stable@vger.kernel.org	# v5.16+
Cc: Jan Kiszka <jan.kiszka@siemens.com>
This commit is contained in:
Bjorn Helgaas 2022-02-07 16:33:30 -06:00
parent e783362eb5
commit 075b7d363c
1 changed files with 17 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
drivers/pci/pcie/portdrv_core.c
View File

@ -166,6 +166,9 @@ static int pcie_init_service_irqs(struct pci_dev *dev, int *irqs, int mask)
{ {
int ret, i; int ret, i;
for (i = 0; i < PCIE_PORT_DEVICE_MAXSERVICES; i++)
irqs[i] = -1;
/* /*
* If we support PME but can't use MSI/MSI-X for it, we have to * If we support PME but can't use MSI/MSI-X for it, we have to
* fall back to INTx or other interrupts, e.g., a system shared * fall back to INTx or other interrupts, e.g., a system shared
@ -314,10 +317,8 @@ static int pcie_device_init(struct pci_dev *pdev, int service, int irq)
*/ */
int pcie_port_device_register(struct pci_dev *dev) int pcie_port_device_register(struct pci_dev *dev)
{ {
int status, capabilities, irq_services, i, nr_service; int status, capabilities, i, nr_service;
int irqs[PCIE_PORT_DEVICE_MAXSERVICES] = { int irqs[PCIE_PORT_DEVICE_MAXSERVICES];
[0 ... PCIE_PORT_DEVICE_MAXSERVICES-1] = -1
};
/* Enable PCI Express port device */ /* Enable PCI Express port device */
status = pci_enable_device(dev); status = pci_enable_device(dev);
@ -330,32 +331,18 @@ int pcie_port_device_register(struct pci_dev *dev)
return 0; return 0;
pci_set_master(dev); pci_set_master(dev);
/*
irq_services = 0; * Initialize service irqs. Don't use service devices that
if (IS_ENABLED(CONFIG_PCIE_PME)) * require interrupts if there is no way to generate them.
irq_services |= PCIE_PORT_SERVICE_PME; * However, some drivers may have a polling mode (e.g. pciehp_poll_mode)
if (IS_ENABLED(CONFIG_PCIEAER)) * that can be used in the absence of irqs. Allow them to determine
irq_services |= PCIE_PORT_SERVICE_AER; * if that is to be used.
if (IS_ENABLED(CONFIG_HOTPLUG_PCI_PCIE)) */
irq_services |= PCIE_PORT_SERVICE_HP; status = pcie_init_service_irqs(dev, irqs, capabilities);
if (IS_ENABLED(CONFIG_PCIE_DPC)) if (status) {
irq_services |= PCIE_PORT_SERVICE_DPC; capabilities &= PCIE_PORT_SERVICE_HP;
irq_services &= capabilities; if (!capabilities)
goto error_disable;
if (irq_services) {
/*
* Initialize service IRQs. Don't use service devices that
* require interrupts if there is no way to generate them.
* However, some drivers may have a polling mode (e.g.
* pciehp_poll_mode) that can be used in the absence of IRQs.
* Allow them to determine if that is to be used.
*/
status = pcie_init_service_irqs(dev, irqs, irq_services);
if (status) {
irq_services &= PCIE_PORT_SERVICE_HP;
if (!irq_services)
goto error_disable;
}
} }
/* Allocate child services if any */ /* Allocate child services if any */