2007-11-11 00:04:49 +00:00
|
|
|
/*
|
|
|
|
* ARMV7M System emulation.
|
|
|
|
*
|
|
|
|
* Copyright (c) 2006-2007 CodeSourcery.
|
|
|
|
* Written by Paul Brook
|
|
|
|
*
|
2011-06-23 00:59:26 +00:00
|
|
|
* This code is licensed under the GPL.
|
2007-11-11 00:04:49 +00:00
|
|
|
*/
|
|
|
|
|
2015-12-07 16:23:45 +00:00
|
|
|
#include "qemu/osdep.h"
|
include/qemu/osdep.h: Don't include qapi/error.h
Commit 57cb38b included qapi/error.h into qemu/osdep.h to get the
Error typedef. Since then, we've moved to include qemu/osdep.h
everywhere. Its file comment explains: "To avoid getting into
possible circular include dependencies, this file should not include
any other QEMU headers, with the exceptions of config-host.h,
compiler.h, os-posix.h and os-win32.h, all of which are doing a
similar job to this file and are under similar constraints."
qapi/error.h doesn't do a similar job, and it doesn't adhere to
similar constraints: it includes qapi-types.h. That's in excess of
100KiB of crap most .c files don't actually need.
Add the typedef to qemu/typedefs.h, and include that instead of
qapi/error.h. Include qapi/error.h in .c files that need it and don't
get it now. Include qapi-types.h in qom/object.h for uint16List.
Update scripts/clean-includes accordingly. Update it further to match
reality: replace config.h by config-target.h, add sysemu/os-posix.h,
sysemu/os-win32.h. Update the list of includes in the qemu/osdep.h
comment quoted above similarly.
This reduces the number of objects depending on qapi/error.h from "all
of them" to less than a third. Unfortunately, the number depending on
qapi-types.h shrinks only a little. More work is needed for that one.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
[Fix compilation without the spice devel packages. - Paolo]
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
2016-03-14 08:01:28 +00:00
|
|
|
#include "qapi/error.h"
|
2013-02-04 14:40:22 +00:00
|
|
|
#include "hw/sysbus.h"
|
2013-04-09 14:26:55 +00:00
|
|
|
#include "hw/arm/arm.h"
|
2013-02-04 14:40:22 +00:00
|
|
|
#include "hw/loader.h"
|
2009-09-20 14:58:02 +00:00
|
|
|
#include "elf.h"
|
2013-07-29 16:36:59 +00:00
|
|
|
#include "sysemu/qtest.h"
|
|
|
|
#include "qemu/error-report.h"
|
2007-11-11 00:04:49 +00:00
|
|
|
|
|
|
|
/* Bitbanded IO. Each word corresponds to a single bit. */
|
|
|
|
|
2011-06-23 00:59:26 +00:00
|
|
|
/* Get the byte address of the real memory for a bitband access. */
|
2008-12-01 18:59:50 +00:00
|
|
|
static inline uint32_t bitband_addr(void * opaque, uint32_t addr)
|
2007-11-11 00:04:49 +00:00
|
|
|
{
|
|
|
|
uint32_t res;
|
|
|
|
|
2008-12-01 18:59:50 +00:00
|
|
|
res = *(uint32_t *)opaque;
|
2007-11-11 00:04:49 +00:00
|
|
|
res |= (addr & 0x1ffffff) >> 5;
|
|
|
|
return res;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
2012-10-23 10:30:10 +00:00
|
|
|
static uint32_t bitband_readb(void *opaque, hwaddr offset)
|
2007-11-11 00:04:49 +00:00
|
|
|
{
|
|
|
|
uint8_t v;
|
2008-12-01 18:59:50 +00:00
|
|
|
cpu_physical_memory_read(bitband_addr(opaque, offset), &v, 1);
|
2007-11-11 00:04:49 +00:00
|
|
|
return (v & (1 << ((offset >> 2) & 7))) != 0;
|
|
|
|
}
|
|
|
|
|
2012-10-23 10:30:10 +00:00
|
|
|
static void bitband_writeb(void *opaque, hwaddr offset,
|
2007-11-11 00:04:49 +00:00
|
|
|
uint32_t value)
|
|
|
|
{
|
|
|
|
uint32_t addr;
|
|
|
|
uint8_t mask;
|
|
|
|
uint8_t v;
|
2008-12-01 18:59:50 +00:00
|
|
|
addr = bitband_addr(opaque, offset);
|
2007-11-11 00:04:49 +00:00
|
|
|
mask = (1 << ((offset >> 2) & 7));
|
|
|
|
cpu_physical_memory_read(addr, &v, 1);
|
|
|
|
if (value & 1)
|
|
|
|
v |= mask;
|
|
|
|
else
|
|
|
|
v &= ~mask;
|
|
|
|
cpu_physical_memory_write(addr, &v, 1);
|
|
|
|
}
|
|
|
|
|
2012-10-23 10:30:10 +00:00
|
|
|
static uint32_t bitband_readw(void *opaque, hwaddr offset)
|
2007-11-11 00:04:49 +00:00
|
|
|
{
|
|
|
|
uint32_t addr;
|
|
|
|
uint16_t mask;
|
|
|
|
uint16_t v;
|
2008-12-01 18:59:50 +00:00
|
|
|
addr = bitband_addr(opaque, offset) & ~1;
|
2007-11-11 00:04:49 +00:00
|
|
|
mask = (1 << ((offset >> 2) & 15));
|
|
|
|
mask = tswap16(mask);
|
2013-04-12 18:53:58 +00:00
|
|
|
cpu_physical_memory_read(addr, &v, 2);
|
2007-11-11 00:04:49 +00:00
|
|
|
return (v & mask) != 0;
|
|
|
|
}
|
|
|
|
|
2012-10-23 10:30:10 +00:00
|
|
|
static void bitband_writew(void *opaque, hwaddr offset,
|
2007-11-11 00:04:49 +00:00
|
|
|
uint32_t value)
|
|
|
|
{
|
|
|
|
uint32_t addr;
|
|
|
|
uint16_t mask;
|
|
|
|
uint16_t v;
|
2008-12-01 18:59:50 +00:00
|
|
|
addr = bitband_addr(opaque, offset) & ~1;
|
2007-11-11 00:04:49 +00:00
|
|
|
mask = (1 << ((offset >> 2) & 15));
|
|
|
|
mask = tswap16(mask);
|
2013-04-12 18:53:58 +00:00
|
|
|
cpu_physical_memory_read(addr, &v, 2);
|
2007-11-11 00:04:49 +00:00
|
|
|
if (value & 1)
|
|
|
|
v |= mask;
|
|
|
|
else
|
|
|
|
v &= ~mask;
|
2013-04-12 18:53:58 +00:00
|
|
|
cpu_physical_memory_write(addr, &v, 2);
|
2007-11-11 00:04:49 +00:00
|
|
|
}
|
|
|
|
|
2012-10-23 10:30:10 +00:00
|
|
|
static uint32_t bitband_readl(void *opaque, hwaddr offset)
|
2007-11-11 00:04:49 +00:00
|
|
|
{
|
|
|
|
uint32_t addr;
|
|
|
|
uint32_t mask;
|
|
|
|
uint32_t v;
|
2008-12-01 18:59:50 +00:00
|
|
|
addr = bitband_addr(opaque, offset) & ~3;
|
2007-11-11 00:04:49 +00:00
|
|
|
mask = (1 << ((offset >> 2) & 31));
|
|
|
|
mask = tswap32(mask);
|
2013-04-12 18:53:58 +00:00
|
|
|
cpu_physical_memory_read(addr, &v, 4);
|
2007-11-11 00:04:49 +00:00
|
|
|
return (v & mask) != 0;
|
|
|
|
}
|
|
|
|
|
2012-10-23 10:30:10 +00:00
|
|
|
static void bitband_writel(void *opaque, hwaddr offset,
|
2007-11-11 00:04:49 +00:00
|
|
|
uint32_t value)
|
|
|
|
{
|
|
|
|
uint32_t addr;
|
|
|
|
uint32_t mask;
|
|
|
|
uint32_t v;
|
2008-12-01 18:59:50 +00:00
|
|
|
addr = bitband_addr(opaque, offset) & ~3;
|
2007-11-11 00:04:49 +00:00
|
|
|
mask = (1 << ((offset >> 2) & 31));
|
|
|
|
mask = tswap32(mask);
|
2013-04-12 18:53:58 +00:00
|
|
|
cpu_physical_memory_read(addr, &v, 4);
|
2007-11-11 00:04:49 +00:00
|
|
|
if (value & 1)
|
|
|
|
v |= mask;
|
|
|
|
else
|
|
|
|
v &= ~mask;
|
2013-04-12 18:53:58 +00:00
|
|
|
cpu_physical_memory_write(addr, &v, 4);
|
2007-11-11 00:04:49 +00:00
|
|
|
}
|
|
|
|
|
2011-08-15 14:17:20 +00:00
|
|
|
static const MemoryRegionOps bitband_ops = {
|
|
|
|
.old_mmio = {
|
|
|
|
.read = { bitband_readb, bitband_readw, bitband_readl, },
|
|
|
|
.write = { bitband_writeb, bitband_writew, bitband_writel, },
|
|
|
|
},
|
|
|
|
.endianness = DEVICE_NATIVE_ENDIAN,
|
2007-11-11 00:04:49 +00:00
|
|
|
};
|
|
|
|
|
2013-07-23 22:46:43 +00:00
|
|
|
#define TYPE_BITBAND "ARM,bitband-memory"
|
|
|
|
#define BITBAND(obj) OBJECT_CHECK(BitBandState, (obj), TYPE_BITBAND)
|
|
|
|
|
2009-06-03 14:16:49 +00:00
|
|
|
typedef struct {
|
2013-07-23 22:46:43 +00:00
|
|
|
/*< private >*/
|
|
|
|
SysBusDevice parent_obj;
|
|
|
|
/*< public >*/
|
|
|
|
|
2011-08-15 14:17:20 +00:00
|
|
|
MemoryRegion iomem;
|
2009-06-03 14:16:49 +00:00
|
|
|
uint32_t base;
|
|
|
|
} BitBandState;
|
|
|
|
|
2009-08-14 08:36:05 +00:00
|
|
|
static int bitband_init(SysBusDevice *dev)
|
2007-11-11 00:04:49 +00:00
|
|
|
{
|
2013-07-23 22:46:43 +00:00
|
|
|
BitBandState *s = BITBAND(dev);
|
2007-11-11 00:04:49 +00:00
|
|
|
|
2013-06-07 01:25:08 +00:00
|
|
|
memory_region_init_io(&s->iomem, OBJECT(s), &bitband_ops, &s->base,
|
|
|
|
"bitband", 0x02000000);
|
2011-11-27 09:38:10 +00:00
|
|
|
sysbus_init_mmio(dev, &s->iomem);
|
2009-08-14 08:36:05 +00:00
|
|
|
return 0;
|
2009-06-03 14:16:49 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static void armv7m_bitband_init(void)
|
|
|
|
{
|
|
|
|
DeviceState *dev;
|
|
|
|
|
2013-07-23 22:46:43 +00:00
|
|
|
dev = qdev_create(NULL, TYPE_BITBAND);
|
2009-07-15 11:43:31 +00:00
|
|
|
qdev_prop_set_uint32(dev, "base", 0x20000000);
|
2009-10-06 23:15:58 +00:00
|
|
|
qdev_init_nofail(dev);
|
2013-01-20 01:47:33 +00:00
|
|
|
sysbus_mmio_map(SYS_BUS_DEVICE(dev), 0, 0x22000000);
|
2009-06-03 14:16:49 +00:00
|
|
|
|
2013-07-23 22:46:43 +00:00
|
|
|
dev = qdev_create(NULL, TYPE_BITBAND);
|
2009-07-15 11:43:31 +00:00
|
|
|
qdev_prop_set_uint32(dev, "base", 0x40000000);
|
2009-10-06 23:15:58 +00:00
|
|
|
qdev_init_nofail(dev);
|
2013-01-20 01:47:33 +00:00
|
|
|
sysbus_mmio_map(SYS_BUS_DEVICE(dev), 0, 0x42000000);
|
2007-11-11 00:04:49 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Board init. */
|
2010-04-05 18:34:51 +00:00
|
|
|
|
|
|
|
static void armv7m_reset(void *opaque)
|
|
|
|
{
|
2012-05-04 14:11:34 +00:00
|
|
|
ARMCPU *cpu = opaque;
|
|
|
|
|
|
|
|
cpu_reset(CPU(cpu));
|
2010-04-05 18:34:51 +00:00
|
|
|
}
|
|
|
|
|
2007-11-11 00:04:49 +00:00
|
|
|
/* Init CPU and memory for a v7-M based board.
|
2015-02-05 13:37:21 +00:00
|
|
|
mem_size is in bytes.
|
2007-11-11 00:04:49 +00:00
|
|
|
Returns the NVIC array. */
|
|
|
|
|
2015-11-03 13:49:41 +00:00
|
|
|
DeviceState *armv7m_init(MemoryRegion *system_memory, int mem_size, int num_irq,
|
2007-11-11 00:04:49 +00:00
|
|
|
const char *kernel_filename, const char *cpu_model)
|
|
|
|
{
|
2012-05-04 14:09:50 +00:00
|
|
|
ARMCPU *cpu;
|
2012-03-14 00:38:23 +00:00
|
|
|
CPUARMState *env;
|
2009-05-14 21:35:08 +00:00
|
|
|
DeviceState *nvic;
|
2007-11-11 00:04:49 +00:00
|
|
|
int image_size;
|
|
|
|
uint64_t entry;
|
|
|
|
uint64_t lowaddr;
|
2009-09-20 14:58:02 +00:00
|
|
|
int big_endian;
|
2011-07-25 11:27:01 +00:00
|
|
|
MemoryRegion *hack = g_new(MemoryRegion, 1);
|
2007-11-11 00:04:49 +00:00
|
|
|
|
2012-05-04 14:09:50 +00:00
|
|
|
if (cpu_model == NULL) {
|
2007-11-11 00:04:49 +00:00
|
|
|
cpu_model = "cortex-m3";
|
2012-05-04 14:09:50 +00:00
|
|
|
}
|
|
|
|
cpu = cpu_arm_init(cpu_model);
|
|
|
|
if (cpu == NULL) {
|
2007-11-11 00:04:49 +00:00
|
|
|
fprintf(stderr, "Unable to find CPU definition\n");
|
|
|
|
exit(1);
|
|
|
|
}
|
2012-05-04 14:09:50 +00:00
|
|
|
env = &cpu->env;
|
2007-11-11 00:04:49 +00:00
|
|
|
|
|
|
|
armv7m_bitband_init();
|
|
|
|
|
2009-05-14 21:35:08 +00:00
|
|
|
nvic = qdev_create(NULL, "armv7m_nvic");
|
2015-02-05 13:37:21 +00:00
|
|
|
qdev_prop_set_uint32(nvic, "num-irq", num_irq);
|
2010-04-05 18:34:51 +00:00
|
|
|
env->nvic = nvic;
|
2009-10-06 23:15:58 +00:00
|
|
|
qdev_init_nofail(nvic);
|
2013-08-20 13:54:28 +00:00
|
|
|
sysbus_connect_irq(SYS_BUS_DEVICE(nvic), 0,
|
|
|
|
qdev_get_gpio_in(DEVICE(cpu), ARM_CPU_IRQ));
|
2007-11-11 00:04:49 +00:00
|
|
|
|
2009-09-20 14:58:02 +00:00
|
|
|
#ifdef TARGET_WORDS_BIGENDIAN
|
|
|
|
big_endian = 1;
|
|
|
|
#else
|
|
|
|
big_endian = 0;
|
|
|
|
#endif
|
|
|
|
|
2013-07-29 16:36:59 +00:00
|
|
|
if (!kernel_filename && !qtest_enabled()) {
|
2012-08-13 10:04:05 +00:00
|
|
|
fprintf(stderr, "Guest image must be specified (using -kernel)\n");
|
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
|
2013-07-29 16:36:59 +00:00
|
|
|
if (kernel_filename) {
|
|
|
|
image_size = load_elf(kernel_filename, NULL, NULL, &entry, &lowaddr,
|
2016-03-04 11:30:21 +00:00
|
|
|
NULL, big_endian, EM_ARM, 1, 0);
|
2013-07-29 16:36:59 +00:00
|
|
|
if (image_size < 0) {
|
2015-02-05 13:37:21 +00:00
|
|
|
image_size = load_image_targphys(kernel_filename, 0, mem_size);
|
2013-07-29 16:36:59 +00:00
|
|
|
lowaddr = 0;
|
|
|
|
}
|
|
|
|
if (image_size < 0) {
|
|
|
|
error_report("Could not load kernel '%s'", kernel_filename);
|
|
|
|
exit(1);
|
|
|
|
}
|
2007-11-11 00:04:49 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Hack to map an additional page of ram at the top of the address
|
|
|
|
space. This stops qemu complaining about executing code outside RAM
|
|
|
|
when returning from an exception. */
|
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 14:51:43 +00:00
|
|
|
memory_region_init_ram(hack, NULL, "armv7m.hack", 0x1000, &error_fatal);
|
2011-12-20 13:59:12 +00:00
|
|
|
vmstate_register_ram_global(hack);
|
2014-08-19 17:56:28 +00:00
|
|
|
memory_region_add_subregion(system_memory, 0xfffff000, hack);
|
2007-11-11 00:04:49 +00:00
|
|
|
|
2012-05-04 14:11:34 +00:00
|
|
|
qemu_register_reset(armv7m_reset, cpu);
|
2015-11-03 13:49:41 +00:00
|
|
|
return nvic;
|
2007-11-11 00:04:49 +00:00
|
|
|
}
|
2009-06-03 14:16:49 +00:00
|
|
|
|
2012-01-24 19:12:29 +00:00
|
|
|
static Property bitband_properties[] = {
|
|
|
|
DEFINE_PROP_UINT32("base", BitBandState, base, 0),
|
|
|
|
DEFINE_PROP_END_OF_LIST(),
|
|
|
|
};
|
|
|
|
|
|
|
|
static void bitband_class_init(ObjectClass *klass, void *data)
|
|
|
|
{
|
2011-12-08 03:34:16 +00:00
|
|
|
DeviceClass *dc = DEVICE_CLASS(klass);
|
2012-01-24 19:12:29 +00:00
|
|
|
SysBusDeviceClass *k = SYS_BUS_DEVICE_CLASS(klass);
|
|
|
|
|
|
|
|
k->init = bitband_init;
|
2011-12-08 03:34:16 +00:00
|
|
|
dc->props = bitband_properties;
|
2012-01-24 19:12:29 +00:00
|
|
|
}
|
|
|
|
|
2013-01-10 15:19:07 +00:00
|
|
|
static const TypeInfo bitband_info = {
|
2013-07-23 22:46:43 +00:00
|
|
|
.name = TYPE_BITBAND,
|
2011-12-08 03:34:16 +00:00
|
|
|
.parent = TYPE_SYS_BUS_DEVICE,
|
|
|
|
.instance_size = sizeof(BitBandState),
|
|
|
|
.class_init = bitband_class_init,
|
2009-07-15 11:43:31 +00:00
|
|
|
};
|
|
|
|
|
2012-02-09 14:20:55 +00:00
|
|
|
static void armv7m_register_types(void)
|
2009-06-03 14:16:49 +00:00
|
|
|
{
|
2011-12-08 03:34:16 +00:00
|
|
|
type_register_static(&bitband_info);
|
2009-06-03 14:16:49 +00:00
|
|
|
}
|
|
|
|
|
2012-02-09 14:20:55 +00:00
|
|
|
type_init(armv7m_register_types)
|