RISC-V: hwprobe: sort EXT_KEY()s in hwprobe_isa_ext0() alphabetically
PATCH 1/1 RISC-V: hwprobe: sort EXT_KEY()s in hwprobe_isa_ext0() alphabetically
From: Conor Dooley <[email protected]>
Currently the entries appear to be in a random order (although according to Palmer he has tried to sort them by key value) which makes it harder to find entries in a growing list, and more likely to have conflicts as all patches are adding to the end of the list. Sort them alphabetically instead.
---
CC: Paul Walmsley <[email protected]>
CC: Palmer Dabbelt <[email protected]>
CC: [email protected]
CC: [email protected]
--- arch/riscv/kernel/sys_hwprobe.c | 43 ++++++++++++++++----------------- 1 file changed, 21 insertions(+), 22 deletions(-)
arch/riscv/kernel/sys_hwprobe.c +21 -22
@@ -93,44 +93,45 @@ static void hwprobe_isa_ext0(struct riscv_hwprobe *pair,* regardless of the kernel's configuration, as no other checks, besides * presence in the hart_isa bitmap, are made. */ +EXT_KEY (ZACAS ); +EXT_KEY (ZAWRS );EXT_KEY (ZBA );EXT_KEY (ZBB ); -EXT_KEY (ZBS ); -EXT_KEY (ZICBOZ );EXT_KEY (ZBC ); -EXT_KEY (ZBKB );EXT_KEY (ZBKC );EXT_KEY (ZBKX ); +EXT_KEY (ZBS ); +EXT_KEY (ZCA ); +EXT_KEY (ZCB ); +EXT_KEY (ZCMOP ); +EXT_KEY (ZICBOZ ); +EXT_KEY (ZICOND ); +EXT_KEY (ZIHINTNTL ); +EXT_KEY (ZIHINTPAUSE ); +EXT_KEY (ZIMOP );EXT_KEY (ZKND );EXT_KEY (ZKNE );EXT_KEY (ZKNH );EXT_KEY (ZKSED );EXT_KEY (ZKSH );EXT_KEY (ZKT ); -EXT_KEY (ZIHINTNTL );EXT_KEY (ZTSO ); -EXT_KEY (ZACAS ); -EXT_KEY (ZICOND ); -EXT_KEY (ZIHINTPAUSE ); -EXT_KEY (ZIMOP ); -EXT_KEY (ZCA ); -EXT_KEY (ZCB ); -EXT_KEY (ZCMOP ); -EXT_KEY (ZAWRS );/* * All the following extensions must depend on the kernel * support of V. */ if (has_vector ()) { -EXT_KEY (ZVE32X ); -EXT_KEY (ZVE32F ); -EXT_KEY (ZVE64X ); -EXT_KEY (ZVE64F ); -EXT_KEY (ZVE64D );EXT_KEY (ZVBB );EXT_KEY (ZVBC ); +EXT_KEY (ZVE32F ); +EXT_KEY (ZVE32X ); +EXT_KEY (ZVE64D ); +EXT_KEY (ZVE64F ); +EXT_KEY (ZVE64X ); +EXT_KEY (ZVFH ); +EXT_KEY (ZVFHMIN );EXT_KEY (ZVKB );EXT_KEY (ZVKG );EXT_KEY (ZVKNED );
@@ -139,16 +140,14 @@ static void hwprobe_isa_ext0(struct riscv_hwprobe *pair,EXT_KEY (ZVKSED );EXT_KEY (ZVKSH );EXT_KEY (ZVKT ); -EXT_KEY (ZVFH ); -EXT_KEY (ZVFHMIN ); }if (has_fpu ()) { -EXT_KEY (ZFH ); -EXT_KEY (ZFHMIN ); -EXT_KEY (ZFA );EXT_KEY (ZCD );EXT_KEY (ZCF ); +EXT_KEY (ZFA ); +EXT_KEY (ZFH ); +EXT_KEY (ZFHMIN ); }#undef EXT_KEY }
Signature · 1 line
2.43.0
Quoted 95 lines · Conor Dooley
From: Conor Dooley <[email protected]>
Currently the entries appear to be in a random order (although according to Palmer he has tried to sort them by key value) which makes it harder to find entries in a growing list, and more likely to have conflicts as all patches are adding to the end of the list. Sort them alphabetically instead.
Signed-off-by Conor Dooley <[email protected]>---
CC: Paul Walmsley <[email protected]>
CC: Palmer Dabbelt <[email protected]>
CC: [email protected]
CC: [email protected]--- arch/riscv/kernel/sys_hwprobe.c | 43 ++++++++++++++++----------------- 1 file changed, 21 insertions(+), 22 deletions(-)arch/riscv/kernel/sys_hwprobe.c +18
-20@@ -93,44 +93,45 @@ static void hwprobe_isa_ext0(struct riscv_hwprobe *pair,* regardless of the kernel's configuration, as no other checks, besides * presence in the hart_isa bitmap, are made. */ +EXT_KEY (ZACAS ); +EXT_KEY (ZAWRS );EXT_KEY (ZBA );EXT_KEY (ZBB ); -EXT_KEY (ZBS ); -EXT_KEY (ZICBOZ );EXT_KEY (ZBC ); -EXT_KEY (ZBKB );EXT_KEY (ZBKC );EXT_KEY (ZBKX ); +EXT_KEY (ZBS ); +EXT_KEY (ZCA ); +EXT_KEY (ZCB ); +EXT_KEY (ZCMOP ); +EXT_KEY (ZICBOZ ); +EXT_KEY (ZICOND ); +EXT_KEY (ZIHINTNTL ); +EXT_KEY (ZIHINTPAUSE ); +EXT_KEY (ZIMOP );EXT_KEY (ZKND );EXT_KEY (ZKNE );EXT_KEY (ZKNH );EXT_KEY (ZKSED );EXT_KEY (ZKSH );EXT_KEY (ZKT ); -EXT_KEY (ZIHINTNTL );EXT_KEY (ZTSO ); -EXT_KEY (ZACAS ); -EXT_KEY (ZICOND ); -EXT_KEY (ZIHINTPAUSE ); -EXT_KEY (ZIMOP ); -EXT_KEY (ZCA ); -EXT_KEY (ZCB ); -EXT_KEY (ZCMOP ); -EXT_KEY (ZAWRS );/* * All the following extensions must depend on the kernel * support of V. */ if (has_vector ()) { -EXT_KEY (ZVE32X ); -EXT_KEY (ZVE32F ); -EXT_KEY (ZVE64X ); -EXT_KEY (ZVE64F ); -EXT_KEY (ZVE64D );EXT_KEY (ZVBB );EXT_KEY (ZVBC ); +EXT_KEY (ZVE32F ); +EXT_KEY (ZVE32X ); +EXT_KEY (ZVE64D ); +EXT_KEY (ZVE64F ); +EXT_KEY (ZVE64X ); +EXT_KEY (ZVFH ); +EXT_KEY (ZVFHMIN );EXT_KEY (ZVKB );EXT_KEY (ZVKG );EXT_KEY (ZVKNED );@@ -139,16 +140,14 @@ static void hwprobe_isa_ext0(struct riscv_hwprobe *pair,EXT_KEY (ZVKSED );EXT_KEY (ZVKSH );EXT_KEY (ZVKT ); -EXT_KEY (ZVFH ); -EXT_KEY (ZVFHMIN ); }if (has_fpu ()) { -EXT_KEY (ZFH );
arch/riscv/kernel/sys_hwprobe.c static void hwprobe_isa_ext0(struct riscv_hwprobe *pair, · line 153
Quoted 10 lines
arch/riscv/kernel/sys_hwprobe.c +3
-2-EXT_KEY (ZFHMIN ); -EXT_KEY (ZFA );EXT_KEY (ZCD );EXT_KEY (ZCF ); +EXT_KEY (ZFA ); +EXT_KEY (ZFH ); +EXT_KEY (ZFHMIN ); }#undef EXT_KEY }
I'd prefer that to be done after removing the "if (has_vector()/has_fpu()) by using the .validate callback for ISA extension. This way, you'll have only a single commit reordering everything.
Thanks,
Clément
Quoted 18 lines · Clément Léger
Quoted 17 lines · Conor Dooley
From: Conor Dooley <[email protected]>
Currently the entries appear to be in a random order (although according to Palmer he has tried to sort them by key value) which makes it harder to find entries in a growing list, and more likely to have conflicts as all patches are adding to the end of the list. Sort them alphabetically instead.
Signed-off-by Conor Dooley <[email protected]>arch/riscv/kernel/sys_hwprobe.c +2
-3if (has_fpu ()) { -EXT_KEY (ZFH ); -EXT_KEY (ZFHMIN ); -EXT_KEY (ZFA );EXT_KEY (ZCD );EXT_KEY (ZCF ); +EXT_KEY (ZFA ); +EXT_KEY (ZFH );
Quoted 8 lines
arch/riscv/kernel/sys_hwprobe.c static void hwprobe_isa_ext0(struct riscv_hwprobe *pair, · line 153
Quoted 4 lines
arch/riscv/kernel/sys_hwprobe.c +1
-0+EXT_KEY (ZFHMIN ); }#undef EXT_KEY }I'd prefer that to be done after removing the "if (has_vector()/has_fpu()) by using the .validate callback for ISA extension. This way, you'll have only a single commit reordering everything.
Right, and I do have some WIP for that here
https://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git/log/?h=validate_fpu_and_vector
but won't be sending that until it's cleaned up after the merge window. I was intentionally sending this during it so that there would be no moving pieces for this to conflict with - because it will conflict with any other patch adding things to the list tails.
Clément Léger
Reviewed-byQuoted 28 lines · Conor Dooley
Quoted 18 lines · Clément Léger
Quoted 17 lines · Conor Dooley
From: Conor Dooley <[email protected]>
Currently the entries appear to be in a random order (although according to Palmer he has tried to sort them by key value) which makes it harder to find entries in a growing list, and more likely to have conflicts as all patches are adding to the end of the list. Sort them alphabetically instead.
Signed-off-by Conor Dooley <[email protected]>arch/riscv/kernel/sys_hwprobe.c +2
-3if (has_fpu ()) { -EXT_KEY (ZFH ); -EXT_KEY (ZFHMIN ); -EXT_KEY (ZFA );EXT_KEY (ZCD );EXT_KEY (ZCF ); +EXT_KEY (ZFA ); +EXT_KEY (ZFH );Quoted 8 lines
arch/riscv/kernel/sys_hwprobe.c static void hwprobe_isa_ext0(struct riscv_hwprobe *pair, · line 153
Quoted 4 lines
arch/riscv/kernel/sys_hwprobe.c +1
-0+EXT_KEY (ZFHMIN ); }#undef EXT_KEY }I'd prefer that to be done after removing the "if (has_vector()/has_fpu()) by using the .validate callback for ISA extension. This way, you'll have only a single commit reordering everything.
Quoted 6 lines
Right, and I do have some WIP for that here
https://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git/log/?h=validate_fpu_and_vector
but won't be sending that until it's cleaned up after the merge window. I was intentionally sending this during it so that there would be no moving pieces for this to conflict with - because it will conflict with any other patch adding things to the list tails.
Makes sense. If you think it's worth it:
Thanks,
Clément
This patch was applied to riscv/linux.git (for-next) by Palmer Dabbelt <[email protected]>:
Hello:
This patch was applied to riscv/linux.git (for-next) by Palmer Dabbelt <[email protected]>:
Quoted 9 lines · On Wed, 17 Jul 2024 09:54:38 +0100 you wrote:
From: Conor Dooley <[email protected]>
Currently the entries appear to be in a random order (although according to Palmer he has tried to sort them by key value) which makes it harder to find entries in a growing list, and more likely to have conflicts as all patches are adding to the end of the list. Sort them alphabetically instead.
[...]
Here is the summary with links:
- [v1] RISC-V: hwprobe: sort EXT_KEY()s in hwprobe_isa_ext0() alphabetically
https://git.kernel.org/riscv/c/3d8d459c8ba2
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html