Commit 21cfe6ed authored by Will Deacon's avatar Will Deacon
Browse files

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: default avatarCatalin Marinas <catalin.marinas@arm.com>
Link: https://lore.kernel.org/r/20210527110319.22157-4-will@kernel.org


Signed-off-by: default avatarWill Deacon <will@kernel.org>
parent ee67c110

arch/arm64/include/asm/memory.h

+2 −3
Original line number Diff line number Diff line
@@ -135,9 +135,8 @@ 
#define MT_NORMAL		0

#define MT_NORMAL_TAGGED	1

#define MT_NORMAL_NC		2

#define MT_NORMAL_WT		3

#define MT_DEVICE_nGnRnE	4

#define MT_DEVICE_nGnRE		5

#define MT_DEVICE_nGnRnE	3

#define MT_DEVICE_nGnRE		4



/*

 * Memory types for Stage-2 translation

arch/arm64/include/asm/pgtable-prot.h

+0 −1
Original line number Diff line number Diff line
@@ -55,7 +55,6 @@ extern bool arm64_use_ng_mappings; 
#define PROT_DEVICE_nGnRnE	(PROT_DEFAULT | PTE_PXN | PTE_UXN | PTE_WRITE | PTE_ATTRINDX(MT_DEVICE_nGnRnE))

#define PROT_DEVICE_nGnRE	(PROT_DEFAULT | PTE_PXN | PTE_UXN | PTE_WRITE | PTE_ATTRINDX(MT_DEVICE_nGnRE))

#define PROT_NORMAL_NC		(PROT_DEFAULT | PTE_PXN | PTE_UXN | PTE_WRITE | PTE_ATTRINDX(MT_NORMAL_NC))

#define PROT_NORMAL_WT		(PROT_DEFAULT | PTE_PXN | PTE_UXN | PTE_WRITE | PTE_ATTRINDX(MT_NORMAL_WT))

#define PROT_NORMAL		(PROT_DEFAULT | PTE_PXN | PTE_UXN | PTE_WRITE | PTE_ATTRINDX(MT_NORMAL))

#define PROT_NORMAL_TAGGED	(PROT_DEFAULT | PTE_PXN | PTE_UXN | PTE_WRITE | PTE_ATTRINDX(MT_NORMAL_TAGGED))

arch/arm64/include/asm/sysreg.h

+0 −1
Original line number Diff line number Diff line
@@ -704,7 +704,6 @@ 
#define MAIR_ATTR_DEVICE_nGnRnE		UL(0x00)

#define MAIR_ATTR_DEVICE_nGnRE		UL(0x04)

#define MAIR_ATTR_NORMAL_NC		UL(0x44)

#define MAIR_ATTR_NORMAL_WT		UL(0xbb)

#define MAIR_ATTR_NORMAL_TAGGED		UL(0xf0)

#define MAIR_ATTR_NORMAL		UL(0xff)

#define MAIR_ATTR_MASK			UL(0xff)

arch/arm64/mm/proc.S

+0 −1
Original line number Diff line number Diff line
@@ -60,7 +60,6 @@ 
	 MAIR_ATTRIDX(MAIR_ATTR_DEVICE_nGnRE, MT_DEVICE_nGnRE) |	\

	 MAIR_ATTRIDX(MAIR_ATTR_NORMAL_NC, MT_NORMAL_NC) |		\

	 MAIR_ATTRIDX(MAIR_ATTR_NORMAL, MT_NORMAL) |			\

	 MAIR_ATTRIDX(MAIR_ATTR_NORMAL_WT, MT_NORMAL_WT) |		\

	 MAIR_ATTRIDX(MAIR_ATTR_NORMAL, MT_NORMAL_TAGGED))



#ifdef CONFIG_CPU_PM