lib: utils/timer: Use fdt_driver for initialization

The timer driver subsystem does not need any extra data, so it can use
`struct fdt_driver` directly. The generic fdt_timer_init() performs a
best-effort initialization of all matching DT nodes.

Signed-off-by: Samuel Holland <samuel.holland@sifive.com>
Reviewed-by: Anup Patel <anup@brainfault.org>
This commit is contained in:
Samuel Holland
2024-11-11 14:02:55 -08:00
committed by Anup Patel
parent a524f0a507
commit a387a8dff0
5 changed files with 10 additions and 45 deletions

View File

@@ -11,14 +11,10 @@
#define __FDT_TIMER_H__
#include <sbi/sbi_types.h>
#include <sbi_utils/fdt/fdt_driver.h>
#ifdef CONFIG_FDT_TIMER
struct fdt_timer {
const struct fdt_match *match_table;
int (*cold_init)(const void *fdt, int nodeoff, const struct fdt_match *match);
};
int fdt_timer_init(void);
#else

View File

@@ -13,44 +13,13 @@
#include <sbi_utils/timer/fdt_timer.h>
/* List of FDT timer drivers generated at compile time */
extern struct fdt_timer *const fdt_timer_drivers[];
extern const struct fdt_driver *const fdt_timer_drivers[];
int fdt_timer_init(void)
{
int pos, noff, rc;
struct fdt_timer *drv;
const struct fdt_match *match;
const void *fdt = fdt_get_address();
for (pos = 0; fdt_timer_drivers[pos]; pos++) {
drv = fdt_timer_drivers[pos];
noff = -1;
while ((noff = fdt_find_match(fdt, noff,
drv->match_table, &match)) >= 0) {
if (!fdt_node_is_enabled(fdt, noff))
continue;
/* drv->cold_init must not be NULL */
if (drv->cold_init == NULL)
return SBI_EFAIL;
rc = drv->cold_init(fdt, noff, match);
if (rc == SBI_ENODEV)
continue;
if (rc)
return rc;
/*
* We will have multiple timer devices on multi-die or
* multi-socket systems so we cannot break here.
*/
}
}
/*
* We can't fail here since systems with Sstc might not provide
* mtimer/clint DT node in the device tree.
* Systems with Sstc might not provide any node in the FDT,
* so do not return a failure if no device is found.
*/
return 0;
return fdt_driver_init_all(fdt_get_address(), fdt_timer_drivers);
}

View File

@@ -1,3 +1,3 @@
HEADER: sbi_utils/timer/fdt_timer.h
TYPE: struct fdt_timer
TYPE: const struct fdt_driver
NAME: fdt_timer_drivers

View File

@@ -162,7 +162,7 @@ static const struct fdt_match timer_mtimer_match[] = {
{ },
};
struct fdt_timer fdt_timer_mtimer = {
const struct fdt_driver fdt_timer_mtimer = {
.match_table = timer_mtimer_match,
.cold_init = timer_mtimer_cold_init,
.init = timer_mtimer_cold_init,
};

View File

@@ -43,7 +43,7 @@ static const struct fdt_match timer_plmt_match[] = {
{},
};
struct fdt_timer fdt_timer_plmt = {
const struct fdt_driver fdt_timer_plmt = {
.match_table = timer_plmt_match,
.cold_init = fdt_plmt_cold_timer_init,
.init = fdt_plmt_cold_timer_init,
};