Skip to content

Commit a9fae40

Browse files
l1kgregkh
authored andcommitted
PCI/portdrv: Use is_pciehp instead of is_hotplug_bridge
commit 1d60796 upstream. The PCIe port driver erroneously creates a subdevice for hotplug on ACPI slots which are handled by the ACPI hotplug driver. Avoid by checking the is_pciehp flag instead of is_hotplug_bridge when deciding whether to create a subdevice. The latter encompasses ACPI slots whereas the former doesn't. The superfluous subdevice has no real negative impact, it occupies memory and interrupt resources but otherwise just sits there waiting for interrupts from the slot that are never signaled. Fixes: f841522 ("PCI: Use cached copy of PCI_EXP_SLTCAP_HPC bit") Signed-off-by: Lukas Wunner <lukas@wunner.de> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> Cc: stable@vger.kernel.org # v4.7+ Link: https://patch.msgid.link/40d5a5fe8d40595d505949c620a067fa110ee85e.1752390102.git.lukas@wunner.de Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent fd2e31c commit a9fae40

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

drivers/pci/pcie/portdrv.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@ static int get_port_device_capability(struct pci_dev *dev)
220220
struct pci_host_bridge *host = pci_find_host_bridge(dev->bus);
221221
int services = 0;
222222

223-
if (dev->is_hotplug_bridge &&
223+
if (dev->is_pciehp &&
224224
(pci_pcie_type(dev) == PCI_EXP_TYPE_ROOT_PORT ||
225225
pci_pcie_type(dev) == PCI_EXP_TYPE_DOWNSTREAM) &&
226226
(pcie_ports_native || host->native_pcie_hotplug)) {

0 commit comments

Comments
 (0)