[PATCHv8,04/21] driver/core: populate devices in order for IOMMUs

Message ID 1401448834-32659-5-git-send-email-hdoyu@nvidia.com
State Superseded, archived
Headers show

Commit Message

Hiroshi Doyu May 30, 2014, 11:20 a.m.
IOMMU devices on the bus need to be poplulated first, then iommu
master devices are done later.

With CONFIG_OF_IOMMU, "iommus=" DT binding would be used to identify
whether a device can be an iommu msater or not. If a device can, we'll
defer to populate that device till an iommu device is populated. Then,
those deferred iommu master devices are populated and configured with
help of the already populated iommu device.

Signed-off-by: Hiroshi Doyu <hdoyu@nvidia.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 drivers/base/dd.c | 5 +++++
 1 file changed, 5 insertions(+)


diff --git a/drivers/base/dd.c b/drivers/base/dd.c
index 62ec61e8f84a..ef5069d03831 100644
--- a/drivers/base/dd.c
+++ b/drivers/base/dd.c
@@ -25,6 +25,7 @@ 
 #include <linux/async.h>
 #include <linux/pm_runtime.h>
 #include <linux/pinctrl/devinfo.h>
+#include <linux/of_iommu.h>
 #include "base.h"
 #include "power/power.h"
@@ -287,6 +288,10 @@  static int really_probe(struct device *dev, struct device_driver *drv)
 	dev->driver = drv;
+	ret = of_iommu_attach(dev);
+	if (ret)
+		goto probe_failed;
 	/* If using pinctrl, bind pins now before probing */
 	ret = pinctrl_bind_pins(dev);
 	if (ret)