[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 43/43] hw/m68k/mcf5208: add support for reset
From: |
Philippe Mathieu-Daudé |
Subject: |
[PULL 43/43] hw/m68k/mcf5208: add support for reset |
Date: |
Sat, 9 Mar 2024 20:22:10 +0100 |
From: Angelo Dureghello <angelo@kernel-space.org>
Add reset support for mcf5208.
Signed-off-by: Angelo Dureghello <angelo@kernel-space.org>
Reviewed-by: Thomas Huth <huth@tuxfamily.org>
Message-ID: <20240309093459.984565-1-angelo@kernel-space.org>
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
hw/m68k/mcf5208.c | 44 ++++++++++++++++++++++++++++++++++++++++++--
1 file changed, 42 insertions(+), 2 deletions(-)
diff --git a/hw/m68k/mcf5208.c b/hw/m68k/mcf5208.c
index 0cfb806c20..ec14096aa4 100644
--- a/hw/m68k/mcf5208.c
+++ b/hw/m68k/mcf5208.c
@@ -40,6 +40,8 @@
#define PCSR_PRE_SHIFT 8
#define PCSR_PRE_MASK 0x0f00
+#define RCR_SOFTRST 0x80
+
typedef struct {
MemoryRegion iomem;
qemu_irq irq;
@@ -185,12 +187,50 @@ static const MemoryRegionOps m5208_sys_ops = {
.endianness = DEVICE_NATIVE_ENDIAN,
};
-static void mcf5208_sys_init(MemoryRegion *address_space, qemu_irq *pic)
+static uint64_t m5208_rcm_read(void *opaque, hwaddr addr,
+ unsigned size)
+{
+ return 0;
+}
+
+static void m5208_rcm_write(void *opaque, hwaddr addr,
+ uint64_t value, unsigned size)
+{
+ M68kCPU *cpu = opaque;
+ CPUState *cs = CPU(cpu);
+ switch (addr) {
+ case 0x0: /* RCR */
+ if (value & RCR_SOFTRST) {
+ cpu_reset(cs);
+ cpu->env.aregs[7] = ldl_phys(cs->as, 0);
+ cpu->env.pc = ldl_phys(cs->as, 4);
+ }
+ break;
+ default:
+ qemu_log_mask(LOG_GUEST_ERROR, "%s: Bad offset 0x%" HWADDR_PRIX "\n",
+ __func__, addr);
+ break;
+ }
+}
+
+static const MemoryRegionOps m5208_rcm_ops = {
+ .read = m5208_rcm_read,
+ .write = m5208_rcm_write,
+ .endianness = DEVICE_NATIVE_ENDIAN,
+};
+
+static void mcf5208_sys_init(MemoryRegion *address_space, qemu_irq *pic,
+ M68kCPU *cpu)
{
MemoryRegion *iomem = g_new(MemoryRegion, 1);
+ MemoryRegion *iomem_rcm = g_new(MemoryRegion, 1);
m5208_timer_state *s;
int i;
+ /* RCM */
+ memory_region_init_io(iomem_rcm, NULL, &m5208_rcm_ops, cpu,
+ "m5208-rcm", 0x00000080);
+ memory_region_add_subregion(address_space, 0xfc0a0000, iomem_rcm);
/* SDRAMC. */
memory_region_init_io(iomem, NULL, &m5208_sys_ops, NULL, "m5208-sys",
0x00004000);
memory_region_add_subregion(address_space, 0xfc0a8000, iomem);
@@ -265,7 +305,7 @@ static void mcf5208evb_init(MachineState *machine)
mcf_uart_create_mmap(0xfc064000, pic[27], serial_hd(1));
mcf_uart_create_mmap(0xfc068000, pic[28], serial_hd(2));
- mcf5208_sys_init(address_space_mem, pic);
+ mcf5208_sys_init(address_space_mem, pic, cpu);
mcf_fec_init(address_space_mem, 0xfc030000, pic + 36);
--
2.41.0
- [PULL 34/43] tests/unit/test-smp-parse: Use CPU number macros in invalid topology case, (continued)
- [PULL 34/43] tests/unit/test-smp-parse: Use CPU number macros in invalid topology case, Philippe Mathieu-Daudé, 2024/03/09
- [PULL 30/43] hw/core/machine-smp: Remove deprecated "parameter=0" SMP configurations, Philippe Mathieu-Daudé, 2024/03/09
- [PULL 35/43] tests/unit/test-smp-parse: Bump max_cpus to 4096, Philippe Mathieu-Daudé, 2024/03/09
- [PULL 39/43] tests/unit/test-smp-parse: Test "drawers" and "books" combination case, Philippe Mathieu-Daudé, 2024/03/09
- [PULL 41/43] tests/unit/test-smp-parse: Test smp_props.has_clusters, Philippe Mathieu-Daudé, 2024/03/09
- [PULL 33/43] tests/unit/test-smp-parse: Drop the unsupported "dies=1" case, Philippe Mathieu-Daudé, 2024/03/09
- [PULL 36/43] tests/unit/test-smp-parse: Make test cases aware of the book/drawer, Philippe Mathieu-Daudé, 2024/03/09
- [PULL 38/43] tests/unit/test-smp-parse: Test "drawers" parameter in -smp, Philippe Mathieu-Daudé, 2024/03/09
- [PULL 40/43] tests/unit/test-smp-parse: Test the full 7-levels topology hierarchy, Philippe Mathieu-Daudé, 2024/03/09
- [PULL 42/43] tests/unit/test-smp-parse: Test "parameter=0" SMP configurations, Philippe Mathieu-Daudé, 2024/03/09
- [PULL 43/43] hw/m68k/mcf5208: add support for reset,
Philippe Mathieu-Daudé <=
- [PULL 37/43] tests/unit/test-smp-parse: Test "books" parameter in -smp, Philippe Mathieu-Daudé, 2024/03/09
- Re: [PULL 00/43] Misc HW patches for 2024-03-09, Peter Maydell, 2024/03/10