lkml.org 
[lkml]   [2016]   [Mar]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.19.y-ckt 011/196] iommu/vt-d: Fix 64-bit accesses to 32-bit DMAR_GSTS_REG
    Date
    3.19.8-ckt16 -stable review patch.  If anyone has any objections, please let me know.

    ---8<------------------------------------------------------------

    From: CQ Tang <cq.tang@intel.com>

    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: Kamal Mostafa <kamal@canonical.com>
    ---
    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 9847613..5a2ec39 100644
    --- a/drivers/iommu/dmar.c
    +++ b/drivers/iommu/dmar.c
    @@ -1342,7 +1342,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 a55b207..153d3a7 100644
    --- a/drivers/iommu/intel_irq_remapping.c
    +++ b/drivers/iommu/intel_irq_remapping.c
    @@ -543,7 +543,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.0
    \
     
     \ /
      Last update: 2016-03-09 03:01    [W:2.164 / U:0.328 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site