riscv: fix sifive and thead section mismatches in errata
Subsystems (2)
PATCH 1/1 riscv: fix sifive and thead section mismatches in errata
When CONFIG_MODULES is set, __init_or_module becomes <empty>, but when CONFIG_MODULES is not set, __init_or_module becomes __init. In the latter case, it causes section mismatch warnings:
WARNING: modpost: vmlinux.o: section mismatch in reference: riscv_fill_cpu_mfr_info (section: .text) -> sifive_errata_patch_func (section: .init.text)
WARNING: modpost: vmlinux.o: section mismatch in reference: riscv_fill_cpu_mfr_info (section: .text) -> thead_errata_patch_func (section: .init.text)
It appears that CONFIG_MODULES not set is not tested very much.
--- arch/riscv/errata/sifive/errata.c | 8 +++----- arch/riscv/errata/thead/errata.c | 6 +++--- 2 files changed, 6 insertions(+), 8 deletions(-)
arch/riscv/errata/sifive/errata.c +3 -5
@@ -82,11 +82,9 @@ static void __init_or_module warn_miss_epr_warn ("----------------------------------------------------------------\n" ); } -void __init_or_module sifive_errata_patch_func(struct alt_entry *begin, -struct alt_entry *end, -unsigned long archid, -unsigned long impid, -unsigned int stage) +void sifive_errata_patch_func (struct alt_entry *begin,struct alt_entry *end, +unsigned long archid,unsigned long impid, +unsigned int stage) {struct alt_entry *alt;u32 cpu_req_errata;
arch/riscv/errata/thead/errata.c +3 -3
@@ -83,9 +83,9 @@ static u32 thead_errata_probe(unsigned ireturn cpu_req_errata; } -void __init_or_module thead_errata_patch_func(struct alt_entry *begin, struct alt_entry *end, -unsigned long archid,unsigned long impid, -unsigned int stage) +void thead_errata_patch_func (struct alt_entry *begin,struct alt_entry *end, +unsigned long archid,unsigned long impid, +unsigned int stage) {struct alt_entry *alt;u32 cpu_req_errata =thead_errata_probe (stage, archid, impid);
Quoted 8 lines · Randy Dunlap
When
CONFIG_MODULESis set,__init_or_modulebecomes <empty>, but whenCONFIG_MODULESis not set,__init_or_modulebecomes__init. In the latter case, it causes section mismatch warnings:WARNING: modpost: vmlinux.o: section mismatch in reference:
riscv_fill_cpu_mfr_info(section: .text) ->sifive_errata_patch_func(section: .init.text)
WARNING: modpost: vmlinux.o: section mismatch in reference:riscv_fill_cpu_mfr_info(section: .text) ->thead_errata_patch_func(section: .init.text)It appears that
CONFIG_MODULESnot set is not tested very much.
I dunno if it the testing is *that* rare, because I'm not sure that the fixes tags below are correct. I think that it is actually:
That was only applied on 20/04.
Cheers,
Conor.
Quoted 47 lines
Fixes a8e910168bba ("riscv: implement module alternatives")Fixes a35707c3d850 ("riscv: add memory-type errata for T-Head")Signed-off-by Randy Dunlap <[email protected]>Cc Heiko Stuebner <[email protected]>Cc Paul Walmsley <[email protected]>Cc Palmer Dabbelt <[email protected]>Cc Albert Ou <[email protected]>--- arch/riscv/errata/sifive/errata.c | 8 +++----- arch/riscv/errata/thead/errata.c | 6 +++--- 2 files changed, 6 insertions(+), 8 deletions(-)diff --
a/arch/riscv/errata/sifive/errata.cb/arch/riscv/errata/sifive/errata.carch/riscv/errata/sifive/errata.c +3
-5@@ -82,11 +82,9 @@ static void __init_or_module warn_miss_epr_warn ("----------------------------------------------------------------\n" ); } -void __init_or_module sifive_errata_patch_func(struct alt_entry *begin, -struct alt_entry *end, -unsigned long archid, -unsigned long impid, -unsigned int stage) +void sifive_errata_patch_func (struct alt_entry *begin,struct alt_entry *end, +unsigned long archid,unsigned long impid, +unsigned int stage) {struct alt_entry *alt;u32 cpu_req_errata;diff --
a/arch/riscv/errata/thead/errata.cb/arch/riscv/errata/thead/errata.carch/riscv/errata/thead/errata.c +3
-3@@ -83,9 +83,9 @@ static u32 thead_errata_probe(unsigned ireturn cpu_req_errata; } -void __init_or_module thead_errata_patch_func(struct alt_entry *begin, struct alt_entry *end, -unsigned long archid,unsigned long impid, -unsigned int stage) +void thead_errata_patch_func (struct alt_entry *begin,struct alt_entry *end, +unsigned long archid,unsigned long impid, +unsigned int stage) {struct alt_entry *alt;u32 cpu_req_errata =thead_errata_probe (stage, archid, impid);
Quoted 8 lines · Conor Dooley
Quoted 7 lines · Randy Dunlap
When
CONFIG_MODULESis set,__init_or_modulebecomes <empty>, but whenCONFIG_MODULESis not set,__init_or_modulebecomes__init. In the latter case, it causes section mismatch warnings:WARNING: modpost: vmlinux.o: section mismatch in reference:
riscv_fill_cpu_mfr_info(section: .text) ->sifive_errata_patch_func(section: .init.text)
WARNING: modpost: vmlinux.o: section mismatch in reference:riscv_fill_cpu_mfr_info(section: .text) ->thead_errata_patch_func(section: .init.text)
Quoted 6 lines
Quoted 1 line
It appears that
CONFIG_MODULESnot set is not tested very much.I dunno if it the testing is *that* rare, because I'm not sure that the fixes tags below are correct. I think that it is actually:
Fixes bb3f89487fd9 ("RISC-V: hwprobe: Remove __init on probe_vendor_features()")That was only applied on 20/04.
Yeah, that Fixes: commit looks like the right one. I'll send a v2.
Thanks.
Quoted 14 lines
Quoted 14 lines
Fixes a8e910168bba ("riscv: implement module alternatives")Fixes a35707c3d850 ("riscv: add memory-type errata for T-Head")Signed-off-by Randy Dunlap <[email protected]>Cc Heiko Stuebner <[email protected]>Cc Paul Walmsley <[email protected]>Cc Palmer Dabbelt <[email protected]>Cc Albert Ou <[email protected]>--- arch/riscv/errata/sifive/errata.c | 8 +++----- arch/riscv/errata/thead/errata.c | 6 +++--- 2 files changed, 6 insertions(+), 8 deletions(-)
Signature · 1 line
~Randy