MIPS patches for 2020-12-13
Subsystems (2)
The following changes since commit ad717e6da3852b5729217d7938eecdb81c546114:
Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging (2020-12-12 00:20:46 +0000)
are available in the Git repository at:
https://gitlab.com/philmd/qemu.git tags/mips-20201213
for you to fetch changes up to 3533ee301c46620fd5699cb97f2d4bd194fe0c24:
target/mips: Use FloatRoundMode enum for FCR31 modes conversion (2020-12-13 20:27:11 +0100)
----------------------------------------------------------------
MIPS patches queue
. Allow executing MSA instructions on Loongson-3A4000 . Update Huacai Chen email address
. Various cleanups:
- unused headers removal
- use definitions instead of magic values
- remove dead code
- avoid calling unused code
. Various code movements
CI jobs results:
https://gitlab.com/philmd/qemu/-/pipelines/229120169
https://cirrus-ci.com/build/4857731557359616
----------------------------------------------------------------
Huacai Chen (1):
MAINTAINERS: [email protected] -> [email protected]
Philippe Mathieu-Daudé (25):
target/mips/kvm: Assert unreachable code is not used target/mips/kvm: Remove unused headers
target/mips: Include "exec/memattrs.h" in 'internal.h' target/mips: Replace magic values by CP0PM_MASK or
TARGET_PAGE_BITS_MIN
target/mips: Do not include CP0 helpers in user-mode emulation target/mips: Remove unused headers from cp0_helper.c target/mips: Also display exception names in user-mode target/mips: Allow executing MSA instructions on Loongson-3A4000 target/mips: Explicit Release 6 MMU types
target/mips: Rename cpu_supports_FEAT() as cpu_type_supports_FEAT() target/mips: Introduce cpu_supports_isa() taking CPUMIPSState argument hw/mips: Move address translation helpers to target/mips/ target/mips: Remove unused headers from translate.c target/mips: Remove unused headers from op_helper.c target/mips: Remove mips_def_t unused argument from mvp_init() target/mips: Introduce ase_mt_available() helper target/mips: Do not initialize MT registers if MT ASE absent hw/mips/malta: Do not initialize MT registers if MT ASE absent hw/mips/malta: Rewrite CP0_MVPConf0 access using deposit() target/mips: Extract cpu_supports*/cpu_set* translate.c target/mips: Move mips_cpu_add_definition() from helper.c to cpu.c target/mips: Move cpu definitions, reset() and realize() to cpu.c target/mips: Inline cpu_mips_realize_env() in mips_cpu_realizefn() target/mips: Remove unused headers from fpu_helper.c target/mips: Use FloatRoundMode enum for FCR31 modes conversion
include/hw/mips/cpudevs.h | 7 -
target/mips/cpu.h | 20 ++-
target/mips/internal.h | 17 +-
hw/mips/boston.c | 5 +-
hw/mips/cps.c | 3 +-
hw/mips/malta.c | 14 +-
{hw => target}/mips/addr.c | 2 +-
target/mips/cp0_helper.c | 15 +-
target/mips/cpu.c | 299 ++++++++++++++++++++++++++++++-
target/mips/fpu_helper.c | 6 +-
target/mips/helper.c | 64 ++-----
target/mips/kvm.c | 11 +-
target/mips/op_helper.c | 4 -
target/mips/translate.c | 262 ---------------------------
target/mips/translate_init.c.inc | 10 +-
.mailmap | 2 +
MAINTAINERS | 8 +-
hw/mips/meson.build | 2 +-
target/mips/meson.build | 3 +-
19 files changed, 378 insertions(+), 376 deletions(-)
rename {hw => target}/mips/addr.c (98%)Signature · 1 line
2.26.2
[PULL 01/26] MAINTAINERS: [email protected] -> [email protected]
From: Huacai Chen <[email protected]>
Use @kernel.org address as the main communications end point. Update the corresponding M-entries and .mailmap (for git shortlog translation).
Message-Id: <[email protected]>
--- .mailmap | 2 ++ MAINTAINERS | 8 ++++---- 2 files changed, 6 insertions(+), 4 deletions(-)
.mailmap +2 -0
@@ -49,6 +49,8 @@ Anthony Liguori <[email protected]> Anthony Liguori <[email protected]> Filip Bozuta <[email protected]> <[email protected]> Frederic Konrad <[email protected]> <[email protected]> Greg Kurz <[email protected]> <[email protected]> +Huacai Chen <[email protected]> <[email protected]> +Huacai Chen <[email protected]> <[email protected]> James Hogan <[email protected]> <[email protected]> Leif Lindholm <[email protected]> <[email protected]> Radoslaw Biernacki <[email protected]> <[email protected]>
MAINTAINERS +4 -4
@@ -388,7 +388,7 @@ S: Maintained F: target/arm/kvm.c MIPS KVM CPUs -M: Huacai Chen <[email protected]> +M: Huacai Chen <[email protected]> S: Odd Fixes F: target/mips/kvm.c
@@ -1149,7 +1149,7 @@ F: hw/mips/mipssim.c F: hw/net/mipsnet.c Fuloong 2E -M: Huacai Chen <[email protected]> +M: Huacai Chen <[email protected]> M: Philippe Mathieu-Daudé <[email protected]> R: Jiaxun Yang <[email protected]> S: Odd Fixes
@@ -1159,7 +1159,7 @@ F: hw/pci-host/bonito.c F: include/hw/isa/vt82c686.h Loongson-3 virtual platforms -M: Huacai Chen <[email protected]> +M: Huacai Chen <[email protected]> R: Jiaxun Yang <[email protected]> S: Maintained F: hw/intc/loongson_liointc.c
@@ -2861,7 +2861,7 @@ F: disas/i386.c MIPS TCG target M: Philippe Mathieu-Daudé <[email protected]> R: Aurelien Jarno <[email protected]> -R: Huacai Chen <[email protected]> +R: Huacai Chen <[email protected]> R: Jiaxun Yang <[email protected]> R: Aleksandar Rikalo <[email protected]> S: Odd Fixes
Signature · 1 line
2.26.2
[PULL 02/26] target/mips/kvm: Assert unreachable code is not used
In reply to Philippe Mathieu-DaudéThis code must not be used outside of KVM. Abort if it is.
Message-Id: <[email protected]>
--- target/mips/kvm.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-)
target/mips/kvm.c +2 -6
@@ -198,9 +198,7 @@ int kvm_mips_set_interrupt(MIPSCPU *cpu, int irq, int level)CPUState *cs =CPU (cpu);struct kvm_mips_interrupt intr; -if (!kvm_enabled ()) { -return 0 ; - } +assert (kvm_enabled ()); intr.cpu =-1 ;
@@ -221,9 +219,7 @@ int kvm_mips_set_ipi_interrupt(MIPSCPU *cpu, int irq, int level)CPUState *dest_cs =CPU (cpu);struct kvm_mips_interrupt intr; -if (!kvm_enabled ()) { -return 0 ; - } +assert (kvm_enabled ()); intr.cpu = dest_cs->cpu_index;
Signature · 1 line
2.26.2
[PULL 03/26] target/mips/kvm: Remove unused headers
In reply to Philippe Mathieu-DaudéMessage-Id: <[email protected]>
--- target/mips/kvm.c | 2 -- 1 file changed, 2 deletions(-)
target/mips/kvm.c +0 -2
@@ -19,11 +19,9 @@#include "internal.h" #include "qemu/error-report.h" #include "qemu/main-loop.h" -#include "qemu/timer.h" #include "sysemu/kvm.h" #include "sysemu/kvm_int.h" #include "sysemu/runstate.h" -#include "sysemu/cpus.h" #include "kvm_mips.h" #include "exec/memattrs.h" #include "hw/boards.h"
Signature · 1 line
2.26.2
[PULL 04/26] target/mips: Include "exec/memattrs.h" in 'internal.h'
In reply to Philippe Mathieu-Daudémips_cpu_do_transaction_failed() requires MemTxAttrs and MemTxResult declarations.
Message-Id: <[email protected]>
--- target/mips/internal.h | 1 + target/mips/kvm.c | 1 - 2 files changed, 1 insertion(+), 1 deletion(-)
target/mips/internal.h +1 -0
@@ -8,6 +8,7 @@#ifndef MIPS_INTERNAL_H #define MIPS_INTERNAL_H +#include "exec/memattrs.h" #include "fpu/softfloat-helpers.h" /*
target/mips/kvm.c +0 -1
@@ -23,7 +23,6 @@#include "sysemu/kvm_int.h" #include "sysemu/runstate.h" #include "kvm_mips.h" -#include "exec/memattrs.h" #include "hw/boards.h" #define DEBUG_KVM 0
Signature · 1 line
2.26.2
[PULL 05/26] target/mips: Replace magic values by CP0PM_MASK or TARGET_PAGE_BITS_MIN
In reply to Philippe Mathieu-DaudéReplace magic values related to page size:
12 -> TARGET_PAGE_BITS_MIN
13 -> CP0PM_MASK
Message-Id: <[email protected]>
--- target/mips/cp0_helper.c | 5 +++-- target/mips/helper.c | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-)
target/mips/cp0_helper.c +3 -2
@@ -904,7 +904,7 @@ void update_pagemask(CPUMIPSState *env, target_ulong arg1, int32_t *pagemask) goto invalid; }/* We don't support VTLB entry smaller than target page */ -if ((maskbits +12 ) <TARGET_PAGE_BITS ) { +if ((maskbits +TARGET_PAGE_BITS_MIN ) <TARGET_PAGE_BITS ) { goto invalid; } env->CP0_PageMask = mask <<CP0PM_MASK ;
@@ -913,7 +913,8 @@ void update_pagemask(CPUMIPSState *env, target_ulong arg1, int32_t *pagemask) invalid:/* When invalid, set to default target page size. */ - env->CP0_PageMask = (~TARGET_PAGE_MASK >>12 ) <<CP0PM_MASK ; + mask = (~TARGET_PAGE_MASK >>TARGET_PAGE_BITS_MIN ); + env->CP0_PageMask = mask <<CP0PM_MASK ; }void helper_mtc0_pagemask (CPUMIPSState *env,target_ulong arg1)
target/mips/helper.c +2 -2
@@ -858,8 +858,8 @@ refill:break ; } } - pw_pagemask = m >>12 ; -update_pagemask (env, pw_pagemask <<13 , &pw_pagemask); + pw_pagemask = m >>TARGET_PAGE_BITS_MIN ; +update_pagemask (env, pw_pagemask <<CP0PM_MASK , &pw_pagemask); pw_entryhi = (address & ~0x1fff ) | (env->CP0_EntryHi &0xFF ); {target_ulong tmp_entryhi = env->CP0_EntryHi;
Signature · 1 line
2.26.2
[PULL 06/26] target/mips: Do not include CP0 helpers in user-mode emulation
In reply to Philippe Mathieu-DaudéCP0 helpers are restricted to system-mode emulation. Do not intent do build cp0_helper.c in user-mode (this allows to simplify some #ifdef'ry).
Message-Id: <[email protected]>
--- target/mips/cp0_helper.c | 4 ---- target/mips/meson.build | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-)
target/mips/cp0_helper.c +0 -4
@@ -32,7 +32,6 @@#include "sysemu/kvm.h" -#ifndef CONFIG_USER_ONLY /* SMP helpers. */ static bool mips_vpe_is_wfi (MIPSCPU *c) {
@@ -1667,10 +1666,8 @@ target_ulong helper_evpe(CPUMIPSState *env) }return prev; } -#endif /* !CONFIG_USER_ONLY */ /* R6 Multi-threading */ -#ifndef CONFIG_USER_ONLY target_ulong helper_dvp (CPUMIPSState *env) {CPUState *other_cs = first_cpu;
@@ -1709,4 +1706,3 @@ target_ulong helper_evp(CPUMIPSState *env) }return prev; } -#endif /* !CONFIG_USER_ONLY */
target/mips/meson.build +1 -1
@@ -1,6 +1,5 @@ mips_ss = ss.source_set() mips_ss.add(files( - 'cp0_helper.c', 'cpu.c', 'dsp_helper.c', 'fpu_helper.c',
@@ -15,6 +14,7 @@ mips_softmmu_ss = ss.source_set() mips_softmmu_ss.add(files( + 'cp0_helper.c', 'cp0_timer.c', 'machine.c', 'mips-semi.c',
Signature · 1 line
2.26.2
[PULL 07/26] target/mips: Remove unused headers from cp0_helper.c
In reply to Philippe Mathieu-DaudéRemove unused headers and add missing "qemu/log.h" since qemu_log() is called.
Message-Id: <[email protected]>
--- target/mips/cp0_helper.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
target/mips/cp0_helper.c +1 -3
@@ -21,15 +21,13 @@*/ #include "qemu/osdep.h" +#include "qemu/log.h" #include "qemu/main-loop.h" #include "cpu.h" #include "internal.h" #include "qemu/host-utils.h" #include "exec/helper-proto.h" #include "exec/exec-all.h" -#include "exec/cpu_ldst.h" -#include "exec/memop.h" -#include "sysemu/kvm.h" /* SMP helpers. */
Signature · 1 line
2.26.2
[PULL 08/26] target/mips: Also display exception names in user-mode
In reply to Philippe Mathieu-DaudéCurrently MIPS exceptions are displayed as string in system-mode emulation, but as number in user-mode.
Unify by extracting the current system-mode code as excp_name() and use that in user-mode.
Message-Id: <[email protected]>
--- target/mips/helper.c | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-)
target/mips/helper.c +14 -11
@@ -978,6 +978,7 @@ hwaddr cpu_mips_translate_address(CPUMIPSState *env, target_ulong address, return physical; } } +#endif /* !CONFIG_USER_ONLY */ static const char *const excp_names[EXCP_LAST +1 ] = { [EXCP_RESET ] ="reset" ,
@@ -1018,7 +1019,14 @@ static const char * const excp_names[EXCP_LAST + 1] = { [EXCP_MSADIS] = "MSA disabled", [EXCP_MSAFPE] = "MSA floating point", }; -#endif + +static const char *mips_exception_name (int32_t exception) +{ +if (exception <0 || exception >EXCP_LAST ) { +return "unknown" ; + } +return excp_names[exception]; +}target_ulong exception_resume_pc (CPUMIPSState *env) {
@@ -1091,19 +1099,13 @@ void mips_cpu_do_interrupt(CPUState *cs)bool update_badinstr =0 ;target_ulong offset;int cause =-1 ; -const char *name;if (qemu_loglevel_mask (CPU_LOG_INT ) && cs->exception_index !=EXCP_EXT_INTERRUPT ) { -if (cs->exception_index <0 || cs->exception_index >EXCP_LAST ) { - name ="unknown" ; - }else { - name = excp_names[cs->exception_index]; - } -qemu_log ("%s enter: PC " TARGET_FMT_lx" EPC " TARGET_FMT_lx" %s exception\n" , - __func__, env->active_tc.PC, env->CP0_EPC, name); + __func__, env->active_tc.PC, env->CP0_EPC, +mips_exception_name (cs->exception_index)); }if (cs->exception_index ==EXCP_EXT_INTERRUPT && (env->hflags &MIPS_HFLAG_DM )) {
@@ -1490,8 +1492,9 @@ void QEMU_NORETURN do_raise_exception_err(CPUMIPSState *env, {CPUState *cs =env_cpu (env); -qemu_log_mask (CPU_LOG_INT ,"%s: %d %d\n" , - __func__, exception, error_code); +qemu_log_mask (CPU_LOG_INT ,"%s: %d (%s) %d\n" , + __func__, exception,mips_exception_name (exception), + error_code); cs->exception_index = exception; env->error_code = error_code;
Signature · 1 line
2.26.2
[PULL 09/26] target/mips: Allow executing MSA instructions on Loongson-3A4000
In reply to Philippe Mathieu-DaudéThe Loongson-3A4000 is a GS464V-based processor with MIPS MSA ASE:
https://www.mail-archive.com/[email protected]/msg763059.html
Commit af868995e1b correctly set the 'MSA present' bit of Config3 register, but forgot to allow the MSA instructions decoding in insn_flags, so executing them triggers a 'Reserved Instruction'.
Fix by adding the ASE_MSA mask to insn_flags.
Message-Id: <[email protected]>
--- target/mips/translate_init.c.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
target/mips/translate_init.c.inc +2 -2
@@ -832,7 +832,7 @@ const mips_def_t mips_defs[] = .mmu_type = MMU_TYPE_R4000, }, { - .name = "Loongson-3A4000", + .name = "Loongson-3A4000", /* GS464V-based */ .CP0_PRid = 0x14C000, /* 64KB I-cache and d-cache. 4 way with 32 bit cache line size. */ .CP0_Config0 = MIPS_CONFIG0 | (0x1 << CP0C0_AR) | (0x2 << CP0C0_AT) |
@@ -885,7 +885,7 @@ const mips_def_t mips_defs[] = .CP1_fcr31_rw_bitmask = 0xFF83FFFF, .SEGBITS = 48, .PABITS = 48, - .insn_flags = CPU_LOONGSON3A, + .insn_flags = CPU_LOONGSON3A | ASE_MSA, .mmu_type = MMU_TYPE_R4000, }, {
Signature · 1 line
2.26.2
[PULL 10/26] target/mips: Explicit Release 6 MMU types
In reply to Philippe Mathieu-DaudéAs of Release 6, MMU type 4 is assigned to "Dual Variable-Page-Size and Fixed-Page-Size TLBs" and type 2 to "Block Address Translation.
Message-Id: <[email protected]>
--- target/mips/internal.h | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)
target/mips/internal.h +5 -4
@@ -16,10 +16,11 @@* CP0C0_MT field. */ enum mips_mmu_types { -MMU_TYPE_NONE , -MMU_TYPE_R4000 , -MMU_TYPE_RESERVED , -MMU_TYPE_FMT , +MMU_TYPE_NONE =0 , +MMU_TYPE_R4000 =1 ,/* Standard TLB */ +MMU_TYPE_BAT =2 ,/* Block Address Translation */ +MMU_TYPE_FMT =3 ,/* Fixed Mapping */ +MMU_TYPE_DVF =4 ,/* Dual VTLB and FTLB */ MMU_TYPE_R3000 ,MMU_TYPE_R6000 ,MMU_TYPE_R8000
Signature · 1 line
2.26.2
[PULL 11/26] target/mips: Rename cpu_supports_FEAT() as cpu_type_supports_FEAT()
In reply to Philippe Mathieu-DaudéAs cpu_supports_isa() / cpu_supports_cps_smp() take a 'cpu_type' name argument, rename them cpu_type_supports_FEAT().
Message-Id: <[email protected]>
--- target/mips/cpu.h | 4 ++-- hw/mips/boston.c | 4 ++-- hw/mips/malta.c | 4 ++-- target/mips/translate.c | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-)
target/mips/cpu.h +2 -2
@@ -1286,8 +1286,8 @@ int cpu_mips_signal_handler(int host_signum, void *pinfo, void *puc);#define MIPS_CPU_TYPE_NAME (model) model MIPS_CPU_TYPE_SUFFIX#define CPU_RESOLVING_TYPE TYPE_MIPS_CPU -bool cpu_supports_cps_smp (const char *cpu_type); -bool cpu_supports_isa (const char *cpu_type,uint64_t isa); +bool cpu_type_supports_cps_smp (const char *cpu_type); +bool cpu_type_supports_isa (const char *cpu_type,uint64_t isa);void cpu_set_exception_base (int vp_index,target_ulong address);/* mips_int.c */
hw/mips/boston.c +2 -2
@@ -459,12 +459,12 @@ static void boston_mach_init(MachineState *machine) s =BOSTON (dev); s->mach = machine; -if (!cpu_supports_cps_smp (machine->cpu_type)) { +if (!cpu_type_supports_cps_smp (machine->cpu_type)) {error_report ("Boston requires CPUs which support CPS" );exit (1 ); } - is_64b =cpu_supports_isa (machine->cpu_type,ISA_MIPS64 ); + is_64b =cpu_type_supports_isa (machine->cpu_type,ISA_MIPS64 );object_initialize_child (OBJECT (machine),"cps" , &s->cps,TYPE_MIPS_CPS ); object_property_set_str(OBJECT(&s->cps), "cpu-type", machine->cpu_type,
hw/mips/malta.c +2 -2
@@ -1205,7 +1205,7 @@ static void create_cps(MachineState *ms, MaltaState *s,static void mips_create_cpu (MachineState *ms,MaltaState *s,qemu_irq *cbus_irq,qemu_irq *i8259_irq) { -if ((ms->smp.cpus >1 ) &&cpu_supports_cps_smp (ms->cpu_type)) { +if ((ms->smp.cpus >1 ) &&cpu_type_supports_cps_smp (ms->cpu_type)) {create_cps (ms, s, cbus_irq, i8259_irq); }else {create_cpu_without_cps (ms, s, cbus_irq, i8259_irq);
@@ -1309,7 +1309,7 @@ void mips_malta_init(MachineState *machine) loaderparams.initrd_filename = initrd_filename; kernel_entry =load_kernel (); -if (!cpu_supports_isa (machine->cpu_type,ISA_NANOMIPS32 )) { +if (!cpu_type_supports_isa (machine->cpu_type,ISA_NANOMIPS32 )) {write_bootloader (memory_region_get_ram_ptr (bios), bootloader_run_addr, kernel_entry); }else {
target/mips/translate.c +2 -2
@@ -31770,13 +31770,13 @@ void cpu_mips_realize_env(CPUMIPSState *env)mvp_init (env, env->cpu_model); } -bool cpu_supports_cps_smp (const char *cpu_type) +bool cpu_type_supports_cps_smp (const char *cpu_type) {const MIPSCPUClass *mcc =MIPS_CPU_CLASS (object_class_by_name (cpu_type));return (mcc->cpu_def->CP0_Config3 & (1 <<CP0C3_CMGCR )) !=0 ; } -bool cpu_supports_isa (const char *cpu_type,uint64_t isa) +bool cpu_type_supports_isa (const char *cpu_type,uint64_t isa) {const MIPSCPUClass *mcc =MIPS_CPU_CLASS (object_class_by_name (cpu_type));return (mcc->cpu_def->insn_flags & isa) !=0 ;
Signature · 1 line
2.26.2
[PULL 15/26] target/mips: Remove unused headers from op_helper.c
In reply to Philippe Mathieu-DaudéMessage-Id: <[email protected]>
--- target/mips/op_helper.c | 4 ---- 1 file changed, 4 deletions(-)
target/mips/op_helper.c +0 -4
@@ -19,15 +19,11 @@*/ #include "qemu/osdep.h" -#include "qemu/main-loop.h" #include "cpu.h" #include "internal.h" -#include "qemu/host-utils.h" #include "exec/helper-proto.h" #include "exec/exec-all.h" -#include "exec/cpu_ldst.h" #include "exec/memop.h" -#include "sysemu/kvm.h" /*****************************************************************************/
Signature · 1 line
2.26.2
[PULL 12/26] target/mips: Introduce cpu_supports_isa() taking CPUMIPSState argument
In reply to Philippe Mathieu-DaudéIntroduce cpu_supports_isa() which takes a CPUMIPSState argument, more useful at runtime when the CPU is created (no need to call the extensive object_class_by_name()).
Message-Id: <[email protected]>
--- target/mips/cpu.h | 1 + target/mips/cpu.c | 5 +++++ 2 files changed, 6 insertions(+)
target/mips/cpu.h +1 -0
@@ -1287,6 +1287,7 @@ int cpu_mips_signal_handler(int host_signum, void *pinfo, void *puc);#define CPU_RESOLVING_TYPE TYPE_MIPS_CPUbool cpu_type_supports_cps_smp (const char *cpu_type); +bool cpu_supports_isa (const CPUMIPSState *env,uint64_t isa_mask);bool cpu_type_supports_isa (const char *cpu_type,uint64_t isa);void cpu_set_exception_base (int vp_index,target_ulong address);
target/mips/cpu.c +5 -0
@@ -310,3 +310,8 @@ MIPSCPU *mips_cpu_create_with_clock(const char *cpu_type, Clock *cpu_refclk)return MIPS_CPU (cpu); } + +bool cpu_supports_isa (const CPUMIPSState *env,uint64_t isa_mask) +{ +return (env->cpu_model->insn_flags & isa_mask) !=0 ; +}
Signature · 1 line
2.26.2
[PULL 13/26] hw/mips: Move address translation helpers to target/mips/
In reply to Philippe Mathieu-DaudéAddress translation is an architectural thing (not hardware related). Move the helpers from hw/ to target/.
As physical address and KVM are specific to system mode emulation, restrict this file to softmmu, so it doesn't get compiled for user-mode emulation.
Message-Id: <[email protected]>
---
include/hw/mips/cpudevs.h | 7 -------
target/mips/cpu.h | 8 ++++++++
hw/mips/boston.c | 1 -
{hw => target}/mips/addr.c | 2 +-
target/mips/translate.c | 2 --
hw/mips/meson.build | 2 +-
target/mips/meson.build | 1 +
7 files changed, 11 insertions(+), 12 deletions(-)
rename {hw => target}/mips/addr.c (98%)include/hw/mips/cpudevs.h +0 -7
@@ -5,13 +5,6 @@/* Definitions for MIPS CPU internal devices. */ -/* addr.c */ -uint64_t cpu_mips_kseg0_to_phys (void *opaque,uint64_t addr); -uint64_t cpu_mips_phys_to_kseg0 (void *opaque,uint64_t addr); -uint64_t cpu_mips_kvm_um_phys_to_kseg0 (void *opaque,uint64_t addr); -bool mips_um_ksegs_enabled (void ); -void mips_um_ksegs_enable (void ); -/* mips_int.c */ void cpu_mips_irq_init_cpu (MIPSCPU *cpu);
target/mips/cpu.h +8 -0
@@ -1291,6 +1291,14 @@ bool cpu_supports_isa(const CPUMIPSState *env, uint64_t isa_mask);bool cpu_type_supports_isa (const char *cpu_type,uint64_t isa);void cpu_set_exception_base (int vp_index,target_ulong address); +/* addr.c */ +uint64_t cpu_mips_kseg0_to_phys (void *opaque,uint64_t addr); +uint64_t cpu_mips_phys_to_kseg0 (void *opaque,uint64_t addr); + +uint64_t cpu_mips_kvm_um_phys_to_kseg0 (void *opaque,uint64_t addr); +bool mips_um_ksegs_enabled (void ); +void mips_um_ksegs_enable (void ); +/* mips_int.c */ void cpu_mips_soft_irq (CPUMIPSState *env,int irq,int level);
hw/mips/boston.c +0 -1
@@ -28,7 +28,6 @@#include "hw/loader.h" #include "hw/loader-fit.h" #include "hw/mips/cps.h" -#include "hw/mips/cpudevs.h" #include "hw/pci-host/xilinx-pcie.h" #include "hw/qdev-clock.h" #include "hw/qdev-properties.h"
target/mips/addr.c renamed from hw/mips/addr.c +1 -1
@@ -21,7 +21,7 @@*/ #include "qemu/osdep.h" -#include "hw/mips/cpudevs.h" +#include "cpu.h" static int mips_um_ksegs;
target/mips/translate.c +0 -2
@@ -28,8 +28,6 @@#include "exec/exec-all.h" #include "tcg/tcg-op.h" #include "exec/cpu_ldst.h" -#include "hw/mips/cpudevs.h" -#include "exec/helper-proto.h" #include "exec/helper-gen.h" #include "hw/semihosting/semihost.h"
hw/mips/meson.build +1 -1
@@ -1,5 +1,5 @@ mips_ss = ss.source_set() -mips_ss.add(files('addr.c', 'mips_int.c')) +mips_ss.add(files('mips_int.c')) mips_ss.add(when: 'CONFIG_FULOONG', if_true: files('fuloong2e.c')) mips_ss.add(when: 'CONFIG_JAZZ', if_true: files('jazz.c')) mips_ss.add(when: 'CONFIG_MALTA', if_true: files('gt64xxx_pci.c', 'malta.c'))
target/mips/meson.build +1 -0
@@ -14,6 +14,7 @@ mips_softmmu_ss = ss.source_set() mips_softmmu_ss.add(files( + 'addr.c', 'cp0_helper.c', 'cp0_timer.c', 'machine.c',
Signature · 1 line
2.26.2
[PULL 14/26] target/mips: Remove unused headers from translate.c
In reply to Philippe Mathieu-DaudéMessage-Id: <[email protected]>
--- target/mips/translate.c | 2 -- 1 file changed, 2 deletions(-)
target/mips/translate.c +0 -2
@@ -24,8 +24,6 @@#include "qemu/osdep.h" #include "cpu.h" #include "internal.h" -#include "disas/disas.h" -#include "exec/exec-all.h" #include "tcg/tcg-op.h" #include "exec/cpu_ldst.h" #include "exec/helper-proto.h"
Signature · 1 line
2.26.2
[PULL 16/26] target/mips: Remove mips_def_t unused argument from mvp_init()
In reply to Philippe Mathieu-Daudémvp_init() doesn't require any CPU definition (beside the information accessible via CPUMIPSState). Remove the unused argument.
Message-Id: <[email protected]>
--- target/mips/translate.c | 2 +- target/mips/translate_init.c.inc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
target/mips/translate.c +1 -1
@@ -31763,7 +31763,7 @@ void cpu_mips_realize_env(CPUMIPSState *env)mmu_init (env, env->cpu_model);#endif fpu_init (env, env->cpu_model); -mvp_init (env, env->cpu_model); +mvp_init (env); }bool cpu_type_supports_cps_smp (const char *cpu_type)
target/mips/translate_init.c.inc +1 -1
@@ -989,7 +989,7 @@ static void fpu_init (CPUMIPSState *env, const mips_def_t *def) memcpy(&env->active_fpu, &env->fpus[0], sizeof(env->active_fpu)); } -static void mvp_init (CPUMIPSState *env, const mips_def_t *def) +static void mvp_init(CPUMIPSState *env) { env->mvp = g_malloc0(sizeof(CPUMIPSMVPContext));
Signature · 1 line
2.26.2
[PULL 17/26] target/mips: Introduce ase_mt_available() helper
In reply to Philippe Mathieu-DaudéInstead of accessing CP0_Config3 directly and checking the 'Multi-Threading Present' bit, introduce an helper to simplify code review.
Message-Id: <[email protected]>
--- target/mips/cpu.h | 7 +++++++ hw/mips/cps.c | 3 +-- target/mips/cp0_helper.c | 2 +- target/mips/cpu.c | 2 +- target/mips/helper.c | 2 +- target/mips/translate.c | 2 +- 6 files changed, 12 insertions(+), 6 deletions(-)
target/mips/cpu.h +7 -0
@@ -1289,6 +1289,13 @@ int cpu_mips_signal_handler(int host_signum, void *pinfo, void *puc);bool cpu_type_supports_cps_smp (const char *cpu_type);bool cpu_supports_isa (const CPUMIPSState *env,uint64_t isa_mask);bool cpu_type_supports_isa (const char *cpu_type,uint64_t isa); + +/* Check presence of multi-threading ASE implementation */ +static inline bool ase_mt_available (CPUMIPSState *env) +{ +return env->CP0_Config3 & (1 <<CP0C3_MT ); +} +void cpu_set_exception_base (int vp_index,target_ulong address);/* addr.c */
hw/mips/cps.c +1 -2
@@ -58,8 +58,7 @@ static void main_cpu_reset(void *opaque)static bool cpu_mips_itu_supported (CPUMIPSState *env) { -bool is_mt = (env->CP0_Config5 & (1 <<CP0C5_VP )) || - (env->CP0_Config3 & (1 <<CP0C3_MT )); +bool is_mt = (env->CP0_Config5 & (1 <<CP0C5_VP )) ||ase_mt_available (env);return is_mt && !kvm_enabled (); }
target/mips/cp0_helper.c +1 -1
@@ -1164,7 +1164,7 @@ void helper_mtc0_entryhi(CPUMIPSState *env, target_ulong arg1) old = env->CP0_EntryHi; val = (arg1 & mask) | (old & ~mask); env->CP0_EntryHi = val; -if (env->CP0_Config3 & (1 <<CP0C3_MT )) { +if (ase_mt_available (env)) {sync_c0_entryhi (env, env->current_tc); }/* If the ASID changes, flush qemu's TLB. */
target/mips/cpu.c +1 -1
@@ -74,7 +74,7 @@ static bool mips_cpu_has_work(CPUState *cs) }/* MIPS-MT has the ability to halt the CPU. */ -if (env->CP0_Config3 & (1 <<CP0C3_MT )) { +if (ase_mt_available (env)) {/* * The QEMU model will issue an _WAKE request whenever the CPUs * should be woken up.
target/mips/helper.c +1 -1
@@ -419,7 +419,7 @@ void cpu_mips_store_status(CPUMIPSState *env, target_ulong val) tlb_flush(env_cpu(env)); }#endif -if (env->CP0_Config3 & (1 <<CP0C3_MT )) { +if (ase_mt_available (env)) {sync_c0_status (env, env, env->current_tc); }else {compute_hflags (env);
target/mips/translate.c +1 -1
@@ -31917,7 +31917,7 @@ void cpu_state_reset(CPUMIPSState *env)cpu_mips_store_count (env,1 ); -if (env->CP0_Config3 & (1 <<CP0C3_MT )) { +if (ase_mt_available (env)) {int i;/* Only TC0 on VPE 0 starts as active. */
Signature · 1 line
2.26.2
[PULL 23/26] target/mips: Move cpu definitions, reset() and realize() to cpu.c
In reply to Philippe Mathieu-DaudéNothing TCG specific there, move to common cpu code.
Message-Id: <[email protected]>
--- target/mips/internal.h | 4 - target/mips/cpu.c | 243 ++++++++++++++++++++++++++++++++++++++++ target/mips/translate.c | 240 --------------------------------------- 3 files changed, 243 insertions(+), 244 deletions(-)
target/mips/internal.h +0 -4
@@ -207,10 +207,6 @@ static inline bool cpu_mips_hw_interrupts_pending(CPUMIPSState *env)void mips_tcg_init (void ); -/* TODO QOM'ify CPU reset and remove */ -void cpu_state_reset (CPUMIPSState *s); -void cpu_mips_realize_env (CPUMIPSState *env); -/* cp0_timer.c */ uint32_t cpu_mips_get_count (CPUMIPSState *env);void cpu_mips_store_count (CPUMIPSState *env,uint32_t value);
target/mips/cpu.c +243 -0
261 lines not on this page · raw message
target/mips/translate.c +0 -240
246 lines not on this page · raw message
Signature · 1 line
2.26.2
[PULL 18/26] target/mips: Do not initialize MT registers if MT ASE absent
In reply to Philippe Mathieu-DaudéDo not initialize MT-related config registers if the MT ASE is not present. As some functions access the 'mvp' structure, we still zero-allocate it.
Message-Id: <[email protected]>
--- target/mips/translate_init.c.inc | 4 ++++ 1 file changed, 4 insertions(+)
target/mips/translate_init.c.inc +4 -0
@@ -993,6 +993,10 @@ static void mvp_init(CPUMIPSState *env) { env->mvp = g_malloc0(sizeof(CPUMIPSMVPContext)); + if (!ase_mt_available(env)) { + return; + } + /* MVPConf1 implemented, TLB sharable, no gating storage support, programmable cache partitioning implemented, number of allocatable and shareable TLB entries, MVP has allocatable TCs, 2 VPEs
Signature · 1 line
2.26.2
[PULL 24/26] target/mips: Inline cpu_mips_realize_env() in mips_cpu_realizefn()
In reply to Philippe Mathieu-DaudéMessage-Id: <[email protected]>
--- target/mips/cpu.c | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-)
target/mips/cpu.c +8 -12
@@ -104,17 +104,6 @@ static bool mips_cpu_has_work(CPUState *cs)#include "translate_init.c.inc" -static void cpu_mips_realize_env (CPUMIPSState *env) -{ - env->exception_base = (int32_t )0xBFC00000 ; - -#ifndef CONFIG_USER_ONLY -mmu_init (env, env->cpu_model); -#endif -fpu_init (env, env->cpu_model); -mvp_init (env); -} -/* TODO QOM'ify CPU reset and remove */ static void cpu_state_reset (CPUMIPSState *env) {
@@ -400,6 +389,7 @@ static void mips_cpu_realizefn(DeviceState *dev, Error **errp) {CPUState *cs =CPU (dev);MIPSCPU *cpu =MIPS_CPU (dev); +CPUMIPSState *env = &cpu->env;MIPSCPUClass *mcc =MIPS_CPU_GET_CLASS (dev);Error *local_err =NULL ;
@@ -423,7 +413,13 @@ static void mips_cpu_realizefn(DeviceState *dev, Error **errp)return ; } -cpu_mips_realize_env (&cpu->env); + env->exception_base = (int32_t )0xBFC00000 ; + +#ifndef CONFIG_USER_ONLY +mmu_init (env, env->cpu_model); +#endif +fpu_init (env, env->cpu_model); +mvp_init (env);cpu_reset (cs);qemu_init_vcpu (cs);
Signature · 1 line
2.26.2
[PULL 26/26] target/mips: Use FloatRoundMode enum for FCR31 modes conversion
In reply to Philippe Mathieu-DaudéUse the FloatRoundMode enum type introduced in commit 3dede407cc6 ("softfloat: Name rounding mode enum") instead of 'unsigned int'.
Message-Id: <[email protected]>
--- target/mips/internal.h | 3 ++- target/mips/fpu_helper.c | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-)
target/mips/internal.h +2 -1
@@ -223,7 +223,8 @@ bool mips_cpu_tlb_fill(CPUState *cs, vaddr address, int size,uint32_t float_class_s (uint32_t arg,float_status *fst);uint64_t float_class_d (uint64_t arg,float_status *fst); -extern unsigned int ieee_rm[]; +extern const FloatRoundMode ieee_rm[4 ]; +void update_pagemask (CPUMIPSState *env,target_ulong arg1,int32_t *pagemask);static inline void restore_rounding_mode (CPUMIPSState *env)
target/mips/fpu_helper.c +1 -1
@@ -38,7 +38,7 @@#define FP_TO_INT64_OVERFLOW 0x7fffffffffffffffULL/* convert MIPS rounding mode in FCR31 to IEEE library */ -unsigned int ieee_rm[] = { +const FloatRoundMode ieee_rm[4 ] = { float_round_nearest_even, float_round_to_zero, float_round_up,
Signature · 1 line
2.26.2
[PULL 19/26] hw/mips/malta: Do not initialize MT registers if MT ASE absent
In reply to Philippe Mathieu-DaudéDo not initialize MT-related config register if the MT ASE is not present.
Message-Id: <[email protected]>
--- hw/mips/malta.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
hw/mips/malta.c +3 -1
@@ -1135,8 +1135,10 @@ static void malta_mips_config(MIPSCPU *cpu)CPUMIPSState *env = &cpu->env;CPUState *cs =CPU (cpu); - env->mvp->CP0_MVPConf0 |= ((smp_cpus -1 ) <<CP0MVPC0_PVPE ) | +if (ase_mt_available (env)) { + env->mvp->CP0_MVPConf0 |= ((smp_cpus -1 ) <<CP0MVPC0_PVPE ) | ((smp_cpus * cs->nr_threads -1 ) <<CP0MVPC0_PTC ); + } }static void main_cpu_reset (void *opaque)
Signature · 1 line
2.26.2
[PULL 22/26] target/mips: Move mips_cpu_add_definition() from helper.c to cpu.c
In reply to Philippe Mathieu-DaudéMessage-Id: <[email protected]>
--- target/mips/cpu.c | 33 +++++++++++++++++++++++++++++++++ target/mips/helper.c | 33 --------------------------------- 2 files changed, 33 insertions(+), 33 deletions(-)
target/mips/cpu.c +33 -0
@@ -30,6 +30,7 @@#include "exec/exec-all.h" #include "hw/qdev-properties.h" #include "hw/qdev-clock.h" +#include "qapi/qapi-commands-machine-target.h" static void mips_cpu_set_pc (CPUState *cs,vaddr value) {
@@ -299,6 +300,38 @@ static void mips_cpu_register_types(void)type_init (mips_cpu_register_types) +static void mips_cpu_add_definition(gpointer data, gpointer user_data) +{ +ObjectClass *oc = data; +CpuDefinitionInfoList **cpu_list = user_data; +CpuDefinitionInfoList *entry; +CpuDefinitionInfo *info; +const char *typename; + + typename =object_class_get_name (oc); + info =g_malloc0 (sizeof (*info)); + info->name =g_strndup (typename, +strlen (typename) -strlen ("-" TYPE_MIPS_CPU )); + info->q_typename =g_strdup (typename); + + entry =g_malloc0 (sizeof (*entry)); + entry->value = info; + entry->next = *cpu_list; + *cpu_list = entry; +} + +CpuDefinitionInfoList *qmp_query_cpu_definitions (Error **errp) +{ +CpuDefinitionInfoList *cpu_list =NULL ; +GSList *list; + + list =object_class_get_list (TYPE_MIPS_CPU , false); +g_slist_foreach (list, mips_cpu_add_definition, &cpu_list); +g_slist_free (list); + +return cpu_list; +} +/* Could be used by generic CPU object */ MIPSCPU *mips_cpu_create_with_clock (const char *cpu_type,Clock *cpu_refclk) {
target/mips/helper.c +0 -33
@@ -24,7 +24,6 @@#include "exec/cpu_ldst.h" #include "exec/log.h" #include "hw/mips/cpudevs.h" -#include "qapi/qapi-commands-machine-target.h" enum {TLBRET_XI =-6 ,
@@ -1500,35 +1499,3 @@ void QEMU_NORETURN do_raise_exception_err(CPUMIPSState *env,cpu_loop_exit_restore (cs, pc); } - -static void mips_cpu_add_definition (gpointer data,gpointer user_data) -{ -ObjectClass *oc = data; -CpuDefinitionInfoList **cpu_list = user_data; -CpuDefinitionInfoList *entry; -CpuDefinitionInfo *info; -const char *typename; - - typename =object_class_get_name (oc); - info =g_malloc0 (sizeof (*info)); - info->name =g_strndup (typename, -strlen (typename) -strlen ("-" TYPE_MIPS_CPU )); - info->q_typename =g_strdup (typename); - - entry =g_malloc0 (sizeof (*entry)); - entry->value = info; - entry->next = *cpu_list; - *cpu_list = entry; -} - -CpuDefinitionInfoList *qmp_query_cpu_definitions (Error **errp) -{ -CpuDefinitionInfoList *cpu_list =NULL ; -GSList *list; - - list =object_class_get_list (TYPE_MIPS_CPU , false); -g_slist_foreach (list, mips_cpu_add_definition, &cpu_list); -g_slist_free (list); - -return cpu_list; -}
Signature · 1 line
2.26.2
[PULL 25/26] target/mips: Remove unused headers from fpu_helper.c
In reply to Philippe Mathieu-DaudéMessage-Id: <[email protected]>
--- target/mips/fpu_helper.c | 4 ---- 1 file changed, 4 deletions(-)
target/mips/fpu_helper.c +0 -4
@@ -21,15 +21,11 @@*/ #include "qemu/osdep.h" -#include "qemu/main-loop.h" #include "cpu.h" #include "internal.h" -#include "qemu/host-utils.h" #include "exec/helper-proto.h" #include "exec/exec-all.h" #include "exec/cpu_ldst.h" -#include "exec/memop.h" -#include "sysemu/kvm.h" #include "fpu/softfloat.h"
Signature · 1 line
2.26.2
[PULL 21/26] target/mips: Extract cpu_supports*/cpu_set* translate.c
In reply to Philippe Mathieu-DaudéMove cpu_supports*() and cpu_set_exception_base() from translate.c to cpu.c.
Message-Id: <[email protected]>
--- target/mips/cpu.c | 18 ++++++++++++++++++ target/mips/translate.c | 18 ------------------ 2 files changed, 18 insertions(+), 18 deletions(-)
target/mips/cpu.c +18 -0
@@ -315,3 +315,21 @@ bool cpu_supports_isa(const CPUMIPSState *env, uint64_t isa_mask) {return (env->cpu_model->insn_flags & isa_mask) !=0 ; } + +bool cpu_type_supports_isa (const char *cpu_type,uint64_t isa) +{ +const MIPSCPUClass *mcc =MIPS_CPU_CLASS (object_class_by_name (cpu_type)); +return (mcc->cpu_def->insn_flags & isa) !=0 ; +} + +bool cpu_type_supports_cps_smp (const char *cpu_type) +{ +const MIPSCPUClass *mcc =MIPS_CPU_CLASS (object_class_by_name (cpu_type)); +return (mcc->cpu_def->CP0_Config3 & (1 <<CP0C3_CMGCR )) !=0 ; +} + +void cpu_set_exception_base (int vp_index,target_ulong address) +{ +MIPSCPU *vp =MIPS_CPU (qemu_get_cpu (vp_index)); + vp->env.exception_base = address; +}
target/mips/translate.c +0 -18
@@ -31766,24 +31766,6 @@ void cpu_mips_realize_env(CPUMIPSState *env)mvp_init (env); } -bool cpu_type_supports_cps_smp (const char *cpu_type) -{ -const MIPSCPUClass *mcc =MIPS_CPU_CLASS (object_class_by_name (cpu_type)); -return (mcc->cpu_def->CP0_Config3 & (1 <<CP0C3_CMGCR )) !=0 ; -} - -bool cpu_type_supports_isa (const char *cpu_type,uint64_t isa) -{ -const MIPSCPUClass *mcc =MIPS_CPU_CLASS (object_class_by_name (cpu_type)); -return (mcc->cpu_def->insn_flags & isa) !=0 ; -} - -void cpu_set_exception_base (int vp_index,target_ulong address) -{ -MIPSCPU *vp =MIPS_CPU (qemu_get_cpu (vp_index)); - vp->env.exception_base = address; -} -void cpu_state_reset (CPUMIPSState *env) {CPUState *cs =env_cpu (env);
Signature · 1 line
2.26.2
[PULL 20/26] hw/mips/malta: Rewrite CP0_MVPConf0 access using deposit()
In reply to Philippe Mathieu-DaudéPTC field has 8 bits, PVPE has 4. We plan to use the "hw/registerfields.h" API with MIPS CPU definitions (target/mips/cpu.h). Meanwhile we use magic 8 and 4.
Message-Id: <[email protected]>
--- hw/mips/malta.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
hw/mips/malta.c +6 -2
@@ -24,6 +24,7 @@#include "qemu/osdep.h" #include "qemu/units.h" +#include "qemu/bitops.h" #include "qemu-common.h" #include "qemu/datadir.h" #include "cpu.h"
@@ -1136,8 +1137,11 @@ static void malta_mips_config(MIPSCPU *cpu)CPUState *cs =CPU (cpu);if (ase_mt_available (env)) { - env->mvp->CP0_MVPConf0 |= ((smp_cpus -1 ) <<CP0MVPC0_PVPE ) | - ((smp_cpus * cs->nr_threads -1 ) <<CP0MVPC0_PTC ); + env->mvp->CP0_MVPConf0 =deposit32 (env->mvp->CP0_MVPConf0, +CP0MVPC0_PTC ,8 , + smp_cpus * cs->nr_threads -1 ); + env->mvp->CP0_MVPConf0 =deposit32 (env->mvp->CP0_MVPConf0, +CP0MVPC0_PVPE ,4 , smp_cpus -1 ); } }
Signature · 1 line
2.26.2
Peter Maydell
AppliedQuoted 25 lines · Philippe Mathieu-Daudé
The following changes since commit
ad717e6da3852b5729217d7938eecdb81c546114:Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging (2020-12-12 00:20:46 +0000)
are available in the Git repository at:
https://gitlab.com/philmd/qemu.git tags/mips-20201213
for you to fetch changes up to
3533ee301c46620fd5699cb97f2d4bd194fe0c24:target/mips: Use FloatRoundMode enum for FCR31 modes conversion (2020-12-13 20:27:11 +0100)
----------------------------------------------------------------
MIPS patches queue. Allow executing MSA instructions on Loongson-3A4000 . Update Huacai Chen email address
. Various cleanups:
- unused headers removal
- use definitions instead of magic values
- remove dead code
- avoid calling unused code
. Various code movements
Quoted 3 lines
CI jobs results:
https://gitlab.com/philmd/qemu/-/pipelines/229120169
https://cirrus-ci.com/build/4857731557359616
Applied, thanks.
Please update the changelog at https://wiki.qemu.org/ChangeLog/6.0
for any user-visible changes.
-- PMM