From 99b01ab610acf6ff7c3d0199f13f5b41322a22e2 Mon Sep 17 00:00:00 2001 From: Samuel Holland Date: Mon, 2 Sep 2024 21:06:50 -0700 Subject: platform: Drop timer warm init and exit hooks Now that driver lifecycle is managed from within the SBI timer core, platforms need only to initialize the driver once during cold init. Remove the remaining platform hooks that are no longer used. Signed-off-by: Samuel Holland Reviewed-by: Anup Patel --- include/sbi/sbi_platform.h | 25 +++++-------------------- include/sbi_utils/timer/fdt_timer.h | 9 ++------- 2 files changed, 7 insertions(+), 27 deletions(-) (limited to 'include') diff --git a/include/sbi/sbi_platform.h b/include/sbi/sbi_platform.h index 7b3ac4bf..d7af3093 100644 --- a/include/sbi/sbi_platform.h +++ b/include/sbi/sbi_platform.h @@ -127,10 +127,8 @@ struct sbi_platform_operations { /** Get tlb fifo num entries*/ u32 (*get_tlb_num_entries)(void); - /** Initialize platform timer for current HART */ - int (*timer_init)(bool cold_boot); - /** Exit platform timer for current HART */ - void (*timer_exit)(void); + /** Initialize platform timer during cold boot */ + int (*timer_init)(void); /** Check if SBI vendor extension is implemented or not */ bool (*vendor_ext_check)(void); @@ -601,32 +599,19 @@ static inline void sbi_platform_ipi_exit(const struct sbi_platform *plat) } /** - * Initialize the platform timer for current HART + * Initialize the platform timer during cold boot * * @param plat pointer to struct sbi_platform - * @param cold_boot whether cold boot (true) or warm_boot (false) * * @return 0 on success and negative error code on failure */ -static inline int sbi_platform_timer_init(const struct sbi_platform *plat, - bool cold_boot) +static inline int sbi_platform_timer_init(const struct sbi_platform *plat) { if (plat && sbi_platform_ops(plat)->timer_init) - return sbi_platform_ops(plat)->timer_init(cold_boot); + return sbi_platform_ops(plat)->timer_init(); return 0; } -/** - * Exit the platform timer for current HART - * - * @param plat pointer to struct sbi_platform - */ -static inline void sbi_platform_timer_exit(const struct sbi_platform *plat) -{ - if (plat && sbi_platform_ops(plat)->timer_exit) - sbi_platform_ops(plat)->timer_exit(); -} - /** * Check if SBI vendor extension is implemented or not. * diff --git a/include/sbi_utils/timer/fdt_timer.h b/include/sbi_utils/timer/fdt_timer.h index 555ebcba..8f0469da 100644 --- a/include/sbi_utils/timer/fdt_timer.h +++ b/include/sbi_utils/timer/fdt_timer.h @@ -17,18 +17,13 @@ struct fdt_timer { const struct fdt_match *match_table; int (*cold_init)(const void *fdt, int nodeoff, const struct fdt_match *match); - int (*warm_init)(void); - void (*exit)(void); }; -void fdt_timer_exit(void); - -int fdt_timer_init(bool cold_boot); +int fdt_timer_init(void); #else -static inline void fdt_timer_exit(void) { } -static inline int fdt_timer_init(bool cold_boot) { return 0; } +static inline int fdt_timer_init(void) { return 0; } #endif -- cgit v1.3.1