ad1a48301f
The init/main.c file contains some extern declarations for functions defined in architecture code, and it defines some other functions that are called from architecture code with a custom prototype. Both of those result in warnings with 'make W=1': init/calibrate.c:261:37: error: no previous prototype for 'calibrate_delay_is_known' [-Werror=missing-prototypes] init/main.c:790:20: error: no previous prototype for 'mem_encrypt_init' [-Werror=missing-prototypes] init/main.c:792:20: error: no previous prototype for 'poking_init' [-Werror=missing-prototypes] arch/arm64/kernel/irq.c:122:13: error: no previous prototype for 'init_IRQ' [-Werror=missing-prototypes] arch/arm64/kernel/time.c:55:13: error: no previous prototype for 'time_init' [-Werror=missing-prototypes] arch/x86/kernel/process.c:935:13: error: no previous prototype for 'arch_post_acpi_subsys_init' [-Werror=missing-prototypes] init/calibrate.c:261:37: error: no previous prototype for 'calibrate_delay_is_known' [-Werror=missing-prototypes] kernel/fork.c:991:20: error: no previous prototype for 'arch_task_cache_init' [-Werror=missing-prototypes] Add prototypes for all of these in include/linux/init.h or another appropriate header, and remove the duplicate declarations from architecture specific code. [sfr@canb.auug.org.au: declare time_init_early()] Link: https://lkml.kernel.org/r/20230519124311.5167221c@canb.auug.org.au Link: https://lkml.kernel.org/r/20230517131102.934196-12-arnd@kernel.org Signed-off-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> Cc: Boqun Feng <boqun.feng@gmail.com> Cc: Catalin Marinas <catalin.marinas@arm.com> Cc: Christoph Lameter <cl@linux.com> Cc: Dennis Zhou <dennis@kernel.org> Cc: Eric Paris <eparis@redhat.com> Cc: Heiko Carstens <hca@linux.ibm.com> Cc: Helge Deller <deller@gmx.de> Cc: Ingo Molnar <mingo@redhat.com> Cc: Michael Ellerman <mpe@ellerman.id.au> Cc: Michal Simek <monstr@monstr.eu> Cc: Palmer Dabbelt <palmer@dabbelt.com> Cc: Paul Moore <paul@paul-moore.com> Cc: Pavel Machek <pavel@ucw.cz> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Rafael J. Wysocki <rafael@kernel.org> Cc: Russell King <linux@armlinux.org.uk> Cc: Tejun Heo <tj@kernel.org> Cc: Thomas Bogendoerfer <tsbogend@alpha.franken.de> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Waiman Long <longman@redhat.com> Cc: Will Deacon <will@kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
92 lines
1.8 KiB
C
92 lines
1.8 KiB
C
/* SPDX-License-Identifier: GPL-2.0-only */
|
|
/*
|
|
* Copyright (C) 2012 Regents of the University of California
|
|
*/
|
|
|
|
#ifndef _ASM_RISCV_TIMEX_H
|
|
#define _ASM_RISCV_TIMEX_H
|
|
|
|
#include <asm/csr.h>
|
|
|
|
typedef unsigned long cycles_t;
|
|
|
|
#ifdef CONFIG_RISCV_M_MODE
|
|
|
|
#include <asm/clint.h>
|
|
|
|
#ifdef CONFIG_64BIT
|
|
static inline cycles_t get_cycles(void)
|
|
{
|
|
return readq_relaxed(clint_time_val);
|
|
}
|
|
#else /* !CONFIG_64BIT */
|
|
static inline u32 get_cycles(void)
|
|
{
|
|
return readl_relaxed(((u32 *)clint_time_val));
|
|
}
|
|
#define get_cycles get_cycles
|
|
|
|
static inline u32 get_cycles_hi(void)
|
|
{
|
|
return readl_relaxed(((u32 *)clint_time_val) + 1);
|
|
}
|
|
#define get_cycles_hi get_cycles_hi
|
|
#endif /* CONFIG_64BIT */
|
|
|
|
/*
|
|
* Much like MIPS, we may not have a viable counter to use at an early point
|
|
* in the boot process. Unfortunately we don't have a fallback, so instead
|
|
* we just return 0.
|
|
*/
|
|
static inline unsigned long random_get_entropy(void)
|
|
{
|
|
if (unlikely(clint_time_val == NULL))
|
|
return random_get_entropy_fallback();
|
|
return get_cycles();
|
|
}
|
|
#define random_get_entropy() random_get_entropy()
|
|
|
|
#else /* CONFIG_RISCV_M_MODE */
|
|
|
|
static inline cycles_t get_cycles(void)
|
|
{
|
|
return csr_read(CSR_TIME);
|
|
}
|
|
#define get_cycles get_cycles
|
|
|
|
static inline u32 get_cycles_hi(void)
|
|
{
|
|
return csr_read(CSR_TIMEH);
|
|
}
|
|
#define get_cycles_hi get_cycles_hi
|
|
|
|
#endif /* !CONFIG_RISCV_M_MODE */
|
|
|
|
#ifdef CONFIG_64BIT
|
|
static inline u64 get_cycles64(void)
|
|
{
|
|
return get_cycles();
|
|
}
|
|
#else /* CONFIG_64BIT */
|
|
static inline u64 get_cycles64(void)
|
|
{
|
|
u32 hi, lo;
|
|
|
|
do {
|
|
hi = get_cycles_hi();
|
|
lo = get_cycles();
|
|
} while (hi != get_cycles_hi());
|
|
|
|
return ((u64)hi << 32) | lo;
|
|
}
|
|
#endif /* CONFIG_64BIT */
|
|
|
|
#define ARCH_HAS_READ_CURRENT_TIMER
|
|
static inline int read_current_timer(unsigned long *timer_val)
|
|
{
|
|
*timer_val = get_cycles();
|
|
return 0;
|
|
}
|
|
|
|
#endif /* _ASM_RISCV_TIMEX_H */
|