RISC-V: Define get_cycles64() regardless of M-mode

palmer-dabbelt · palmer-dabbelt · commit ccbbfd1cbf36 · 2020-12-10T17:39:43.000-08:00
The timer driver uses get_cycles64() unconditionally to obtain the current time. A recent refactoring lost the common definition for some configs, which is now the only one we need. Fixes: d5be89a ("RISC-V: Resurrect the MMIO timer implementation for M-mode systems") Reported-by: kernel test robot <lkp@intel.com> Signed-off-by: Palmer Dabbelt <palmerdabbelt@google.com>
diff --git a/arch/riscv/include/asm/timex.h b/arch/riscv/include/asm/timex.h
@@ -60,6 +60,8 @@ static inline u32 get_cycles_hi(void)
 }
 #define get_cycles_hi get_cycles_hi
 
+#endif /* !CONFIG_RISCV_M_MODE */
+
 #ifdef CONFIG_64BIT
 static inline u64 get_cycles64(void)
 {
@@ -79,8 +81,6 @@ static inline u64 get_cycles64(void)
 }
 #endif /* CONFIG_64BIT */
 
-#endif /* !CONFIG_RISCV_M_MODE */
-
 #define ARCH_HAS_READ_CURRENT_TIMER
 static inline int read_current_timer(unsigned long *timer_val)
 {

Original file line number	Diff line number	Diff line change
`@@ -60,6 +60,8 @@ static inline u32 get_cycles_hi(void)`
`60`	`60`	`}`
`61`	`61`	`#define get_cycles_hi get_cycles_hi`
`62`	`62`
	`63`	`+#endif /* !CONFIG_RISCV_M_MODE */`
	`64`	`+`
`63`	`65`	`#ifdef CONFIG_64BIT`
`64`	`66`	`static inline u64 get_cycles64(void)`
`65`	`67`	`{`
`@@ -79,8 +81,6 @@ static inline u64 get_cycles64(void)`
`79`	`81`	`}`
`80`	`82`	`#endif /* CONFIG_64BIT */`
`81`	`83`
`82`		`-#endif /* !CONFIG_RISCV_M_MODE */`
`83`		`-`
`84`	`84`	`#define ARCH_HAS_READ_CURRENT_TIMER`
`85`	`85`	`static inline int read_current_timer(unsigned long *timer_val)`
`86`	`86`	`{`