Commit acb3f4bc authored by Will Deacon's avatar Will Deacon
Browse files

arm64/sysreg: Remove duplicate definitions from asm/sysreg.h 



With the new-fangled generation of asm/sysreg-defs.h, some definitions
have ended up being duplicated between the two files.

Remove these duplicate definitions, and consolidate the naming for
GMID_EL1_BS_WIDTH.

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

arch/arm64/include/asm/sysreg.h

+0 −6
Original line number Diff line number Diff line
@@ -667,8 +667,6 @@ 
#define ID_AA64MMFR0_EL1_PARANGE_MAX	ID_AA64MMFR0_EL1_PARANGE_48

#endif



#define ID_DFR1_EL1_MTPMU_SHIFT		0



#if defined(CONFIG_ARM64_4K_PAGES)

#define ID_AA64MMFR0_EL1_TGRAN_SHIFT		ID_AA64MMFR0_EL1_TGRAN4_SHIFT

#define ID_AA64MMFR0_EL1_TGRAN_SUPPORTED_MIN	ID_AA64MMFR0_EL1_TGRAN4_SUPPORTED_MIN
@@ -719,10 +717,6 @@ 
#define SYS_RGSR_EL1_SEED_SHIFT	8

#define SYS_RGSR_EL1_SEED_MASK	0xffffUL



/* GMID_EL1 field definitions */

#define GMID_EL1_BS_SHIFT	0

#define GMID_EL1_BS_SIZE	4



/* TFSR{,E0}_EL1 bit definitions */

#define SYS_TFSR_EL1_TF0_SHIFT	0

#define SYS_TFSR_EL1_TF1_SHIFT	1

arch/arm64/lib/mte.S

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 
 */

	.macro	multitag_transfer_size, reg, tmp

	mrs_s	\reg, SYS_GMID_EL1

	ubfx	\reg, \reg, #GMID_EL1_BS_SHIFT, #GMID_EL1_BS_SIZE

	ubfx	\reg, \reg, #GMID_EL1_BS_SHIFT, #GMID_EL1_BS_WIDTH

	mov	\tmp, #4

	lsl	\reg, \tmp, \reg

	.endm