@@ -28,6 +28,9 @@ struct sbi_timer_device {
/** Stop timer event for current HART */
void (*timer_event_stop)(void);
+
+ /** Initialize timer device for current HART */
+ int (*warm_init)(void);
};
struct sbi_scratch;
@@ -47,8 +47,6 @@ void aclint_mtimer_sync(struct aclint_mtimer_data *mt);
void aclint_mtimer_set_reference(struct aclint_mtimer_data *mt,
struct aclint_mtimer_data *ref);
-int aclint_mtimer_warm_init(void);
-
int aclint_mtimer_cold_init(struct aclint_mtimer_data *mt,
struct aclint_mtimer_data *reference);
@@ -24,6 +24,5 @@ struct plmt_data {
};
int plmt_cold_timer_init(struct plmt_data *plmt);
-int plmt_warm_timer_init(void);
#endif /* __TIMER_ANDES_PLMT_H__ */
@@ -182,6 +182,7 @@ int sbi_timer_init(struct sbi_scratch *scratch, bool cold_boot)
{
u64 *time_delta;
const struct sbi_platform *plat = sbi_platform_ptr(scratch);
+ int ret;
if (cold_boot) {
time_delta_off = sbi_scratch_alloc_offset(sizeof(*time_delta));
@@ -198,7 +199,17 @@ int sbi_timer_init(struct sbi_scratch *scratch, bool cold_boot)
time_delta = sbi_scratch_offset_ptr(scratch, time_delta_off);
*time_delta = 0;
- return sbi_platform_timer_init(plat, cold_boot);
+ ret = sbi_platform_timer_init(plat, cold_boot);
+ if (ret)
+ return ret;
+
+ if (timer_dev && timer_dev->warm_init) {
+ ret = timer_dev->warm_init();
+ if (ret)
+ return ret;
+ }
+
+ return 0;
}
void sbi_timer_exit(struct sbi_scratch *scratch)
@@ -143,7 +143,7 @@ void aclint_mtimer_set_reference(struct aclint_mtimer_data *mt,
mt->time_delta_computed = 0;
}
-int aclint_mtimer_warm_init(void)
+static int aclint_mtimer_warm_init(void)
{
u64 *mt_time_cmp;
u32 target_hart = current_hartid();
@@ -260,6 +260,7 @@ int aclint_mtimer_cold_init(struct aclint_mtimer_data *mt,
}
mtimer.timer_freq = mt->mtime_freq;
+ mtimer.warm_init = aclint_mtimer_warm_init;
sbi_timer_set_device(&mtimer);
return 0;
@@ -67,12 +67,23 @@ static void plmt_timer_event_start(u64 next_event)
#endif
}
+static int plmt_warm_timer_init(void)
+{
+ if (!plmt.time_val)
+ return SBI_ENODEV;
+
+ plmt_timer_event_stop();
+
+ return 0;
+}
+
static struct sbi_timer_device plmt_timer = {
.name = "andes_plmt",
.timer_freq = DEFAULT_AE350_PLMT_FREQ,
.timer_value = plmt_timer_value,
.timer_event_start = plmt_timer_event_start,
- .timer_event_stop = plmt_timer_event_stop
+ .timer_event_stop = plmt_timer_event_stop,
+ .warm_init = plmt_warm_timer_init,
};
int plmt_cold_timer_init(struct plmt_data *plmt)
@@ -95,13 +106,3 @@ int plmt_cold_timer_init(struct plmt_data *plmt)
return 0;
}
-
-int plmt_warm_timer_init(void)
-{
- if (!plmt.time_val)
- return SBI_ENODEV;
-
- plmt_timer_event_stop();
-
- return 0;
-}
@@ -165,6 +165,6 @@ static const struct fdt_match timer_mtimer_match[] = {
struct fdt_timer fdt_timer_mtimer = {
.match_table = timer_mtimer_match,
.cold_init = timer_mtimer_cold_init,
- .warm_init = aclint_mtimer_warm_init,
+ .warm_init = NULL,
.exit = NULL,
};
@@ -46,6 +46,6 @@ static const struct fdt_match timer_plmt_match[] = {
struct fdt_timer fdt_timer_plmt = {
.match_table = timer_plmt_match,
.cold_init = fdt_plmt_cold_timer_init,
- .warm_init = plmt_warm_timer_init,
+ .warm_init = NULL,
.exit = NULL,
};
@@ -159,7 +159,7 @@ static int ariane_timer_init(bool cold_boot)
return ret;
}
- return aclint_mtimer_warm_init();
+ return 0;
}
/*
@@ -190,7 +190,7 @@ static int openpiton_timer_init(bool cold_boot)
return ret;
}
- return aclint_mtimer_warm_init();
+ return 0;
}
/*
@@ -169,7 +169,7 @@ static int k210_timer_init(bool cold_boot)
return rc;
}
- return aclint_mtimer_warm_init();
+ return 0;
}
const struct sbi_platform_operations platform_ops = {
@@ -225,7 +225,7 @@ static int ux600_timer_init(bool cold_boot)
return rc;
}
- return aclint_mtimer_warm_init();
+ return 0;
}
const struct sbi_platform_operations platform_ops = {
@@ -129,7 +129,7 @@ static int platform_timer_init(bool cold_boot)
return ret;
}
- return aclint_mtimer_warm_init();
+ return 0;
}
/*
Currently, the platform's timer device is tracked in two places: the core SBI implementation has `timer_dev`, and the FDT timer layer has `current_driver`. The latter is used for warm initialization of the timer device. However, this warm init is not specific to FDT-based platforms; other platforms call exactly the same functions from the same point in the boot sequence. The code is simplified and made common across platforms by treating warm init and exit as properties of the driver, not the platform. Then the platform's only role is to select and prepare a driver during cold boot. For now, only add a .warm_init hook, since none of the existing drivers need an .exit hook. It could be added in the future if needed. Signed-off-by: Samuel Holland <samuel.holland@sifive.com> --- include/sbi/sbi_timer.h | 3 +++ include/sbi_utils/timer/aclint_mtimer.h | 2 -- include/sbi_utils/timer/andes_plmt.h | 1 - lib/sbi/sbi_timer.c | 13 ++++++++++++- lib/utils/timer/aclint_mtimer.c | 3 ++- lib/utils/timer/andes_plmt.c | 23 ++++++++++++----------- lib/utils/timer/fdt_timer_mtimer.c | 2 +- lib/utils/timer/fdt_timer_plmt.c | 2 +- platform/fpga/ariane/platform.c | 2 +- platform/fpga/openpiton/platform.c | 2 +- platform/kendryte/k210/platform.c | 2 +- platform/nuclei/ux600/platform.c | 2 +- platform/template/platform.c | 2 +- 13 files changed, 36 insertions(+), 23 deletions(-)