浏览代码

iommu/vt-d: Fix 64-bit accesses to 32-bit DMAR_GSTS_REG

This is a 32-bit register. Apparently harmless on real hardware, but
causing justified warnings in simulation.

Signed-off-by: CQ Tang <cq.tang@intel.com>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
Cc: stable@vger.kernel.org
CQ Tang 9 年之前
父节点
当前提交
fda3bec12d
共有 2 个文件被更改,包括 2 次插入2 次删除
  1. 1 1
      drivers/iommu/dmar.c
  2. 1 1
      drivers/iommu/intel_irq_remapping.c

+ 1 - 1
drivers/iommu/dmar.c

@@ -1347,7 +1347,7 @@ void dmar_disable_qi(struct intel_iommu *iommu)
 
 	raw_spin_lock_irqsave(&iommu->register_lock, flags);
 
-	sts =  dmar_readq(iommu->reg + DMAR_GSTS_REG);
+	sts =  readl(iommu->reg + DMAR_GSTS_REG);
 	if (!(sts & DMA_GSTS_QIES))
 		goto end;
 

+ 1 - 1
drivers/iommu/intel_irq_remapping.c

@@ -629,7 +629,7 @@ static void iommu_disable_irq_remapping(struct intel_iommu *iommu)
 
 	raw_spin_lock_irqsave(&iommu->register_lock, flags);
 
-	sts = dmar_readq(iommu->reg + DMAR_GSTS_REG);
+	sts = readl(iommu->reg + DMAR_GSTS_REG);
 	if (!(sts & DMA_GSTS_IRES))
 		goto end;