D55948.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D55948.diff
View Options

	diff --git a/sys/arm64/arm64/locore.S b/sys/arm64/arm64/locore.S
	--- a/sys/arm64/arm64/locore.S
	+++ b/sys/arm64/arm64/locore.S
	@@ -1134,7 +1134,8 @@
	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
	--- a/sys/arm64/arm64/pmap.c
	+++ b/sys/arm64/arm64/pmap.c
	@@ -10015,6 +10015,9 @@
	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
	--- 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