The current DMA routines are driven by a call in main_loop_wait() after every select. This patch converts the DMA code to be driven by a constantly rescheduled bottom half. The advantage of using a scheduled bottom half is that we can stop scheduling the bottom half when there no DMA channels are runnable. This means we can potentially detect this case and sleep longer in the main loop. The only two architectures implementing DMA_run() are cris and i386. For cris, I converted it to a simple repeating bottom half. I've only compile tested this as cris does not seem to work on a 64-bit host. It should be functionally identical to the previous implementation so I expect it to work. For x86, I've made sure to only fire the DMA bottom half if there is a DMA channel that is runnable. The effect of this is that unless you're using sb16 or a floppy disk, the DMA bottom half never fires. You probably should test this malc. My own benchmarks actually show slight improvement by it's possible the change in timing could affect your demos. Since v1, I've changed the code to use a BH instead of a timer. cris at least seems to depend on faster than 10ms polling. Signed-off-by: Anthony Liguori <aliguori@us.ibm.com> git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@5573 c046a42c-6fe2-441c-8c8c-71466251a162
92 lines
2.2 KiB
C
92 lines
2.2 KiB
C
/*
|
|
* Arnewsh 5206 ColdFire system emulation.
|
|
*
|
|
* Copyright (c) 2007 CodeSourcery.
|
|
*
|
|
* This code is licenced under the GPL
|
|
*/
|
|
|
|
#include "hw.h"
|
|
#include "mcf.h"
|
|
#include "sysemu.h"
|
|
#include "boards.h"
|
|
|
|
#define KERNEL_LOAD_ADDR 0x10000
|
|
#define AN5206_MBAR_ADDR 0x10000000
|
|
#define AN5206_RAMBAR_ADDR 0x20000000
|
|
|
|
/* Stub functions for hardware that doesn't exist. */
|
|
void pic_info(void)
|
|
{
|
|
}
|
|
|
|
void irq_info(void)
|
|
{
|
|
}
|
|
|
|
/* Board init. */
|
|
|
|
static void an5206_init(ram_addr_t ram_size, int vga_ram_size,
|
|
const char *boot_device, DisplayState *ds,
|
|
const char *kernel_filename, const char *kernel_cmdline,
|
|
const char *initrd_filename, const char *cpu_model)
|
|
{
|
|
CPUState *env;
|
|
int kernel_size;
|
|
uint64_t elf_entry;
|
|
target_ulong entry;
|
|
|
|
if (!cpu_model)
|
|
cpu_model = "m5206";
|
|
env = cpu_init(cpu_model);
|
|
if (!env) {
|
|
cpu_abort(env, "Unable to find m68k CPU definition\n");
|
|
}
|
|
|
|
/* Initialize CPU registers. */
|
|
env->vbr = 0;
|
|
/* TODO: allow changing MBAR and RAMBAR. */
|
|
env->mbar = AN5206_MBAR_ADDR | 1;
|
|
env->rambar0 = AN5206_RAMBAR_ADDR | 1;
|
|
|
|
/* DRAM at address zero */
|
|
cpu_register_physical_memory(0, ram_size,
|
|
qemu_ram_alloc(ram_size) | IO_MEM_RAM);
|
|
|
|
/* Internal SRAM. */
|
|
cpu_register_physical_memory(AN5206_RAMBAR_ADDR, 512,
|
|
qemu_ram_alloc(512) | IO_MEM_RAM);
|
|
|
|
mcf5206_init(AN5206_MBAR_ADDR, env);
|
|
|
|
/* Load kernel. */
|
|
if (!kernel_filename) {
|
|
fprintf(stderr, "Kernel image must be specified\n");
|
|
exit(1);
|
|
}
|
|
|
|
kernel_size = load_elf(kernel_filename, 0, &elf_entry, NULL, NULL);
|
|
entry = elf_entry;
|
|
if (kernel_size < 0) {
|
|
kernel_size = load_uboot(kernel_filename, &entry, NULL);
|
|
}
|
|
if (kernel_size < 0) {
|
|
kernel_size = load_image(kernel_filename,
|
|
phys_ram_base + KERNEL_LOAD_ADDR);
|
|
entry = KERNEL_LOAD_ADDR;
|
|
}
|
|
if (kernel_size < 0) {
|
|
fprintf(stderr, "qemu: could not load kernel '%s'\n", kernel_filename);
|
|
exit(1);
|
|
}
|
|
|
|
env->pc = entry;
|
|
}
|
|
|
|
QEMUMachine an5206_machine = {
|
|
.name = "an5206",
|
|
.desc = "Arnewsh 5206",
|
|
.init = an5206_init,
|
|
.ram_require = 512,
|
|
};
|