* [PATCH] arm64: drop duplicate definitions of ID_AA64MMFR0_TGRAN constants
@ 2020-04-14 13:47 Ard Biesheuvel
2020-04-14 13:58 ` Mark Rutland
` (2 more replies)
0 siblings, 3 replies; 5+ messages in thread
From: Ard Biesheuvel @ 2020-04-14 13:47 UTC (permalink / raw)
To: linux-arm-kernel; +Cc: catalin.marinas, will, Ard Biesheuvel, suzuki.poulose
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(-)
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
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH] arm64: drop duplicate definitions of ID_AA64MMFR0_TGRAN constants
2020-04-14 13:47 [PATCH] arm64: drop duplicate definitions of ID_AA64MMFR0_TGRAN constants Ard Biesheuvel
@ 2020-04-14 13:58 ` Mark Rutland
2020-04-14 15:31 ` Will Deacon
2020-04-14 14:52 ` Suzuki K Poulose
2020-04-28 16:39 ` Will Deacon
2 siblings, 1 reply; 5+ messages in thread
From: Mark Rutland @ 2020-04-14 13:58 UTC (permalink / raw)
To: Ard Biesheuvel; +Cc: catalin.marinas, will, linux-arm-kernel, suzuki.poulose
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
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH] arm64: drop duplicate definitions of ID_AA64MMFR0_TGRAN constants
2020-04-14 13:58 ` Mark Rutland
@ 2020-04-14 15:31 ` Will Deacon
0 siblings, 0 replies; 5+ messages in thread
From: Will Deacon @ 2020-04-14 15:31 UTC (permalink / raw)
To: Mark Rutland
Cc: catalin.marinas, Ard Biesheuvel, linux-arm-kernel, suzuki.poulose
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
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] arm64: drop duplicate definitions of ID_AA64MMFR0_TGRAN constants
2020-04-14 13:47 [PATCH] arm64: drop duplicate definitions of ID_AA64MMFR0_TGRAN constants Ard Biesheuvel
2020-04-14 13:58 ` Mark Rutland
@ 2020-04-14 14:52 ` Suzuki K Poulose
2020-04-28 16:39 ` Will Deacon
2 siblings, 0 replies; 5+ messages in thread
From: Suzuki K Poulose @ 2020-04-14 14:52 UTC (permalink / raw)
To: ardb, linux-arm-kernel; +Cc: catalin.marinas, will
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>
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] arm64: drop duplicate definitions of ID_AA64MMFR0_TGRAN constants
2020-04-14 13:47 [PATCH] arm64: drop duplicate definitions of ID_AA64MMFR0_TGRAN constants Ard Biesheuvel
2020-04-14 13:58 ` Mark Rutland
2020-04-14 14:52 ` Suzuki K Poulose
@ 2020-04-28 16:39 ` Will Deacon
2 siblings, 0 replies; 5+ messages in thread
From: Will Deacon @ 2020-04-28 16:39 UTC (permalink / raw)
To: Ard Biesheuvel, linux-arm-kernel
Cc: catalin.marinas, Will Deacon, suzuki.poulose
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,
--
Will
https://fixes.arm64.dev
https://next.arm64.dev
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2020-04-28 16:39 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-04-14 13:47 [PATCH] arm64: drop duplicate definitions of ID_AA64MMFR0_TGRAN constants Ard Biesheuvel
2020-04-14 13:58 ` Mark Rutland
2020-04-14 15:31 ` Will Deacon
2020-04-14 14:52 ` Suzuki K Poulose
2020-04-28 16:39 ` Will Deacon
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).