arm64: drop duplicate definitions of ID_AA64MMFR0_TGRAN constants
PATCH 1/1 arm64: drop duplicate definitions of ID_AA64MMFR0_TGRAN constants
A bunch of ID_AA64MMFR0_TGRAN_* constant definitions appear twice in arch/arm64/include/asm/sysreg.h, so drop the duplicates.
--- arch/arm64/include/asm/sysreg.h | 12 ------------ 1 file changed, 12 deletions(-)
arch/arm64/include/asm/sysreg.h +0 -12
@@ -783,18 +783,6 @@#define MVFR1_FPDNAN_SHIFT 4#define MVFR1_FPFTZ_SHIFT 0 - -#define ID_AA64MMFR0_TGRAN4_SHIFT 28 -#define ID_AA64MMFR0_TGRAN64_SHIFT 24 -#define ID_AA64MMFR0_TGRAN16_SHIFT 20 - -#define ID_AA64MMFR0_TGRAN4_NI 0xf -#define ID_AA64MMFR0_TGRAN4_SUPPORTED 0x0 -#define ID_AA64MMFR0_TGRAN64_NI 0xf -#define ID_AA64MMFR0_TGRAN64_SUPPORTED 0x0 -#define ID_AA64MMFR0_TGRAN16_NI 0x0 -#define ID_AA64MMFR0_TGRAN16_SUPPORTED 0x1 -#if defined(CONFIG_ARM64_4K_PAGES )#define ID_AA64MMFR0_TGRAN_SHIFT ID_AA64MMFR0_TGRAN4_SHIFT#define ID_AA64MMFR0_TGRAN_SUPPORTED ID_AA64MMFR0_TGRAN4_SUPPORTED
Signature · 7 lines
2.17.1 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Quoted 4 lines · Ard Biesheuvel
A bunch of ID_AA64MMFR0_TGRAN_* constant definitions appear twice in
arch/arm64/include/asm/sysreg.h, so drop the duplicates.Signed-off-by Ard Biesheuvel <[email protected]>
Whoops. Looks like these were added in commit:
4bf8b96ed3f7e114 ("arm64: Check for selected granule support")
... and then duplicated along with all the other registers in commit:
3c739b5710843621 ("arm64: Keep track of CPU feature registers")
This patch looks sound to me, so:
Mark.
Quoted 35 lines
--- arch/arm64/include/asm/sysreg.h | 12 ------------ 1 file changed, 12 deletions(-)arch/arm64/include/asm/sysreg.h +0
-12@@ -783,18 +783,6 @@#define MVFR1_FPDNAN_SHIFT 4#define MVFR1_FPFTZ_SHIFT 0 - -#define ID_AA64MMFR0_TGRAN4_SHIFT 28 -#define ID_AA64MMFR0_TGRAN64_SHIFT 24 -#define ID_AA64MMFR0_TGRAN16_SHIFT 20 - -#define ID_AA64MMFR0_TGRAN4_NI 0xf -#define ID_AA64MMFR0_TGRAN4_SUPPORTED 0x0 -#define ID_AA64MMFR0_TGRAN64_NI 0xf -#define ID_AA64MMFR0_TGRAN64_SUPPORTED 0x0 -#define ID_AA64MMFR0_TGRAN16_NI 0x0 -#define ID_AA64MMFR0_TGRAN16_SUPPORTED 0x1 -#if defined(CONFIG_ARM64_4K_PAGES )#define ID_AA64MMFR0_TGRAN_SHIFT ID_AA64MMFR0_TGRAN4_SHIFT#define ID_AA64MMFR0_TGRAN_SUPPORTED ID_AA64MMFR0_TGRAN4_SUPPORTEDSignature · 7 lines
2.17.1 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Will Deacon
maintainerQuoted 6 lines · Mark Rutland
Quoted 4 lines · Ard Biesheuvel
A bunch of ID_AA64MMFR0_TGRAN_* constant definitions appear twice in
arch/arm64/include/asm/sysreg.h, so drop the duplicates.Signed-off-by Ard Biesheuvel <[email protected]>
Quoted 7 lines
Whoops. Looks like these were added in commit:
4bf8b96ed3f7e114("arm64: Check for selected granule support")... and then duplicated along with all the other registers in commit:
3c739b5710843621("arm64: Keep track of CPU feature registers")
Thanks for tracking that down, I was worried we might have messed up a merge conflict and potentially broken something else at the same time.
Will
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Quoted 4 lines · Ard Biesheuvel
A bunch of ID_AA64MMFR0_TGRAN_* constant definitions appear twice in
arch/arm64/include/asm/sysreg.h, so drop the duplicates.Signed-off-by Ard Biesheuvel <[email protected]>
Thanks for the cleanup !
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Quoted 2 lines · Ard Biesheuvel
A bunch of ID_AA64MMFR0_TGRAN_* constant definitions appear twice in
arch/arm64/include/asm/sysreg.h, so drop the duplicates.
Applied to arm64 (for-next/cpufeature), thanks!
[1/1] arm64: drop duplicate definitions of ID_AA64MMFR0_TGRAN constants
https://git.kernel.org/arm64/c/9b5aaec441d3
Cheers,
Signature · 9 lines
Will https://fixes.arm64.dev https://next.arm64.dev _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel