tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
arm64: mm: Remove unused support for Normal-WT memory type
The Normal-WT memory type is unused, so remove it and reclaim a MAIR.
Cc: Christoph Hellwig <hch@lst.de>
Acked-by: Catalin Marinas <catalin.marinas@arm.com>
Link: https://lore.kernel.org/r/20210527110319.22157-4-will@kernel.org
Signed-off-by: Will Deacon <will@kernel.org>
+2
-6
+2
-3
arch/arm64/include/asm/memory.h
+2
-3
arch/arm64/include/asm/memory.h
···
135
135
#define MT_NORMAL 0
136
136
#define MT_NORMAL_TAGGED 1
137
137
#define MT_NORMAL_NC 2
138
-
#define MT_NORMAL_WT 3
139
-
#define MT_DEVICE_nGnRnE 4
140
-
#define MT_DEVICE_nGnRE 5
138
+
#define MT_DEVICE_nGnRnE 3
139
+
#define MT_DEVICE_nGnRE 4
141
140
142
141
/*
143
142
* Memory types for Stage-2 translation
-1
arch/arm64/include/asm/pgtable-prot.h
-1
arch/arm64/include/asm/pgtable-prot.h
···
55
55
#define PROT_DEVICE_nGnRnE (PROT_DEFAULT | PTE_PXN | PTE_UXN | PTE_WRITE | PTE_ATTRINDX(MT_DEVICE_nGnRnE))
56
56
#define PROT_DEVICE_nGnRE (PROT_DEFAULT | PTE_PXN | PTE_UXN | PTE_WRITE | PTE_ATTRINDX(MT_DEVICE_nGnRE))
57
57
#define PROT_NORMAL_NC (PROT_DEFAULT | PTE_PXN | PTE_UXN | PTE_WRITE | PTE_ATTRINDX(MT_NORMAL_NC))
58
-
#define PROT_NORMAL_WT (PROT_DEFAULT | PTE_PXN | PTE_UXN | PTE_WRITE | PTE_ATTRINDX(MT_NORMAL_WT))
59
58
#define PROT_NORMAL (PROT_DEFAULT | PTE_PXN | PTE_UXN | PTE_WRITE | PTE_ATTRINDX(MT_NORMAL))
60
59
#define PROT_NORMAL_TAGGED (PROT_DEFAULT | PTE_PXN | PTE_UXN | PTE_WRITE | PTE_ATTRINDX(MT_NORMAL_TAGGED))
61
60
-1
arch/arm64/include/asm/sysreg.h
-1
arch/arm64/include/asm/sysreg.h
···
704
704
#define MAIR_ATTR_DEVICE_nGnRnE UL(0x00)
705
705
#define MAIR_ATTR_DEVICE_nGnRE UL(0x04)
706
706
#define MAIR_ATTR_NORMAL_NC UL(0x44)
707
-
#define MAIR_ATTR_NORMAL_WT UL(0xbb)
708
707
#define MAIR_ATTR_NORMAL_TAGGED UL(0xf0)
709
708
#define MAIR_ATTR_NORMAL UL(0xff)
710
709
#define MAIR_ATTR_MASK UL(0xff)
-1
arch/arm64/mm/proc.S
-1
arch/arm64/mm/proc.S
···
60
60
MAIR_ATTRIDX(MAIR_ATTR_DEVICE_nGnRE, MT_DEVICE_nGnRE) | \
61
61
MAIR_ATTRIDX(MAIR_ATTR_NORMAL_NC, MT_NORMAL_NC) | \
62
62
MAIR_ATTRIDX(MAIR_ATTR_NORMAL, MT_NORMAL) | \
63
-
MAIR_ATTRIDX(MAIR_ATTR_NORMAL_WT, MT_NORMAL_WT) | \
64
63
MAIR_ATTRIDX(MAIR_ATTR_NORMAL, MT_NORMAL_TAGGED))
65
64
66
65
#ifdef CONFIG_CPU_PM