[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH for-9.0 v2 3/8] target/riscv/cpu.c: finalize satp_mode earlier
From: |
Daniel Henrique Barboza |
Subject: |
[PATCH for-9.0 v2 3/8] target/riscv/cpu.c: finalize satp_mode earlier |
Date: |
Mon, 27 Nov 2023 08:37:47 -0300 |
Profiles will need to validate satp_mode during their own finalize
methods. This will occur inside riscv_tcg_cpu_finalize_features() for
TCG. Given that satp_mode does not have any pre-req from the accelerator
finalize() method, it's safe to finalize it earlier.
Signed-off-by: Daniel Henrique Barboza <dbarboza@ventanamicro.com>
Reviewed-by: Andrew Jones <ajones@ventanamicro.com>
---
target/riscv/cpu.c | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/target/riscv/cpu.c b/target/riscv/cpu.c
index 29a9f77702..a395c77bda 100644
--- a/target/riscv/cpu.c
+++ b/target/riscv/cpu.c
@@ -1056,6 +1056,14 @@ void riscv_cpu_finalize_features(RISCVCPU *cpu, Error
**errp)
{
Error *local_err = NULL;
+#ifndef CONFIG_USER_ONLY
+ riscv_cpu_satp_mode_finalize(cpu, &local_err);
+ if (local_err != NULL) {
+ error_propagate(errp, local_err);
+ return;
+ }
+#endif
+
/*
* KVM accel does not have a specialized finalize()
* callback because its extensions are validated
@@ -1068,14 +1076,6 @@ void riscv_cpu_finalize_features(RISCVCPU *cpu, Error
**errp)
return;
}
}
-
-#ifndef CONFIG_USER_ONLY
- riscv_cpu_satp_mode_finalize(cpu, &local_err);
- if (local_err != NULL) {
- error_propagate(errp, local_err);
- return;
- }
-#endif
}
static void riscv_cpu_realize(DeviceState *dev, Error **errp)
--
2.41.0
- [PATCH for-9.0 v2 0/8] target/riscv: implement RVA22S64 profile, Daniel Henrique Barboza, 2023/11/27
- [PATCH for-9.0 v2 1/8] target/riscv: implement svade, Daniel Henrique Barboza, 2023/11/27
- [PATCH for-9.0 v2 2/8] target/riscv: add priv ver restriction to profiles, Daniel Henrique Barboza, 2023/11/27
- [PATCH for-9.0 v2 4/8] target/riscv/cpu.c: add riscv_cpu_is_32bit(), Daniel Henrique Barboza, 2023/11/27
- [PATCH for-9.0 v2 5/8] target/riscv: add satp_mode profile support, Daniel Henrique Barboza, 2023/11/27
- [PATCH for-9.0 v2 6/8] target/riscv: add 'parent' in profile description, Daniel Henrique Barboza, 2023/11/27
- [PATCH for-9.0 v2 3/8] target/riscv/cpu.c: finalize satp_mode earlier,
Daniel Henrique Barboza <=
- [PATCH for-9.0 v2 7/8] target/riscv: add RVA22S64 profile, Daniel Henrique Barboza, 2023/11/27
- [PATCH for-9.0 v2 8/8] target/riscv: add rva22s64 cpu, Daniel Henrique Barboza, 2023/11/27