Merge tag 'iommu-updates-v4.21' of git://git.kernel.org/pub/scm/linux/kernel/git...

[sfrench/cifs-2.6.git] / drivers / acpi / arm64 / iort.c

diff --git a/drivers/acpi/arm64/iort.c b/drivers/acpi/arm64/iort.c
index 6d539d0673738378428bae5bba34580cd29e0736..fdd90ffceb85cedd8c8a2049d48be97d66ee9a6e 100644 (file)
--- a/drivers/acpi/arm64/iort.c
+++ b/drivers/acpi/arm64/iort.c
@@ -1436,8 +1436,14 @@ dev_put:
        return ret;
 }
 
-static bool __init iort_enable_acs(struct acpi_iort_node *iort_node)
+#ifdef CONFIG_PCI
+static void __init iort_enable_acs(struct acpi_iort_node *iort_node)
 {
+       static bool acs_enabled __initdata;
+
+       if (acs_enabled)
+               return;
+
        if (iort_node->type == ACPI_IORT_NODE_PCI_ROOT_COMPLEX) {
                struct acpi_iort_node *parent;
                struct acpi_iort_id_mapping *map;
@@ -1459,13 +1465,15 @@ static bool __init iort_enable_acs(struct acpi_iort_node *iort_node)
                        if ((parent->type == ACPI_IORT_NODE_SMMU) ||
                                (parent->type == ACPI_IORT_NODE_SMMU_V3)) {
                                pci_request_acs();
-                               return true;
+                               acs_enabled = true;
+                               return;
                        }
                }
        }
-
-       return false;
 }
+#else
+static inline void iort_enable_acs(struct acpi_iort_node *iort_node) { }
+#endif
 
 static void __init iort_init_platform_devices(void)
 {
@@ -1473,7 +1481,6 @@ static void __init iort_init_platform_devices(void)
        struct acpi_table_iort *iort;
        struct fwnode_handle *fwnode;
        int i, ret;
-       bool acs_enabled = false;
        const struct iort_dev_config *ops;
 
        /*
@@ -1494,8 +1501,7 @@ static void __init iort_init_platform_devices(void)
                        return;
                }
 
-               if (!acs_enabled)
-                       acs_enabled = iort_enable_acs(iort_node);
+               iort_enable_acs(iort_node);
 
                ops = iort_get_dev_cfg(iort_node);
                if (ops) {