Commit 96f101a9 authored by Mark Brown's avatar Mark Brown Committed by Catalin Marinas
Browse files

arm64/mte: Make TCF0 naming and field values more standard 



In preparation for automatic generation of SCTLR_EL1 register definitions
make the macros used to define SCTLR_EL1.TCF0 and the enumeration values it
has more standard so they can be used with FIELD_PREP() via the newly
defined SYS_FIELD_PREP_ helpers.

Since the field also exists in SCTLR_EL2 with the same values also rename
the macros to SCTLR_ELx rather than SCTLR_EL1.

There should be no functional change as a result of this patch.

Signed-off-by: default avatarMark Brown <broonie@kernel.org>
Acked-by: default avatarMark Rutland <mark.rutland@arm.com>
Link: https://lore.kernel.org/r/20220503170233.507788-3-broonie@kernel.org


Signed-off-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
parent e6a6b34f

arch/arm64/include/asm/sysreg.h

+4 −4
Original line number Diff line number Diff line
@@ -678,10 +678,10 @@ 
#define SCTLR_EL1_ATA0		(BIT(42))



#define SCTLR_EL1_TCF0_SHIFT	38

#define SCTLR_EL1_TCF0_NONE	(UL(0x0) << SCTLR_EL1_TCF0_SHIFT)

#define SCTLR_EL1_TCF0_SYNC	(UL(0x1) << SCTLR_EL1_TCF0_SHIFT)

#define SCTLR_EL1_TCF0_ASYNC	(UL(0x2) << SCTLR_EL1_TCF0_SHIFT)

#define SCTLR_EL1_TCF0_ASYMM	(UL(0x3) << SCTLR_EL1_TCF0_SHIFT)

#define SCTLR_EL1_TCF0_NONE	(UL(0x0))

#define SCTLR_EL1_TCF0_SYNC	(UL(0x1))

#define SCTLR_EL1_TCF0_ASYNC	(UL(0x2))

#define SCTLR_EL1_TCF0_ASYMM	(UL(0x3))

#define SCTLR_EL1_TCF0_MASK	(UL(0x3) << SCTLR_EL1_TCF0_SHIFT)



#define SCTLR_EL1_BT1		(BIT(36))

arch/arm64/kernel/mte.c

+3 −3
Original line number Diff line number Diff line
@@ -216,11 +216,11 @@ static void mte_update_sctlr_user(struct task_struct *task) 
	 * default order.

	 */

	if (resolved_mte_tcf & MTE_CTRL_TCF_ASYMM)

		sctlr |= SCTLR_EL1_TCF0_ASYMM;

		sctlr |= SYS_FIELD_PREP_ENUM(SCTLR_EL1, TCF0, ASYMM);

	else if (resolved_mte_tcf & MTE_CTRL_TCF_ASYNC)

		sctlr |= SCTLR_EL1_TCF0_ASYNC;

		sctlr |= SYS_FIELD_PREP_ENUM(SCTLR_EL1, TCF0, ASYNC);

	else if (resolved_mte_tcf & MTE_CTRL_TCF_SYNC)

		sctlr |= SCTLR_EL1_TCF0_SYNC;

		sctlr |= SYS_FIELD_PREP_ENUM(SCTLR_EL1, TCF0, SYNC);

	task->thread.sctlr_user = sctlr;

}