arm64: cpucaps: Remove stale comment about keeping capabilities sorted
Will Deacon
maintainerPATCH 1/1 arm64: cpucaps: Remove stale comment about keeping capabilities sorted
From: Will Deacon <[email protected]>
There is no functional requirement to keep the entries in arm64's tools/cpucaps file sorted alphabetically and, in fact, they have fallen out of order over time. Given that only the arm64 tree touches this file, just remove the stale comment and accept that we're collectively not very good at the alphabet.
---
Follow-up from the discussion at:
https://lore.kernel.org/r/[email protected]
arch/arm64/tools/cpucaps | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/tools/cpucaps +1 -1
@@ -1,6 +1,6 @@ # SPDX-License-Identifier: GPL-2.0 # -# Internal CPU capabilities constants, keep this list sorted +# Internal CPU capabilities constants ALWAYS_BOOT ALWAYS_SYSTEM
Signature · 1 line
2.55.0.229.g6434b31f56-goog
Quoted 9 lines · Will Deacon
From: Will Deacon <[email protected]>
There is no functional requirement to keep the entries in arm64's
tools/cpucapsfile sorted alphabetically and, in fact, they have fallen out of order over time. Given that only the arm64 tree touches this file, just remove the stale comment and accept that we're collectively not very good at the alphabet.
Quoted 4 lines
Cc Catalin Marinas <[email protected]>Cc Mark Rutland <[email protected]>Reported-by Marc Zyngier <[email protected]>Signed-off-by Will Deacon <[email protected]>
Cheers,
/fuad
Quoted 25 lines
---
Follow-up from the discussion at:
https://lore.kernel.org/r/[email protected]
arch/arm64/tools/cpucaps | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)arch/arm64/tools/cpucaps +1
-2@@ -1,6 +1,6 @@ # SPDX-License-Identifier: GPL-2.0 # -# Internal CPU capabilities constants, keep this list sorted +# Internal CPU capabilities constants ALWAYS_BOOT ALWAYS_SYSTEM --2.55.0.229.g6434b31f56-goog
Quoted 7 lines · Will Deacon
From: Will Deacon <[email protected]>
There is no functional requirement to keep the entries in arm64's
tools/cpucapsfile sorted alphabetically and, in fact, they have fallen out of order over time. Given that only the arm64 tree touches this file, just remove the stale comment and accept that we're collectively not very good at the alphabet.
It might be worth mentioning:
(1) The intent of sorting was to make it easier to avoid and/or resolve merge conflicts, which hasn't been a big problem in practice.
(2) In the few cases where we do depend on the order of specific cpucaps, we've added build-time asserts, e.g. in can_use_gic_priorities(), which has:
/*
* ARM64_HAS_GICV3_CPUIF has a lower index, and is a boot CPU
* feature, so will be detected earlier.
*/
BUILD_BUG_ON(ARM64_HAS_GIC_PRIO_MASKING <= ARM64_HAS_GICV3_CPUIF);... and we can still do that.
Quoted 4 lines
Cc Catalin Marinas <[email protected]>Cc Mark Rutland <[email protected]>Reported-by Marc Zyngier <[email protected]>Signed-off-by Will Deacon <[email protected]>
Regardless of whether you add the above to the commit message:
Mark.
Quoted 24 lines
---
Follow-up from the discussion at:
https://lore.kernel.org/r/[email protected]
arch/arm64/tools/cpucaps | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)arch/arm64/tools/cpucaps +1
-1@@ -1,6 +1,6 @@ # SPDX-License-Identifier: GPL-2.0 # -# Internal CPU capabilities constants, keep this list sorted +# Internal CPU capabilities constants ALWAYS_BOOT ALWAYS_SYSTEMSignature · 1 line
2.55.0.229.g6434b31f56-goog
Will Deacon
maintainerQuoted 9 lines · Mark Rutland
Quoted 7 lines · Will Deacon
From: Will Deacon <[email protected]>
There is no functional requirement to keep the entries in arm64's
tools/cpucapsfile sorted alphabetically and, in fact, they have fallen out of order over time. Given that only the arm64 tree touches this file, just remove the stale comment and accept that we're collectively not very good at the alphabet.
Quoted 4 lines
It might be worth mentioning:
(1) The intent of sorting was to make it easier to avoid and/or resolve merge conflicts, which hasn't been a big problem in practice.
I was trying to get at that when I mentioned that "only the arm64 tree touches this file", but I'll add some extra wording.
Quoted 5 lines
(2) In the few cases where we do depend on the order of specific cpucaps, we've added build-time asserts, e.g. in
can_use_gic_priorities(), which has:
Quoted 7 lines
/* * ARM64_HAS_GICV3_CPUIF has a lower index, and is a boot CPU * feature, so will be detected earlier. */ BUILD_BUG_ON(ARM64_HAS_GIC_PRIO_MASKING <= ARM64_HAS_GICV3_CPUIF);... and we can still do that.
I'll mention this too.
Quoted 9 lines
Quoted 5 lines
Cc Catalin Marinas <[email protected]>Cc Mark Rutland <[email protected]>Reported-by Marc Zyngier <[email protected]>Signed-off-by Will Deacon <[email protected]>Regardless of whether you add the above to the commit message:
Acked-by Mark Rutland <[email protected]>
Thanks. I'll post a v2 with the author fixed up as well... either my hard drive or my TPM died this week, so it's been great fun setting up a new machine whilst in the middle of merging stuff.
Will