iommu/amd: X2apic mode: re-enable after resume

Maxim Levitsky · joergroedel · commit 01b297a48a26 · 2021-12-17T09:20:43.000+01:00
Otherwise it is guaranteed to not work after the resume... Fixes: 6692981 ("iommu/amd: Add support for X2APIC IOMMU interrupts") Signed-off-by: Maxim Levitsky <mlevitsk@redhat.com> Link: https://lore.kernel.org/r/20211123161038.48009-3-mlevitsk@redhat.com Signed-off-by: Joerg Roedel <jroedel@suse.de>
diff --git a/drivers/iommu/amd/init.c b/drivers/iommu/amd/init.c
@@ -2172,7 +2172,6 @@ static int iommu_setup_intcapxt(struct amd_iommu *iommu)
 		return ret;
 	}
 
-	iommu_feature_enable(iommu, CONTROL_INTCAPXT_EN);
 	return 0;
 }
 
@@ -2195,6 +2194,10 @@ static int iommu_init_irq(struct amd_iommu *iommu)
 
 	iommu->int_enabled = true;
 enable_faults:
+
+	if (amd_iommu_xt_mode == IRQ_REMAP_X2APIC_MODE)
+		iommu_feature_enable(iommu, CONTROL_INTCAPXT_EN);
+
 	iommu_feature_enable(iommu, CONTROL_EVT_INT_EN);
 
 	if (iommu->ppr_log != NULL)

Original file line number	Diff line number	Diff line change
`@@ -2172,7 +2172,6 @@ static int iommu_setup_intcapxt(struct amd_iommu *iommu)`
`2172`	`2172`	`return ret;`
`2173`	`2173`	`}`
`2174`	`2174`
`2175`		`- iommu_feature_enable(iommu, CONTROL_INTCAPXT_EN);`
`2176`	`2175`	`return 0;`
`2177`	`2176`	`}`
`2178`	`2177`
`@@ -2195,6 +2194,10 @@ static int iommu_init_irq(struct amd_iommu *iommu)`
`2195`	`2194`
`2196`	`2195`	`iommu->int_enabled = true;`
`2197`	`2196`	`enable_faults:`
	`2197`	`+`
	`2198`	`+ if (amd_iommu_xt_mode == IRQ_REMAP_X2APIC_MODE)`
	`2199`	`+ iommu_feature_enable(iommu, CONTROL_INTCAPXT_EN);`
	`2200`	`+`
`2198`	`2201`	`iommu_feature_enable(iommu, CONTROL_EVT_INT_EN);`
`2199`	`2202`
`2200`	`2203`	`if (iommu->ppr_log != NULL)`