aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Turner <andrew@FreeBSD.org>2022-03-23 15:33:05 +0000
committerAndrew Turner <andrew@FreeBSD.org>2022-03-23 15:33:05 +0000
commit6e1f7b9b38011eaa54d06b92cd58c180788d141f (patch)
tree574a9d41ce09c719eca9b4bf22418381ca839377
parent863f3220d09716ea2e570fadc6b19dcb6e4c2191 (diff)
downloadsrc-6e1f7b9b38011eaa54d06b92cd58c180788d141f.tar.gz
src-6e1f7b9b38011eaa54d06b92cd58c180788d141f.zip
Remove L2_BLOCK_MASK from arm64
It's unneeded as it was just used to align KERNBASE to a level 2 block start address. KERNBASE was already aligned correctly. Sponsored by: The FreeBSD Foundation
-rw-r--r--sys/arm64/arm64/locore.S2
-rw-r--r--sys/arm64/include/pte.h2
2 files changed, 1 insertions, 3 deletions
diff --git a/sys/arm64/arm64/locore.S b/sys/arm64/arm64/locore.S
index c9cf25aae37f..534c89ac32dc 100644
--- a/sys/arm64/arm64/locore.S
+++ b/sys/arm64/arm64/locore.S
@@ -455,7 +455,7 @@ common:
/* Create the kernel space L2 table */
mov x6, x26
mov x7, #(ATTR_S1_IDX(VM_MEMATTR_WRITE_BACK))
- mov x8, #(KERNBASE & L2_BLOCK_MASK)
+ mov x8, #(KERNBASE)
mov x9, x28
bl build_l2_block_pagetable
diff --git a/sys/arm64/include/pte.h b/sys/arm64/include/pte.h
index 6b816464c167..3ce11133e2ef 100644
--- a/sys/arm64/include/pte.h
+++ b/sys/arm64/include/pte.h
@@ -134,8 +134,6 @@ typedef uint64_t pt_entry_t; /* page table entry */
#define L2_BLOCK L1_BLOCK
#define L2_TABLE L1_TABLE
-#define L2_BLOCK_MASK UINT64_C(0xffffffffffe00000)
-
/* Level 3 table, 4KiB per entry */
#define L3_SHIFT 12
#define L3_SIZE (1 << L3_SHIFT)