diff options
author | CQ Tang <cq.tang@intel.com> | 2016-01-13 16:15:03 -0500 |
---|---|---|
committer | David Woodhouse <David.Woodhouse@intel.com> | 2016-01-13 18:30:49 -0500 |
commit | fda3bec12d0979aae3f02ee645913d66fbc8a26e (patch) | |
tree | 6f90194cfdc2b3fe1e7b84ac488785305a1caa27 | |
parent | e57e58bd390a6843db58560bf7b8341665d2e058 (diff) |
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
-rw-r--r-- | drivers/iommu/dmar.c | 2 | ||||
-rw-r--r-- | drivers/iommu/intel_irq_remapping.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/iommu/dmar.c b/drivers/iommu/dmar.c index 80e3c176008e..55a19e49205b 100644 --- a/drivers/iommu/dmar.c +++ b/drivers/iommu/dmar.c | |||
@@ -1347,7 +1347,7 @@ void dmar_disable_qi(struct intel_iommu *iommu) | |||
1347 | 1347 | ||
1348 | raw_spin_lock_irqsave(&iommu->register_lock, flags); | 1348 | raw_spin_lock_irqsave(&iommu->register_lock, flags); |
1349 | 1349 | ||
1350 | sts = dmar_readq(iommu->reg + DMAR_GSTS_REG); | 1350 | sts = readl(iommu->reg + DMAR_GSTS_REG); |
1351 | if (!(sts & DMA_GSTS_QIES)) | 1351 | if (!(sts & DMA_GSTS_QIES)) |
1352 | goto end; | 1352 | goto end; |
1353 | 1353 | ||
diff --git a/drivers/iommu/intel_irq_remapping.c b/drivers/iommu/intel_irq_remapping.c index 1fae1881648c..e9b241b1c9dd 100644 --- a/drivers/iommu/intel_irq_remapping.c +++ b/drivers/iommu/intel_irq_remapping.c | |||
@@ -629,7 +629,7 @@ static void iommu_disable_irq_remapping(struct intel_iommu *iommu) | |||
629 | 629 | ||
630 | raw_spin_lock_irqsave(&iommu->register_lock, flags); | 630 | raw_spin_lock_irqsave(&iommu->register_lock, flags); |
631 | 631 | ||
632 | sts = dmar_readq(iommu->reg + DMAR_GSTS_REG); | 632 | sts = readl(iommu->reg + DMAR_GSTS_REG); |
633 | if (!(sts & DMA_GSTS_IRES)) | 633 | if (!(sts & DMA_GSTS_IRES)) |
634 | goto end; | 634 | goto end; |
635 | 635 | ||