device property: Introduces device_dma_is_coherent()

Currently, device drivers, which support both OF and ACPI,
need to call two separate APIs, of_dma_is_coherent() and
acpi_dma_is_coherent()) to determine device coherency attribute.

This patch simplifies this process by introducing a new device
property API, device_dma_is_coherent(), which calls the appropriate
interface based on the booting architecture.

Signed-off-by: Suravee Suthikulpanit <Suravee.Suthikulpanit@amd.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

diff --git a/drivers/base/property.c b/drivers/base/property.c
index 1d0b116cae959041682eaf6bb7ea91895b390e58..e645852396ba44430d77273b0a513cb5e8deb78a 100644 (file)
--- a/drivers/base/property.c
+++ b/drivers/base/property.c
@@ -14,6 +14,7 @@
 #include <linux/export.h>
 #include <linux/kernel.h>
 #include <linux/of.h>
+#include <linux/of_address.h>
 #include <linux/property.h>
 
 /**
@@ -519,3 +520,16 @@ unsigned int device_get_child_node_count(struct device *dev)
        return count;
 }
 EXPORT_SYMBOL_GPL(device_get_child_node_count);
+
+bool device_dma_is_coherent(struct device *dev)
+{
+       bool coherent = false;
+
+       if (IS_ENABLED(CONFIG_OF) && dev->of_node)
+               coherent = of_dma_is_coherent(dev->of_node);
+       else
+               acpi_check_dma(ACPI_COMPANION(dev), &coherent);
+
+       return coherent;
+}
+EXPORT_SYMBOL_GPL(device_dma_is_coherent);

diff --git a/include/linux/property.h b/include/linux/property.h
index de8bdf417a35adc745e37fc1df1de7453d518895..76ebde9c11d483fe3a177b049e2774550e7b2bcc 100644 (file)
--- a/include/linux/property.h
+++ b/include/linux/property.h
@@ -164,4 +164,6 @@ struct property_set {
 
 void device_add_property_set(struct device *dev, struct property_set *pset);
 
+bool device_dma_is_coherent(struct device *dev);
+
 #endif /* _LINUX_PROPERTY_H_ */