From 2e70264d33ac767134278bc4275eace299cdede3 Mon Sep 17 00:00:00 2001 From: Jeffy Chen Date: Mon, 28 Nov 2016 20:21:25 +0800 Subject: [PATCH] UPSTREAM: iommu/rockchip: Fix "is stall active" check Since commit cd6438c5f844 ("iommu/rockchip: Reconstruct to support multi slaves") rk_iommu_is_stall_active() always returns false because the bitwise AND operates on the boolean flag promoted to an integer and a value that is either zero or BIT(2). Explicitly convert the right-hand value to a boolean so that both sides are guaranteed to be either zero or one. rk_iommu_is_paging_enabled() does not suffer from the same problem since RK_MMU_STATUS_PAGING_ENABLED is BIT(0), but let's apply the same change for consistency and to make it clear that it's correct without needing to lookup the value. Fixes: cd6438c5f844 ("iommu/rockchip: Reconstruct to support multi slaves") Signed-off-by: John Keeping Reviewed-by: Heiko Stuebner Tested-by: Tomeu Vizoso Signed-off-by: Joerg Roedel (cherry picked from commit fbedd9b9905c1643b9f7244d88999e39632bbd87) Conflicts: drivers/iommu/rockchip-iommu.c Change-Id: I5a43eb19d515eba7daf1dc4b1592ac692c115df0 Signed-off-by: Jeffy Chen --- drivers/iommu/rockchip-iommu.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/iommu/rockchip-iommu.c b/drivers/iommu/rockchip-iommu.c index a34e459f560d..0b7dbf1ae3ed 100644 --- a/drivers/iommu/rockchip-iommu.c +++ b/drivers/iommu/rockchip-iommu.c @@ -319,7 +319,7 @@ static bool rk_iommu_is_stall_active(struct rk_iommu *iommu) int i; for (i = 0; i < iommu->num_mmu; i++) - active &= rk_iommu_read(iommu->bases[i], RK_MMU_STATUS); + active &= !!rk_iommu_read(iommu->bases[i], RK_MMU_STATUS); return active; } @@ -330,7 +330,7 @@ static bool rk_iommu_is_paging_enabled(struct rk_iommu *iommu) int i; for (i = 0; i < iommu->num_mmu; i++) - enable &= rk_iommu_read(iommu->bases[i], RK_MMU_STATUS); + enable &= !!rk_iommu_read(iommu->bases[i], RK_MMU_STATUS); return enable; } -- 2.34.1