Re: [PATCH v3 03/23] arm64: sysreg: Convert OSLSR to automatic register generation

[sashiko-bot@kernel.org]

Thank you for your contribution! Sashiko AI review found 1 potential
issue to consider:
- [Medium] arm64: sysreg: OSLSR_EL1_OSLK redefinition in tools/ sysreg.h
  breaks perf
--

commit 33e9aa857b4dfa390c27f99a1a44127d7465fe7b
Author: Steffen Eiden <seiden@linux.ibm.com>

arm64: sysreg: Convert OSLSR to automatic register generation

This commit converts OSLSR_EL1 to automatic system register generation in
arch/arm64/tools/sysreg and renames OSLSR_EL1_OSLM_IMPLEMENTED to
OSLSR_EL1_OSLM_IMP.

> diff --git a/arch/arm64/include/asm/sysreg.h b/arch/arm64/include/asm/sysreg.h
> index e3b60ee030230..2ec9ba9cd896f 100644
> --- a/arch/arm64/include/asm/sysreg.h
> +++ b/arch/arm64/include/asm/sysreg.h
> @@ -186,11 +186,13 @@
>  #define SYS_DBGWCRn_EL1(n)		sys_reg(2, 0, 0, n, 7)
>  #define SYS_MDRAR_EL1			sys_reg(2, 0, 1, 0, 0)
>  
> -#define SYS_OSLSR_EL1			sys_reg(2, 0, 1, 1, 4)
> -#define OSLSR_EL1_OSLM_MASK		(BIT(3) | BIT(0))
> -#define OSLSR_EL1_OSLM_NI		0
> -#define OSLSR_EL1_OSLM_IMPLEMENTED	BIT(3)
> -#define OSLSR_EL1_OSLK			BIT(1)
> +#define OSLSR_EL1_OSLM_MASK (OSLSR_EL1_OSLM0_MASK | OSLSR_EL1_OSLM1_MASK)
> +#define OSLSR_EL1_OSLM_NI						\
> +	((OSLSR_EL1_OSLM1_NI << OSLSR_EL1_OSLM1_SHIFT) |		\
> +	(OSLSR_EL1_OSLM0_VAL_0 << OSLSR_EL1_OSLM0_SHIFT))
> +#define OSLSR_EL1_OSLM_IMP						\
> +	((OSLSR_EL1_OSLM1_IMP << OSLSR_EL1_OSLM1_SHIFT) |		\
> +	(OSLSR_EL1_OSLM0_VAL_0 << OSLSR_EL1_OSLM0_SHIFT))

[Severity: Medium]
Should tools/arch/arm64/include/asm/sysreg.h receive the same update?

The tools build generates its own asm/sysreg-defs.h from
arch/arm64/tools/sysreg, which now defines OSLSR_EL1_OSLK as GENMASK(1, 1).
Because tools/arch/arm64/include/asm/sysreg.h includes asm/sysreg-defs.h and
still defines OSLSR_EL1_OSLK as BIT(1), building tools/perf fails under
-Werror with a macro redefinition error.

-- 
Sashiko AI review · https://sashiko.dev/#/patchset/20261106-sysreg-v3-0-75e95980fb10@linux.ibm.com?part=3