From 559a8f1d3be3210d4903c0db54c2d36e2f8d6ad4 Mon Sep 17 00:00:00 2001
From: Anup Patel <anup.patel@wdc.com>
Date: Wed, 21 Apr 2021 22:04:17 +0530
Subject: lib: sbi: Simplify timer platform operations
Instead of having timer_value(), timer_event_start(), and
timer_event_stop() callbacks in platform operations, it will
be much simpler for timer driver to directly register these
operations as device to the sbi_timer implementation.
Signed-off-by: Anup Patel <anup.patel@wdc.com>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
---
include/sbi/sbi_platform.h | 58 +++----------------------------------
include/sbi/sbi_timer.h | 21 ++++++++++++++
include/sbi_utils/sys/clint.h | 6 ----
include/sbi_utils/timer/fdt_timer.h | 9 ------
4 files changed, 25 insertions(+), 69 deletions(-)
(limited to 'include')
diff --git a/include/sbi/sbi_platform.h b/include/sbi/sbi_platform.h
index 0d18ef2..a2084c1 100644
--- a/include/sbi/sbi_platform.h
+++ b/include/sbi/sbi_platform.h
@@ -51,14 +51,12 @@ struct sbi_trap_regs;
/** Possible feature flags of a platform */
enum sbi_platform_features {
- /** Platform has timer value */
- SBI_PLATFORM_HAS_TIMER_VALUE = (1 << 0),
/** Platform has HART hotplug support */
- SBI_PLATFORM_HAS_HART_HOTPLUG = (1 << 1),
+ SBI_PLATFORM_HAS_HART_HOTPLUG = (1 << 0),
/** Platform has fault delegation support */
- SBI_PLATFORM_HAS_MFAULTS_DELEGATION = (1 << 2),
+ SBI_PLATFORM_HAS_MFAULTS_DELEGATION = (1 << 1),
/** Platform has custom secondary hart booting support */
- SBI_PLATFORM_HAS_HART_SECONDARY_BOOT = (1 << 3),
+ SBI_PLATFORM_HAS_HART_SECONDARY_BOOT = (1 << 2),
/** Last index of Platform features*/
SBI_PLATFORM_HAS_LAST_FEATURE = SBI_PLATFORM_HAS_HART_SECONDARY_BOOT,
@@ -66,7 +64,7 @@ enum sbi_platform_features {
/** Default feature set for a platform */
#define SBI_PLATFORM_DEFAULT_FEATURES \
- (SBI_PLATFORM_HAS_TIMER_VALUE | SBI_PLATFORM_HAS_MFAULTS_DELEGATION)
+ (SBI_PLATFORM_HAS_MFAULTS_DELEGATION)
/** Platform functions */
struct sbi_platform_operations {
@@ -115,12 +113,6 @@ struct sbi_platform_operations {
/** Get tlb flush limit value **/
u64 (*get_tlbr_flush_limit)(void);
- /** Get platform timer value */
- u64 (*timer_value)(void);
- /** Start platform timer event for current HART */
- void (*timer_event_start)(u64 next_event);
- /** Stop platform timer event for current HART */
- void (*timer_event_stop)(void);
/** Initialize platform timer for current HART */
int (*timer_init)(bool cold_boot);
/** Exit platform timer for current HART */
@@ -210,9 +202,6 @@ struct sbi_platform {
#define sbi_platform_ops(__p) \
((const struct sbi_platform_operations *)(__p)->platform_ops_addr)
-/** Check whether the platform supports timer value */
-#define sbi_platform_has_timer_value(__p) \
- ((__p)->features & SBI_PLATFORM_HAS_TIMER_VALUE)
/** Check whether the platform supports HART hotplug */
#define sbi_platform_has_hart_hotplug(__p) \
((__p)->features & SBI_PLATFORM_HAS_HART_HOTPLUG)
@@ -586,45 +575,6 @@ static inline void sbi_platform_ipi_exit(const struct sbi_platform *plat)
sbi_platform_ops(plat)->ipi_exit();
}
-/**
- * Get platform timer value
- *
- * @param plat pointer to struct sbi_platform
- *
- * @return 64-bit timer value
- */
-static inline u64 sbi_platform_timer_value(const struct sbi_platform *plat)
-{
- if (plat && sbi_platform_ops(plat)->timer_value)
- return sbi_platform_ops(plat)->timer_value();
- return 0;
-}
-
-/**
- * Start platform timer event for current HART
- *
- * @param plat pointer to struct struct sbi_platform
- * @param next_event timer value when timer event will happen
- */
-static inline void
-sbi_platform_timer_event_start(const struct sbi_platform *plat, u64 next_event)
-{
- if (plat && sbi_platform_ops(plat)->timer_event_start)
- sbi_platform_ops(plat)->timer_event_start(next_event);
-}
-
-/**
- * Stop platform timer event for current HART
- *
- * @param plat pointer to struct sbi_platform
- */
-static inline void
-sbi_platform_timer_event_stop(const struct sbi_platform *plat)
-{
- if (plat && sbi_platform_ops(plat)->timer_event_stop)
- sbi_platform_ops(plat)->timer_event_stop();
-}
-
/**
* Initialize the platform timer for current HART
*
diff --git a/include/sbi/sbi_timer.h b/include/sbi/sbi_timer.h
index 87bbdbf..1ba6da0 100644
--- a/include/sbi/sbi_timer.h
+++ b/include/sbi/sbi_timer.h
@@ -12,6 +12,21 @@
#include <sbi/sbi_types.h>
+/** Timer hardware device */
+struct sbi_timer_device {
+ /** Name of the timer operations */
+ char name[32];
+
+ /** Get free-running timer value */
+ u64 (*timer_value)(void);
+
+ /** Start timer event for current HART */
+ void (*timer_event_start)(u64 next_event);
+
+ /** Stop timer event for current HART */
+ void (*timer_event_stop)(void);
+};
+
struct sbi_scratch;
/** Get timer value for current HART */
@@ -35,6 +50,12 @@ void sbi_timer_event_start(u64 next_event);
/** Process timer event for current HART */
void sbi_timer_process(void);
+/** Get current timer device */
+const struct sbi_timer_device *sbi_timer_get_device(void);
+
+/** Register timer device */
+void sbi_timer_set_device(const struct sbi_timer_device *dev);
+
/* Initialize timer */
int sbi_timer_init(struct sbi_scratch *scratch, bool cold_boot);
diff --git a/include/sbi_utils/sys/clint.h b/include/sbi_utils/sys/clint.h
index b07cf62..e102196 100644
--- a/include/sbi_utils/sys/clint.h
+++ b/include/sbi_utils/sys/clint.h
@@ -37,12 +37,6 @@ int clint_warm_ipi_init(void);
int clint_cold_ipi_init(struct clint_data *clint);
-u64 clint_timer_value(void);
-
-void clint_timer_event_stop(void);
-
-void clint_timer_event_start(u64 next_event);
-
int clint_warm_timer_init(void);
int clint_cold_timer_init(struct clint_data *clint,
diff --git a/include/sbi_utils/timer/fdt_timer.h b/include/sbi_utils/timer/fdt_timer.h
index 770a0f3..36202a4 100644
--- a/include/sbi_utils/timer/fdt_timer.h
+++ b/include/sbi_utils/timer/fdt_timer.h
@@ -17,17 +17,8 @@ struct fdt_timer {
int (*cold_init)(void *fdt, int nodeoff, const struct fdt_match *match);
int (*warm_init)(void);
void (*exit)(void);
- u64 (*value)(void);
- void (*event_stop)(void);
- void (*event_start)(u64 next_event);
};
-u64 fdt_timer_value(void);
-
-void fdt_timer_event_stop(void);
-
-void fdt_timer_event_start(u64 next_event);
-
void fdt_timer_exit(void);
int fdt_timer_init(bool cold_boot);
--
cgit v1.2.3