diff options
| author |   Marek Szyprowski <m.szyprowski@samsung.com> | 2017-01-09 13:03:55 +0100 |
|---|---|---|
| committer |   Joerg Roedel <jroedel@suse.de> | 2017-01-10 15:01:21 +0100 |
| commit | 0bd5a0c77ad49ce5cf631bbe5616b6625ff50d96 (patch) | |
| tree | e026f987eecd1a1ecc3c2c16687fc76d4840d981 /drivers/iommu | |
| parent | iommu/exynos: Fix warnings from DMA-debug (diff) | |
| download | linux-dev-0bd5a0c77ad49ce5cf631bbe5616b6625ff50d96.tar.xz linux-dev-0bd5a0c77ad49ce5cf631bbe5616b6625ff50d96.zip | |
iommu/exynos: Ensure that SYSMMU is added only once to its master device
This patch prepares Exynos IOMMU driver for deferred probing
support. Once it gets added, of_xlate() callback might be called
more than once for the same SYSMMU controller and master device
(for example it happens when masters device driver fails with
EPROBE_DEFER). This patch adds a check, which ensures that SYSMMU
controller is added to its master device (owner) only once.
Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Signed-off-by: Joerg Roedel <jroedel@suse.de>
Diffstat (limited to 'drivers/iommu')
| -rw-r--r-- | drivers/iommu/exynos-iommu.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/iommu/exynos-iommu.c b/drivers/iommu/exynos-iommu.c index dda4e5907979..91f78272167c 100644 --- a/drivers/iommu/exynos-iommu.c +++ b/drivers/iommu/exynos-iommu.c @@ -1253,7 +1253,7 @@ static int exynos_iommu_of_xlate(struct device *dev, { struct exynos_iommu_owner *owner = dev->archdata.iommu; struct platform_device *sysmmu = of_find_device_by_node(spec->np); - struct sysmmu_drvdata *data; + struct sysmmu_drvdata *data, *entry; if (!sysmmu) return -ENODEV; @@ -1272,6 +1272,10 @@ static int exynos_iommu_of_xlate(struct device *dev, dev->archdata.iommu = owner; } + list_for_each_entry(entry, &owner->controllers, owner_node) + if (entry == data) + return 0; + list_add_tail(&data->owner_node, &owner->controllers); data->master = dev; |