mirror of
https://git.yoctoproject.org/meta-ti
synced 2026-07-27 14:28:05 +00:00
Koen Kooi
189ce92b4c
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> Signed-off-by: Denys Dmytriyenko <denys@ti.com>
64 lines
2.0 KiB
Diff
64 lines
2.0 KiB
Diff
From 7049f47a9ae3e01f50957ed9349d850579905544 Mon Sep 17 00:00:00 2001
|
|
From: David Woodhouse <dwmw2@infradead.org>
|
|
Date: Fri, 25 May 2012 17:42:54 +0100
|
|
Subject: [PATCH 101/117] intel-iommu: Add device info into list before doing
|
|
context mapping
|
|
|
|
commit e2ad23d04c1304431ab5176c89b7b476ded2d995 upstream.
|
|
|
|
Add device info into list before doing context mapping, because device
|
|
info will be used by iommu_enable_dev_iotlb(). Without it, ATS won't get
|
|
enabled as it should be.
|
|
|
|
ATS, while a dubious decision from a security point of view, can be very
|
|
important for performance.
|
|
|
|
Signed-off-by: Xudong Hao <xudong.hao@intel.com>
|
|
Signed-off-by: Xiantao Zhang <xiantao.zhang@intel.com>
|
|
Acked-by: Chris Wright <chrisw@sous-sol.org>
|
|
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
|
|
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
|
|
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
|
|
---
|
|
drivers/iommu/intel-iommu.c | 17 +++++++++++------
|
|
1 file changed, 11 insertions(+), 6 deletions(-)
|
|
|
|
diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c
|
|
index bdc447f..ccf347f 100644
|
|
--- a/drivers/iommu/intel-iommu.c
|
|
+++ b/drivers/iommu/intel-iommu.c
|
|
@@ -2267,12 +2267,6 @@ static int domain_add_dev_info(struct dmar_domain *domain,
|
|
if (!info)
|
|
return -ENOMEM;
|
|
|
|
- ret = domain_context_mapping(domain, pdev, translation);
|
|
- if (ret) {
|
|
- free_devinfo_mem(info);
|
|
- return ret;
|
|
- }
|
|
-
|
|
info->segment = pci_domain_nr(pdev->bus);
|
|
info->bus = pdev->bus->number;
|
|
info->devfn = pdev->devfn;
|
|
@@ -2285,6 +2279,17 @@ static int domain_add_dev_info(struct dmar_domain *domain,
|
|
pdev->dev.archdata.iommu = info;
|
|
spin_unlock_irqrestore(&device_domain_lock, flags);
|
|
|
|
+ ret = domain_context_mapping(domain, pdev, translation);
|
|
+ if (ret) {
|
|
+ spin_lock_irqsave(&device_domain_lock, flags);
|
|
+ list_del(&info->link);
|
|
+ list_del(&info->global);
|
|
+ pdev->dev.archdata.iommu = NULL;
|
|
+ spin_unlock_irqrestore(&device_domain_lock, flags);
|
|
+ free_devinfo_mem(info);
|
|
+ return ret;
|
|
+ }
|
|
+
|
|
return 0;
|
|
}
|
|
|
|
--
|
|
1.7.9.5
|
|
|