aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHarry Moulton <harry.moulton@arm.com>2026-04-16 13:30:15 +0000
committerAndrew Turner <andrew@FreeBSD.org>2026-04-16 14:22:24 +0000
commitaa2d89cb4263f5d638b150efb4a2e6adab4ee9d6 (patch)
tree4f07c6e83402b7bdb8523570da6074dc8f49503e
parent6f9e9eba984f5c8d8a022c0ec99f844a911687fe (diff)
arm64: mte: add tagged memory attribute
Add the Normal-Tagged memory attribute introduced with MTE. Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D55948
-rw-r--r--sys/arm64/arm64/locore.S3
-rw-r--r--sys/arm64/arm64/pmap.c3
-rw-r--r--sys/arm64/include/vm.h3
3 files changed, 7 insertions, 2 deletions
diff --git a/sys/arm64/arm64/locore.S b/sys/arm64/arm64/locore.S
index 4c8e0c680321..c86f98da55a8 100644
--- a/sys/arm64/arm64/locore.S
+++ b/sys/arm64/arm64/locore.S
@@ -1134,7 +1134,8 @@ mair:
MAIR_ATTR(MAIR_NORMAL_NC, VM_MEMATTR_UNCACHEABLE) | \
MAIR_ATTR(MAIR_NORMAL_WB, VM_MEMATTR_WRITE_BACK) | \
MAIR_ATTR(MAIR_NORMAL_WT, VM_MEMATTR_WRITE_THROUGH) | \
- MAIR_ATTR(MAIR_DEVICE_nGnRE, VM_MEMATTR_DEVICE_nGnRE)
+ MAIR_ATTR(MAIR_DEVICE_nGnRE, VM_MEMATTR_DEVICE_nGnRE) | \
+ MAIR_ATTR(MAIR_NORMAL_TG, VM_MEMATTR_TAGGED)
tcr:
#if PAGE_SIZE == PAGE_SIZE_4K
#define TCR_TG (TCR_TG1_4K | TCR_TG0_4K)
diff --git a/sys/arm64/arm64/pmap.c b/sys/arm64/arm64/pmap.c
index a23905994846..5017b5f63c4d 100644
--- a/sys/arm64/arm64/pmap.c
+++ b/sys/arm64/arm64/pmap.c
@@ -10015,6 +10015,9 @@ sysctl_kmaps_dump(struct sbuf *sb, struct pmap_kernel_map_range *range,
case ATTR_S1_IDX(VM_MEMATTR_WRITE_THROUGH):
mode = "WT";
break;
+ case ATTR_S1_IDX(VM_MEMATTR_TAGGED):
+ mode = "TAGGED";
+ break;
default:
printf(
"%s: unknown memory type %x for range 0x%016lx-0x%016lx\n",
diff --git a/sys/arm64/include/vm.h b/sys/arm64/include/vm.h
index e03e615bb841..4d9f2860f654 100644
--- a/sys/arm64/include/vm.h
+++ b/sys/arm64/include/vm.h
@@ -33,7 +33,8 @@
#define VM_MEMATTR_WRITE_BACK 2
#define VM_MEMATTR_WRITE_THROUGH 3
#define VM_MEMATTR_DEVICE_nGnRE 4
-#define VM_MEMATTR_END (VM_MEMATTR_DEVICE_nGnRE + 1)
+#define VM_MEMATTR_TAGGED 5
+#define VM_MEMATTR_END (VM_MEMATTR_TAGGED + 1)
#define VM_MEMATTR_DEVICE VM_MEMATTR_DEVICE_nGnRE
#define VM_MEMATTR_DEVICE_NP VM_MEMATTR_DEVICE_nGnRnE