aboutsummaryrefslogtreecommitdiff
path: root/platform
diff options
context:
space:
mode:
authorAnup Patel <anup.patel@wdc.com>2021-05-21 16:33:33 +0530
committerAnup Patel <anup@brainfault.org>2021-06-24 09:39:55 +0530
commita731c7e36988c3308e1978ecde491f2f6182d490 (patch)
treee6d966c4cc40d92863326914bc1e8b736bcf93c6 /platform
parent03d6bb51ba96a16a8ac9a2fcbaebec9f6c31d900 (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')
-rw-r--r--platform/fpga/ariane/platform.c27
-rw-r--r--platform/fpga/openpiton/platform.c33
-rw-r--r--platform/kendryte/k210/platform.c23
-rw-r--r--platform/kendryte/k210/platform.h4
-rw-r--r--platform/nuclei/ux600/platform.c28
-rw-r--r--platform/template/platform.c31
6 files changed, 107 insertions, 39 deletions
diff --git a/platform/fpga/ariane/platform.c b/platform/fpga/ariane/platform.c
index 42e43fa..0b47aa0 100644
--- a/platform/fpga/ariane/platform.c
+++ b/platform/fpga/ariane/platform.c
@@ -12,9 +12,10 @@
#include <sbi/sbi_hart.h>
#include <sbi/sbi_platform.h>
#include <sbi_utils/fdt/fdt_fixup.h>
+#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 ARIANE_UART_ADDR 0x10000000
#define ARIANE_UART_FREQ 50000000
@@ -25,14 +26,26 @@
#define ARIANE_PLIC_NUM_SOURCES 3
#define ARIANE_HART_COUNT 1
#define ARIANE_CLINT_ADDR 0x2000000
+#define ARIANE_ACLINT_MSWI_ADDR (ARIANE_CLINT_ADDR + \
+ CLINT_MSWI_OFFSET)
+#define ARIANE_ACLINT_MTIMER_ADDR (ARIANE_CLINT_ADDR + \
+ CLINT_MTIMER_OFFSET)
static struct plic_data plic = {
.addr = ARIANE_PLIC_ADDR,
.num_src = ARIANE_PLIC_NUM_SOURCES,
};
-static struct clint_data clint = {
- .addr = ARIANE_CLINT_ADDR,
+static struct aclint_mswi_data mswi = {
+ .addr = ARIANE_ACLINT_MSWI_ADDR,
+ .size = ACLINT_MSWI_SIZE,
+ .first_hartid = 0,
+ .hart_count = ARIANE_HART_COUNT,
+};
+
+static struct aclint_mtimer_data mtimer = {
+ .addr = ARIANE_ACLINT_MTIMER_ADDR,
+ .size = ACLINT_MTIMER_SIZE,
.first_hartid = 0,
.hart_count = ARIANE_HART_COUNT,
.has_64bit_mmio = TRUE,
@@ -123,12 +136,12 @@ static int ariane_ipi_init(bool cold_boot)
int ret;
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();
}
/*
@@ -139,12 +152,12 @@ static int ariane_timer_init(bool cold_boot)
int ret;
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();
}
/*
diff --git a/platform/fpga/openpiton/platform.c b/platform/fpga/openpiton/platform.c
index 894bfdc..57ec21b 100644
--- a/platform/fpga/openpiton/platform.c
+++ b/platform/fpga/openpiton/platform.c
@@ -12,9 +12,10 @@
#include <sbi/sbi_platform.h>
#include <sbi_utils/fdt/fdt_helper.h>
#include <sbi_utils/fdt/fdt_fixup.h>
+#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 OPENPITON_DEFAULT_UART_ADDR 0xfff0c2c000
#define OPENPITON_DEFAULT_UART_FREQ 60000000
@@ -25,6 +26,10 @@
#define OPENPITON_DEFAULT_PLIC_NUM_SOURCES 2
#define OPENPITON_DEFAULT_HART_COUNT 3
#define OPENPITON_DEFAULT_CLINT_ADDR 0xfff1020000
+#define OPENPITON_DEFAULT_ACLINT_MSWI_ADDR \
+ (OPENPITON_DEFAULT_CLINT_ADDR + CLINT_MSWI_OFFSET)
+#define OPENPITON_DEFAULT_ACLINT_MTIMER_ADDR \
+ (OPENPITON_DEFAULT_CLINT_ADDR + CLINT_MTIMER_OFFSET)
static struct platform_uart_data uart = {
OPENPITON_DEFAULT_UART_ADDR,
@@ -36,8 +41,16 @@ static struct plic_data plic = {
.num_src = OPENPITON_DEFAULT_PLIC_NUM_SOURCES,
};
-static struct clint_data clint = {
- .addr = OPENPITON_DEFAULT_CLINT_ADDR,
+static struct aclint_mswi_data mswi = {
+ .addr = OPENPITON_DEFAULT_ACLINT_MSWI_ADDR,
+ .size = ACLINT_MSWI_SIZE,
+ .first_hartid = 0,
+ .hart_count = OPENPITON_DEFAULT_HART_COUNT,
+};
+
+static struct aclint_mtimer_data mtimer = {
+ .addr = OPENPITON_DEFAULT_ACLINT_MTIMER_ADDR,
+ .size = ACLINT_MTIMER_SIZE,
.first_hartid = 0,
.hart_count = OPENPITON_DEFAULT_HART_COUNT,
.has_64bit_mmio = TRUE,
@@ -67,8 +80,10 @@ static int openpiton_early_init(bool cold_boot)
plic = plic_data;
rc = fdt_parse_compat_addr(fdt, &clint_addr, "riscv,clint0");
- if (!rc)
- clint.addr = clint_addr;
+ if (!rc) {
+ mswi.addr = clint_addr;
+ mtimer.addr = clint_addr + CLINT_MTIMER_OFFSET;
+ }
return 0;
}
@@ -149,12 +164,12 @@ static int openpiton_ipi_init(bool cold_boot)
int ret;
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();
}
/*
@@ -165,12 +180,12 @@ static int openpiton_timer_init(bool cold_boot)
int ret;
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();
}
/*
diff --git a/platform/kendryte/k210/platform.c b/platform/kendryte/k210/platform.c
index 66a0392..55c4b1e 100644
--- a/platform/kendryte/k210/platform.c
+++ b/platform/kendryte/k210/platform.c
@@ -14,9 +14,10 @@
#include <sbi/sbi_platform.h>
#include <sbi/sbi_system.h>
#include <sbi_utils/fdt/fdt_fixup.h>
+#include <sbi_utils/ipi/aclint_mswi.h>
#include <sbi_utils/irqchip/plic.h>
#include <sbi_utils/serial/sifive-uart.h>
-#include <sbi_utils/sys/clint.h>
+#include <sbi_utils/timer/aclint_mtimer.h>
#include "platform.h"
extern const char dt_k210_start[];
@@ -33,8 +34,16 @@ static struct plic_data plic = {
.num_src = K210_PLIC_NUM_SOURCES,
};
-static struct clint_data clint = {
- .addr = K210_CLINT_BASE_ADDR,
+static struct aclint_mswi_data mswi = {
+ .addr = K210_ACLINT_MSWI_ADDR,
+ .size = ACLINT_MSWI_SIZE,
+ .first_hartid = 0,
+ .hart_count = K210_HART_COUNT,
+};
+
+static struct aclint_mtimer_data mtimer = {
+ .addr = K210_ACLINT_MTIMER_ADDR,
+ .size = ACLINT_MTIMER_SIZE,
.first_hartid = 0,
.hart_count = K210_HART_COUNT,
.has_64bit_mmio = TRUE,
@@ -139,12 +148,12 @@ static int k210_ipi_init(bool cold_boot)
int rc;
if (cold_boot) {
- rc = clint_cold_ipi_init(&clint);
+ rc = aclint_mswi_cold_init(&mswi);
if (rc)
return rc;
}
- return clint_warm_ipi_init();
+ return aclint_mswi_warm_init();
}
static int k210_timer_init(bool cold_boot)
@@ -152,12 +161,12 @@ static int k210_timer_init(bool cold_boot)
int rc;
if (cold_boot) {
- rc = clint_cold_timer_init(&clint, NULL);
+ rc = aclint_mtimer_cold_init(&mtimer, NULL);
if (rc)
return rc;
}
- return clint_warm_timer_init();
+ return aclint_mtimer_warm_init();
}
const struct sbi_platform_operations platform_ops = {
diff --git a/platform/kendryte/k210/platform.h b/platform/kendryte/k210/platform.h
index e425faf..0a32530 100644
--- a/platform/kendryte/k210/platform.h
+++ b/platform/kendryte/k210/platform.h
@@ -22,6 +22,10 @@
#define K210_SYSCTL_BASE_ADDR 0x50440000ULL
#define K210_UART_BASE_ADDR 0x38000000ULL
#define K210_CLINT_BASE_ADDR 0x02000000ULL
+#define K210_ACLINT_MSWI_ADDR \
+ (K210_CLINT_BASE_ADDR + CLINT_MSWI_OFFSET)
+#define K210_ACLINT_MTIMER_ADDR \
+ (K210_CLINT_BASE_ADDR + CLINT_MTIMER_OFFSET)
#define K210_PLIC_BASE_ADDR 0x0C000000ULL
/* Registers */
diff --git a/platform/nuclei/ux600/platform.c b/platform/nuclei/ux600/platform.c
index 5414316..22ca4c9 100644
--- a/platform/nuclei/ux600/platform.c
+++ b/platform/nuclei/ux600/platform.c
@@ -17,9 +17,10 @@
#include <sbi/sbi_platform.h>
#include <sbi/sbi_system.h>
#include <sbi_utils/fdt/fdt_fixup.h>
+#include <sbi_utils/ipi/aclint_mswi.h>
#include <sbi_utils/irqchip/plic.h>
#include <sbi_utils/serial/sifive-uart.h>
-#include <sbi_utils/sys/clint.h>
+#include <sbi_utils/timer/aclint_mtimer.h>
/* clang-format off */
@@ -32,6 +33,10 @@
#define UX600_NUCLEI_TIMER_MSFTRST_KEY 0x80000A5F
/* The clint compatiable timer offset is 0x1000 against nuclei timer */
#define UX600_CLINT_TIMER_ADDR (UX600_NUCLEI_TIMER_ADDR + 0x1000)
+#define UX600_ACLINT_MSWI_ADDR (UX600_CLINT_TIMER_ADDR + \
+ CLINT_MSWI_OFFSET)
+#define UX600_ACLINT_MTIMER_ADDR (UX600_CLINT_TIMER_ADDR + \
+ CLINT_MTIMER_OFFSET)
#define UX600_PLIC_ADDR 0x8000000
#define UX600_PLIC_NUM_SOURCES 0x35
@@ -61,12 +66,21 @@ static struct plic_data plic = {
.num_src = UX600_PLIC_NUM_SOURCES,
};
-static struct clint_data clint = {
- .addr = UX600_CLINT_TIMER_ADDR,
+static struct aclint_mswi_data mswi = {
+ .addr = UX600_ACLINT_MSWI_ADDR,
+ .size = ACLINT_MSWI_SIZE,
+ .first_hartid = 0,
+ .hart_count = UX600_HART_COUNT,
+};
+
+static struct aclint_mtimer_data mtimer = {
+ .addr = UX600_ACLINT_MTIMER_ADDR,
+ .size = ACLINT_MTIMER_SIZE,
.first_hartid = 0,
.hart_count = UX600_HART_COUNT,
.has_64bit_mmio = TRUE,
};
+
static u32 measure_cpu_freq(u32 n)
{
u32 start_mtime, delta_mtime;
@@ -188,12 +202,12 @@ static int ux600_ipi_init(bool cold_boot)
int rc;
if (cold_boot) {
- rc = clint_cold_ipi_init(&clint);
+ rc = aclint_mswi_cold_init(&mswi);
if (rc)
return rc;
}
- return clint_warm_ipi_init();
+ return aclint_mswi_warm_init();
}
static int ux600_timer_init(bool cold_boot)
@@ -201,12 +215,12 @@ static int ux600_timer_init(bool cold_boot)
int rc;
if (cold_boot) {
- rc = clint_cold_timer_init(&clint, NULL);
+ rc = aclint_mtimer_cold_init(&mtimer, NULL);
if (rc)
return rc;
}
- return clint_warm_timer_init();
+ return aclint_mtimer_warm_init();
}
const struct sbi_platform_operations platform_ops = {
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();
}
/*
generated by cgit v1.2.3 (git 2.39.1) at 2025-04-05 06:32:31 +0000