Firmware/opensbi
8
0
Fork 0
forked from Mirrors/opensbi
Code Pull Requests Activity

lib: sbi: Simplify timer platform operations

Browse Source 
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>
This commit is contained in:
Anup Patel
2021-04-21 22:04:17 +05:30
committed by Anup Patel
parent 068ca086af
commit 559a8f1d3b
19 changed files with 92 additions and 191 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
lib/utils/sys/clint.c
View File

@@ -13,6 +13,7 @@
#include <sbi/sbi_domain.h>
#include <sbi/sbi_error.h>
#include <sbi/sbi_hartmask.h>
#include <sbi/sbi_timer.h>
#include <sbi_utils/sys/clint.h>
#define CLINT_IPI_OFF 0
@@ -118,7 +119,7 @@ static void clint_time_wr32(u64 value, volatile u64 *addr)
writel_relaxed(value >> 32, (void *)(addr) + 0x04);
}
u64 clint_timer_value(void)
static u64 clint_timer_value(void)
{
struct clint_data *clint = clint_timer_hartid2data[current_hartid()];
@@ -126,7 +127,7 @@ u64 clint_timer_value(void)
return clint->time_rd(clint->time_val) + clint->time_delta;
}
void clint_timer_event_stop(void)
static void clint_timer_event_stop(void)
{
u32 target_hart = current_hartid();
struct clint_data *clint = clint_timer_hartid2data[target_hart];
@@ -136,7 +137,7 @@ void clint_timer_event_stop(void)
&clint->time_cmp[target_hart - clint->first_hartid]);
}
void clint_timer_event_start(u64 next_event)
static void clint_timer_event_start(u64 next_event)
{
u32 target_hart = current_hartid();
struct clint_data *clint = clint_timer_hartid2data[target_hart];
@@ -146,6 +147,13 @@ void clint_timer_event_start(u64 next_event)
&clint->time_cmp[target_hart - clint->first_hartid]);
}
static struct sbi_timer_device clint_timer = {
.name = "clint",
.timer_value = clint_timer_value,
.timer_event_start = clint_timer_event_start,
.timer_event_stop = clint_timer_event_stop
};
int clint_warm_timer_init(void)
{
u64 v1, v2, mv;
@@ -224,5 +232,11 @@ int clint_cold_timer_init(struct clint_data *clint,
sbi_domain_memregion_init(clint->addr + CLINT_TIME_CMP_OFF,
CLINT_TIME_CMP_SIZE,
SBI_DOMAIN_MEMREGION_MMIO, &reg);
return sbi_domain_root_add_memregion(&reg);
rc = sbi_domain_root_add_memregion(&reg);
if (rc)
return rc;
sbi_timer_set_device(&clint_timer);
return 0;
}

31
lib/utils/timer/fdt_timer.c
View File

@@ -17,46 +17,15 @@ static struct fdt_timer *timer_drivers[] = {
&fdt_timer_clint
};
static u64 dummy_value(void)
{
return 0;
}
static void dummy_event_stop(void)
{
}
static void dummy_event_start(u64 next_event)
{
}
static struct fdt_timer dummy = {
.match_table = NULL,
.cold_init = NULL,
.warm_init = NULL,
.exit = NULL,
.value = dummy_value,
.event_stop = dummy_event_stop,
.event_start = dummy_event_start
};
static struct fdt_timer *current_driver = &dummy;
u64 fdt_timer_value(void)
{
return current_driver->value();
}
void fdt_timer_event_stop(void)
{
current_driver->event_stop();
}
void fdt_timer_event_start(u64 next_event)
{
current_driver->event_start(next_event);
}
void fdt_timer_exit(void)
{
if (current_driver->exit)

3
lib/utils/timer/fdt_timer_clint.c
View File

@@ -47,7 +47,4 @@ struct fdt_timer fdt_timer_clint = {
.cold_init = timer_clint_cold_init,
.warm_init = clint_warm_timer_init,
.exit = NULL,
.value = clint_timer_value,
.event_stop = clint_timer_event_stop,
.event_start = clint_timer_event_start,
};