iommu/vt-d: Set context field after value initialized

LuBaolu · joergroedel · commit 41b80db22799 · 2019-03-01T10:23:35.000+01:00
Otherwise, the translation type field of a context entry for a PCI device will always be 0. All translated DMA requests will be blocked by IOMMU. As the result, the PCI devices with PCI ATS (device IOTBL) support won't work as expected. Cc: Ashok Raj <ashok.raj@intel.com> Cc: Jacob Pan <jacob.jun.pan@linux.intel.com> Suggested-by: Kevin Tian <kevin.tian@intel.com> Fixes: 7373a8c ("iommu/vt-d: Setup context and enable RID2PASID support") Signed-off-by: Lu Baolu <baolu.lu@linux.intel.com> Signed-off-by: Joerg Roedel <jroedel@suse.de>
diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c
@@ -2056,7 +2056,6 @@ static int domain_context_mapping_one(struct dmar_domain *domain,
 		int agaw;
 
 		context_set_domain_id(context, did);
-		context_set_translation_type(context, translation);
 
 		if (translation != CONTEXT_TT_PASS_THROUGH) {
 			/*
@@ -2086,6 +2085,8 @@ static int domain_context_mapping_one(struct dmar_domain *domain,
 			 */
 			context_set_address_width(context, iommu->msagaw);
 		}
+
+		context_set_translation_type(context, translation);
 	}
 
 	context_set_fault_enable(context);

Original file line number	Diff line number	Diff line change
`@@ -2056,7 +2056,6 @@ static int domain_context_mapping_one(struct dmar_domain *domain,`
`2056`	`2056`	`int agaw;`
`2057`	`2057`
`2058`	`2058`	`context_set_domain_id(context, did);`
`2059`		`- context_set_translation_type(context, translation);`
`2060`	`2059`
`2061`	`2060`	`if (translation != CONTEXT_TT_PASS_THROUGH) {`
`2062`	`2061`	`/*`
`@@ -2086,6 +2085,8 @@ static int domain_context_mapping_one(struct dmar_domain *domain,`
`2086`	`2085`	`*/`
`2087`	`2086`	`context_set_address_width(context, iommu->msagaw);`
`2088`	`2087`	`}`
	`2088`	`+`
	`2089`	`+ context_set_translation_type(context, translation);`
`2089`	`2090`	`}`
`2090`	`2091`
`2091`	`2092`	`context_set_fault_enable(context);`