diff options
author | Joerg Roedel <joerg.roedel@amd.com> | 2009-11-23 12:32:38 -0500 |
---|---|---|
committer | Joerg Roedel <joerg.roedel@amd.com> | 2009-11-27 08:16:29 -0500 |
commit | 318afd41d2eca3224de3fd85a3b9a27a3010a98d (patch) | |
tree | 83434f1a39ee76536b4a987a25f4ff1153c41438 /arch/x86/kernel/amd_iommu.c | |
parent | 09b4280439ef6fdc55f1353a9135034336eb5d26 (diff) |
x86/amd-iommu: Make np-cache a global flag
The non-present cache flag was IOMMU local until now which
doesn't make sense. Make this a global flag so we can remove
the lase user of 'struct iommu' in the map/unmap path.
Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>
Diffstat (limited to 'arch/x86/kernel/amd_iommu.c')
-rw-r--r-- | arch/x86/kernel/amd_iommu.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/arch/x86/kernel/amd_iommu.c b/arch/x86/kernel/amd_iommu.c index a1bd99d390ab..5ebd24e4fc57 100644 --- a/arch/x86/kernel/amd_iommu.c +++ b/arch/x86/kernel/amd_iommu.c | |||
@@ -131,12 +131,6 @@ static void amd_iommu_stats_init(void) | |||
131 | 131 | ||
132 | #endif | 132 | #endif |
133 | 133 | ||
134 | /* returns !0 if the IOMMU is caching non-present entries in its TLB */ | ||
135 | static int iommu_has_npcache(struct amd_iommu *iommu) | ||
136 | { | ||
137 | return iommu->cap & (1UL << IOMMU_CAP_NPCACHE); | ||
138 | } | ||
139 | |||
140 | /**************************************************************************** | 134 | /**************************************************************************** |
141 | * | 135 | * |
142 | * Interrupt handling functions | 136 | * Interrupt handling functions |
@@ -1713,7 +1707,7 @@ retry: | |||
1713 | if (unlikely(dma_dom->need_flush && !amd_iommu_unmap_flush)) { | 1707 | if (unlikely(dma_dom->need_flush && !amd_iommu_unmap_flush)) { |
1714 | iommu_flush_tlb(&dma_dom->domain); | 1708 | iommu_flush_tlb(&dma_dom->domain); |
1715 | dma_dom->need_flush = false; | 1709 | dma_dom->need_flush = false; |
1716 | } else if (unlikely(iommu_has_npcache(iommu))) | 1710 | } else if (unlikely(amd_iommu_np_cache)) |
1717 | iommu_flush_pages(&dma_dom->domain, address, size); | 1711 | iommu_flush_pages(&dma_dom->domain, address, size); |
1718 | 1712 | ||
1719 | out: | 1713 | out: |