Commit 00ab6f2d authored by Yong Wu's avatar Yong Wu Committed by Will Deacon
Browse files

iommu/io-pgtable-arm-v7s: Clarify LVL_SHIFT/BITS macro 



The current _ARM_V7S_LVL_BITS/ARM_V7S_LVL_SHIFT use a formula to calculate
the corresponding value for level1 and level2 to pretend the code sane.
Actually their level1 and level2 values are different from each other.
This patch only clarify the two macro. No functional change.

Suggested-by: default avatarRobin Murphy <robin.murphy@arm.com>
Signed-off-by: default avatarYong Wu <yong.wu@mediatek.com>
Reviewed-by: default avatarRobin Murphy <robin.murphy@arm.com>
Reviewed-by: default avatarTomasz Figa <tfiga@chromium.org>
Link: https://lore.kernel.org/r/20210111111914.22211-12-yong.wu@mediatek.com


Signed-off-by: default avatarWill Deacon <will@kernel.org>
parent 40596d2f

drivers/iommu/io-pgtable-arm-v7s.c

+3 −5
Original line number Diff line number Diff line
@@ -44,13 +44,11 @@ 


/*

 * We have 32 bits total; 12 bits resolved at level 1, 8 bits at level 2,

 * and 12 bits in a page. With some carefully-chosen coefficients we can

 * hide the ugly inconsistencies behind these macros and at least let the

 * rest of the code pretend to be somewhat sane.

 * and 12 bits in a page.

 */

#define ARM_V7S_ADDR_BITS		32

#define _ARM_V7S_LVL_BITS(lvl)		(16 - (lvl) * 4)

#define ARM_V7S_LVL_SHIFT(lvl)		(ARM_V7S_ADDR_BITS - (4 + 8 * (lvl)))

#define _ARM_V7S_LVL_BITS(lvl)		((lvl) == 1 ? 12 : 8)

#define ARM_V7S_LVL_SHIFT(lvl)		((lvl) == 1 ? 20 : 12)

#define ARM_V7S_TABLE_SHIFT		10



#define ARM_V7S_PTES_PER_LVL(lvl)	(1 << _ARM_V7S_LVL_BITS(lvl))