Merge tag 'pci-v5.9-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci

[linux-block.git] / drivers / pci / pci-acpi.c

diff --git a/drivers/pci/pci-acpi.c b/drivers/pci/pci-acpi.c
index 0d85025c55fd4e6f4d06d7e7ee2b9b012cb8a699..d5869a03f748368e31e5be96ae0d477f88d2d494 100644 (file)
--- a/drivers/pci/pci-acpi.c
+++ b/drivers/pci/pci-acpi.c
@@ -1213,7 +1213,7 @@ static void pci_acpi_optimize_delay(struct pci_dev *pdev,
        ACPI_FREE(obj);
 }
 
-static void pci_acpi_set_untrusted(struct pci_dev *dev)
+static void pci_acpi_set_external_facing(struct pci_dev *dev)
 {
        u8 val;
 
@@ -1224,11 +1224,10 @@ static void pci_acpi_set_untrusted(struct pci_dev *dev)
 
        /*
         * These root ports expose PCIe (including DMA) outside of the
-        * system so make sure we treat them and everything behind as
-        * untrusted.
+        * system.  Everything downstream from them is external.
         */
        if (val)
-               dev->untrusted = 1;
+               dev->external_facing = 1;
 }
 
 static void pci_acpi_setup(struct device *dev)
@@ -1240,7 +1239,7 @@ static void pci_acpi_setup(struct device *dev)
                return;
 
        pci_acpi_optimize_delay(pci_dev, adev->handle);
-       pci_acpi_set_untrusted(pci_dev);
+       pci_acpi_set_external_facing(pci_dev);
        pci_acpi_add_edr_notifier(pci_dev);
 
        pci_acpi_add_pm_notifier(adev, pci_dev);