projects
/
platform
/
kernel
/
linux-amlogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
60b523e
)
iommu/vt-d: Enable Translation only if it was previously disabled
author
Joerg Roedel
<jroedel@suse.de>
Fri, 12 Jun 2015 12:40:01 +0000
(14:40 +0200)
committer
Joerg Roedel
<jroedel@suse.de>
Tue, 16 Jun 2015 08:59:35 +0000
(10:59 +0200)
Do not touch the TE bit unless we know translation is
disabled.
Tested-by: ZhenHua Li <zhen-hual@hp.com>
Tested-by: Baoquan He <bhe@redhat.com>
Signed-off-by: Joerg Roedel <jroedel@suse.de>
drivers/iommu/intel-iommu.c
patch
|
blob
|
history
diff --git
a/drivers/iommu/intel-iommu.c
b/drivers/iommu/intel-iommu.c
index
e40c858
..
a98a7b2
100644
(file)
--- a/
drivers/iommu/intel-iommu.c
+++ b/
drivers/iommu/intel-iommu.c
@@
-3204,7
+3204,9
@@
domains_done:
if (ret)
goto free_iommu;
- iommu_enable_translation(iommu);
+ if (!translation_pre_enabled(iommu))
+ iommu_enable_translation(iommu);
+
iommu_disable_protect_mem_regions(iommu);
}