PCI: acpiphp: Handle PCIe ports without native hotplug capability

Commit 0d52f54e2ef64c189dedc332e680b2eb4a34590a (PCI / ACPI: Make acpiphp
ignore root bridges using PCIe native hotplug) added code that made the
acpiphp driver completely ignore PCIe root complexes for which the kernel
had been granted control of the native PCIe hotplug feature by the BIOS
through _OSC. Later commit 619a5182d1f38a3d629ee48e04fa182ef9170052
"PCI hotplug: Always allow acpiphp to handle non-PCIe bridges" relaxed
the constraints to allow acpiphp driver handle non-PCIe bridges under
such a complex.  The constraint needs to be relaxed further to allow
acpiphp driver to handle PCIe ports without native PCIe hotplug capability.

Some MR-IOV switch chipsets, such PLX8696, support multiple virtual PCIe
switches and may migrate downstream ports among virtual switches.  To
migrate a downstream port from the source virtual switch to the target, the
port needs to be hot-removed from the source and hot-added into the target.
The pciehp driver can't be used here because there are no slots within the
virtual PCIe switch.  So acpiphp driver is used to support downstream port
migration.  A typical configuration is as below:

    [Root without native PCIe HP]
        [Upstream port of vswitch without native PCIe HP]
            [Downstream port of vswitch with native PCIe HP]
                [PCIe endpoint]

Here acpiphp driver will be used to handle root ports and upstream port
in the virtual switch, and pciehp driver will be used to handle downstream
ports in the virtual switch.

Signed-off-by: Jiang Liu <liuj97@gmail.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Acked-by: Rafael J. Wysocki <rjw@sisk.pl>

diff --git a/drivers/pci/hotplug/acpiphp_glue.c b/drivers/pci/hotplug/acpiphp_glue.c
index ad6fd66954956e81a91195c5b265fea27c2fd6b5..e6da3927c497fb8ed60db4c3bd7975359ebc082f 100644 (file)
--- a/drivers/pci/hotplug/acpiphp_glue.c
+++ b/drivers/pci/hotplug/acpiphp_glue.c
@@ -115,6 +115,35 @@ static const struct acpi_dock_ops acpiphp_dock_ops = {
        .handler = handle_hotplug_event_func,
 };
 
+/* Check whether the PCI device is managed by native PCIe hotplug driver */
+static bool device_is_managed_by_native_pciehp(struct pci_dev *pdev)
+{
+       u32 reg32;
+       acpi_handle tmp;
+       struct acpi_pci_root *root;
+
+       /* Check whether the PCIe port supports native PCIe hotplug */
+       if (pcie_capability_read_dword(pdev, PCI_EXP_SLTCAP, &reg32))
+               return false;
+       if (!(reg32 & PCI_EXP_SLTCAP_HPC))
+               return false;
+
+       /*
+        * Check whether native PCIe hotplug has been enabled for
+        * this PCIe hierarchy.
+        */
+       tmp = acpi_find_root_bridge_handle(pdev);
+       if (!tmp)
+               return false;
+       root = acpi_pci_find_root(tmp);
+       if (!root)
+               return false;
+       if (!(root->osc_control_set & OSC_PCI_EXPRESS_NATIVE_HP_CONTROL))
+               return false;
+
+       return true;
+}
+
 /* callback routine to register each ACPI PCI slot object */
 static acpi_status
 register_slot(acpi_handle handle, u32 lvl, void *context, void **rv)
@@ -142,16 +171,8 @@ register_slot(acpi_handle handle, u32 lvl, void *context, void **rv)
        function = adr & 0xffff;
 
        pdev = pbus->self;
-       if (pdev && pci_is_pcie(pdev)) {
-               tmp = acpi_find_root_bridge_handle(pdev);
-               if (tmp) {
-                       struct acpi_pci_root *root = acpi_pci_find_root(tmp);
-
-                       if (root && (root->osc_control_set &
-                                       OSC_PCI_EXPRESS_NATIVE_HP_CONTROL))
-                               return AE_OK;
-               }
-       }
+       if (pdev && device_is_managed_by_native_pciehp(pdev))
+               return AE_OK;
 
        newfunc = kzalloc(sizeof(struct acpiphp_func), GFP_KERNEL);
        if (!newfunc)