projects
/
linux-2.6-block.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
38a76ee
)
x86/amd-iommu: Use fetch_pte in amd_iommu_iova_to_phys
author
Joerg Roedel
<joerg.roedel@amd.com>
Wed, 2 Sep 2009 15:08:55 +0000
(17:08 +0200)
committer
Joerg Roedel
<joerg.roedel@amd.com>
Thu, 3 Sep 2009 14:03:42 +0000
(16:03 +0200)
Don't reimplement the page table walker in this function.
Use the generic one.
Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>
arch/x86/kernel/amd_iommu.c
patch
|
blob
|
blame
|
history
diff --git
a/arch/x86/kernel/amd_iommu.c
b/arch/x86/kernel/amd_iommu.c
index 5e52798999944fa1ef3e2646f916d2d4c9f56bd9..4a54366d422d93e0afb0b80464ee973ac3446880 100644
(file)
--- a/
arch/x86/kernel/amd_iommu.c
+++ b/
arch/x86/kernel/amd_iommu.c
@@
-2140,21
+2140,9
@@
static phys_addr_t amd_iommu_iova_to_phys(struct iommu_domain *dom,
phys_addr_t paddr;
u64 *pte;
- pte =
&domain->pt_root[IOMMU_PTE_L2_INDEX(iova)]
;
+ pte =
fetch_pte(domain, iova)
;
- if (!IOMMU_PTE_PRESENT(*pte))
- return 0;
-
- pte = IOMMU_PTE_PAGE(*pte);
- pte = &pte[IOMMU_PTE_L1_INDEX(iova)];
-
- if (!IOMMU_PTE_PRESENT(*pte))
- return 0;
-
- pte = IOMMU_PTE_PAGE(*pte);
- pte = &pte[IOMMU_PTE_L0_INDEX(iova)];
-
- if (!IOMMU_PTE_PRESENT(*pte))
+ if (!pte || !IOMMU_PTE_PRESENT(*pte))
return 0;
paddr = *pte & IOMMU_PAGE_MASK;