lkml.org 
[lkml]   [2014]   [Oct]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.13 020/163] iommu/arm-smmu: fix programming of SMMU_CBn_TCR for stage 1
    Date
    3.13.11.9 -stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Olav Haugan <ohaugan@codeaurora.org>

    commit 1fc870c7efa364862c3bc792cfbdb38afea26742 upstream.

    Stage-1 context banks do not have the SMMU_CBn_TCR[SL0] field since it
    is only applicable to stage-2 context banks.

    This patch ensures that we don't set the reserved TCR bits for stage-1
    translations.

    Signed-off-by: Olav Haugan <ohaugan@codeaurora.org>
    Signed-off-by: Will Deacon <will.deacon@arm.com>
    Signed-off-by: Kamal Mostafa <kamal@canonical.com>
    ---
    drivers/iommu/arm-smmu.c | 7 +++++--
    1 file changed, 5 insertions(+), 2 deletions(-)

    diff --git a/drivers/iommu/arm-smmu.c b/drivers/iommu/arm-smmu.c
    index 0d3e4e6..91739bf 100644
    --- a/drivers/iommu/arm-smmu.c
    +++ b/drivers/iommu/arm-smmu.c
    @@ -793,8 +793,11 @@ static void arm_smmu_init_context_bank(struct arm_smmu_domain *smmu_domain)
    reg |= TTBCR_EAE |
    (TTBCR_SH_IS << TTBCR_SH0_SHIFT) |
    (TTBCR_RGN_WBWA << TTBCR_ORGN0_SHIFT) |
    - (TTBCR_RGN_WBWA << TTBCR_IRGN0_SHIFT) |
    - (TTBCR_SL0_LVL_1 << TTBCR_SL0_SHIFT);
    + (TTBCR_RGN_WBWA << TTBCR_IRGN0_SHIFT);
    +
    + if (!stage1)
    + reg |= (TTBCR_SL0_LVL_1 << TTBCR_SL0_SHIFT);
    +
    writel_relaxed(reg, cb_base + ARM_SMMU_CB_TTBCR);

    /* MAIR0 (stage-1 only) */
    --
    1.9.1


    \
     
     \ /
      Last update: 2014-10-10 00:21    [W:4.059 / U:0.100 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site