[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 4/7] hw/arm/armsse: Give SSE-300 its own Property array
From: |
Peter Maydell |
Subject: |
[PULL 4/7] hw/arm/armsse: Give SSE-300 its own Property array |
Date: |
Sat, 17 Apr 2021 20:42:02 +0100 |
SSE-300 currently shares the SSE-200 Property array. This is
bad principally because the default values of the CPU0_FPU
and CPU0_DSP properties disable the FPU and DSP on the CPU.
That is correct for the SSE-200 but not the SSE-300.
Give the SSE-300 its own Property array with the correct
SSE-300 specific settings:
* SSE-300 has only one CPU, so no CPU1* properties
* SSE-300 CPU has FPU and DSP
Buglink: https://bugs.launchpad.net/qemu/+bug/1923861
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-id: 20210415182353.8173-1-peter.maydell@linaro.org
---
hw/arm/armsse.c | 17 ++++++++++++++---
1 file changed, 14 insertions(+), 3 deletions(-)
diff --git a/hw/arm/armsse.c b/hw/arm/armsse.c
index e5aeb9e485f..170dea8632d 100644
--- a/hw/arm/armsse.c
+++ b/hw/arm/armsse.c
@@ -84,7 +84,7 @@ static Property iotkit_properties[] = {
DEFINE_PROP_END_OF_LIST()
};
-static Property armsse_properties[] = {
+static Property sse200_properties[] = {
DEFINE_PROP_LINK("memory", ARMSSE, board_memory, TYPE_MEMORY_REGION,
MemoryRegion *),
DEFINE_PROP_UINT32("EXP_NUMIRQ", ARMSSE, exp_numirq, 64),
@@ -97,6 +97,17 @@ static Property armsse_properties[] = {
DEFINE_PROP_END_OF_LIST()
};
+static Property sse300_properties[] = {
+ DEFINE_PROP_LINK("memory", ARMSSE, board_memory, TYPE_MEMORY_REGION,
+ MemoryRegion *),
+ DEFINE_PROP_UINT32("EXP_NUMIRQ", ARMSSE, exp_numirq, 64),
+ DEFINE_PROP_UINT32("SRAM_ADDR_WIDTH", ARMSSE, sram_addr_width, 15),
+ DEFINE_PROP_UINT32("init-svtor", ARMSSE, init_svtor, 0x10000000),
+ DEFINE_PROP_BOOL("CPU0_FPU", ARMSSE, cpu_fpu[0], true),
+ DEFINE_PROP_BOOL("CPU0_DSP", ARMSSE, cpu_dsp[0], true),
+ DEFINE_PROP_END_OF_LIST()
+};
+
static const ARMSSEDeviceInfo iotkit_devices[] = {
{
.name = "timer0",
@@ -519,7 +530,7 @@ static const ARMSSEInfo armsse_variants[] = {
.has_cpuid = true,
.has_cpu_pwrctrl = false,
.has_sse_counter = false,
- .props = armsse_properties,
+ .props = sse200_properties,
.devinfo = sse200_devices,
.irq_is_common = sse200_irq_is_common,
},
@@ -537,7 +548,7 @@ static const ARMSSEInfo armsse_variants[] = {
.has_cpuid = true,
.has_cpu_pwrctrl = true,
.has_sse_counter = true,
- .props = armsse_properties,
+ .props = sse300_properties,
.devinfo = sse300_devices,
.irq_is_common = sse300_irq_is_common,
},
--
2.20.1
- [PULL 0/7] queue of proposed rc4 fixes, Peter Maydell, 2021/04/17
- [PULL 1/7] osdep: include glib-compat.h before other QEMU headers, Peter Maydell, 2021/04/17
- [PULL 2/7] osdep: protect qemu/osdep.h with extern "C", Peter Maydell, 2021/04/17
- [PULL 4/7] hw/arm/armsse: Give SSE-300 its own Property array,
Peter Maydell <=
- [PULL 3/7] include/qemu/osdep.h: Move system includes to top, Peter Maydell, 2021/04/17
- [PULL 5/7] hw/arm/armsse: Make SSE-300 use Cortex-M55, Peter Maydell, 2021/04/17
- [PULL 6/7] target/arm: drop CF_LAST_IO/dc->condjump check, Peter Maydell, 2021/04/17
- [PULL 7/7] accel/tcg: avoid re-translating one-shot instructions, Peter Maydell, 2021/04/17
- Re: [PULL 0/7] queue of proposed rc4 fixes, no-reply, 2021/04/17
- Re: [PULL 0/7] queue of proposed rc4 fixes, Philippe Mathieu-Daudé, 2021/04/18
- Re: [PULL 0/7] queue of proposed rc4 fixes, Alex Bennée, 2021/04/18
- Re: [PULL 0/7] queue of proposed rc4 fixes, Thomas Huth, 2021/04/19