RISC-V: fixup ISA string parser merge conflict
PATCH 1/1 RISC-V: fixup ISA string parser merge conflict
From: Conor Dooley <[email protected]>
Commit 6589450fa2e3 ("Merge patch series "ISA string parser cleanups"") has interacted poorly with commit 16252e018a30 ("Merge patch series "RISC-V: Export Zba, Zbb to usermode via hwprobe""), as there were some semantic conflicts between the former which added more users of the "this_isa" bitmap which the latter removed.
---
As promised, feel free to squash ;)
--- arch/riscv/kernel/cpufeature.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-)
arch/riscv/kernel/cpufeature.c +4 -6
@@ -131,7 +131,6 @@ void __init riscv_fill_hwcap(void)for_each_possible_cpu (cpu) {struct riscv_isainfo *isainfo = &hart_isa[cpu];unsigned long this_hwcap =0 ; -DECLARE_BITMAP (this_isa,RISCV_ISA_EXT_MAX );if (acpi_disabled) { node =of_cpu_device_node_get (cpu);
@@ -162,7 +161,6 @@ void __init riscv_fill_hwcap(void)*/ isa +=4 ; -bitmap_zero (this_isa,RISCV_ISA_EXT_MAX );while (*isa) {const char *ext = isa++;const char *ext_end = isa;
@@ -323,8 +321,8 @@ void __init riscv_fill_hwcap(void)* Linux requires the following extensions, so we may as well * always set them. */ -set_bit (RISCV_ISA_EXT_ZICSR , this_isa); -set_bit (RISCV_ISA_EXT_ZIFENCEI , this_isa); +set_bit (RISCV_ISA_EXT_ZICSR , isainfo->isa); +set_bit (RISCV_ISA_EXT_ZIFENCEI , isainfo->isa);/* * These ones were as they were part of the base ISA when the
@@ -332,8 +330,8 @@ void __init riscv_fill_hwcap(void)* unconditionally where `i` is in riscv,isa on DT systems. */ if (acpi_disabled) { -set_bit (RISCV_ISA_EXT_ZICNTR , this_isa); -set_bit (RISCV_ISA_EXT_ZIHPM , this_isa); +set_bit (RISCV_ISA_EXT_ZICNTR , isainfo->isa); +set_bit (RISCV_ISA_EXT_ZIHPM , isainfo->isa); }/*
Signature · 7 lines
2.39.2 _______________________________________________ linux-riscv mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-riscv
Palmer Dabbelt
maintainerQuoted 8 lines · Conor Dooley
From: Conor Dooley <[email protected]>
Commit
6589450fa2e3("Merge patch series "ISA string parser cleanups"") has interacted poorly with commit16252e018a30("Merge patch series "RISC-V: Export Zba, Zbb to usermode via hwprobe""), as there were some semantic conflicts between the former which added more users of the "this_isa" bitmap which the latter removed.
Quoted 4 lines
Fixes 6589450fa2e3 ("Merge patch series "ISA string parser cleanups"")Signed-off-by Conor Dooley <[email protected]>---
As promised, feel free to squash ;)
Thanks, I will ;)
Quoted 36 lines
--- arch/riscv/kernel/cpufeature.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-)arch/riscv/kernel/cpufeature.c +2
-4@@ -131,7 +131,6 @@ void __init riscv_fill_hwcap(void)for_each_possible_cpu (cpu) {struct riscv_isainfo *isainfo = &hart_isa[cpu];unsigned long this_hwcap =0 ; -DECLARE_BITMAP (this_isa,RISCV_ISA_EXT_MAX );if (acpi_disabled) { node =of_cpu_device_node_get (cpu);@@ -162,7 +161,6 @@ void __init riscv_fill_hwcap(void)*/ isa +=4 ; -bitmap_zero (this_isa,RISCV_ISA_EXT_MAX );while (*isa) {const char *ext = isa++;const char *ext_end = isa;@@ -323,8 +321,8 @@ void __init riscv_fill_hwcap(void)* Linux requires the following extensions, so we may as well * always set them. */ -set_bit (RISCV_ISA_EXT_ZICSR , this_isa); -set_bit (RISCV_ISA_EXT_ZIFENCEI , this_isa); +set_bit (RISCV_ISA_EXT_ZICSR , isainfo->isa); +set_bit (RISCV_ISA_EXT_ZIFENCEI , isainfo->isa);/* * These ones were as they were part of the base ISA when the
arch/riscv/kernel/cpufeature.c void __init riscv_fill_hwcap(void) · line 337
Quoted 10 lines
arch/riscv/kernel/cpufeature.c +2
-2@@ -332,8 +330,8 @@ void __init riscv_fill_hwcap(void)* unconditionally where `i` is in riscv,isa on DT systems. */ if (acpi_disabled) { -set_bit (RISCV_ISA_EXT_ZICNTR , this_isa); -set_bit (RISCV_ISA_EXT_ZIHPM , this_isa); +set_bit (RISCV_ISA_EXT_ZICNTR , isainfo->isa); +set_bit (RISCV_ISA_EXT_ZIHPM , isainfo->isa); }/*
_______________________________________________
linux-riscv mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-riscv