2d0d2837dc
There are QEMUMachines that have neither IF_IDE nor IF_SCSI as a default/standard interface to their block devices / drives. Therefore, this patch introduces a new field default_block_type per QEMUMachine struct. The prior use_scsi field becomes thereby obsolete and is replaced through .default_block_type = IF_SCSI. This patch also changes the default for s390x to IF_VIRTIO and removes an early hack that converts IF_IDE drives. Other parties have already claimed interest (e.g. IF_SD for exynos) To create a sane default, for machines that dont specify a default_block_type, this patch makes IF_IDE = 0 and IF_NONE = 1. I checked all users of IF_NONE (blockdev.c and ww/device-hotplug.c) as well as IF_IDE and it seems that it is ok to change the defines - in other words, I found no obvious (to me) assumption in the code regarding IF_NONE==0. IF_NONE is only set if there is an explicit if=none. Without if=* the interface becomes IF_DEFAULT. I would suggest to have some additional care, e.g. by letting this patch sit some days in the block tree. Based on an initial patch from Einar Lueck <elelueck@de.ibm.com> Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com> CC: Igor Mitsyanko <i.mitsyanko@samsung.com> CC: Markus Armbruster <armbru@redhat.com> CC: Kevin Wolf <kwolf@redhat.com> Reviewed-by: Alexander Graf <agraf@suse.de> Acked-by: Igor Mitsyanko <i.mitsyanko@samsung.com> Reviewed-by: Markus Armbruster <armbru@redhat.com> Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
133 lines
3.8 KiB
C
133 lines
3.8 KiB
C
/*
|
|
* 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.
|
|
*/
|
|
#include "console.h"
|
|
#include "elf.h"
|
|
#include "exec-memory.h"
|
|
#include "sysbus.h"
|
|
#include "boards.h"
|
|
#include "loader.h"
|
|
#include "pc.h"
|
|
|
|
#undef DEBUG_PUV3
|
|
#include "puv3.h"
|
|
|
|
#define KERNEL_LOAD_ADDR 0x03000000
|
|
#define KERNEL_MAX_SIZE 0x00800000 /* Just a guess */
|
|
|
|
static void puv3_intc_cpu_handler(void *opaque, int irq, int level)
|
|
{
|
|
CPUUniCore32State *env = opaque;
|
|
|
|
assert(irq == 0);
|
|
if (level) {
|
|
cpu_interrupt(env, CPU_INTERRUPT_HARD);
|
|
} else {
|
|
cpu_reset_interrupt(env, CPU_INTERRUPT_HARD);
|
|
}
|
|
}
|
|
|
|
static void puv3_soc_init(CPUUniCore32State *env)
|
|
{
|
|
qemu_irq *cpu_intc, irqs[PUV3_IRQS_NR];
|
|
DeviceState *dev;
|
|
MemoryRegion *i8042 = g_new(MemoryRegion, 1);
|
|
int i;
|
|
|
|
/* Initialize interrupt controller */
|
|
cpu_intc = qemu_allocate_irqs(puv3_intc_cpu_handler, env, 1);
|
|
dev = sysbus_create_simple("puv3_intc", PUV3_INTC_BASE, *cpu_intc);
|
|
for (i = 0; i < PUV3_IRQS_NR; i++) {
|
|
irqs[i] = qdev_get_gpio_in(dev, i);
|
|
}
|
|
|
|
/* Initialize minimal necessary devices for kernel booting */
|
|
sysbus_create_simple("puv3_pm", PUV3_PM_BASE, NULL);
|
|
sysbus_create_simple("puv3_dma", PUV3_DMA_BASE, NULL);
|
|
sysbus_create_simple("puv3_ost", PUV3_OST_BASE, irqs[PUV3_IRQS_OST0]);
|
|
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);
|
|
|
|
/* 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);
|
|
}
|
|
|
|
static void puv3_board_init(CPUUniCore32State *env, ram_addr_t ram_size)
|
|
{
|
|
MemoryRegion *ram_memory = g_new(MemoryRegion, 1);
|
|
|
|
/* SDRAM at address zero. */
|
|
memory_region_init_ram(ram_memory, "puv3.ram", ram_size);
|
|
vmstate_register_ram_global(ram_memory);
|
|
memory_region_add_subregion(get_system_memory(), 0, ram_memory);
|
|
}
|
|
|
|
static void puv3_load_kernel(const char *kernel_filename)
|
|
{
|
|
int size;
|
|
|
|
assert(kernel_filename != NULL);
|
|
|
|
/* only zImage format supported */
|
|
size = load_image_targphys(kernel_filename, KERNEL_LOAD_ADDR,
|
|
KERNEL_MAX_SIZE);
|
|
if (size < 0) {
|
|
hw_error("Load kernel error: '%s'\n", kernel_filename);
|
|
}
|
|
|
|
/* cheat curses that we have a graphic console, only under ocd console */
|
|
graphic_console_init(NULL, NULL, NULL, NULL, NULL);
|
|
}
|
|
|
|
static void puv3_init(QEMUMachineInitArgs *args)
|
|
{
|
|
ram_addr_t ram_size = args->ram_size;
|
|
const char *cpu_model = args->cpu_model;
|
|
const char *kernel_filename = args->kernel_filename;
|
|
const char *initrd_filename = args->initrd_filename;
|
|
CPUUniCore32State *env;
|
|
|
|
if (initrd_filename) {
|
|
hw_error("Please use kernel built-in initramdisk.\n");
|
|
}
|
|
|
|
if (!cpu_model) {
|
|
cpu_model = "UniCore-II";
|
|
}
|
|
|
|
env = cpu_init(cpu_model);
|
|
if (!env) {
|
|
hw_error("Unable to find CPU definition\n");
|
|
}
|
|
|
|
puv3_soc_init(env);
|
|
puv3_board_init(env, ram_size);
|
|
puv3_load_kernel(kernel_filename);
|
|
}
|
|
|
|
static QEMUMachine puv3_machine = {
|
|
.name = "puv3",
|
|
.desc = "PKUnity Version-3 based on UniCore32",
|
|
.init = puv3_init,
|
|
.is_default = 1,
|
|
};
|
|
|
|
static void puv3_machine_init(void)
|
|
{
|
|
qemu_register_machine(&puv3_machine);
|
|
}
|
|
|
|
machine_init(puv3_machine_init)
|