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

Commit c416daa9 authored by David Woodhouse's avatar David Woodhouse
Browse files

intel-iommu: Tidy up iommu->gcmd handling 



Signed-off-by: default avatarDavid Woodhouse <David.Woodhouse@intel.com>
parent 462b60f6

drivers/pci/dmar.c

+2 −4
Original line number Diff line number Diff line
@@ -784,7 +784,6 @@ void dmar_disable_qi(struct intel_iommu *iommu) 
		cpu_relax();



	iommu->gcmd &= ~DMA_GCMD_QIE;



	writel(iommu->gcmd, iommu->reg + DMAR_GCMD_REG);



	IOMMU_WAIT_OP(iommu, DMAR_GSTS_REG, readl,
@@ -798,7 +797,7 @@ void dmar_disable_qi(struct intel_iommu *iommu) 
 */

static void __dmar_enable_qi(struct intel_iommu *iommu)

{

	u32 cmd, sts;

	u32 sts;

	unsigned long flags;

	struct q_inval *qi = iommu->qi;
@@ -812,9 +811,8 @@ static void __dmar_enable_qi(struct intel_iommu *iommu) 


	dmar_writeq(iommu->reg + DMAR_IQA_REG, virt_to_phys(qi->desc));



	cmd = iommu->gcmd | DMA_GCMD_QIE;

	iommu->gcmd |= DMA_GCMD_QIE;

	writel(cmd, iommu->reg + DMAR_GCMD_REG);

	writel(iommu->gcmd, iommu->reg + DMAR_GCMD_REG);



	/* Make sure hardware complete it */

	IOMMU_WAIT_OP(iommu, DMAR_GSTS_REG, readl, (sts & DMA_GSTS_QIES), sts);

drivers/pci/intel-iommu.c

+9 −9
Original line number Diff line number Diff line
@@ -819,7 +819,7 @@ static int iommu_alloc_root_entry(struct intel_iommu *iommu) 
static void iommu_set_root_entry(struct intel_iommu *iommu)

{

	void *addr;

	u32 cmd, sts;

	u32 sts;

	unsigned long flag;



	addr = iommu->root_entry;
@@ -827,8 +827,7 @@ static void iommu_set_root_entry(struct intel_iommu *iommu) 
	spin_lock_irqsave(&iommu->register_lock, flag);

	dmar_writeq(iommu->reg + DMAR_RTADDR_REG, virt_to_phys(addr));



	cmd = iommu->gcmd | DMA_GCMD_SRTP;

	writel(cmd, iommu->reg + DMAR_GCMD_REG);

	writel(iommu->gcmd | DMA_GCMD_SRTP, iommu->reg + DMAR_GCMD_REG);



	/* Make sure hardware complete it */

	IOMMU_WAIT_OP(iommu, DMAR_GSTS_REG,
@@ -844,6 +843,7 @@ static void iommu_flush_write_buffer(struct intel_iommu *iommu) 


	if (!rwbf_quirk && !cap_rwbf(iommu->cap))

		return;



	spin_lock_irqsave(&iommu->register_lock, flag);

	writel(iommu->gcmd | DMA_GCMD_WBF, iommu->reg + DMAR_GCMD_REG);
@@ -995,13 +995,13 @@ static int iommu_enable_translation(struct intel_iommu *iommu) 
	unsigned long flags;



	spin_lock_irqsave(&iommu->register_lock, flags);

	writel(iommu->gcmd|DMA_GCMD_TE, iommu->reg + DMAR_GCMD_REG);

	iommu->gcmd |= DMA_GCMD_TE;

	writel(iommu->gcmd, iommu->reg + DMAR_GCMD_REG);



	/* Make sure hardware complete it */

	IOMMU_WAIT_OP(iommu, DMAR_GSTS_REG,

		      readl, (sts & DMA_GSTS_TES), sts);



	iommu->gcmd |= DMA_GCMD_TE;

	spin_unlock_irqrestore(&iommu->register_lock, flags);

	return 0;

}

drivers/pci/intr_remapping.c

+4 −7
Original line number Diff line number Diff line
@@ -404,7 +404,7 @@ int free_irte(int irq) 
static void iommu_set_intr_remapping(struct intel_iommu *iommu, int mode)

{

	u64 addr;

	u32 cmd, sts;

	u32 sts;

	unsigned long flags;



	addr = virt_to_phys((void *)iommu->ir_table->base);
@@ -415,9 +415,8 @@ static void iommu_set_intr_remapping(struct intel_iommu *iommu, int mode) 
		    (addr) | IR_X2APIC_MODE(mode) | INTR_REMAP_TABLE_REG_SIZE);



	/* Set interrupt-remapping table pointer */

	cmd = iommu->gcmd | DMA_GCMD_SIRTP;

	iommu->gcmd |= DMA_GCMD_SIRTP;

	writel(cmd, iommu->reg + DMAR_GCMD_REG);

	writel(iommu->gcmd, iommu->reg + DMAR_GCMD_REG);



	IOMMU_WAIT_OP(iommu, DMAR_GSTS_REG,

		      readl, (sts & DMA_GSTS_IRTPS), sts);
@@ -427,9 +426,8 @@ static void iommu_set_intr_remapping(struct intel_iommu *iommu, int mode) 
		spin_lock_irqsave(&iommu->register_lock, flags);



		/* enable comaptiblity format interrupt pass through */

		cmd = iommu->gcmd | DMA_GCMD_CFI;

		iommu->gcmd |= DMA_GCMD_CFI;

		writel(cmd, iommu->reg + DMAR_GCMD_REG);

		writel(iommu->gcmd, iommu->reg + DMAR_GCMD_REG);



		IOMMU_WAIT_OP(iommu, DMAR_GSTS_REG,

			      readl, (sts & DMA_GSTS_CFIS), sts);
@@ -446,9 +444,8 @@ static void iommu_set_intr_remapping(struct intel_iommu *iommu, int mode) 
	spin_lock_irqsave(&iommu->register_lock, flags);



	/* Enable interrupt-remapping */

	cmd = iommu->gcmd | DMA_GCMD_IRE;

	iommu->gcmd |= DMA_GCMD_IRE;

	writel(cmd, iommu->reg + DMAR_GCMD_REG);

	writel(iommu->gcmd, iommu->reg + DMAR_GCMD_REG);



	IOMMU_WAIT_OP(iommu, DMAR_GSTS_REG,

		      readl, (sts & DMA_GSTS_IRES), sts);