| Message ID | 20191018080841.26712-2-paul.walmsley@sifive.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | riscv: resolve most warnings from sparse | expand |
On Fri, Oct 18, 2019 at 01:08:34AM -0700, Paul Walmsley wrote: > Add prototypes for assembly language functions defined in entry.S, > and include these prototypes into C source files that call those > functions. > > This patch resolves the following warnings from sparse: > > arch/riscv/kernel/signal.c:32:53: warning: incorrect type in initializer (different address spaces) I don't see how adding prototypes will fix an address space warning. > +asmlinkage void do_trap_unknown(struct pt_regs *regs); > +asmlinkage void do_trap_insn_misaligned(struct pt_regs *regs); > +asmlinkage void do_trap_insn_fault(struct pt_regs *regs); > +asmlinkage void do_trap_insn_illegal(struct pt_regs *regs); > +asmlinkage void do_trap_load_misaligned(struct pt_regs *regs); > +asmlinkage void do_trap_load_fault(struct pt_regs *regs); > +asmlinkage void do_trap_store_misaligned(struct pt_regs *regs); > +asmlinkage void do_trap_store_fault(struct pt_regs *regs); > +asmlinkage void do_trap_ecall_u(struct pt_regs *regs); > +asmlinkage void do_trap_ecall_s(struct pt_regs *regs); > +asmlinkage void do_trap_ecall_m(struct pt_regs *regs); > +asmlinkage void do_trap_break(struct pt_regs *regs); All these are not defined in entry.S, but called from entry.S. And as Luc pointed out last time the easiest way to fix the sparse warnings is to add __visible to the definitions of those functions.
On Fri, 18 Oct 2019, Christoph Hellwig wrote: > On Fri, Oct 18, 2019 at 01:08:34AM -0700, Paul Walmsley wrote: > > Add prototypes for assembly language functions defined in entry.S, > > and include these prototypes into C source files that call those > > functions. > > > > This patch resolves the following warnings from sparse: > > > > arch/riscv/kernel/signal.c:32:53: warning: incorrect type in initializer (different address spaces) > > I don't see how adding prototypes will fix an address space warning. You're right - that was a cut-and-paste error on my part. [ ... ] > All these are not defined in entry.S, but called from entry.S. Indeed. After reviewing this patch closely, I've just dropped it, and used __visible for just about everything. All that is reflected in the v4 series. Thanks for the review. - Paul
diff --git a/arch/riscv/kernel/entry.h b/arch/riscv/kernel/entry.h new file mode 100644 index 000000000000..73bfcda993d0 --- /dev/null +++ b/arch/riscv/kernel/entry.h @@ -0,0 +1,29 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* + * Copyright (C) 2019 SiFive, Inc. + */ +#ifndef __ASM_ENTRY_H +#define __ASM_ENTRY_H + +#include <linux/linkage.h> +#include <linux/init.h> + +asmlinkage void do_trap_unknown(struct pt_regs *regs); +asmlinkage void do_trap_insn_misaligned(struct pt_regs *regs); +asmlinkage void do_trap_insn_fault(struct pt_regs *regs); +asmlinkage void do_trap_insn_illegal(struct pt_regs *regs); +asmlinkage void do_trap_load_misaligned(struct pt_regs *regs); +asmlinkage void do_trap_load_fault(struct pt_regs *regs); +asmlinkage void do_trap_store_misaligned(struct pt_regs *regs); +asmlinkage void do_trap_store_fault(struct pt_regs *regs); +asmlinkage void do_trap_ecall_u(struct pt_regs *regs); +asmlinkage void do_trap_ecall_s(struct pt_regs *regs); +asmlinkage void do_trap_ecall_m(struct pt_regs *regs); +asmlinkage void do_trap_break(struct pt_regs *regs); + +asmlinkage void do_notify_resume(struct pt_regs *regs, + unsigned long thread_info_flags); + +void __init trap_init(void); + +#endif /* __ASM__H */ diff --git a/arch/riscv/kernel/signal.c b/arch/riscv/kernel/signal.c index b14d7647d800..85c700ad47e9 100644 --- a/arch/riscv/kernel/signal.c +++ b/arch/riscv/kernel/signal.c @@ -17,6 +17,8 @@ #include <asm/switch_to.h> #include <asm/csr.h> +#include "entry.h" + #define DEBUG_SIG 0 struct rt_sigframe { diff --git a/arch/riscv/kernel/traps.c b/arch/riscv/kernel/traps.c index 1ac75f7d0bff..eff679c3b618 100644 --- a/arch/riscv/kernel/traps.c +++ b/arch/riscv/kernel/traps.c @@ -19,6 +19,8 @@ #include <asm/ptrace.h> #include <asm/csr.h> +#include "entry.h" + int show_unhandled_signals = 1; extern asmlinkage void handle_exception(void);
Add prototypes for assembly language functions defined in entry.S, and include these prototypes into C source files that call those functions. This patch resolves the following warnings from sparse: arch/riscv/kernel/signal.c:32:53: warning: incorrect type in initializer (different address spaces) arch/riscv/kernel/signal.c:45:23: warning: incorrect type in initializer (different address spaces) arch/riscv/kernel/signal.c:59:53: warning: incorrect type in initializer (different address spaces) arch/riscv/kernel/signal.c:69:23: warning: incorrect type in initializer (different address spaces) arch/riscv/kernel/signal.c:89:48: warning: incorrect type in argument 2 (different address spaces) arch/riscv/kernel/signal.c:142:45: warning: incorrect type in argument 2 (different address spaces) arch/riscv/kernel/signal.c:295:17: warning: symbol 'do_notify_resume' was not declared. Should it be static? arch/riscv/kernel/traps.c:91:1: warning: symbol 'do_trap_unknown' was not declared. Should it be static? arch/riscv/kernel/traps.c:93:1: warning: symbol 'do_trap_insn_misaligned' was not declared. Should it be static? arch/riscv/kernel/traps.c:95:1: warning: symbol 'do_trap_insn_fault' was not declared. Should it be static? arch/riscv/kernel/traps.c:97:1: warning: symbol 'do_trap_insn_illegal' was not declared. Should it be static? arch/riscv/kernel/traps.c:99:1: warning: symbol 'do_trap_load_misaligned' was not declared. Should it be static? arch/riscv/kernel/traps.c:101:1: warning: symbol 'do_trap_load_fault' was not declared. Should it be static? arch/riscv/kernel/traps.c:103:1: warning: symbol 'do_trap_store_misaligned' was not declared. Should it be static? arch/riscv/kernel/traps.c:105:1: warning: symbol 'do_trap_store_fault' was not declared. Should it be static? arch/riscv/kernel/traps.c:107:1: warning: symbol 'do_trap_ecall_u' was not declared. Should it be static? arch/riscv/kernel/traps.c:109:1: warning: symbol 'do_trap_ecall_s' was not declared. Should it be static? arch/riscv/kernel/traps.c:111:1: warning: symbol 'do_trap_ecall_m' was not declared. Should it be static? arch/riscv/kernel/traps.c:125:17: warning: symbol 'do_trap_break' was not declared. Should it be static? arch/riscv/kernel/traps.c:163:13: warning: symbol 'trap_init' was not declared. Should it be static? This change should have no functional impact. Signed-off-by: Paul Walmsley <paul.walmsley@sifive.com> --- arch/riscv/kernel/entry.h | 29 +++++++++++++++++++++++++++++ arch/riscv/kernel/signal.c | 2 ++ arch/riscv/kernel/traps.c | 2 ++ 3 files changed, 33 insertions(+) create mode 100644 arch/riscv/kernel/entry.h