Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d4d1c0f3 authored by Joerg Roedel's avatar Joerg Roedel
Browse files

iommu/vt-d: Set IRTA in intel_setup_irq_remapping 



This way we can give the hardware the new IR table right
after it has been allocated and initialized.

Tested-by: default avatarZhenHua Li <zhen-hual@hp.com>
Tested-by: default avatarBaoquan He <bhe@redhat.com>
Signed-off-by: default avatarJoerg Roedel <jroedel@suse.de>
parent c676f587

drivers/iommu/intel_irq_remapping.c

+14 −5
Original line number Diff line number Diff line
@@ -428,9 +428,9 @@ static int set_msi_sid(struct irte *irte, struct pci_dev *dev) 


static void iommu_set_irq_remapping(struct intel_iommu *iommu, int mode)

{

	unsigned long flags;

	u64 addr;

	u32 sts;

	unsigned long flags;



	addr = virt_to_phys((void *)iommu->ir_table->base);
@@ -447,10 +447,16 @@ static void iommu_set_irq_remapping(struct intel_iommu *iommu, int mode) 
	raw_spin_unlock_irqrestore(&iommu->register_lock, flags);



	/*

	 * global invalidation of interrupt entry cache before enabling

	 * interrupt-remapping.

	 * Global invalidation of interrupt entry cache to make sure the

	 * hardware uses the new irq remapping table.

	 */

	qi_global_iec(iommu);

}



static void iommu_enable_irq_remapping(struct intel_iommu *iommu)

{

	unsigned long flags;

	u32 sts;



	raw_spin_lock_irqsave(&iommu->register_lock, flags);
@@ -525,6 +531,8 @@ static int intel_setup_irq_remapping(struct intel_iommu *iommu) 
		}

	}



	iommu_set_irq_remapping(iommu, eim_mode);



	return 0;



out_free_bitmap:
@@ -689,7 +697,7 @@ static int __init intel_enable_irq_remapping(void) 
	 * Setup Interrupt-remapping for all the DRHD's now.

	 */

	for_each_iommu(iommu, drhd) {

		iommu_set_irq_remapping(iommu, eim_mode);

		iommu_enable_irq_remapping(iommu);

		setup = true;

	}
@@ -926,6 +934,7 @@ static int reenable_irq_remapping(int eim) 


		/* Set up interrupt remapping for iommu.*/

		iommu_set_irq_remapping(iommu, eim);

		iommu_enable_irq_remapping(iommu);

		setup = true;

	}
@@ -1241,7 +1250,7 @@ static int dmar_ir_add(struct dmar_drhd_unit *dmaru, struct intel_iommu *iommu) 
		intel_teardown_irq_remapping(iommu);

		ir_remove_ioapic_hpet_scope(iommu);

	} else {

		iommu_set_irq_remapping(iommu, eim);

		iommu_enable_irq_remapping(iommu);

	}



	return ret;