From: "Philippe Mathieu-Daudé" <philmd@linaro.org>
To: qemu-devel@nongnu.org
Cc: "Philippe Mathieu-Daudé" <philmd@linaro.org>,
"Jiaxun Yang" <jiaxun.yang@flygoat.com>,
"Richard Henderson" <richard.henderson@linaro.org>
Subject: [PULL 33/33] hw/mips: Have mips_cpu_create_with_clock() take an endianness argument
Date: Tue, 15 Oct 2024 12:44:42 -0300 [thread overview]
Message-ID: <20241015154443.71763-34-philmd@linaro.org> (raw)
In-Reply-To: <20241015154443.71763-1-philmd@linaro.org>
mips_cpu_create_with_clock() creates a vCPU. Pass it the vCPU
endianness requested by argument. Update the board call sites.
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Jiaxun Yang <jiaxun.yang@flygoat.com>
Tested-by: Jiaxun Yang <jiaxun.yang@flygoat.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20241010215015.44326-17-philmd@linaro.org>
---
target/mips/cpu.h | 4 +++-
hw/mips/fuloong2e.c | 2 +-
hw/mips/jazz.c | 3 ++-
hw/mips/loongson3_virt.c | 2 +-
hw/mips/malta.c | 3 ++-
hw/mips/mipssim.c | 3 ++-
target/mips/cpu.c | 5 ++++-
7 files changed, 15 insertions(+), 7 deletions(-)
diff --git a/target/mips/cpu.h b/target/mips/cpu.h
index 070e11fe0da..a4a46ebbe98 100644
--- a/target/mips/cpu.h
+++ b/target/mips/cpu.h
@@ -1376,12 +1376,14 @@ static inline void cpu_get_tb_cpu_state(CPUMIPSState *env, vaddr *pc,
* mips_cpu_create_with_clock:
* @typename: a MIPS CPU type.
* @cpu_refclk: this cpu input clock (an output clock of another device)
+ * @is_big_endian: whether this CPU is configured in big endianness
*
* Instantiates a MIPS CPU, set the input clock of the CPU to @cpu_refclk,
* then realizes the CPU.
*
* Returns: A #CPUState or %NULL if an error occurred.
*/
-MIPSCPU *mips_cpu_create_with_clock(const char *cpu_type, Clock *cpu_refclk);
+MIPSCPU *mips_cpu_create_with_clock(const char *cpu_type, Clock *cpu_refclk,
+ bool is_big_endian);
#endif /* MIPS_CPU_H */
diff --git a/hw/mips/fuloong2e.c b/hw/mips/fuloong2e.c
index 6e4303ba473..7fd8296ccb6 100644
--- a/hw/mips/fuloong2e.c
+++ b/hw/mips/fuloong2e.c
@@ -229,7 +229,7 @@ static void mips_fuloong2e_init(MachineState *machine)
clock_set_hz(cpuclk, 533080000); /* ~533 MHz */
/* init CPUs */
- cpu = mips_cpu_create_with_clock(machine->cpu_type, cpuclk);
+ cpu = mips_cpu_create_with_clock(machine->cpu_type, cpuclk, false);
env = &cpu->env;
qemu_register_reset(main_cpu_reset, cpu);
diff --git a/hw/mips/jazz.c b/hw/mips/jazz.c
index 33ce51fb09c..0e43c9f0bac 100644
--- a/hw/mips/jazz.c
+++ b/hw/mips/jazz.c
@@ -212,7 +212,8 @@ static void mips_jazz_init(MachineState *machine,
* ext_clk[jazz_model].pll_mult);
/* init CPUs */
- cpu = mips_cpu_create_with_clock(machine->cpu_type, cpuclk);
+ cpu = mips_cpu_create_with_clock(machine->cpu_type, cpuclk,
+ TARGET_BIG_ENDIAN);
env = &cpu->env;
qemu_register_reset(main_cpu_reset, cpu);
diff --git a/hw/mips/loongson3_virt.c b/hw/mips/loongson3_virt.c
index a2db98665df..f3b6326cc59 100644
--- a/hw/mips/loongson3_virt.c
+++ b/hw/mips/loongson3_virt.c
@@ -567,7 +567,7 @@ static void mips_loongson3_virt_init(MachineState *machine)
int ip;
/* init CPUs */
- cpu = mips_cpu_create_with_clock(machine->cpu_type, cpuclk);
+ cpu = mips_cpu_create_with_clock(machine->cpu_type, cpuclk, false);
/* Init internal devices */
cpu_mips_irq_init_cpu(cpu);
diff --git a/hw/mips/malta.c b/hw/mips/malta.c
index 964d3592da7..198da5ba3d4 100644
--- a/hw/mips/malta.c
+++ b/hw/mips/malta.c
@@ -1034,7 +1034,8 @@ static void create_cpu_without_cps(MachineState *ms, MaltaState *s,
int i;
for (i = 0; i < ms->smp.cpus; i++) {
- cpu = mips_cpu_create_with_clock(ms->cpu_type, s->cpuclk);
+ cpu = mips_cpu_create_with_clock(ms->cpu_type, s->cpuclk,
+ TARGET_BIG_ENDIAN);
/* Init internal devices */
cpu_mips_irq_init_cpu(cpu);
diff --git a/hw/mips/mipssim.c b/hw/mips/mipssim.c
index a07732d3dc5..5f4835a38de 100644
--- a/hw/mips/mipssim.c
+++ b/hw/mips/mipssim.c
@@ -160,7 +160,8 @@ mips_mipssim_init(MachineState *machine)
#endif
/* Init CPUs. */
- cpu = mips_cpu_create_with_clock(machine->cpu_type, cpuclk);
+ cpu = mips_cpu_create_with_clock(machine->cpu_type, cpuclk,
+ TARGET_BIG_ENDIAN);
env = &cpu->env;
reset_info = g_new0(ResetData, 1);
diff --git a/target/mips/cpu.c b/target/mips/cpu.c
index 04bf4b11db2..9724e71a5e0 100644
--- a/target/mips/cpu.c
+++ b/target/mips/cpu.c
@@ -643,12 +643,15 @@ static void mips_cpu_register_types(void)
type_init(mips_cpu_register_types)
/* Could be used by generic CPU object */
-MIPSCPU *mips_cpu_create_with_clock(const char *cpu_type, Clock *cpu_refclk)
+MIPSCPU *mips_cpu_create_with_clock(const char *cpu_type, Clock *cpu_refclk,
+ bool is_big_endian)
{
DeviceState *cpu;
cpu = DEVICE(object_new(cpu_type));
qdev_connect_clock_in(cpu, "clk-in", cpu_refclk);
+ object_property_set_bool(OBJECT(cpu), "big-endian", is_big_endian,
+ &error_abort);
qdev_realize(cpu, NULL, &error_abort);
return MIPS_CPU(cpu);
--
2.45.2
next prev parent reply other threads:[~2024-10-15 15:50 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-10-15 15:44 [PULL 00/33] Endianness cleanup patches for 2024-10-15 Philippe Mathieu-Daudé
2024-10-15 15:44 ` [PULL 01/33] qemu/bswap: Undefine CPU_CONVERT() once done Philippe Mathieu-Daudé
2024-10-15 15:44 ` [PULL 02/33] exec/tswap: Massage target_needs_bswap() definition Philippe Mathieu-Daudé
2024-10-15 15:44 ` [PULL 03/33] exec/memop: Remove unused memop_big_endian() helper Philippe Mathieu-Daudé
2024-10-15 15:44 ` [PULL 04/33] target/hexagon: Replace ldtul_p() -> ldl_p() Philippe Mathieu-Daudé
2024-10-15 15:44 ` [PULL 05/33] target/alpha: Replace ldtul_p() -> ldq_p() Philippe Mathieu-Daudé
2024-10-15 15:44 ` [PULL 06/33] gdbstub/helpers: Introduce ldtul_$endian_p() helpers Philippe Mathieu-Daudé
2024-10-15 15:44 ` [PULL 07/33] target/alpha: Use explicit little-endian LD/ST API Philippe Mathieu-Daudé
2024-10-15 15:44 ` [PULL 08/33] target/hexagon: " Philippe Mathieu-Daudé
2024-10-15 15:44 ` [PULL 09/33] hw/i386: " Philippe Mathieu-Daudé
2024-10-15 15:44 ` [PULL 10/33] target/avr: " Philippe Mathieu-Daudé
2024-10-15 15:44 ` [PULL 11/33] linux-user/i386: " Philippe Mathieu-Daudé
2024-10-15 15:44 ` [PULL 12/33] target/loongarch: " Philippe Mathieu-Daudé
2024-10-15 15:44 ` [PULL 13/33] target/tricore: " Philippe Mathieu-Daudé
2024-10-15 15:44 ` [PULL 14/33] target/tricore: Use tcg_constant_tl() instead of tcg_gen_movi_tl() Philippe Mathieu-Daudé
2024-10-15 15:44 ` [PULL 15/33] target/ppc: " Philippe Mathieu-Daudé
2024-10-15 15:44 ` [PULL 16/33] hw/xtensa/xtfpga: Remove TARGET_BIG_ENDIAN #ifdef'ry Philippe Mathieu-Daudé
2024-10-15 15:44 ` [PULL 17/33] target/mips: Declare mips_env_is_bigendian() in 'internal.h' Philippe Mathieu-Daudé
2024-10-15 15:44 ` [PULL 18/33] target/mips: Rename cpu_is_bigendian() -> disas_is_bigendian() Philippe Mathieu-Daudé
2024-10-15 15:44 ` [PULL 19/33] target/mips: Introduce mo_endian_env() helper Philippe Mathieu-Daudé
2024-10-15 15:44 ` [PULL 20/33] target/mips: Replace MO_TE by mo_endian_env() in get_pte() Philippe Mathieu-Daudé
2024-10-15 15:44 ` [PULL 21/33] target/mips: Convert mips16e decr_and_load/store() macros to functions Philippe Mathieu-Daudé
2024-10-15 15:44 ` [PULL 22/33] target/mips: Factor mo_endian_rev() out of MXU code Philippe Mathieu-Daudé
2024-10-15 15:44 ` [PULL 23/33] target/mips: Explode MO_TExx -> MO_TE | MO_xx Philippe Mathieu-Daudé
2024-10-15 15:44 ` [PULL 24/33] target/mips: Rename unused sysemu argument of OP_LD_ATOMIC() Philippe Mathieu-Daudé
2024-10-15 15:44 ` [PULL 25/33] target/mips: Remove unused MEMOP_IDX() macro Philippe Mathieu-Daudé
2024-10-15 15:44 ` [PULL 26/33] target/mips: Introduce mo_endian() helper Philippe Mathieu-Daudé
2024-10-15 15:44 ` [PULL 27/33] target/mips: Replace MO_TE by mo_endian() Philippe Mathieu-Daudé
2024-10-15 15:44 ` [PULL 28/33] target/mips: Have gen_addiupc() expand $pc during translation Philippe Mathieu-Daudé
2024-10-15 15:44 ` [PULL 29/33] target/mips: Use gen_op_addr_addi() when possible Philippe Mathieu-Daudé
2024-10-15 15:44 ` [PULL 30/33] target/mips: Use tcg_constant_tl() instead of tcg_gen_movi_tl() Philippe Mathieu-Daudé
2024-10-15 15:44 ` [PULL 31/33] target/mips: Expose MIPSCPU::is_big_endian property Philippe Mathieu-Daudé
2024-10-15 15:44 ` [PULL 32/33] hw/mips/cps: Set the vCPU 'cpu-big-endian' property Philippe Mathieu-Daudé
2024-10-15 15:44 ` Philippe Mathieu-Daudé [this message]
2024-10-17 11:42 ` [PULL 00/33] Endianness cleanup patches for 2024-10-15 Peter Maydell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20241015154443.71763-34-philmd@linaro.org \
--to=philmd@linaro.org \
--cc=jiaxun.yang@flygoat.com \
--cc=qemu-devel@nongnu.org \
--cc=richard.henderson@linaro.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).