lkml.org 
[lkml]   [2016]   [Feb]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.12 128/142] iommu/vt-d: Fix 64-bit accesses to 32-bit DMAR_GSTS_REG
    Date
    From: CQ Tang <cq.tang@intel.com>

    3.12-stable review patch. If anyone has any objections, please let me know.

    ===============

    commit fda3bec12d0979aae3f02ee645913d66fbc8a26e upstream.

    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>
    Signed-off-by: Jiri Slaby <jslaby@suse.cz>
    ---
    drivers/iommu/dmar.c | 2 +-
    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 785675a56a10..ba5d1a37a90d 100644
    --- a/drivers/iommu/dmar.c
    +++ b/drivers/iommu/dmar.c
    @@ -972,7 +972,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;

    diff --git a/drivers/iommu/intel_irq_remapping.c b/drivers/iommu/intel_irq_remapping.c
    index b97d70b1abe0..0ff40be0f3b2 100644
    --- a/drivers/iommu/intel_irq_remapping.c
    +++ b/drivers/iommu/intel_irq_remapping.c
    @@ -495,7 +495,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;

    --
    2.7.1
    \
     
     \ /
      Last update: 2016-02-24 12:01    [W:2.763 / U:0.580 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site