-------- Original Message --------
In amd-vi spec bit[60:58] are only used to store the bit[14:12] of GCR3.
No any other useage is found in several versions of amd-vi spec. So remove
them in this patch.
Also,this patch also made me confusion, please keep FC bit here, bit[60]
should be PTE's FC bit.
Vincent.
Signed-off-by: Baoquan He <b...@redhat.com>
---
drivers/iommu/amd_iommu.c | 6 +++---
drivers/iommu/amd_iommu_types.h | 2 --
2 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/drivers/iommu/amd_iommu.c b/drivers/iommu/amd_iommu.c
index f02d4b1..93bc690 100644
--- a/drivers/iommu/amd_iommu.c
+++ b/drivers/iommu/amd_iommu.c
@@ -1331,9 +1331,9 @@ static int iommu_map_page(struct protection_domain *dom,
if (count > 1) {
__pte = PAGE_SIZE_PTE(phys_addr, page_size);
- __pte |= PM_LEVEL_ENC(7) | IOMMU_PTE_V | IOMMU_PTE_FC;
+ __pte |= PM_LEVEL_ENC(7) | IOMMU_PTE_V;
} else
- __pte = phys_addr | IOMMU_PTE_V | IOMMU_PTE_FC;
+ __pte = phys_addr | IOMMU_PTE_V;
if (prot & IOMMU_PROT_IR)
__pte |= IOMMU_PTE_IR;
@@ -2463,7 +2463,7 @@ static dma_addr_t dma_ops_domain_map(struct
dma_ops_domain *dom,
if (!pte)
return DMA_ERROR_CODE;
- __pte = paddr | IOMMU_PTE_V | IOMMU_PTE_FC;
+ __pte = paddr | IOMMU_PTE_V;
if (direction == DMA_TO_DEVICE)
__pte |= IOMMU_PTE_IR;
diff --git a/drivers/iommu/amd_iommu_types.h b/drivers/iommu/amd_iommu_types.h
index 65f7988..42cd3d5 100644
--- a/drivers/iommu/amd_iommu_types.h
+++ b/drivers/iommu/amd_iommu_types.h
@@ -295,8 +295,6 @@
#define IOMMU_PTE_V (1ULL << 0)
#define IOMMU_PTE_TV (1ULL << 1)
-#define IOMMU_PTE_U (1ULL << 59)
-#define IOMMU_PTE_FC (1ULL << 60)
#define IOMMU_PTE_IR (1ULL << 61)
#define IOMMU_PTE_IW (1ULL << 62)
_______________________________________________
iommu mailing list
iommu@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/iommu
