| Message ID | 20200414134706.8435-1-ardb@kernel.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | arm64: drop duplicate definitions of ID_AA64MMFR0_TGRAN constants | expand |
On Tue, Apr 14, 2020 at 03:47:06PM +0200, Ard Biesheuvel wrote: > 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 <ardb@kernel.org> 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: Acked-by: Mark Rutland <mark.rutland@arm.com> Mark. > --- > arch/arm64/include/asm/sysreg.h | 12 ------------ > 1 file changed, 12 deletions(-) > > diff --git a/arch/arm64/include/asm/sysreg.h b/arch/arm64/include/asm/sysreg.h > index ebc622432831..b7e62b4f73af 100644 > --- a/arch/arm64/include/asm/sysreg.h > +++ b/arch/arm64/include/asm/sysreg.h > @@ -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 > -- > 2.17.1 > > > _______________________________________________ > linux-arm-kernel mailing list > linux-arm-kernel@lists.infradead.org > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
On 04/14/2020 02:47 PM, Ard Biesheuvel wrote: > 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 <ardb@kernel.org> Thanks for the cleanup ! Acked-by: Suzuki K Poulose <suzuki.poulose@arm.com>
On Tue, Apr 14, 2020 at 02:58:57PM +0100, Mark Rutland wrote: > On Tue, Apr 14, 2020 at 03:47:06PM +0200, Ard Biesheuvel wrote: > > 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 <ardb@kernel.org> > > 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
On Tue, 14 Apr 2020 15:47:06 +0200, Ard Biesheuvel wrote: > 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,
diff --git a/arch/arm64/include/asm/sysreg.h b/arch/arm64/include/asm/sysreg.h index ebc622432831..b7e62b4f73af 100644 --- a/arch/arm64/include/asm/sysreg.h +++ b/arch/arm64/include/asm/sysreg.h @@ -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
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 <ardb@kernel.org> --- arch/arm64/include/asm/sysreg.h | 12 ------------ 1 file changed, 12 deletions(-)