[PATCHv4 07/12] arm64: Simplify NR_FIX_BTMAPS calculation

From	"Suzuki K. Poulose" <suzuki.poulose@arm.com>
Newsgroups	linux.kernel
Subject	[PATCHv4 07/12] arm64: Simplify NR_FIX_BTMAPS calculation
Date	2015-10-19 15:30 +0200
Message-ID	<qliFI-5Ez-5@gated-at.bofh.it> (permalink)
References	<qliFI-5Ez-7@gated-at.bofh.it>
Organization	linux.* mail to news gateway

Show all headers | View raw

From: Mark Rutland <mark.rutland@arm.com>

We choose NR_FIX_BTMAPS such that each slot (NR_FIX_BTMAPS * PAGE_SIZE)
can address 256K.

Use division to derive NR_FIX_BTMAPS rather than defining it for each
page size.

Signed-off-by:  Mark Rutland <mark.rutland@arm.com>
Signed-off-by:  Suzuki K. Poulose <suzuki.poulose@arm.com>
---
 arch/arm64/include/asm/fixmap.h |    7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/arch/arm64/include/asm/fixmap.h b/arch/arm64/include/asm/fixmap.h
index 8b9884c..3097045 100644
--- a/arch/arm64/include/asm/fixmap.h
+++ b/arch/arm64/include/asm/fixmap.h
@@ -17,6 +17,7 @@
 
 #ifndef __ASSEMBLY__
 #include <linux/kernel.h>
+#include <linux/sizes.h>
 #include <asm/boot.h>
 #include <asm/page.h>
 
@@ -55,11 +56,7 @@ enum fixed_addresses {
 	 * Temporary boot-time mappings, used by early_ioremap(),
 	 * before ioremap() is functional.
 	 */
-#ifdef CONFIG_ARM64_64K_PAGES
-#define NR_FIX_BTMAPS		4
-#else
-#define NR_FIX_BTMAPS		64
-#endif
+#define NR_FIX_BTMAPS		(SZ_256K / PAGE_SIZE)
 #define FIX_BTMAPS_SLOTS	7
 #define TOTAL_FIX_BTMAPS	(NR_FIX_BTMAPS * FIX_BTMAPS_SLOTS)
 
-- 
1.7.9.5

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | Next | Find similar | Unroll thread

Thread

[PATCHv4 07/12] arm64: Simplify NR_FIX_BTMAPS calculation "Suzuki K. Poulose" <suzuki.poulose@arm.com> - 2015-10-19 15:30 +0200

csiph-web