[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v6 7/9] target/riscv/cpu.c: validate extensions before riscv_time
|
From: |
Daniel Henrique Barboza |
|
Subject: |
[PATCH v6 7/9] target/riscv/cpu.c: validate extensions before riscv_timer_init() |
|
Date: |
Wed, 29 Mar 2023 17:08:54 -0300 |
There is no need to init timers if we're not even sure that our
extensions are valid. Execute riscv_cpu_validate_set_extensions() before
riscv_timer_init().
Signed-off-by: Daniel Henrique Barboza <dbarboza@ventanamicro.com>
Reviewed-by: LIU Zhiwei <zhiwei_liu@linux.alibaba.com>
Reviewed-by: Weiwei Li <liweiwei@iscas.ac.cn>
---
target/riscv/cpu.c | 11 ++++-------
1 file changed, 4 insertions(+), 7 deletions(-)
diff --git a/target/riscv/cpu.c b/target/riscv/cpu.c
index e8045840bd..331272c8a0 100644
--- a/target/riscv/cpu.c
+++ b/target/riscv/cpu.c
@@ -1196,13 +1196,6 @@ static void riscv_cpu_realize(DeviceState *dev, Error
**errp)
return;
}
-
-#ifndef CONFIG_USER_ONLY
- if (cpu->cfg.ext_sstc) {
- riscv_timer_init(cpu);
- }
-#endif /* CONFIG_USER_ONLY */
-
riscv_cpu_validate_set_extensions(cpu, &local_err);
if (local_err != NULL) {
error_propagate(errp, local_err);
@@ -1210,6 +1203,10 @@ static void riscv_cpu_realize(DeviceState *dev, Error
**errp)
}
#ifndef CONFIG_USER_ONLY
+ if (cpu->cfg.ext_sstc) {
+ riscv_timer_init(cpu);
+ }
+
if (cpu->cfg.pmu_num) {
if (!riscv_pmu_init(cpu, cpu->cfg.pmu_num) && cpu->cfg.ext_sscofpmf) {
cpu->pmu_timer = timer_new_ns(QEMU_CLOCK_VIRTUAL,
--
2.39.2
- [PATCH v6 0/9] target/riscv: rework CPU extensions validation, Daniel Henrique Barboza, 2023/03/29
- [PATCH v6 1/9] target/riscv/cpu.c: add riscv_cpu_validate_v(), Daniel Henrique Barboza, 2023/03/29
- [PATCH v6 2/9] target/riscv/cpu.c: remove set_vext_version(), Daniel Henrique Barboza, 2023/03/29
- [PATCH v6 3/9] target/riscv/cpu.c: remove set_priv_version(), Daniel Henrique Barboza, 2023/03/29
- [PATCH v6 4/9] target/riscv: add PRIV_VERSION_LATEST, Daniel Henrique Barboza, 2023/03/29
- [PATCH v6 5/9] target/riscv/cpu.c: add priv_spec validate/disable_exts helpers, Daniel Henrique Barboza, 2023/03/29
- [PATCH v6 6/9] target/riscv/cpu.c: add riscv_cpu_validate_misa_mxl(), Daniel Henrique Barboza, 2023/03/29
- [PATCH v6 7/9] target/riscv/cpu.c: validate extensions before riscv_timer_init(),
Daniel Henrique Barboza <=
- [PATCH v6 8/9] target/riscv/cpu.c: remove cfg setup from riscv_cpu_init(), Daniel Henrique Barboza, 2023/03/29
- [PATCH v6 9/9] target/riscv: rework write_misa(), Daniel Henrique Barboza, 2023/03/29
- Re: [PATCH v6 0/9] target/riscv: rework CPU extensions validation, Daniel Henrique Barboza, 2023/03/29