2006-04-27 23:32:09 +02:00
|
|
|
/*
|
|
|
|
|
* SHIX 2.0 board description
|
2007-09-16 23:08:06 +02:00
|
|
|
*
|
2006-04-27 23:32:09 +02:00
|
|
|
* Copyright (c) 2005 Samuel Tardieu
|
2007-09-16 23:08:06 +02:00
|
|
|
*
|
2006-04-27 23:32:09 +02:00
|
|
|
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
|
|
|
* of this software and associated documentation files (the "Software"), to deal
|
|
|
|
|
* in the Software without restriction, including without limitation the rights
|
|
|
|
|
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
|
|
|
* copies of the Software, and to permit persons to whom the Software is
|
|
|
|
|
* furnished to do so, subject to the following conditions:
|
|
|
|
|
*
|
|
|
|
|
* The above copyright notice and this permission notice shall be included in
|
|
|
|
|
* all copies or substantial portions of the Software.
|
|
|
|
|
*
|
|
|
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
|
|
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
|
|
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
|
|
|
|
* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
|
|
|
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
|
|
|
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
|
|
|
|
* THE SOFTWARE.
|
|
|
|
|
*/
|
2007-09-16 23:08:06 +02:00
|
|
|
/*
|
2006-04-27 23:32:09 +02:00
|
|
|
Shix 2.0 board by Alexis Polti, described at
|
2016-08-31 18:31:04 +02:00
|
|
|
https://web.archive.org/web/20070917001736/perso.enst.fr/~polti/realisations/shix20
|
2006-04-27 23:32:09 +02:00
|
|
|
|
2016-10-11 08:56:52 +02:00
|
|
|
More information in target/sh4/README.sh4
|
2006-04-27 23:32:09 +02:00
|
|
|
*/
|
2016-01-26 19:17:20 +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/hw.h"
|
2013-02-05 17:06:20 +01:00
|
|
|
#include "hw/sh4/sh.h"
|
2012-12-17 18:20:04 +01:00
|
|
|
#include "sysemu/sysemu.h"
|
2013-08-04 17:51:15 +02:00
|
|
|
#include "sysemu/qtest.h"
|
2013-02-04 15:40:22 +01:00
|
|
|
#include "hw/boards.h"
|
|
|
|
|
#include "hw/loader.h"
|
2012-12-17 18:19:49 +01:00
|
|
|
#include "exec/address-spaces.h"
|
2013-08-04 17:51:15 +02:00
|
|
|
#include "qemu/error-report.h"
|
2006-04-27 23:32:09 +02:00
|
|
|
|
|
|
|
|
#define BIOS_FILENAME "shix_bios.bin"
|
|
|
|
|
#define BIOS_ADDRESS 0xA0000000
|
|
|
|
|
|
2014-05-07 16:42:57 +02:00
|
|
|
static void shix_init(MachineState *machine)
|
2006-04-27 23:32:09 +02:00
|
|
|
{
|
|
|
|
|
int ret;
|
2013-04-09 16:51:24 +02:00
|
|
|
SuperHCPU *cpu;
|
2006-04-27 23:32:09 +02:00
|
|
|
struct SH7750State *s;
|
2011-10-06 12:52:27 +02:00
|
|
|
MemoryRegion *sysmem = get_system_memory();
|
|
|
|
|
MemoryRegion *rom = g_new(MemoryRegion, 1);
|
|
|
|
|
MemoryRegion *sdram = g_new(MemoryRegion, 2);
|
2007-11-10 16:15:54 +01:00
|
|
|
|
2017-10-05 15:50:54 +02:00
|
|
|
cpu = SUPERH_CPU(cpu_create(machine->cpu_type));
|
2006-04-27 23:32:09 +02:00
|
|
|
|
|
|
|
|
/* Allocate memory space */
|
2017-07-07 16:42:53 +02:00
|
|
|
memory_region_init_ram(rom, NULL, "shix.rom", 0x4000, &error_fatal);
|
2011-10-06 12:52:27 +02:00
|
|
|
memory_region_set_readonly(rom, true);
|
|
|
|
|
memory_region_add_subregion(sysmem, 0x00000000, rom);
|
2017-07-07 16:42:53 +02:00
|
|
|
memory_region_init_ram(&sdram[0], NULL, "shix.sdram1", 0x01000000,
|
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);
|
2011-10-06 12:52:27 +02:00
|
|
|
memory_region_add_subregion(sysmem, 0x08000000, &sdram[0]);
|
2017-07-07 16:42:53 +02:00
|
|
|
memory_region_init_ram(&sdram[1], NULL, "shix.sdram2", 0x01000000,
|
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);
|
2011-10-06 12:52:27 +02:00
|
|
|
memory_region_add_subregion(sysmem, 0x0c000000, &sdram[1]);
|
2006-04-27 23:32:09 +02:00
|
|
|
|
|
|
|
|
/* Load BIOS in 0 (and access it through P2, 0xA0000000) */
|
2007-10-05 15:08:35 +02:00
|
|
|
if (bios_name == NULL)
|
|
|
|
|
bios_name = BIOS_FILENAME;
|
2009-04-09 22:05:49 +02:00
|
|
|
ret = load_image_targphys(bios_name, 0, 0x4000);
|
2013-08-04 17:51:15 +02:00
|
|
|
if (ret < 0 && !qtest_enabled()) {
|
|
|
|
|
error_report("Could not load SHIX bios '%s'", bios_name);
|
|
|
|
|
exit(1);
|
2006-04-27 23:32:09 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Register peripherals */
|
2013-04-09 16:51:24 +02:00
|
|
|
s = sh7750_init(cpu, sysmem);
|
2006-04-27 23:32:09 +02:00
|
|
|
/* XXXXX Check success */
|
|
|
|
|
tc58128_init(s, "shix_linux_nand.bin", NULL);
|
|
|
|
|
}
|
|
|
|
|
|
2015-09-04 20:37:08 +02:00
|
|
|
static void shix_machine_init(MachineClass *mc)
|
2009-05-21 01:38:09 +02:00
|
|
|
{
|
2015-09-04 20:37:08 +02:00
|
|
|
mc->desc = "shix card";
|
|
|
|
|
mc->init = shix_init;
|
|
|
|
|
mc->is_default = 1;
|
2017-10-05 15:50:54 +02:00
|
|
|
mc->default_cpu_type = TYPE_SH7750R_CPU;
|
2009-05-21 01:38:09 +02:00
|
|
|
}
|
|
|
|
|
|
2015-09-04 20:37:08 +02:00
|
|
|
DEFINE_MACHINE("shix", shix_machine_init)
|