iommu/amd: Restore IRTE.RemapEn bit after programming IRTE (26e495f3) · Commits · 戴 / test

Currently, the RemapEn (valid) bit is accidentally cleared when programming IRTE w/ guestMode=0. It should be restored to the prior state. Fixes: ("iommu/amd: Implements irq_set_vcpu_affinity() hook to setup vapic mode for pass-through devices") Signed-off-by:

Suravee Suthikulpanit <suravee.suthikulpanit@amd.com> Reviewed-by:

Joao Martins <joao.m.martins@oracle.com> Link: https://lore.kernel.org/r/20200903093822.52012-2-suravee.suthikulpanit@amd.com Signed-off-by:

Joerg Roedel <jroedel@suse.de>

drivers/iommu/amd/iommu.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -3850,6 +3850,7 @@ int amd_iommu_deactivate_guest_mode(void *data)
		struct amd_ir_data ir_data = (struct amd_ir_data )data;
		struct irte_ga entry = (struct irte_ga ) ir_data->entry;
		struct irq_cfg *cfg = ir_data->cfg;
		u64 valid = entry->lo.fields_remap.valid;

		if (!AMD_IOMMU_GUEST_IR_VAPIC(amd_iommu_guest_ir) \|\|
		!entry \|\| !entry->lo.fields_vapic.guest_mode)
		@@ -3858,6 +3859,7 @@ int amd_iommu_deactivate_guest_mode(void *data)
		entry->lo.val = 0;
		entry->hi.val = 0;

		entry->lo.fields_remap.valid = valid;
		entry->lo.fields_remap.dm = apic->irq_dest_mode;
		entry->lo.fields_remap.int_type = apic->irq_delivery_mode;
		entry->hi.fields.vector = cfg->vector;

Admin message