2012-02-16 10:56:05 +01:00
|
|
|
/*
|
|
|
|
* Samsung exynos4210 SoC emulation
|
|
|
|
*
|
|
|
|
* Copyright (c) 2011 Samsung Electronics Co., Ltd. All rights reserved.
|
|
|
|
* Maksim Kozlov <m.kozlov@samsung.com>
|
|
|
|
* Evgeny Voevodin <e.voevodin@samsung.com>
|
|
|
|
* Igor Mitsyanko <i.mitsyanko@samsung.com>
|
|
|
|
*
|
|
|
|
* This program is free software; you can redistribute it and/or modify it
|
|
|
|
* under the terms of the GNU General Public License as published by the
|
|
|
|
* Free Software Foundation; either version 2 of the License, or
|
|
|
|
* (at your option) any later version.
|
|
|
|
*
|
|
|
|
* This program is distributed in the hope that it will be useful, but WITHOUT
|
|
|
|
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
|
|
|
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
|
|
|
* for more details.
|
|
|
|
*
|
|
|
|
* You should have received a copy of the GNU General Public License along
|
|
|
|
* with this program; if not, see <http://www.gnu.org/licenses/>.
|
|
|
|
*
|
|
|
|
*/
|
|
|
|
|
2015-12-07 17:23:45 +01: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 09:01:28 +01:00
|
|
|
#include "qapi/error.h"
|
2016-01-19 21:51:44 +01:00
|
|
|
#include "qemu-common.h"
|
|
|
|
#include "cpu.h"
|
2013-02-04 15:40:22 +01:00
|
|
|
#include "hw/boards.h"
|
2012-12-17 18:20:04 +01:00
|
|
|
#include "sysemu/sysemu.h"
|
2013-02-04 15:40:22 +01:00
|
|
|
#include "hw/sysbus.h"
|
2013-04-09 16:26:55 +02:00
|
|
|
#include "hw/arm/arm.h"
|
2013-02-04 15:40:22 +01:00
|
|
|
#include "hw/loader.h"
|
2013-02-05 17:06:20 +01:00
|
|
|
#include "hw/arm/exynos4210.h"
|
2013-02-04 15:40:22 +01:00
|
|
|
#include "hw/usb/hcd-ehci.h"
|
2012-02-16 10:56:05 +01:00
|
|
|
|
|
|
|
#define EXYNOS4210_CHIPID_ADDR 0x10000000
|
|
|
|
|
2012-02-16 10:56:05 +01:00
|
|
|
/* PWM */
|
|
|
|
#define EXYNOS4210_PWM_BASE_ADDR 0x139D0000
|
|
|
|
|
2012-07-04 12:43:32 +02:00
|
|
|
/* RTC */
|
|
|
|
#define EXYNOS4210_RTC_BASE_ADDR 0x10070000
|
|
|
|
|
2012-02-16 10:56:05 +01:00
|
|
|
/* MCT */
|
|
|
|
#define EXYNOS4210_MCT_BASE_ADDR 0x10050000
|
|
|
|
|
2012-07-18 10:18:34 +02:00
|
|
|
/* I2C */
|
|
|
|
#define EXYNOS4210_I2C_SHIFT 0x00010000
|
|
|
|
#define EXYNOS4210_I2C_BASE_ADDR 0x13860000
|
|
|
|
/* Interrupt Group of External Interrupt Combiner for I2C */
|
|
|
|
#define EXYNOS4210_I2C_INTG 27
|
|
|
|
#define EXYNOS4210_HDMI_INTG 16
|
|
|
|
|
2012-02-16 10:56:05 +01:00
|
|
|
/* UART's definitions */
|
|
|
|
#define EXYNOS4210_UART0_BASE_ADDR 0x13800000
|
|
|
|
#define EXYNOS4210_UART1_BASE_ADDR 0x13810000
|
|
|
|
#define EXYNOS4210_UART2_BASE_ADDR 0x13820000
|
|
|
|
#define EXYNOS4210_UART3_BASE_ADDR 0x13830000
|
|
|
|
#define EXYNOS4210_UART0_FIFO_SIZE 256
|
|
|
|
#define EXYNOS4210_UART1_FIFO_SIZE 64
|
|
|
|
#define EXYNOS4210_UART2_FIFO_SIZE 16
|
|
|
|
#define EXYNOS4210_UART3_FIFO_SIZE 16
|
|
|
|
/* Interrupt Group of External Interrupt Combiner for UART */
|
|
|
|
#define EXYNOS4210_UART_INT_GRP 26
|
|
|
|
|
2012-02-16 10:56:05 +01:00
|
|
|
/* External GIC */
|
|
|
|
#define EXYNOS4210_EXT_GIC_CPU_BASE_ADDR 0x10480000
|
|
|
|
#define EXYNOS4210_EXT_GIC_DIST_BASE_ADDR 0x10490000
|
|
|
|
|
|
|
|
/* Combiner */
|
|
|
|
#define EXYNOS4210_EXT_COMBINER_BASE_ADDR 0x10440000
|
|
|
|
#define EXYNOS4210_INT_COMBINER_BASE_ADDR 0x10448000
|
|
|
|
|
2012-02-16 10:56:05 +01:00
|
|
|
/* PMU SFR base address */
|
|
|
|
#define EXYNOS4210_PMU_BASE_ADDR 0x10020000
|
|
|
|
|
2012-02-16 10:56:06 +01:00
|
|
|
/* Display controllers (FIMD) */
|
|
|
|
#define EXYNOS4210_FIMD0_BASE_ADDR 0x11C00000
|
|
|
|
|
2012-12-16 04:49:46 +01:00
|
|
|
/* EHCI */
|
|
|
|
#define EXYNOS4210_EHCI_BASE_ADDR 0x12580000
|
|
|
|
|
2012-02-16 10:56:05 +01:00
|
|
|
static uint8_t chipid_and_omr[] = { 0x11, 0x02, 0x21, 0x43,
|
|
|
|
0x09, 0x00, 0x00, 0x00 };
|
|
|
|
|
2013-06-03 18:17:46 +02:00
|
|
|
static uint64_t exynos4210_chipid_and_omr_read(void *opaque, hwaddr offset,
|
|
|
|
unsigned size)
|
|
|
|
{
|
|
|
|
assert(offset < sizeof(chipid_and_omr));
|
|
|
|
return chipid_and_omr[offset];
|
|
|
|
}
|
|
|
|
|
|
|
|
static void exynos4210_chipid_and_omr_write(void *opaque, hwaddr offset,
|
|
|
|
uint64_t value, unsigned size)
|
|
|
|
{
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
static const MemoryRegionOps exynos4210_chipid_and_omr_ops = {
|
|
|
|
.read = exynos4210_chipid_and_omr_read,
|
|
|
|
.write = exynos4210_chipid_and_omr_write,
|
|
|
|
.endianness = DEVICE_NATIVE_ENDIAN,
|
|
|
|
.impl = {
|
|
|
|
.max_access_size = 1,
|
|
|
|
}
|
|
|
|
};
|
|
|
|
|
2012-05-14 00:08:10 +02:00
|
|
|
void exynos4210_write_secondary(ARMCPU *cpu,
|
2012-04-13 13:39:06 +02:00
|
|
|
const struct arm_boot_info *info)
|
|
|
|
{
|
|
|
|
int n;
|
|
|
|
uint32_t smpboot[] = {
|
2012-12-11 12:30:37 +01:00
|
|
|
0xe59f3034, /* ldr r3, External gic_cpu_if */
|
|
|
|
0xe59f2034, /* ldr r2, Internal gic_cpu_if */
|
|
|
|
0xe59f0034, /* ldr r0, startaddr */
|
2012-04-13 13:39:06 +02:00
|
|
|
0xe3a01001, /* mov r1, #1 */
|
|
|
|
0xe5821000, /* str r1, [r2] */
|
|
|
|
0xe5831000, /* str r1, [r3] */
|
2012-12-11 12:30:37 +01:00
|
|
|
0xe3a010ff, /* mov r1, #0xff */
|
|
|
|
0xe5821004, /* str r1, [r2, #4] */
|
|
|
|
0xe5831004, /* str r1, [r3, #4] */
|
|
|
|
0xf57ff04f, /* dsb */
|
2012-04-13 13:39:06 +02:00
|
|
|
0xe320f003, /* wfi */
|
|
|
|
0xe5901000, /* ldr r1, [r0] */
|
|
|
|
0xe1110001, /* tst r1, r1 */
|
|
|
|
0x0afffffb, /* beq <wfi> */
|
|
|
|
0xe12fff11, /* bx r1 */
|
|
|
|
EXYNOS4210_EXT_GIC_CPU_BASE_ADDR,
|
|
|
|
0, /* gic_cpu_if: base address of Internal GIC CPU interface */
|
|
|
|
0 /* bootreg: Boot register address is held here */
|
|
|
|
};
|
|
|
|
smpboot[ARRAY_SIZE(smpboot) - 1] = info->smp_bootreg_addr;
|
|
|
|
smpboot[ARRAY_SIZE(smpboot) - 2] = info->gic_cpu_if_addr;
|
|
|
|
for (n = 0; n < ARRAY_SIZE(smpboot); n++) {
|
|
|
|
smpboot[n] = tswap32(smpboot[n]);
|
|
|
|
}
|
|
|
|
rom_add_blob_fixed("smpboot", smpboot, sizeof(smpboot),
|
|
|
|
info->smp_loader_start);
|
|
|
|
}
|
|
|
|
|
2012-02-16 10:56:05 +01:00
|
|
|
Exynos4210State *exynos4210_init(MemoryRegion *system_mem,
|
|
|
|
unsigned long ram_size)
|
|
|
|
{
|
2012-05-28 06:11:49 +02:00
|
|
|
int i, n;
|
2012-02-16 10:56:05 +01:00
|
|
|
Exynos4210State *s = g_new(Exynos4210State, 1);
|
2012-05-28 06:11:49 +02:00
|
|
|
qemu_irq gate_irq[EXYNOS4210_NCPUS][EXYNOS4210_IRQ_GATE_NINPUTS];
|
2012-02-16 10:56:05 +01:00
|
|
|
unsigned long mem_size;
|
|
|
|
DeviceState *dev;
|
|
|
|
SysBusDevice *busdev;
|
2014-03-17 17:31:46 +01:00
|
|
|
ObjectClass *cpu_oc;
|
|
|
|
|
|
|
|
cpu_oc = cpu_class_by_name(TYPE_ARM_CPU, "cortex-a9");
|
|
|
|
assert(cpu_oc);
|
2012-02-16 10:56:05 +01:00
|
|
|
|
|
|
|
for (n = 0; n < EXYNOS4210_NCPUS; n++) {
|
2014-03-17 17:31:46 +01:00
|
|
|
Object *cpuobj = object_new(object_class_get_name(cpu_oc));
|
|
|
|
|
2014-12-16 00:09:51 +01:00
|
|
|
/* By default A9 CPUs have EL3 enabled. This board does not currently
|
|
|
|
* support EL3 so the CPU EL3 property is disabled before realization.
|
|
|
|
*/
|
|
|
|
if (object_property_find(cpuobj, "has_el3", NULL)) {
|
2015-09-11 15:04:45 +02:00
|
|
|
object_property_set_bool(cpuobj, false, "has_el3", &error_fatal);
|
2014-12-16 00:09:51 +01:00
|
|
|
}
|
|
|
|
|
2014-03-17 17:31:46 +01:00
|
|
|
s->cpu[n] = ARM_CPU(cpuobj);
|
|
|
|
object_property_set_int(cpuobj, EXYNOS4210_SMP_PRIVATE_BASE_ADDR,
|
|
|
|
"reset-cbar", &error_abort);
|
2015-09-11 15:04:45 +02:00
|
|
|
object_property_set_bool(cpuobj, true, "realized", &error_fatal);
|
2012-02-16 10:56:05 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
/*** IRQs ***/
|
|
|
|
|
|
|
|
s->irq_table = exynos4210_init_irq(&s->irqs);
|
|
|
|
|
|
|
|
/* IRQ Gate */
|
2012-05-28 06:11:49 +02:00
|
|
|
for (i = 0; i < EXYNOS4210_NCPUS; i++) {
|
|
|
|
dev = qdev_create(NULL, "exynos4210.irq_gate");
|
|
|
|
qdev_prop_set_uint32(dev, "n_in", EXYNOS4210_IRQ_GATE_NINPUTS);
|
|
|
|
qdev_init_nofail(dev);
|
|
|
|
/* Get IRQ Gate input in gate_irq */
|
|
|
|
for (n = 0; n < EXYNOS4210_IRQ_GATE_NINPUTS; n++) {
|
|
|
|
gate_irq[i][n] = qdev_get_gpio_in(dev, n);
|
|
|
|
}
|
2013-01-20 02:47:33 +01:00
|
|
|
busdev = SYS_BUS_DEVICE(dev);
|
2012-05-28 06:11:49 +02:00
|
|
|
|
2013-08-20 15:54:28 +02:00
|
|
|
/* Connect IRQ Gate output to CPU's IRQ line */
|
|
|
|
sysbus_connect_irq(busdev, 0,
|
|
|
|
qdev_get_gpio_in(DEVICE(s->cpu[i]), ARM_CPU_IRQ));
|
2012-02-16 10:56:05 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Private memory region and Internal GIC */
|
|
|
|
dev = qdev_create(NULL, "a9mpcore_priv");
|
|
|
|
qdev_prop_set_uint32(dev, "num-cpu", EXYNOS4210_NCPUS);
|
|
|
|
qdev_init_nofail(dev);
|
2013-01-20 02:47:33 +01:00
|
|
|
busdev = SYS_BUS_DEVICE(dev);
|
2012-02-16 10:56:05 +01:00
|
|
|
sysbus_mmio_map(busdev, 0, EXYNOS4210_SMP_PRIVATE_BASE_ADDR);
|
|
|
|
for (n = 0; n < EXYNOS4210_NCPUS; n++) {
|
2012-05-28 06:11:49 +02:00
|
|
|
sysbus_connect_irq(busdev, n, gate_irq[n][0]);
|
2012-02-16 10:56:05 +01:00
|
|
|
}
|
|
|
|
for (n = 0; n < EXYNOS4210_INT_GIC_NIRQ; n++) {
|
|
|
|
s->irqs.int_gic_irq[n] = qdev_get_gpio_in(dev, n);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Cache controller */
|
|
|
|
sysbus_create_simple("l2x0", EXYNOS4210_L2X0_BASE_ADDR, NULL);
|
|
|
|
|
|
|
|
/* External GIC */
|
|
|
|
dev = qdev_create(NULL, "exynos4210.gic");
|
|
|
|
qdev_prop_set_uint32(dev, "num-cpu", EXYNOS4210_NCPUS);
|
|
|
|
qdev_init_nofail(dev);
|
2013-01-20 02:47:33 +01:00
|
|
|
busdev = SYS_BUS_DEVICE(dev);
|
2012-02-16 10:56:05 +01:00
|
|
|
/* Map CPU interface */
|
|
|
|
sysbus_mmio_map(busdev, 0, EXYNOS4210_EXT_GIC_CPU_BASE_ADDR);
|
|
|
|
/* Map Distributer interface */
|
|
|
|
sysbus_mmio_map(busdev, 1, EXYNOS4210_EXT_GIC_DIST_BASE_ADDR);
|
|
|
|
for (n = 0; n < EXYNOS4210_NCPUS; n++) {
|
2012-05-28 06:11:49 +02:00
|
|
|
sysbus_connect_irq(busdev, n, gate_irq[n][1]);
|
2012-02-16 10:56:05 +01:00
|
|
|
}
|
|
|
|
for (n = 0; n < EXYNOS4210_EXT_GIC_NIRQ; n++) {
|
|
|
|
s->irqs.ext_gic_irq[n] = qdev_get_gpio_in(dev, n);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Internal Interrupt Combiner */
|
|
|
|
dev = qdev_create(NULL, "exynos4210.combiner");
|
|
|
|
qdev_init_nofail(dev);
|
2013-01-20 02:47:33 +01:00
|
|
|
busdev = SYS_BUS_DEVICE(dev);
|
2012-02-16 10:56:05 +01:00
|
|
|
for (n = 0; n < EXYNOS4210_MAX_INT_COMBINER_OUT_IRQ; n++) {
|
|
|
|
sysbus_connect_irq(busdev, n, s->irqs.int_gic_irq[n]);
|
|
|
|
}
|
|
|
|
exynos4210_combiner_get_gpioin(&s->irqs, dev, 0);
|
|
|
|
sysbus_mmio_map(busdev, 0, EXYNOS4210_INT_COMBINER_BASE_ADDR);
|
|
|
|
|
|
|
|
/* External Interrupt Combiner */
|
|
|
|
dev = qdev_create(NULL, "exynos4210.combiner");
|
|
|
|
qdev_prop_set_uint32(dev, "external", 1);
|
|
|
|
qdev_init_nofail(dev);
|
2013-01-20 02:47:33 +01:00
|
|
|
busdev = SYS_BUS_DEVICE(dev);
|
2012-02-16 10:56:05 +01:00
|
|
|
for (n = 0; n < EXYNOS4210_MAX_INT_COMBINER_OUT_IRQ; n++) {
|
|
|
|
sysbus_connect_irq(busdev, n, s->irqs.ext_gic_irq[n]);
|
|
|
|
}
|
|
|
|
exynos4210_combiner_get_gpioin(&s->irqs, dev, 1);
|
|
|
|
sysbus_mmio_map(busdev, 0, EXYNOS4210_EXT_COMBINER_BASE_ADDR);
|
|
|
|
|
|
|
|
/* Initialize board IRQs. */
|
|
|
|
exynos4210_init_board_irqs(&s->irqs);
|
|
|
|
|
|
|
|
/*** Memory ***/
|
|
|
|
|
|
|
|
/* Chip-ID and OMR */
|
2013-06-06 11:41:28 +02:00
|
|
|
memory_region_init_io(&s->chipid_mem, NULL, &exynos4210_chipid_and_omr_ops,
|
2013-06-03 18:17:46 +02:00
|
|
|
NULL, "exynos4210.chipid", sizeof(chipid_and_omr));
|
2012-02-16 10:56:05 +01:00
|
|
|
memory_region_add_subregion(system_mem, EXYNOS4210_CHIPID_ADDR,
|
|
|
|
&s->chipid_mem);
|
|
|
|
|
|
|
|
/* Internal ROM */
|
2013-06-06 11:41:28 +02:00
|
|
|
memory_region_init_ram(&s->irom_mem, NULL, "exynos4210.irom",
|
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
|
|
|
EXYNOS4210_IROM_SIZE, &error_fatal);
|
2013-06-03 18:17:46 +02:00
|
|
|
vmstate_register_ram_global(&s->irom_mem);
|
2012-02-16 10:56:05 +01:00
|
|
|
memory_region_set_readonly(&s->irom_mem, true);
|
|
|
|
memory_region_add_subregion(system_mem, EXYNOS4210_IROM_BASE_ADDR,
|
|
|
|
&s->irom_mem);
|
|
|
|
/* mirror of iROM */
|
2013-06-06 11:41:28 +02:00
|
|
|
memory_region_init_alias(&s->irom_alias_mem, NULL, "exynos4210.irom_alias",
|
2012-02-16 10:56:05 +01:00
|
|
|
&s->irom_mem,
|
2012-07-04 12:43:32 +02:00
|
|
|
0,
|
2012-02-16 10:56:05 +01:00
|
|
|
EXYNOS4210_IROM_SIZE);
|
|
|
|
memory_region_set_readonly(&s->irom_alias_mem, true);
|
|
|
|
memory_region_add_subregion(system_mem, EXYNOS4210_IROM_MIRROR_BASE_ADDR,
|
|
|
|
&s->irom_alias_mem);
|
|
|
|
|
|
|
|
/* Internal RAM */
|
2013-06-06 11:41:28 +02:00
|
|
|
memory_region_init_ram(&s->iram_mem, NULL, "exynos4210.iram",
|
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
|
|
|
EXYNOS4210_IRAM_SIZE, &error_fatal);
|
2012-02-16 10:56:05 +01:00
|
|
|
vmstate_register_ram_global(&s->iram_mem);
|
|
|
|
memory_region_add_subregion(system_mem, EXYNOS4210_IRAM_BASE_ADDR,
|
|
|
|
&s->iram_mem);
|
|
|
|
|
|
|
|
/* DRAM */
|
|
|
|
mem_size = ram_size;
|
|
|
|
if (mem_size > EXYNOS4210_DRAM_MAX_SIZE) {
|
2013-06-06 11:41:28 +02:00
|
|
|
memory_region_init_ram(&s->dram1_mem, NULL, "exynos4210.dram1",
|
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
|
|
|
mem_size - EXYNOS4210_DRAM_MAX_SIZE, &error_fatal);
|
2012-02-16 10:56:05 +01:00
|
|
|
vmstate_register_ram_global(&s->dram1_mem);
|
|
|
|
memory_region_add_subregion(system_mem, EXYNOS4210_DRAM1_BASE_ADDR,
|
|
|
|
&s->dram1_mem);
|
|
|
|
mem_size = EXYNOS4210_DRAM_MAX_SIZE;
|
|
|
|
}
|
2014-09-09 07:27:55 +02:00
|
|
|
memory_region_init_ram(&s->dram0_mem, NULL, "exynos4210.dram0", mem_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-02-16 10:56:05 +01:00
|
|
|
vmstate_register_ram_global(&s->dram0_mem);
|
|
|
|
memory_region_add_subregion(system_mem, EXYNOS4210_DRAM0_BASE_ADDR,
|
|
|
|
&s->dram0_mem);
|
|
|
|
|
2012-02-16 10:56:05 +01:00
|
|
|
/* PMU.
|
|
|
|
* The only reason of existence at the moment is that secondary CPU boot
|
|
|
|
* loader uses PMU INFORM5 register as a holding pen.
|
|
|
|
*/
|
|
|
|
sysbus_create_simple("exynos4210.pmu", EXYNOS4210_PMU_BASE_ADDR, NULL);
|
|
|
|
|
2012-02-16 10:56:05 +01:00
|
|
|
/* PWM */
|
|
|
|
sysbus_create_varargs("exynos4210.pwm", EXYNOS4210_PWM_BASE_ADDR,
|
|
|
|
s->irq_table[exynos4210_get_irq(22, 0)],
|
|
|
|
s->irq_table[exynos4210_get_irq(22, 1)],
|
|
|
|
s->irq_table[exynos4210_get_irq(22, 2)],
|
|
|
|
s->irq_table[exynos4210_get_irq(22, 3)],
|
|
|
|
s->irq_table[exynos4210_get_irq(22, 4)],
|
|
|
|
NULL);
|
2012-07-04 12:43:32 +02:00
|
|
|
/* RTC */
|
|
|
|
sysbus_create_varargs("exynos4210.rtc", EXYNOS4210_RTC_BASE_ADDR,
|
|
|
|
s->irq_table[exynos4210_get_irq(23, 0)],
|
|
|
|
s->irq_table[exynos4210_get_irq(23, 1)],
|
|
|
|
NULL);
|
2012-02-16 10:56:05 +01:00
|
|
|
|
2012-02-16 10:56:05 +01:00
|
|
|
/* Multi Core Timer */
|
|
|
|
dev = qdev_create(NULL, "exynos4210.mct");
|
|
|
|
qdev_init_nofail(dev);
|
2013-01-20 02:47:33 +01:00
|
|
|
busdev = SYS_BUS_DEVICE(dev);
|
2012-02-16 10:56:05 +01:00
|
|
|
for (n = 0; n < 4; n++) {
|
|
|
|
/* Connect global timer interrupts to Combiner gpio_in */
|
|
|
|
sysbus_connect_irq(busdev, n,
|
|
|
|
s->irq_table[exynos4210_get_irq(1, 4 + n)]);
|
|
|
|
}
|
|
|
|
/* Connect local timer interrupts to Combiner gpio_in */
|
|
|
|
sysbus_connect_irq(busdev, 4,
|
|
|
|
s->irq_table[exynos4210_get_irq(51, 0)]);
|
|
|
|
sysbus_connect_irq(busdev, 5,
|
|
|
|
s->irq_table[exynos4210_get_irq(35, 3)]);
|
|
|
|
sysbus_mmio_map(busdev, 0, EXYNOS4210_MCT_BASE_ADDR);
|
|
|
|
|
2012-07-18 10:18:34 +02:00
|
|
|
/*** I2C ***/
|
|
|
|
for (n = 0; n < EXYNOS4210_I2C_NUMBER; n++) {
|
|
|
|
uint32_t addr = EXYNOS4210_I2C_BASE_ADDR + EXYNOS4210_I2C_SHIFT * n;
|
|
|
|
qemu_irq i2c_irq;
|
|
|
|
|
|
|
|
if (n < 8) {
|
|
|
|
i2c_irq = s->irq_table[exynos4210_get_irq(EXYNOS4210_I2C_INTG, n)];
|
|
|
|
} else {
|
|
|
|
i2c_irq = s->irq_table[exynos4210_get_irq(EXYNOS4210_HDMI_INTG, 1)];
|
|
|
|
}
|
|
|
|
|
|
|
|
dev = qdev_create(NULL, "exynos4210.i2c");
|
|
|
|
qdev_init_nofail(dev);
|
2013-01-20 02:47:33 +01:00
|
|
|
busdev = SYS_BUS_DEVICE(dev);
|
2012-07-18 10:18:34 +02:00
|
|
|
sysbus_connect_irq(busdev, 0, i2c_irq);
|
|
|
|
sysbus_mmio_map(busdev, 0, addr);
|
2013-08-03 00:18:51 +02:00
|
|
|
s->i2c_if[n] = (I2CBus *)qdev_get_child_bus(dev, "i2c");
|
2012-07-18 10:18:34 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2012-02-16 10:56:05 +01:00
|
|
|
/*** UARTs ***/
|
|
|
|
exynos4210_uart_create(EXYNOS4210_UART0_BASE_ADDR,
|
|
|
|
EXYNOS4210_UART0_FIFO_SIZE, 0, NULL,
|
|
|
|
s->irq_table[exynos4210_get_irq(EXYNOS4210_UART_INT_GRP, 0)]);
|
|
|
|
|
|
|
|
exynos4210_uart_create(EXYNOS4210_UART1_BASE_ADDR,
|
|
|
|
EXYNOS4210_UART1_FIFO_SIZE, 1, NULL,
|
|
|
|
s->irq_table[exynos4210_get_irq(EXYNOS4210_UART_INT_GRP, 1)]);
|
|
|
|
|
|
|
|
exynos4210_uart_create(EXYNOS4210_UART2_BASE_ADDR,
|
|
|
|
EXYNOS4210_UART2_FIFO_SIZE, 2, NULL,
|
|
|
|
s->irq_table[exynos4210_get_irq(EXYNOS4210_UART_INT_GRP, 2)]);
|
|
|
|
|
|
|
|
exynos4210_uart_create(EXYNOS4210_UART3_BASE_ADDR,
|
|
|
|
EXYNOS4210_UART3_FIFO_SIZE, 3, NULL,
|
|
|
|
s->irq_table[exynos4210_get_irq(EXYNOS4210_UART_INT_GRP, 3)]);
|
|
|
|
|
2012-02-16 10:56:06 +01:00
|
|
|
/*** Display controller (FIMD) ***/
|
|
|
|
sysbus_create_varargs("exynos4210.fimd", EXYNOS4210_FIMD0_BASE_ADDR,
|
|
|
|
s->irq_table[exynos4210_get_irq(11, 0)],
|
|
|
|
s->irq_table[exynos4210_get_irq(11, 1)],
|
|
|
|
s->irq_table[exynos4210_get_irq(11, 2)],
|
|
|
|
NULL);
|
|
|
|
|
2012-12-16 04:49:46 +01:00
|
|
|
sysbus_create_simple(TYPE_EXYNOS4210_EHCI, EXYNOS4210_EHCI_BASE_ADDR,
|
|
|
|
s->irq_table[exynos4210_get_irq(28, 3)]);
|
|
|
|
|
2012-02-16 10:56:05 +01:00
|
|
|
return s;
|
|
|
|
}
|