2012-08-10 08:42:27 +02:00
|
|
|
/*
|
|
|
|
* Generic PKUnity SoC machine and board descriptor
|
|
|
|
*
|
|
|
|
* Copyright (C) 2010-2012 Guan Xuetao
|
|
|
|
*
|
|
|
|
* This program is free software; you can redistribute it and/or modify
|
|
|
|
* it under the terms of the GNU General Public License version 2 as
|
|
|
|
* published by the Free Software Foundation, or any later version.
|
|
|
|
* See the COPYING file in the top-level directory.
|
|
|
|
*/
|
2012-09-25 10:04:17 +02:00
|
|
|
|
2016-01-26 19:17:01 +01:00
|
|
|
#include "qemu/osdep.h"
|
2012-09-25 10:04:17 +02:00
|
|
|
#include "qemu-common.h"
|
2012-11-28 12:06:30 +01:00
|
|
|
#include "ui/console.h"
|
2012-08-10 08:42:27 +02:00
|
|
|
#include "elf.h"
|
2012-12-17 18:19:49 +01:00
|
|
|
#include "exec/address-spaces.h"
|
2013-02-04 15:40:22 +01:00
|
|
|
#include "hw/sysbus.h"
|
|
|
|
#include "hw/boards.h"
|
|
|
|
#include "hw/loader.h"
|
2013-02-05 17:06:20 +01:00
|
|
|
#include "hw/i386/pc.h"
|
2015-12-17 17:35:09 +01:00
|
|
|
#include "qemu/error-report.h"
|
2013-07-29 18:43:57 +02:00
|
|
|
#include "sysemu/qtest.h"
|
2012-08-10 08:42:27 +02:00
|
|
|
|
|
|
|
#undef DEBUG_PUV3
|
2013-02-05 17:06:20 +01:00
|
|
|
#include "hw/unicore32/puv3.h"
|
2012-08-10 08:42:27 +02:00
|
|
|
|
|
|
|
#define KERNEL_LOAD_ADDR 0x03000000
|
|
|
|
#define KERNEL_MAX_SIZE 0x00800000 /* Just a guess */
|
|
|
|
|
2012-08-10 08:42:28 +02:00
|
|
|
static void puv3_intc_cpu_handler(void *opaque, int irq, int level)
|
|
|
|
{
|
2013-01-17 22:30:20 +01:00
|
|
|
UniCore32CPU *cpu = opaque;
|
|
|
|
CPUState *cs = CPU(cpu);
|
2012-08-10 08:42:28 +02:00
|
|
|
|
|
|
|
assert(irq == 0);
|
|
|
|
if (level) {
|
2013-01-18 15:03:43 +01:00
|
|
|
cpu_interrupt(cs, CPU_INTERRUPT_HARD);
|
2012-08-10 08:42:28 +02:00
|
|
|
} else {
|
2013-01-17 22:30:20 +01:00
|
|
|
cpu_reset_interrupt(cs, CPU_INTERRUPT_HARD);
|
2012-08-10 08:42:28 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2012-08-10 08:42:27 +02:00
|
|
|
static void puv3_soc_init(CPUUniCore32State *env)
|
|
|
|
{
|
2015-05-29 07:27:08 +02:00
|
|
|
qemu_irq cpu_intc, irqs[PUV3_IRQS_NR];
|
2012-08-10 08:42:28 +02:00
|
|
|
DeviceState *dev;
|
2012-08-10 08:42:33 +02:00
|
|
|
MemoryRegion *i8042 = g_new(MemoryRegion, 1);
|
2012-08-10 08:42:28 +02:00
|
|
|
int i;
|
|
|
|
|
|
|
|
/* Initialize interrupt controller */
|
2015-05-29 07:27:08 +02:00
|
|
|
cpu_intc = qemu_allocate_irq(puv3_intc_cpu_handler,
|
|
|
|
uc32_env_get_cpu(env), 0);
|
|
|
|
dev = sysbus_create_simple("puv3_intc", PUV3_INTC_BASE, cpu_intc);
|
2012-08-10 08:42:28 +02:00
|
|
|
for (i = 0; i < PUV3_IRQS_NR; i++) {
|
|
|
|
irqs[i] = qdev_get_gpio_in(dev, i);
|
|
|
|
}
|
2012-08-10 08:42:29 +02:00
|
|
|
|
|
|
|
/* Initialize minimal necessary devices for kernel booting */
|
2012-08-10 08:42:31 +02:00
|
|
|
sysbus_create_simple("puv3_pm", PUV3_PM_BASE, NULL);
|
2012-08-10 08:42:32 +02:00
|
|
|
sysbus_create_simple("puv3_dma", PUV3_DMA_BASE, NULL);
|
2012-08-10 08:42:29 +02:00
|
|
|
sysbus_create_simple("puv3_ost", PUV3_OST_BASE, irqs[PUV3_IRQS_OST0]);
|
2012-08-10 08:42:30 +02:00
|
|
|
sysbus_create_varargs("puv3_gpio", PUV3_GPIO_BASE,
|
|
|
|
irqs[PUV3_IRQS_GPIOLOW0], irqs[PUV3_IRQS_GPIOLOW1],
|
|
|
|
irqs[PUV3_IRQS_GPIOLOW2], irqs[PUV3_IRQS_GPIOLOW3],
|
|
|
|
irqs[PUV3_IRQS_GPIOLOW4], irqs[PUV3_IRQS_GPIOLOW5],
|
|
|
|
irqs[PUV3_IRQS_GPIOLOW6], irqs[PUV3_IRQS_GPIOLOW7],
|
|
|
|
irqs[PUV3_IRQS_GPIOHIGH], NULL);
|
2012-08-10 08:42:33 +02:00
|
|
|
|
|
|
|
/* Keyboard (i8042), mouse disabled for nographic */
|
|
|
|
i8042_mm_init(irqs[PUV3_IRQS_PS2_KBD], NULL, i8042, PUV3_REGS_OFFSET, 4);
|
|
|
|
memory_region_add_subregion(get_system_memory(), PUV3_PS2_BASE, i8042);
|
2012-08-10 08:42:27 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
static void puv3_board_init(CPUUniCore32State *env, ram_addr_t ram_size)
|
|
|
|
{
|
|
|
|
MemoryRegion *ram_memory = g_new(MemoryRegion, 1);
|
|
|
|
|
|
|
|
/* SDRAM at address zero. */
|
2014-09-09 07:27:55 +02:00
|
|
|
memory_region_init_ram(ram_memory, NULL, "puv3.ram", ram_size,
|
Fix bad error handling after memory_region_init_ram()
Symptom:
$ qemu-system-x86_64 -m 10000000
Unexpected error in ram_block_add() at /work/armbru/qemu/exec.c:1456:
upstream-qemu: cannot set up guest memory 'pc.ram': Cannot allocate memory
Aborted (core dumped)
Root cause: commit ef701d7 screwed up handling of out-of-memory
conditions. Before the commit, we report the error and exit(1), in
one place, ram_block_add(). The commit lifts the error handling up
the call chain some, to three places. Fine. Except it uses
&error_abort in these places, changing the behavior from exit(1) to
abort(), and thus undoing the work of commit 3922825 "exec: Don't
abort when we can't allocate guest memory".
The three places are:
* memory_region_init_ram()
Commit 4994653 (right after commit ef701d7) lifted the error
handling further, through memory_region_init_ram(), multiplying the
incorrect use of &error_abort. Later on, imitation of existing
(bad) code may have created more.
* memory_region_init_ram_ptr()
The &error_abort is still there.
* memory_region_init_rom_device()
Doesn't need fixing, because commit 33e0eb5 (soon after commit
ef701d7) lifted the error handling further, and in the process
changed it from &error_abort to passing it up the call chain.
Correct, because the callers are realize() methods.
Fix the error handling after memory_region_init_ram() with a
Coccinelle semantic patch:
@r@
expression mr, owner, name, size, err;
position p;
@@
memory_region_init_ram(mr, owner, name, size,
(
- &error_abort
+ &error_fatal
|
err@p
)
);
@script:python@
p << r.p;
@@
print "%s:%s:%s" % (p[0].file, p[0].line, p[0].column)
When the last argument is &error_abort, it gets replaced by
&error_fatal. This is the fix.
If the last argument is anything else, its position is reported. This
lets us check the fix is complete. Four positions get reported:
* ram_backend_memory_alloc()
Error is passed up the call chain, ultimately through
user_creatable_complete(). As far as I can tell, it's callers all
handle the error sanely.
* fsl_imx25_realize(), fsl_imx31_realize(), dp8393x_realize()
DeviceClass.realize() methods, errors handled sanely further up the
call chain.
We're good. Test case again behaves:
$ qemu-system-x86_64 -m 10000000
qemu-system-x86_64: cannot set up guest memory 'pc.ram': Cannot allocate memory
[Exit 1 ]
The next commits will repair the rest of commit ef701d7's damage.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <1441983105-26376-3-git-send-email-armbru@redhat.com>
Reviewed-by: Peter Crosthwaite <crosthwaite.peter@gmail.com>
2015-09-11 16:51:43 +02:00
|
|
|
&error_fatal);
|
2012-08-10 08:42:27 +02:00
|
|
|
vmstate_register_ram_global(ram_memory);
|
|
|
|
memory_region_add_subregion(get_system_memory(), 0, ram_memory);
|
|
|
|
}
|
|
|
|
|
2013-03-13 14:04:18 +01:00
|
|
|
static const GraphicHwOps no_ops;
|
|
|
|
|
2012-08-10 08:42:27 +02:00
|
|
|
static void puv3_load_kernel(const char *kernel_filename)
|
|
|
|
{
|
|
|
|
int size;
|
|
|
|
|
2013-07-29 18:43:57 +02:00
|
|
|
if (kernel_filename == NULL && qtest_enabled()) {
|
|
|
|
return;
|
|
|
|
}
|
2012-08-10 08:42:27 +02:00
|
|
|
assert(kernel_filename != NULL);
|
|
|
|
|
|
|
|
/* only zImage format supported */
|
|
|
|
size = load_image_targphys(kernel_filename, KERNEL_LOAD_ADDR,
|
|
|
|
KERNEL_MAX_SIZE);
|
|
|
|
if (size < 0) {
|
2015-12-17 17:35:09 +01:00
|
|
|
error_report("Load kernel error: '%s'", kernel_filename);
|
|
|
|
exit(1);
|
2012-08-10 08:42:27 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
/* cheat curses that we have a graphic console, only under ocd console */
|
2014-01-24 15:35:21 +01:00
|
|
|
graphic_console_init(NULL, 0, &no_ops, NULL);
|
2012-08-10 08:42:27 +02:00
|
|
|
}
|
|
|
|
|
2014-05-07 16:42:57 +02:00
|
|
|
static void puv3_init(MachineState *machine)
|
2012-08-10 08:42:27 +02:00
|
|
|
{
|
2014-05-07 16:42:57 +02:00
|
|
|
ram_addr_t ram_size = machine->ram_size;
|
|
|
|
const char *cpu_model = machine->cpu_model;
|
|
|
|
const char *kernel_filename = machine->kernel_filename;
|
|
|
|
const char *initrd_filename = machine->initrd_filename;
|
2012-08-10 08:42:27 +02:00
|
|
|
CPUUniCore32State *env;
|
2015-02-26 21:37:48 +01:00
|
|
|
UniCore32CPU *cpu;
|
2012-08-10 08:42:27 +02:00
|
|
|
|
|
|
|
if (initrd_filename) {
|
2015-12-17 17:35:09 +01:00
|
|
|
error_report("Please use kernel built-in initramdisk");
|
|
|
|
exit(1);
|
2012-08-10 08:42:27 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
if (!cpu_model) {
|
|
|
|
cpu_model = "UniCore-II";
|
|
|
|
}
|
|
|
|
|
2015-02-26 21:37:48 +01:00
|
|
|
cpu = uc32_cpu_init(cpu_model);
|
|
|
|
if (!cpu) {
|
2015-12-17 17:35:09 +01:00
|
|
|
error_report("Unable to find CPU definition");
|
|
|
|
exit(1);
|
2012-08-10 08:42:27 +02:00
|
|
|
}
|
2015-02-26 21:37:48 +01:00
|
|
|
env = &cpu->env;
|
2012-08-10 08:42:27 +02:00
|
|
|
|
|
|
|
puv3_soc_init(env);
|
|
|
|
puv3_board_init(env, ram_size);
|
|
|
|
puv3_load_kernel(kernel_filename);
|
|
|
|
}
|
|
|
|
|
2015-09-04 20:37:08 +02:00
|
|
|
static void puv3_machine_init(MachineClass *mc)
|
2012-08-10 08:42:27 +02:00
|
|
|
{
|
2015-09-04 20:37:08 +02:00
|
|
|
mc->desc = "PKUnity Version-3 based on UniCore32";
|
|
|
|
mc->init = puv3_init;
|
|
|
|
mc->is_default = 1;
|
2012-08-10 08:42:27 +02:00
|
|
|
}
|
|
|
|
|
2015-09-04 20:37:08 +02:00
|
|
|
DEFINE_MACHINE("puv3", puv3_machine_init)
|