From: Joerg Roedel <[email protected]> Hide the copied context entries from the IOMMU driver by considering them as non-present. This is implemented by setting the first AVL bit (bit 67) in the context entry to one. If this bit is set, the context_present() function returns false.
Signed-off-by: Joerg Roedel <[email protected]> --- drivers/iommu/intel-iommu.c | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c index b0fd5f2..f50d065 100644 --- a/drivers/iommu/intel-iommu.c +++ b/drivers/iommu/intel-iommu.c @@ -234,11 +234,21 @@ struct context_entry { u64 hi; }; -static inline bool context_present(struct context_entry *context) +static inline bool __context_present(struct context_entry *context) { return (context->lo & 1); } +static inline bool context_copied(struct context_entry *context) +{ + return (((context->hi >> 3) & 0xfULL) == 1); +} + +static inline bool context_present(struct context_entry *context) +{ + return __context_present(context) && !context_copied(context); +} + static inline int context_fault_enable(struct context_entry *c) { return((c->lo >> 1) & 0x1); @@ -269,6 +279,11 @@ static inline void context_set_present(struct context_entry *context) context->lo |= 1; } +static inline void context_set_copied(struct context_entry *context) +{ + context->hi |= 1ULL << 3; +} + static inline void context_set_fault_enable(struct context_entry *context) { context->lo &= (((u64)-1) << 2) | 1; @@ -1919,6 +1934,9 @@ static int domain_context_mapping_one(struct dmar_domain *domain, } } + /* First clear any left-overs, like a copied context entry */ + context_clear_entry(context); + context_set_domain_id(context, id); if (translation != CONTEXT_TT_PASS_THROUGH) { @@ -4911,13 +4929,15 @@ static int copy_one_context_table(struct intel_iommu *iommu, memcpy_fromio(&ce, &ctxt_tbl_old[devfn], sizeof(struct context_entry)); - if (!context_present(&ce)) + if (!__context_present(&ce)) continue; did = context_domain_id(&ce); if (did >=0 && did < cap_ndoms(iommu->cap)) set_bit(did, iommu->domain_ids); + context_set_copied(&ce); + ctxt_tbl[devfn] = ce; } -- 1.9.1 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
