Commit 057bbd8e authored by Will Deacon's avatar Will Deacon Committed by Catalin Marinas
Browse files

arm64: mm: Simplify __TLBI_RANGE_NUM() macro 



Since commit e2768b79 ("arm64/mm: Modify range-based tlbi to
decrement scale"), we don't need to clamp the 'pages' argument to fit
the range for the specified 'scale' as we know that the upper bits will
have been processed in a prior iteration.

Drop the clamping and simplify the __TLBI_RANGE_NUM() macro.

Signed-off-by: default avatarWill Deacon <will@kernel.org>
Reviewed-by: default avatarRyan Roberts <ryan.roberts@arm.com>
Reviewed-by: default avatarDev Jain <dev.jain@arm.com>
Reviewed-by: default avatarJonathan Cameron <jonathan.cameron@huawei.com>
Signed-off-by: default avatarRyan Roberts <ryan.roberts@arm.com>
Signed-off-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
parent 5e63b73f

arch/arm64/include/asm/tlbflush.h

+1 −5
Original line number Diff line number Diff line
@@ -199,11 +199,7 @@ static inline void __tlbi_level(tlbi_op op, u64 addr, u32 level) 
 * range.

 */

#define __TLBI_RANGE_NUM(pages, scale)					\

	({								\

		int __pages = min((pages),				\

				  __TLBI_RANGE_PAGES(31, (scale)));	\

		(__pages >> (5 * (scale) + 1)) - 1;			\

	})

	(((pages) >> (5 * (scale) + 1)) - 1)



#define __repeat_tlbi_sync(op, arg...)						\

do {										\