diff options
| author | Anup Patel <anup.patel@wdc.com> | 2021-05-21 16:33:33 +0530 |
|---|---|---|
| committer | Anup Patel <anup@brainfault.org> | 2021-06-24 09:39:55 +0530 |
| commit | a731c7e36988c3308e1978ecde491f2f6182d490 (patch) | |
| tree | e6d966c4cc40d92863326914bc1e8b736bcf93c6 /platform/template | |
| parent | 03d6bb51ba96a16a8ac9a2fcbaebec9f6c31d900 (diff) | |
platform: Replace CLINT library usage with ACLINT library
The ACLINT devices are backward compatible with SiFive CLINT
so we replace all CLINT library usage in various platforms
with ACLINT library. As a result of this replacement, the
CLINT library is not used by any part of OpenSBI hence we
remove it.
Signed-off-by: Anup Patel <anup.patel@wdc.com>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
Reviewed-by: Xiang W <wxjstz@126.com>
Diffstat (limited to 'platform/template')
| -rw-r--r-- | platform/template/platform.c | 31 |
1 files changed, 22 insertions, 9 deletions
diff --git a/platform/template/platform.c b/platform/template/platform.c index d407fd5..3f09d98 100644 --- a/platform/template/platform.c +++ b/platform/template/platform.c @@ -13,14 +13,19 @@ * Include these files as needed. * See config.mk PLATFORM_xxx configuration parameters. */ +#include <sbi_utils/ipi/aclint_mswi.h> #include <sbi_utils/irqchip/plic.h> #include <sbi_utils/serial/uart8250.h> -#include <sbi_utils/sys/clint.h> +#include <sbi_utils/timer/aclint_mtimer.h> #define PLATFORM_PLIC_ADDR 0xc000000 #define PLATFORM_PLIC_NUM_SOURCES 128 #define PLATFORM_HART_COUNT 4 #define PLATFORM_CLINT_ADDR 0x2000000 +#define PLATFORM_ACLINT_MSWI_ADDR (PLATFORM_CLINT_ADDR + \ + CLINT_MSWI_OFFSET) +#define PLATFORM_ACLINT_MTIMER_ADDR (PLATFORM_CLINT_ADDR + \ + CLINT_MTIMER_OFFSET) #define PLATFORM_UART_ADDR 0x09000000 #define PLATFORM_UART_INPUT_FREQ 10000000 #define PLATFORM_UART_BAUDRATE 115200 @@ -30,8 +35,16 @@ static struct plic_data plic = { .num_src = PLATFORM_PLIC_NUM_SOURCES, }; -static struct clint_data clint = { - .addr = PLATFORM_CLINT_ADDR, +static struct aclint_mswi_data mswi = { + .addr = PLATFORM_ACLINT_MSWI_ADDR, + .size = ACLINT_MSWI_SIZE, + .first_hartid = 0, + .hart_count = PLATFORM_HART_COUNT, +}; + +static struct aclint_mtimer_data mtimer = { + .addr = PLATFORM_ACLINT_MTIMER_ADDR, + .size = ACLINT_MTIMER_SIZE, .first_hartid = 0, .hart_count = PLATFORM_HART_COUNT, .has_64bit_mmio = TRUE, @@ -88,14 +101,14 @@ static int platform_ipi_init(bool cold_boot) { int ret; - /* Example if the generic CLINT driver is used */ + /* Example if the generic ACLINT driver is used */ if (cold_boot) { - ret = clint_cold_ipi_init(&clint); + ret = aclint_mswi_cold_init(&mswi); if (ret) return ret; } - return clint_warm_ipi_init(); + return aclint_mswi_warm_init(); } /* @@ -105,14 +118,14 @@ static int platform_timer_init(bool cold_boot) { int ret; - /* Example if the generic CLINT driver is used */ + /* Example if the generic ACLINT driver is used */ if (cold_boot) { - ret = clint_cold_timer_init(&clint, NULL); + ret = aclint_mtimer_cold_init(&mtimer, NULL); if (ret) return ret; } - return clint_warm_timer_init(); + return aclint_mtimer_warm_init(); } /* |