Merge tag 'Smack-for-5.11' of git://github.com/cschaufler/smack-next

[linux-2.6-microblaze.git] / drivers / pci / pci-acpi.c

diff --git a/drivers/pci/pci-acpi.c b/drivers/pci/pci-acpi.c
index d5869a0..53502a7 100644 (file)
--- a/drivers/pci/pci-acpi.c
+++ b/drivers/pci/pci-acpi.c
@@ -944,6 +944,16 @@ static bool acpi_pci_bridge_d3(struct pci_dev *dev)
        if (!dev->is_hotplug_bridge)
                return false;
 
+       /* Assume D3 support if the bridge is power-manageable by ACPI. */
+       adev = ACPI_COMPANION(&dev->dev);
+       if (!adev && !pci_dev_is_added(dev)) {
+               adev = acpi_pci_find_companion(&dev->dev);
+               ACPI_COMPANION_SET(&dev->dev, adev);
+       }
+
+       if (adev && acpi_device_power_manageable(adev))
+               return true;
+
        /*
         * Look for a special _DSD property for the root port and if it
         * is set we know the hierarchy behind it supports D3 just fine.
@@ -1050,7 +1060,7 @@ static int acpi_pci_propagate_wakeup(struct pci_bus *bus, bool enable)
 {
        while (bus->parent) {
                if (acpi_pm_device_can_wakeup(&bus->self->dev))
-                       return acpi_pm_set_bridge_wakeup(&bus->self->dev, enable);
+                       return acpi_pm_set_device_wakeup(&bus->self->dev, enable);
 
                bus = bus->parent;
        }
@@ -1058,7 +1068,7 @@ static int acpi_pci_propagate_wakeup(struct pci_bus *bus, bool enable)
        /* We have reached the root bus. */
        if (bus->bridge) {
                if (acpi_pm_device_can_wakeup(bus->bridge))
-                       return acpi_pm_set_bridge_wakeup(bus->bridge, enable);
+                       return acpi_pm_set_device_wakeup(bus->bridge, enable);
        }
        return 0;
 }
@@ -1152,14 +1162,34 @@ void acpi_pci_remove_bus(struct pci_bus *bus)
 static struct acpi_device *acpi_pci_find_companion(struct device *dev)
 {
        struct pci_dev *pci_dev = to_pci_dev(dev);
+       struct acpi_device *adev;
        bool check_children;
        u64 addr;
 
        check_children = pci_is_bridge(pci_dev);
        /* Please ref to ACPI spec for the syntax of _ADR */
        addr = (PCI_SLOT(pci_dev->devfn) << 16) | PCI_FUNC(pci_dev->devfn);
-       return acpi_find_child_device(ACPI_COMPANION(dev->parent), addr,
+       adev = acpi_find_child_device(ACPI_COMPANION(dev->parent), addr,
                                      check_children);
+
+       /*
+        * There may be ACPI device objects in the ACPI namespace that are
+        * children of the device object representing the host bridge, but don't
+        * represent PCI devices.  Both _HID and _ADR may be present for them,
+        * even though that is against the specification (for example, see
+        * Section 6.1 of ACPI 6.3), but in many cases the _ADR returns 0 which
+        * appears to indicate that they should not be taken into consideration
+        * as potential companions of PCI devices on the root bus.
+        *
+        * To catch this special case, disregard the returned device object if
+        * it has a valid _HID, addr is 0 and the PCI device at hand is on the
+        * root bus.
+        */
+       if (adev && adev->pnp.type.platform_id && !addr &&
+           pci_is_root_bus(pci_dev->bus))
+               return NULL;
+
+       return adev;
 }
 
 /**
@@ -1167,7 +1197,7 @@ static struct acpi_device *acpi_pci_find_companion(struct device *dev)
  * @pdev: the PCI device whose delay is to be updated
  * @handle: ACPI handle of this device
  *
- * Update the d3_delay and d3cold_delay of a PCI device from the ACPI _DSM
+ * Update the d3hot_delay and d3cold_delay of a PCI device from the ACPI _DSM
  * control method of either the device itself or the PCI host bridge.
  *
  * Function 8, "Reset Delay," applies to the entire hierarchy below a PCI
@@ -1206,8 +1236,8 @@ static void pci_acpi_optimize_delay(struct pci_dev *pdev,
                }
                if (elements[3].type == ACPI_TYPE_INTEGER) {
                        value = (int)elements[3].integer.value / 1000;
-                       if (value < PCI_PM_D3_WAIT)
-                               pdev->d3_delay = value;
+                       if (value < PCI_PM_D3HOT_WAIT)
+                               pdev->d3hot_delay = value;
                }
        }
        ACPI_FREE(obj);