target/riscv: Misc header cleanups
v2 cover target/riscv: Misc header cleanups
As requested by Daniel in [1], these patches are extracted from my "target/riscv: Allow building without TCG (KVM-only so far)" series and cleanly rebased onto Alistair's riscv-to-apply.next.
[1] https://lore.kernel.org/qemu-devel/[email protected]/
[2] https://lore.kernel.org/qemu-devel/[email protected]/
Philippe Mathieu-Daudé (4):
target/riscv: Remove unused 'instmap.h' header in translate.c target/riscv: Restrict sysemu specific header to user emulation target/riscv: Restrict 'rv128' machine to TCG accelerator target/riscv: Restrict riscv_cpu_do_interrupt() to sysemu
target/riscv/cpu.h | 5 +++-- target/riscv/cpu.c | 20 ++++++++++++++------ target/riscv/cpu_helper.c | 9 ++++----- target/riscv/csr.c | 2 ++ target/riscv/translate.c | 1 - 5 files changed, 23 insertions(+), 14 deletions(-)
Signature · 1 line
2.38.1
PATCH v2 1/4 target/riscv: Remove unused 'instmap.h' header in translate.c
--- target/riscv/translate.c | 1 - 1 file changed, 1 deletion(-)
target/riscv/translate.c +0 -1
@@ -30,7 +30,6 @@#include "exec/log.h" #include "semihosting/semihost.h" -#include "instmap.h" #include "internals.h" #define HELPER_H "helper.h"
Signature · 1 line
2.38.1
Re: [PATCH v2 1/4] target/riscv: Remove unused 'instmap.h' header in translate.c
Quoted 2 lines · Philippe Mathieu-Daudé
Signed-off-by Philippe Mathieu-Daudé <[email protected]>---
Quoted 15 lines
target/riscv/translate.c | 1 - 1 file changed, 1 deletion(-)target/riscv/translate.c +0
-1@@ -30,7 +30,6 @@#include "exec/log.h" #include "semihosting/semihost.h" -#include "instmap.h" #include "internals.h" #define HELPER_H "helper.h"
PATCH v2 2/4 target/riscv: Restrict sysemu specific header to user emulation
In reply to Philippe Mathieu-Daudé--- target/riscv/cpu.c | 8 +++++--- target/riscv/cpu_helper.c | 2 ++ target/riscv/csr.c | 2 ++ 3 files changed, 9 insertions(+), 3 deletions(-)
target/riscv/cpu.c +5 -3
@@ -23,9 +23,13 @@#include "qemu/log.h" #include "cpu.h" #include "cpu_vendorid.h" +#ifndef CONFIG_USER_ONLY #include "pmu.h" -#include "internals.h" #include "time_helper.h" +#include "sysemu/kvm.h" +#include "kvm_riscv.h" +#endif +#include "internals.h" #include "exec/exec-all.h" #include "qapi/error.h" #include "qapi/visitor.h"
@@ -33,8 +37,6 @@#include "hw/qdev-properties.h" #include "migration/vmstate.h" #include "fpu/softfloat-helpers.h" -#include "sysemu/kvm.h" -#include "kvm_riscv.h" #include "tcg/tcg.h" /* RISC-V CPU definitions */
target/riscv/cpu_helper.c +2 -0
@@ -28,7 +28,9 @@#include "tcg/tcg-op.h" #include "trace.h" #include "semihosting/common-semi.h" +#ifndef CONFIG_USER_ONLY #include "sysemu/cpu-timers.h" +#endif #include "cpu_bits.h" #include "debug.h" #include "tcg/oversized-guest.h"
target/riscv/csr.c +2 -0
@@ -21,8 +21,10 @@#include "qemu/log.h" #include "qemu/timer.h" #include "cpu.h" +#ifndef CONFIG_USER_ONLY #include "pmu.h" #include "time_helper.h" +#endif #include "qemu/main-loop.h" #include "exec/exec-all.h" #include "exec/tb-flush.h"
Signature · 1 line
2.38.1
Re: [PATCH v2 2/4] target/riscv: Restrict sysemu specific header to user emulation
Quoted 2 lines · Philippe Mathieu-Daudé
Signed-off-by Philippe Mathieu-Daudé <[email protected]>---
Quoted 62 lines
target/riscv/cpu.c | 8 +++++--- target/riscv/cpu_helper.c | 2 ++ target/riscv/csr.c | 2 ++ 3 files changed, 9 insertions(+), 3 deletions(-)target/riscv/cpu.c +5
-3@@ -23,9 +23,13 @@#include "qemu/log.h" #include "cpu.h" #include "cpu_vendorid.h" +#ifndef CONFIG_USER_ONLY #include "pmu.h" -#include "internals.h" #include "time_helper.h" +#include "sysemu/kvm.h" +#include "kvm_riscv.h" +#endif +#include "internals.h" #include "exec/exec-all.h" #include "qapi/error.h" #include "qapi/visitor.h" @@ -33,8 +37,6 @@#include "hw/qdev-properties.h" #include "migration/vmstate.h" #include "fpu/softfloat-helpers.h" -#include "sysemu/kvm.h" -#include "kvm_riscv.h" #include "tcg/tcg.h" /* RISC-V CPU definitions */ target/riscv/cpu_helper.c +2
-0@@ -28,7 +28,9 @@#include "tcg/tcg-op.h" #include "trace.h" #include "semihosting/common-semi.h" +#ifndef CONFIG_USER_ONLY #include "sysemu/cpu-timers.h" +#endif #include "cpu_bits.h" #include "debug.h" #include "tcg/oversized-guest.h" target/riscv/csr.c +2
-0@@ -21,8 +21,10 @@#include "qemu/log.h" #include "qemu/timer.h" #include "cpu.h" +#ifndef CONFIG_USER_ONLY #include "pmu.h" #include "time_helper.h" +#endif #include "qemu/main-loop.h" #include "exec/exec-all.h" #include "exec/tb-flush.h"
PATCH v2 3/4 target/riscv: Restrict 'rv128' machine to TCG accelerator
In reply to Philippe Mathieu-DaudéWe only build for 32/64-bit hosts, so TCG is required for 128-bit targets.
--- target/riscv/cpu.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-)
target/riscv/cpu.c +9 -3
@@ -476,6 +476,7 @@ static void rv64_veyron_v1_cpu_init(Object *obj)#endif } +#ifdef CONFIG_TCG static void rv128_base_cpu_init (Object *obj) {if (qemu_tcg_mttcg_enabled ()) {
@@ -494,7 +495,10 @@ static void rv128_base_cpu_init(Object *obj)set_satp_mode_max_supported (RISCV_CPU (obj),VM_1_10_SV57 ); #endif } -#else +#endif + +#else /* !TARGET_RISCV64 */ +static void rv32_base_cpu_init (Object *obj) {CPURISCVState *env = &RISCV_CPU (obj)->env;
@@ -576,7 +580,7 @@ static void rv32_imafcu_nommu_cpu_init(Object *obj) cpu->cfg.ext_icsr = true; cpu->cfg.pmp = true; } -#endif +#endif /* !TARGET_RISCV64 */ #if defined(CONFIG_KVM )static void riscv_host_cpu_init (Object *obj)
@@ -1951,8 +1955,10 @@ static const TypeInfo riscv_cpu_type_infos[] = {DEFINE_CPU (TYPE_RISCV_CPU_SHAKTI_C , rv64_sifive_u_cpu_init),DEFINE_CPU (TYPE_RISCV_CPU_THEAD_C906 , rv64_thead_c906_cpu_init),DEFINE_CPU (TYPE_RISCV_CPU_VEYRON_V1 , rv64_veyron_v1_cpu_init), +#ifdef CONFIG_TCG DEFINE_DYNAMIC_CPU(TYPE_RISCV_CPU_BASE128, rv128_base_cpu_init), -#endif +#endif /* CONFIG_TCG */ +#endif /* TARGET_RISCV64 */ };DEFINE_TYPES (riscv_cpu_type_infos)
Signature · 1 line
2.38.1
Re: [PATCH v2 3/4] target/riscv: Restrict 'rv128' machine to TCG accelerator
Quoted 5 lines · Philippe Mathieu-Daudé
We only build for 32/64-bit hosts, so TCG is required for 128-bit targets.
Signed-off-by Philippe Mathieu-Daudé <[email protected]>---
Quoted 48 lines
target/riscv/cpu.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-)target/riscv/cpu.c +9
-3@@ -476,6 +476,7 @@ static void rv64_veyron_v1_cpu_init(Object *obj)#endif } +#ifdef CONFIG_TCG static void rv128_base_cpu_init (Object *obj) {if (qemu_tcg_mttcg_enabled ()) {@@ -494,7 +495,10 @@ static void rv128_base_cpu_init(Object *obj)set_satp_mode_max_supported (RISCV_CPU (obj),VM_1_10_SV57 ); #endif } -#else +#endif + +#else /* !TARGET_RISCV64 */ +static void rv32_base_cpu_init (Object *obj) {CPURISCVState *env = &RISCV_CPU (obj)->env;@@ -576,7 +580,7 @@ static void rv32_imafcu_nommu_cpu_init(Object *obj) cpu->cfg.ext_icsr = true; cpu->cfg.pmp = true; } -#endif +#endif /* !TARGET_RISCV64 */ #if defined(CONFIG_KVM )static void riscv_host_cpu_init (Object *obj)@@ -1951,8 +1955,10 @@ static const TypeInfo riscv_cpu_type_infos[] = {DEFINE_CPU (TYPE_RISCV_CPU_SHAKTI_C , rv64_sifive_u_cpu_init),DEFINE_CPU (TYPE_RISCV_CPU_THEAD_C906 , rv64_thead_c906_cpu_init),DEFINE_CPU (TYPE_RISCV_CPU_VEYRON_V1 , rv64_veyron_v1_cpu_init), +#ifdef CONFIG_TCG DEFINE_DYNAMIC_CPU(TYPE_RISCV_CPU_BASE128, rv128_base_cpu_init), -#endif +#endif /* CONFIG_TCG */ +#endif /* TARGET_RISCV64 */ };DEFINE_TYPES (riscv_cpu_type_infos)
PATCH v2 4/4 target/riscv: Restrict riscv_cpu_do_interrupt() to sysemu
In reply to Philippe Mathieu-Daudériscv_cpu_do_interrupt() is not reachable on user emulation.
--- target/riscv/cpu.h | 5 +++-- target/riscv/cpu_helper.c | 7 ++----- 2 files changed, 5 insertions(+), 7 deletions(-)
target/riscv/cpu.h +3 -2
@@ -409,7 +409,6 @@ extern const char * const riscv_int_regnamesh[];extern const char *const riscv_fpr_regnames[];const char *riscv_cpu_get_trap_name (target_ulong cause,bool async); -void riscv_cpu_do_interrupt (CPUState *cpu);int riscv_cpu_write_elf64_note (WriteCoreDumpFunction f,CPUState *cs,int cpuid,DumpState *s); int riscv_cpu_write_elf32_note(WriteCoreDumpFunction f, CPUState *cs,
@@ -442,6 +441,7 @@ void riscv_cpu_validate_set_extensions(RISCVCPU *cpu, Error **errp);#define cpu_mmu_index riscv_cpu_mmu_index#ifndef CONFIG_USER_ONLY +void riscv_cpu_do_interrupt (CPUState *cpu); void riscv_cpu_do_transaction_failed(CPUState *cs, hwaddr physaddr, vaddr addr, unsigned size, MMUAccessType access_type,
@@ -465,7 +465,8 @@ void riscv_cpu_set_aia_ireg_rmw_fn(CPURISCVState *env, uint32_t priv, void *rmw_fn_arg);RISCVException smstateen_acc_ok (CPURISCVState *env,int index,uint64_t bit); -#endif +#endif /* !CONFIG_USER_ONLY */ +void riscv_cpu_set_mode (CPURISCVState *env,target_ulong newpriv);void riscv_translate_init (void );
target/riscv/cpu_helper.c +2 -5
@@ -1580,7 +1580,6 @@ static target_ulong riscv_transformed_insn(CPURISCVState *env,return xinsn; } -#endif /* !CONFIG_USER_ONLY */ /* * Handle Traps
@@ -1590,8 +1589,6 @@ static target_ulong riscv_transformed_insn(CPURISCVState *env,*/ void riscv_cpu_do_interrupt (CPUState *cs) { -#if !defined(CONFIG_USER_ONLY ) -RISCVCPU *cpu =RISCV_CPU (cs);CPURISCVState *env = &cpu->env;bool write_gva = false;
@@ -1784,6 +1781,6 @@ void riscv_cpu_do_interrupt(CPUState *cs) env->two_stage_lookup = false; env->two_stage_indirect_lookup = false; -#endif - cs->exception_index =RISCV_EXCP_NONE ;/* mark handled to qemu */ } + +#endif /* !CONFIG_USER_ONLY */
Signature · 1 line
2.38.1
Re: [PATCH v2 4/4] target/riscv: Restrict riscv_cpu_do_interrupt() to sysemu
Quoted 4 lines · Philippe Mathieu-Daudé
riscv_cpu_do_interrupt()is not reachable on user emulation.Signed-off-by Philippe Mathieu-Daudé <[email protected]>---
Quoted 64 lines
target/riscv/cpu.h | 5 +++-- target/riscv/cpu_helper.c | 7 ++----- 2 files changed, 5 insertions(+), 7 deletions(-)target/riscv/cpu.h +3
-2@@ -409,7 +409,6 @@ extern const char * const riscv_int_regnamesh[];extern const char *const riscv_fpr_regnames[];const char *riscv_cpu_get_trap_name (target_ulong cause,bool async); -void riscv_cpu_do_interrupt (CPUState *cpu);int riscv_cpu_write_elf64_note (WriteCoreDumpFunction f,CPUState *cs,int cpuid,DumpState *s); int riscv_cpu_write_elf32_note(WriteCoreDumpFunction f, CPUState *cs,@@ -442,6 +441,7 @@ void riscv_cpu_validate_set_extensions(RISCVCPU *cpu, Error **errp);#define cpu_mmu_index riscv_cpu_mmu_index#ifndef CONFIG_USER_ONLY +void riscv_cpu_do_interrupt (CPUState *cpu); void riscv_cpu_do_transaction_failed(CPUState *cs, hwaddr physaddr, vaddr addr, unsigned size, MMUAccessType access_type,@@ -465,7 +465,8 @@ void riscv_cpu_set_aia_ireg_rmw_fn(CPURISCVState *env, uint32_t priv, void *rmw_fn_arg);RISCVException smstateen_acc_ok (CPURISCVState *env,int index,uint64_t bit); -#endif +#endif /* !CONFIG_USER_ONLY */ +void riscv_cpu_set_mode (CPURISCVState *env,target_ulong newpriv);void riscv_translate_init (void );target/riscv/cpu_helper.c +2
-5@@ -1580,7 +1580,6 @@ static target_ulong riscv_transformed_insn(CPURISCVState *env,return xinsn; } -#endif /* !CONFIG_USER_ONLY */ /* * Handle Traps @@ -1590,8 +1589,6 @@ static target_ulong riscv_transformed_insn(CPURISCVState *env,*/ void riscv_cpu_do_interrupt (CPUState *cs) { -#if !defined(CONFIG_USER_ONLY ) -RISCVCPU *cpu =RISCV_CPU (cs);CPURISCVState *env = &cpu->env;bool write_gva = false;@@ -1784,6 +1781,6 @@ void riscv_cpu_do_interrupt(CPUState *cs) env->two_stage_lookup = false; env->two_stage_indirect_lookup = false; -#endif - cs->exception_index =RISCV_EXCP_NONE ;/* mark handled to qemu */ } + +#endif /* !CONFIG_USER_ONLY */
Quoted 5 lines · Philippe Mathieu-Daudé
As requested by Daniel in [1], these patches are extracted from my "target/riscv: Allow building without TCG (KVM-only so far)" series and cleanly rebased onto Alistair's riscv-to-apply.next.
Quoted 8 lines
[1] https://lore.kernel.org/qemu-devel/[email protected]/
[2] https://lore.kernel.org/qemu-devel/[email protected]/Philippe Mathieu-Daudé (4):
target/riscv: Remove unused 'instmap.h' header intranslate.ctarget/riscv: Restrict sysemu specific header to user emulation target/riscv: Restrict 'rv128' machine to TCG accelerator target/riscv: Restrictriscv_cpu_do_interrupt()to sysemu
But this doesn't apply on the latest riscv-to-apply.next
Alistair
Quoted 12 lines
target/riscv/cpu.h | 5 +++-- target/riscv/cpu.c | 20 ++++++++++++++------ target/riscv/cpu_helper.c | 9 ++++----- target/riscv/csr.c | 2 ++ target/riscv/translate.c | 1 - 5 files changed, 23 insertions(+), 14 deletions(-)--
2.38.1