2010-06-29 06:50:43 +04:00
|
|
|
/*
|
|
|
|
* QEMU fulong 2e mini pc support
|
|
|
|
*
|
|
|
|
* Copyright (c) 2008 yajin (yajin@vm-kernel.org)
|
|
|
|
* Copyright (c) 2009 chenming (chenming@rdc.faw.com.cn)
|
|
|
|
* Copyright (c) 2010 Huacai Chen (zltjiangshi@gmail.com)
|
|
|
|
* This code is licensed under the GNU GPL v2.
|
2012-01-13 20:44:23 +04:00
|
|
|
*
|
|
|
|
* Contributions after 2012-01-13 are licensed under the terms of the
|
|
|
|
* GNU GPL, version 2 or (at your option) any later version.
|
2010-06-29 06:50:43 +04:00
|
|
|
*/
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Fulong 2e mini pc is based on ICT/ST Loongson 2e CPU (MIPS III like, 800MHz)
|
|
|
|
* http://www.linux-mips.org/wiki/Fulong
|
|
|
|
*
|
|
|
|
* Loongson 2e user manual:
|
|
|
|
* http://www.loongsondeveloper.com/doc/Loongson2EUserGuide.pdf
|
|
|
|
*/
|
|
|
|
|
2016-01-18 20:35:00 +03: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 11:01:28 +03:00
|
|
|
#include "qapi/error.h"
|
2013-02-04 18:40:22 +04:00
|
|
|
#include "hw/hw.h"
|
2013-02-05 20:06:20 +04:00
|
|
|
#include "hw/i386/pc.h"
|
|
|
|
#include "hw/char/serial.h"
|
|
|
|
#include "hw/block/fdc.h"
|
2012-10-24 10:43:34 +04:00
|
|
|
#include "net/net.h"
|
2013-02-04 18:40:22 +04:00
|
|
|
#include "hw/boards.h"
|
2013-02-05 20:06:20 +04:00
|
|
|
#include "hw/i2c/smbus.h"
|
2014-10-07 15:59:18 +04:00
|
|
|
#include "sysemu/block-backend.h"
|
2013-02-05 20:06:20 +04:00
|
|
|
#include "hw/block/flash.h"
|
|
|
|
#include "hw/mips/mips.h"
|
|
|
|
#include "hw/mips/cpudevs.h"
|
2013-02-04 18:40:22 +04:00
|
|
|
#include "hw/pci/pci.h"
|
2013-04-08 18:55:25 +04:00
|
|
|
#include "sysemu/char.h"
|
2012-12-17 21:20:04 +04:00
|
|
|
#include "sysemu/sysemu.h"
|
2010-06-29 06:50:43 +04:00
|
|
|
#include "audio/audio.h"
|
2012-12-17 21:20:00 +04:00
|
|
|
#include "qemu/log.h"
|
2013-02-04 18:40:22 +04:00
|
|
|
#include "hw/loader.h"
|
2013-02-05 20:06:20 +04:00
|
|
|
#include "hw/mips/bios.h"
|
2013-02-04 18:40:22 +04:00
|
|
|
#include "hw/ide.h"
|
2010-06-29 06:50:43 +04:00
|
|
|
#include "elf.h"
|
2013-02-05 20:06:20 +04:00
|
|
|
#include "hw/isa/vt82c686.h"
|
|
|
|
#include "hw/timer/mc146818rtc.h"
|
|
|
|
#include "hw/timer/i8254.h"
|
2012-12-17 21:20:04 +04:00
|
|
|
#include "sysemu/blockdev.h"
|
2012-12-17 21:19:49 +04:00
|
|
|
#include "exec/address-spaces.h"
|
2013-07-29 18:05:30 +04:00
|
|
|
#include "sysemu/qtest.h"
|
2013-08-03 18:03:18 +04:00
|
|
|
#include "qemu/error-report.h"
|
2010-06-29 06:50:43 +04:00
|
|
|
|
|
|
|
#define DEBUG_FULONG2E_INIT
|
|
|
|
|
|
|
|
#define ENVP_ADDR 0x80002000l
|
|
|
|
#define ENVP_NB_ENTRIES 16
|
|
|
|
#define ENVP_ENTRY_SIZE 256
|
|
|
|
|
|
|
|
#define MAX_IDE_BUS 2
|
|
|
|
|
|
|
|
/*
|
|
|
|
* PMON is not part of qemu and released with BSD license, anyone
|
|
|
|
* who want to build a pmon binary please first git-clone the source
|
|
|
|
* from the git repository at:
|
|
|
|
* http://www.loongson.cn/support/git/pmon
|
|
|
|
* Then follow the "Compile Guide" available at:
|
|
|
|
* http://dev.lemote.com/code/pmon
|
|
|
|
*
|
|
|
|
* Notes:
|
|
|
|
* 1, don't use the source at http://dev.lemote.com/http_git/pmon.git
|
|
|
|
* 2, use "Bonito2edev" to replace "dir_corresponding_to_your_target_hardware"
|
|
|
|
* in the "Compile Guide".
|
|
|
|
*/
|
|
|
|
#define FULONG_BIOSNAME "pmon_fulong2e.bin"
|
|
|
|
|
|
|
|
/* PCI SLOT in fulong 2e */
|
|
|
|
#define FULONG2E_VIA_SLOT 5
|
|
|
|
#define FULONG2E_ATI_SLOT 6
|
|
|
|
#define FULONG2E_RTL8139_SLOT 7
|
|
|
|
|
2011-02-13 22:54:40 +03:00
|
|
|
static ISADevice *pit;
|
2010-06-29 06:50:43 +04:00
|
|
|
|
|
|
|
static struct _loaderparams {
|
|
|
|
int ram_size;
|
|
|
|
const char *kernel_filename;
|
|
|
|
const char *kernel_cmdline;
|
|
|
|
const char *initrd_filename;
|
|
|
|
} loaderparams;
|
|
|
|
|
2010-09-23 23:28:05 +04:00
|
|
|
static void GCC_FMT_ATTR(3, 4) prom_set(uint32_t* prom_buf, int index,
|
|
|
|
const char *string, ...)
|
2010-06-29 06:50:43 +04:00
|
|
|
{
|
|
|
|
va_list ap;
|
|
|
|
int32_t table_addr;
|
|
|
|
|
|
|
|
if (index >= ENVP_NB_ENTRIES)
|
|
|
|
return;
|
|
|
|
|
|
|
|
if (string == NULL) {
|
|
|
|
prom_buf[index] = 0;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
table_addr = sizeof(int32_t) * ENVP_NB_ENTRIES + index * ENVP_ENTRY_SIZE;
|
|
|
|
prom_buf[index] = tswap32(ENVP_ADDR + table_addr);
|
|
|
|
|
|
|
|
va_start(ap, string);
|
|
|
|
vsnprintf((char *)prom_buf + table_addr, ENVP_ENTRY_SIZE, string, ap);
|
|
|
|
va_end(ap);
|
|
|
|
}
|
|
|
|
|
2012-03-14 04:38:23 +04:00
|
|
|
static int64_t load_kernel (CPUMIPSState *env)
|
2010-06-29 06:50:43 +04:00
|
|
|
{
|
|
|
|
int64_t kernel_entry, kernel_low, kernel_high;
|
|
|
|
int index = 0;
|
|
|
|
long initrd_size;
|
|
|
|
ram_addr_t initrd_offset;
|
|
|
|
uint32_t *prom_buf;
|
|
|
|
long prom_size;
|
|
|
|
|
|
|
|
if (load_elf(loaderparams.kernel_filename, cpu_mips_kseg0_to_phys, NULL,
|
|
|
|
(uint64_t *)&kernel_entry, (uint64_t *)&kernel_low,
|
2016-03-04 14:30:21 +03:00
|
|
|
(uint64_t *)&kernel_high, 0, EM_MIPS, 1, 0) < 0) {
|
2010-06-29 06:50:43 +04:00
|
|
|
fprintf(stderr, "qemu: could not load kernel '%s'\n",
|
|
|
|
loaderparams.kernel_filename);
|
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* load initrd */
|
|
|
|
initrd_size = 0;
|
|
|
|
initrd_offset = 0;
|
|
|
|
if (loaderparams.initrd_filename) {
|
|
|
|
initrd_size = get_image_size (loaderparams.initrd_filename);
|
|
|
|
if (initrd_size > 0) {
|
2013-06-27 11:35:27 +04:00
|
|
|
initrd_offset = (kernel_high + ~INITRD_PAGE_MASK) & INITRD_PAGE_MASK;
|
2010-06-29 06:50:43 +04:00
|
|
|
if (initrd_offset + initrd_size > ram_size) {
|
|
|
|
fprintf(stderr,
|
|
|
|
"qemu: memory too small for initial ram disk '%s'\n",
|
|
|
|
loaderparams.initrd_filename);
|
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
initrd_size = load_image_targphys(loaderparams.initrd_filename,
|
|
|
|
initrd_offset, ram_size - initrd_offset);
|
|
|
|
}
|
|
|
|
if (initrd_size == (target_ulong) -1) {
|
|
|
|
fprintf(stderr, "qemu: could not load initial ram disk '%s'\n",
|
|
|
|
loaderparams.initrd_filename);
|
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Setup prom parameters. */
|
|
|
|
prom_size = ENVP_NB_ENTRIES * (sizeof(int32_t) + ENVP_ENTRY_SIZE);
|
2011-08-21 07:09:37 +04:00
|
|
|
prom_buf = g_malloc(prom_size);
|
2010-06-29 06:50:43 +04:00
|
|
|
|
2010-09-21 00:18:00 +04:00
|
|
|
prom_set(prom_buf, index++, "%s", loaderparams.kernel_filename);
|
2010-06-29 06:50:43 +04:00
|
|
|
if (initrd_size > 0) {
|
2010-09-21 00:18:00 +04:00
|
|
|
prom_set(prom_buf, index++, "rd_start=0x%" PRIx64 " rd_size=%li %s",
|
2010-06-29 06:50:43 +04:00
|
|
|
cpu_mips_phys_to_kseg0(NULL, initrd_offset), initrd_size,
|
|
|
|
loaderparams.kernel_cmdline);
|
|
|
|
} else {
|
2010-09-21 00:18:00 +04:00
|
|
|
prom_set(prom_buf, index++, "%s", loaderparams.kernel_cmdline);
|
2010-06-29 06:50:43 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Setup minimum environment variables */
|
|
|
|
prom_set(prom_buf, index++, "busclock=33000000");
|
|
|
|
prom_set(prom_buf, index++, "cpuclock=100000000");
|
|
|
|
prom_set(prom_buf, index++, "memsize=%i", loaderparams.ram_size/1024/1024);
|
|
|
|
prom_set(prom_buf, index++, "modetty0=38400n8r");
|
|
|
|
prom_set(prom_buf, index++, NULL);
|
|
|
|
|
|
|
|
rom_add_blob_fixed("prom", prom_buf, prom_size,
|
|
|
|
cpu_mips_kseg0_to_phys(NULL, ENVP_ADDR));
|
|
|
|
|
2015-04-28 12:11:02 +03:00
|
|
|
g_free(prom_buf);
|
2010-06-29 06:50:43 +04:00
|
|
|
return kernel_entry;
|
|
|
|
}
|
|
|
|
|
2012-03-14 04:38:23 +04:00
|
|
|
static void write_bootloader (CPUMIPSState *env, uint8_t *base, int64_t kernel_addr)
|
2010-06-29 06:50:43 +04:00
|
|
|
{
|
|
|
|
uint32_t *p;
|
|
|
|
|
|
|
|
/* Small bootloader */
|
|
|
|
p = (uint32_t *) base;
|
|
|
|
|
2014-03-28 21:43:14 +04:00
|
|
|
stl_p(p++, 0x0bf00010); /* j 0x1fc00040 */
|
|
|
|
stl_p(p++, 0x00000000); /* nop */
|
2010-06-29 06:50:43 +04:00
|
|
|
|
|
|
|
/* Second part of the bootloader */
|
|
|
|
p = (uint32_t *) (base + 0x040);
|
|
|
|
|
2014-03-28 21:43:14 +04:00
|
|
|
stl_p(p++, 0x3c040000); /* lui a0, 0 */
|
|
|
|
stl_p(p++, 0x34840002); /* ori a0, a0, 2 */
|
|
|
|
stl_p(p++, 0x3c050000 | ((ENVP_ADDR >> 16) & 0xffff)); /* lui a1, high(ENVP_ADDR) */
|
|
|
|
stl_p(p++, 0x34a50000 | (ENVP_ADDR & 0xffff)); /* ori a1, a0, low(ENVP_ADDR) */
|
|
|
|
stl_p(p++, 0x3c060000 | (((ENVP_ADDR + 8) >> 16) & 0xffff)); /* lui a2, high(ENVP_ADDR + 8) */
|
|
|
|
stl_p(p++, 0x34c60000 | ((ENVP_ADDR + 8) & 0xffff)); /* ori a2, a2, low(ENVP_ADDR + 8) */
|
|
|
|
stl_p(p++, 0x3c070000 | (loaderparams.ram_size >> 16)); /* lui a3, high(env->ram_size) */
|
|
|
|
stl_p(p++, 0x34e70000 | (loaderparams.ram_size & 0xffff)); /* ori a3, a3, low(env->ram_size) */
|
|
|
|
stl_p(p++, 0x3c1f0000 | ((kernel_addr >> 16) & 0xffff)); /* lui ra, high(kernel_addr) */;
|
|
|
|
stl_p(p++, 0x37ff0000 | (kernel_addr & 0xffff)); /* ori ra, ra, low(kernel_addr) */
|
|
|
|
stl_p(p++, 0x03e00008); /* jr ra */
|
|
|
|
stl_p(p++, 0x00000000); /* nop */
|
2010-06-29 06:50:43 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static void main_cpu_reset(void *opaque)
|
|
|
|
{
|
2012-05-05 15:56:22 +04:00
|
|
|
MIPSCPU *cpu = opaque;
|
|
|
|
CPUMIPSState *env = &cpu->env;
|
2010-06-29 06:50:43 +04:00
|
|
|
|
2012-05-05 15:56:22 +04:00
|
|
|
cpu_reset(CPU(cpu));
|
2010-06-29 06:50:43 +04:00
|
|
|
/* TODO: 2E reset stuff */
|
|
|
|
if (loaderparams.kernel_filename) {
|
|
|
|
env->CP0_Status &= ~((1 << CP0St_BEV) | (1 << CP0St_ERL));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-05-03 00:29:33 +04:00
|
|
|
static const uint8_t eeprom_spd[0x80] = {
|
2010-06-29 06:50:43 +04:00
|
|
|
0x80,0x08,0x07,0x0d,0x09,0x02,0x40,0x00,0x04,0x70,
|
|
|
|
0x70,0x00,0x82,0x10,0x00,0x01,0x0e,0x04,0x0c,0x01,
|
|
|
|
0x02,0x20,0x80,0x75,0x70,0x00,0x00,0x50,0x3c,0x50,
|
|
|
|
0x2d,0x20,0xb0,0xb0,0x50,0x50,0x00,0x00,0x00,0x00,
|
|
|
|
0x00,0x41,0x48,0x3c,0x32,0x75,0x00,0x00,0x00,0x00,
|
|
|
|
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
|
|
|
|
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
|
|
|
|
0x00,0x00,0x00,0x9c,0x7b,0x07,0x00,0x00,0x00,0x00,
|
|
|
|
0x00,0x00,0x00,0x00,0x48,0x42,0x35,0x34,0x41,0x32,
|
|
|
|
0x35,0x36,0x38,0x4b,0x4e,0x2d,0x41,0x37,0x35,0x42,
|
|
|
|
0x20,0x30,0x20
|
|
|
|
};
|
|
|
|
|
|
|
|
/* Audio support */
|
|
|
|
static void audio_init (PCIBus *pci_bus)
|
|
|
|
{
|
2010-07-27 10:24:47 +04:00
|
|
|
vt82c686b_ac97_init(pci_bus, PCI_DEVFN(FULONG2E_VIA_SLOT, 5));
|
|
|
|
vt82c686b_mc97_init(pci_bus, PCI_DEVFN(FULONG2E_VIA_SLOT, 6));
|
2010-06-29 06:50:43 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Network support */
|
2013-06-06 12:48:51 +04:00
|
|
|
static void network_init (PCIBus *pci_bus)
|
2010-06-29 06:50:43 +04:00
|
|
|
{
|
|
|
|
int i;
|
|
|
|
|
|
|
|
for(i = 0; i < nb_nics; i++) {
|
|
|
|
NICInfo *nd = &nd_table[i];
|
|
|
|
const char *default_devaddr = NULL;
|
|
|
|
|
|
|
|
if (i == 0 && (!nd->model || strcmp(nd->model, "rtl8139") == 0)) {
|
|
|
|
/* The fulong board has a RTL8139 card using PCI SLOT 7 */
|
|
|
|
default_devaddr = "07";
|
|
|
|
}
|
|
|
|
|
2013-06-06 12:48:51 +04:00
|
|
|
pci_nic_init_nofail(nd, pci_bus, "rtl8139", default_devaddr);
|
2010-06-29 06:50:43 +04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-05-07 18:42:57 +04:00
|
|
|
static void mips_fulong2e_init(MachineState *machine)
|
2010-06-29 06:50:43 +04:00
|
|
|
{
|
2014-05-07 18:42:57 +04: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 *kernel_cmdline = machine->kernel_cmdline;
|
|
|
|
const char *initrd_filename = machine->initrd_filename;
|
2010-06-29 06:50:43 +04:00
|
|
|
char *filename;
|
2011-08-08 22:46:13 +04:00
|
|
|
MemoryRegion *address_space_mem = get_system_memory();
|
|
|
|
MemoryRegion *ram = g_new(MemoryRegion, 1);
|
|
|
|
MemoryRegion *bios = g_new(MemoryRegion, 1);
|
2010-09-18 09:53:14 +04:00
|
|
|
long bios_size;
|
2010-06-29 06:50:43 +04:00
|
|
|
int64_t kernel_entry;
|
|
|
|
qemu_irq *i8259;
|
|
|
|
PCIBus *pci_bus;
|
2011-12-16 01:09:51 +04:00
|
|
|
ISABus *isa_bus;
|
2013-08-03 02:18:51 +04:00
|
|
|
I2CBus *smbus;
|
2010-06-29 06:50:43 +04:00
|
|
|
DriveInfo *hd[MAX_IDE_BUS * MAX_IDE_DEVS];
|
2012-05-05 15:54:41 +04:00
|
|
|
MIPSCPU *cpu;
|
2012-03-14 04:38:23 +04:00
|
|
|
CPUMIPSState *env;
|
2010-06-29 06:50:43 +04:00
|
|
|
|
|
|
|
/* init CPUs */
|
|
|
|
if (cpu_model == NULL) {
|
|
|
|
cpu_model = "Loongson-2E";
|
|
|
|
}
|
2012-05-05 15:54:41 +04:00
|
|
|
cpu = cpu_mips_init(cpu_model);
|
|
|
|
if (cpu == NULL) {
|
2010-06-29 06:50:43 +04:00
|
|
|
fprintf(stderr, "Unable to find CPU definition\n");
|
|
|
|
exit(1);
|
|
|
|
}
|
2012-05-05 15:54:41 +04:00
|
|
|
env = &cpu->env;
|
2010-06-29 06:50:43 +04:00
|
|
|
|
2012-05-05 15:56:22 +04:00
|
|
|
qemu_register_reset(main_cpu_reset, cpu);
|
2010-06-29 06:50:43 +04:00
|
|
|
|
|
|
|
/* fulong 2e has 256M ram. */
|
|
|
|
ram_size = 256 * 1024 * 1024;
|
|
|
|
|
|
|
|
/* fulong 2e has a 1M flash.Winbond W39L040AP70Z */
|
|
|
|
bios_size = 1024 * 1024;
|
|
|
|
|
|
|
|
/* allocate RAM */
|
2015-03-25 00:28:15 +03:00
|
|
|
memory_region_allocate_system_memory(ram, NULL, "fulong2e.ram", ram_size);
|
2014-09-09 09:27:55 +04:00
|
|
|
memory_region_init_ram(bios, NULL, "fulong2e.bios", bios_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 17:51:43 +03:00
|
|
|
&error_fatal);
|
2011-12-20 17:59:12 +04:00
|
|
|
vmstate_register_ram_global(bios);
|
2011-08-08 22:46:13 +04:00
|
|
|
memory_region_set_readonly(bios, true);
|
2010-06-29 06:50:43 +04:00
|
|
|
|
2011-08-08 22:46:13 +04:00
|
|
|
memory_region_add_subregion(address_space_mem, 0, ram);
|
|
|
|
memory_region_add_subregion(address_space_mem, 0x1fc00000LL, bios);
|
2010-06-29 06:50:43 +04:00
|
|
|
|
|
|
|
/* We do not support flash operation, just loading pmon.bin as raw BIOS.
|
|
|
|
* Please use -L to set the BIOS path and -bios to set bios name. */
|
|
|
|
|
|
|
|
if (kernel_filename) {
|
|
|
|
loaderparams.ram_size = ram_size;
|
|
|
|
loaderparams.kernel_filename = kernel_filename;
|
|
|
|
loaderparams.kernel_cmdline = kernel_cmdline;
|
|
|
|
loaderparams.initrd_filename = initrd_filename;
|
|
|
|
kernel_entry = load_kernel (env);
|
2011-08-08 22:46:13 +04:00
|
|
|
write_bootloader(env, memory_region_get_ram_ptr(bios), kernel_entry);
|
2010-06-29 06:50:43 +04:00
|
|
|
} else {
|
2010-06-30 21:39:45 +04:00
|
|
|
if (bios_name == NULL) {
|
|
|
|
bios_name = FULONG_BIOSNAME;
|
2010-06-29 06:50:43 +04:00
|
|
|
}
|
|
|
|
filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, bios_name);
|
|
|
|
if (filename) {
|
|
|
|
bios_size = load_image_targphys(filename, 0x1fc00000LL,
|
|
|
|
BIOS_SIZE);
|
2011-08-21 07:09:37 +04:00
|
|
|
g_free(filename);
|
2010-06-29 06:50:43 +04:00
|
|
|
} else {
|
|
|
|
bios_size = -1;
|
|
|
|
}
|
|
|
|
|
2013-07-29 18:05:30 +04:00
|
|
|
if ((bios_size < 0 || bios_size > BIOS_SIZE) &&
|
|
|
|
!kernel_filename && !qtest_enabled()) {
|
2013-08-03 18:03:18 +04:00
|
|
|
error_report("Could not load MIPS bios '%s'", bios_name);
|
|
|
|
exit(1);
|
2010-06-30 21:39:45 +04:00
|
|
|
}
|
2010-06-29 06:50:43 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Init internal devices */
|
2016-03-15 16:32:19 +03:00
|
|
|
cpu_mips_irq_init_cpu(cpu);
|
|
|
|
cpu_mips_clock_init(cpu);
|
2010-06-29 06:50:43 +04:00
|
|
|
|
|
|
|
/* North bridge, Bonito --> IP2 */
|
|
|
|
pci_bus = bonito_init((qemu_irq *)&(env->irq[2]));
|
|
|
|
|
|
|
|
/* South bridge */
|
2014-10-01 22:19:27 +04:00
|
|
|
ide_drive_get(hd, ARRAY_SIZE(hd));
|
2010-06-29 06:50:43 +04:00
|
|
|
|
2011-12-16 01:09:57 +04:00
|
|
|
isa_bus = vt82c686b_init(pci_bus, PCI_DEVFN(FULONG2E_VIA_SLOT, 0));
|
|
|
|
if (!isa_bus) {
|
2011-09-13 00:33:01 +04:00
|
|
|
fprintf(stderr, "vt82c686b_init error\n");
|
2010-06-29 06:50:43 +04:00
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
|
2011-09-28 13:19:02 +04:00
|
|
|
/* Interrupt controller */
|
|
|
|
/* The 8259 -> IP5 */
|
2011-12-16 01:09:51 +04:00
|
|
|
i8259 = i8259_init(isa_bus, env->irq[5]);
|
|
|
|
isa_bus_irqs(isa_bus, i8259);
|
2011-09-28 13:19:02 +04:00
|
|
|
|
2010-07-27 10:24:47 +04:00
|
|
|
vt82c686b_ide_init(pci_bus, hd, PCI_DEVFN(FULONG2E_VIA_SLOT, 1));
|
2012-03-07 18:06:32 +04:00
|
|
|
pci_create_simple(pci_bus, PCI_DEVFN(FULONG2E_VIA_SLOT, 2),
|
|
|
|
"vt82c686b-usb-uhci");
|
|
|
|
pci_create_simple(pci_bus, PCI_DEVFN(FULONG2E_VIA_SLOT, 3),
|
|
|
|
"vt82c686b-usb-uhci");
|
2010-06-29 06:50:43 +04:00
|
|
|
|
2010-07-27 10:24:47 +04:00
|
|
|
smbus = vt82c686b_pm_init(pci_bus, PCI_DEVFN(FULONG2E_VIA_SLOT, 4),
|
2010-06-29 06:50:43 +04:00
|
|
|
0xeee1, NULL);
|
|
|
|
/* TODO: Populate SPD eeprom data. */
|
2011-04-05 06:07:06 +04:00
|
|
|
smbus_eeprom_init(smbus, 1, eeprom_spd, sizeof(eeprom_spd));
|
2010-06-29 06:50:43 +04:00
|
|
|
|
|
|
|
/* init other devices */
|
2012-02-01 23:31:40 +04:00
|
|
|
pit = pit_init(isa_bus, 0x40, 0, NULL);
|
2016-02-03 19:28:55 +03:00
|
|
|
DMA_init(isa_bus, 0);
|
2010-06-29 06:50:43 +04:00
|
|
|
|
|
|
|
/* Super I/O */
|
2011-12-16 01:09:51 +04:00
|
|
|
isa_create_simple(isa_bus, "i8042");
|
2010-06-29 06:50:43 +04:00
|
|
|
|
2011-12-16 01:09:51 +04:00
|
|
|
rtc_init(isa_bus, 2000, NULL);
|
2010-06-29 06:50:43 +04:00
|
|
|
|
2016-10-22 12:52:44 +03:00
|
|
|
serial_hds_isa_init(isa_bus, 0, MAX_SERIAL_PORTS);
|
2015-02-04 20:33:07 +03:00
|
|
|
parallel_hds_isa_init(isa_bus, 1);
|
2010-06-29 06:50:43 +04:00
|
|
|
|
|
|
|
/* Sound card */
|
|
|
|
audio_init(pci_bus);
|
|
|
|
/* Network card */
|
2013-06-06 12:48:51 +04:00
|
|
|
network_init(pci_bus);
|
2010-06-29 06:50:43 +04:00
|
|
|
}
|
|
|
|
|
2015-09-04 21:37:08 +03:00
|
|
|
static void mips_fulong2e_machine_init(MachineClass *mc)
|
2010-06-29 06:50:43 +04:00
|
|
|
{
|
2015-09-04 21:37:08 +03:00
|
|
|
mc->desc = "Fulong 2e mini pc";
|
|
|
|
mc->init = mips_fulong2e_init;
|
2010-06-29 06:50:43 +04:00
|
|
|
}
|
|
|
|
|
2015-09-04 21:37:08 +03:00
|
|
|
DEFINE_MACHINE("fulong2e", mips_fulong2e_machine_init)
|