diff options
| author | Varun Sethi <Varun.Sethi@freescale.com> | 2014-06-24 19:27:16 +0530 |
|---|---|---|
| committer | Joerg Roedel <jroedel@suse.de> | 2014-07-07 10:30:02 +0200 |
| commit | 75f0e4615dc328e67634eccd86bc71597da9f8a3 (patch) | |
| tree | 3b28358c4cb72c27ac3e86d46b269f62c599ccf6 /drivers/iommu | |
| parent | d033f48f3a4a9279c7475891fbb060d4881c22da (diff) | |
| download | op-kernel-dev-75f0e4615dc328e67634eccd86bc71597da9f8a3.zip op-kernel-dev-75f0e4615dc328e67634eccd86bc71597da9f8a3.tar.gz | |
iommu/fsl: Fix the device domain attach condition.
Store the domain information for the device, only if it's not already
attached to a domain.
Signed-off-by: Varun Sethi <Varun.Sethi@freescale.com>
Signed-off-by: Joerg Roedel <jroedel@suse.de>
Diffstat (limited to 'drivers/iommu')
| -rw-r--r-- | drivers/iommu/fsl_pamu_domain.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/drivers/iommu/fsl_pamu_domain.c b/drivers/iommu/fsl_pamu_domain.c index 3dd0b8e..54060d1 100644 --- a/drivers/iommu/fsl_pamu_domain.c +++ b/drivers/iommu/fsl_pamu_domain.c @@ -335,11 +335,6 @@ static struct fsl_dma_domain *iommu_alloc_dma_domain(void) return domain; } -static inline struct device_domain_info *find_domain(struct device *dev) -{ - return dev->archdata.iommu_domain; -} - static void remove_device_ref(struct device_domain_info *info, u32 win_cnt) { unsigned long flags; @@ -380,7 +375,7 @@ static void attach_device(struct fsl_dma_domain *dma_domain, int liodn, struct d * Check here if the device is already attached to domain or not. * If the device is already attached to a domain detach it. */ - old_domain_info = find_domain(dev); + old_domain_info = dev->archdata.iommu_domain; if (old_domain_info && old_domain_info->domain != dma_domain) { spin_unlock_irqrestore(&device_domain_lock, flags); detach_device(dev, old_domain_info->domain); @@ -399,7 +394,7 @@ static void attach_device(struct fsl_dma_domain *dma_domain, int liodn, struct d * the info for the first LIODN as all * LIODNs share the same domain */ - if (!old_domain_info) + if (!dev->archdata.iommu_domain) dev->archdata.iommu_domain = info; spin_unlock_irqrestore(&device_domain_lock, flags); |
