--- qemu/hw/mips_jazz.c 2018/04/24 16:53:06 1.1 +++ qemu/hw/mips_jazz.c 2018/04/24 18:29:10 1.1.1.4 @@ -24,6 +24,7 @@ #include "hw.h" #include "mips.h" +#include "mips_cpudevs.h" #include "pc.h" #include "isa.h" #include "fdc.h" @@ -31,13 +32,10 @@ #include "audio/audio.h" #include "boards.h" #include "net.h" -#include "scsi.h" - -#ifdef TARGET_WORDS_BIGENDIAN -#define BIOS_FILENAME "mips_bios.bin" -#else -#define BIOS_FILENAME "mipsel_bios.bin" -#endif +#include "esp.h" +#include "mips-bios.h" +#include "loader.h" +#include "mc146818rtc.h" enum jazz_model_e { @@ -53,23 +51,21 @@ static void main_cpu_reset(void *opaque) static uint32_t rtc_readb(void *opaque, target_phys_addr_t addr) { - CPUState *env = opaque; - return cpu_inw(env, 0x71); + return cpu_inw(0x71); } static void rtc_writeb(void *opaque, target_phys_addr_t addr, uint32_t val) { - CPUState *env = opaque; - cpu_outw(env, 0x71, val & 0xff); + cpu_outw(0x71, val & 0xff); } -static CPUReadMemoryFunc *rtc_read[3] = { +static CPUReadMemoryFunc * const rtc_read[3] = { rtc_readb, rtc_readb, rtc_readb, }; -static CPUWriteMemoryFunc *rtc_write[3] = { +static CPUWriteMemoryFunc * const rtc_write[3] = { rtc_writeb, rtc_writeb, rtc_writeb, @@ -81,19 +77,18 @@ static void dma_dummy_writeb(void *opaqu * the current DMA acknowledge cycle is completed. */ } -static CPUReadMemoryFunc *dma_dummy_read[3] = { +static CPUReadMemoryFunc * const dma_dummy_read[3] = { NULL, NULL, NULL, }; -static CPUWriteMemoryFunc *dma_dummy_write[3] = { +static CPUWriteMemoryFunc * const dma_dummy_write[3] = { dma_dummy_writeb, dma_dummy_writeb, dma_dummy_writeb, }; -#ifdef HAS_AUDIO static void audio_init(qemu_irq *pic) { struct soundhw *c; @@ -104,43 +99,47 @@ static void audio_init(qemu_irq *pic) } if (audio_enabled) { - AudioState *s; - - s = AUD_init(); - if (s) { - for (c = soundhw; c->name; ++c) { - if (c->enabled) { - if (c->isa) { - c->init.init_isa(s, pic); - } + for (c = soundhw; c->name; ++c) { + if (c->enabled) { + if (c->isa) { + c->init.init_isa(pic); } } } } } -#endif #define MAGNUM_BIOS_SIZE_MAX 0x7e000 #define MAGNUM_BIOS_SIZE (BIOS_SIZE < MAGNUM_BIOS_SIZE_MAX ? BIOS_SIZE : MAGNUM_BIOS_SIZE_MAX) +static void cpu_request_exit(void *opaque, int irq, int level) +{ + CPUState *env = cpu_single_env; + + if (env && level) { + cpu_exit(env); + } +} + static -void mips_jazz_init (ram_addr_t ram_size, int vga_ram_size, +void mips_jazz_init (ram_addr_t ram_size, const char *cpu_model, enum jazz_model_e jazz_model) { - char buf[1024]; - unsigned long bios_offset; + char *filename; int bios_size, n; CPUState *env; qemu_irq *rc4030, *i8259; rc4030_dma *dmas; - rc4030_dma_function dma_read, dma_write; - void *scsi_hba; - int hd; + void* rc4030_opaque; int s_rtc, s_dma_dummy; + NICInfo *nd; PITState *pit; - BlockDriverState *fds[MAX_FD]; + DriveInfo *fds[MAX_FD]; qemu_irq esp_reset; + qemu_irq *cpu_exit_irq; + ram_addr_t ram_offset; + ram_addr_t bios_offset; /* init CPUs */ if (cpu_model == NULL) { @@ -159,100 +158,127 @@ void mips_jazz_init (ram_addr_t ram_size qemu_register_reset(main_cpu_reset, env); /* allocate RAM */ - cpu_register_physical_memory(0, ram_size, IO_MEM_RAM); + ram_offset = qemu_ram_alloc(NULL, "mips_jazz.ram", ram_size); + cpu_register_physical_memory(0, ram_size, ram_offset | IO_MEM_RAM); + + bios_offset = qemu_ram_alloc(NULL, "mips_jazz.bios", MAGNUM_BIOS_SIZE); + cpu_register_physical_memory(0x1fc00000LL, + MAGNUM_BIOS_SIZE, bios_offset | IO_MEM_ROM); + cpu_register_physical_memory(0xfff00000LL, + MAGNUM_BIOS_SIZE, bios_offset | IO_MEM_ROM); /* load the BIOS image. */ - bios_offset = ram_size + vga_ram_size; if (bios_name == NULL) bios_name = BIOS_FILENAME; - snprintf(buf, sizeof(buf), "%s/%s", bios_dir, bios_name); - bios_size = load_image(buf, phys_ram_base + bios_offset); + filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, bios_name); + if (filename) { + bios_size = load_image_targphys(filename, 0xfff00000LL, + MAGNUM_BIOS_SIZE); + qemu_free(filename); + } else { + bios_size = -1; + } if (bios_size < 0 || bios_size > MAGNUM_BIOS_SIZE) { fprintf(stderr, "qemu: Could not load MIPS bios '%s'\n", - buf); + bios_name); exit(1); } - cpu_register_physical_memory(0x1fc00000LL, - MAGNUM_BIOS_SIZE, bios_offset | IO_MEM_ROM); - cpu_register_physical_memory(0xfff00000LL, - MAGNUM_BIOS_SIZE, bios_offset | IO_MEM_ROM); - /* Init CPU internal devices */ cpu_mips_irq_init_cpu(env); cpu_mips_clock_init(env); /* Chipset */ - rc4030 = rc4030_init(env->irq[6], env->irq[3], - &dmas, &dma_read, &dma_write); - s_dma_dummy = cpu_register_io_memory(0, dma_dummy_read, dma_dummy_write, NULL); + rc4030_opaque = rc4030_init(env->irq[6], env->irq[3], &rc4030, &dmas); + s_dma_dummy = cpu_register_io_memory(dma_dummy_read, dma_dummy_write, NULL); cpu_register_physical_memory(0x8000d000, 0x00001000, s_dma_dummy); /* ISA devices */ i8259 = i8259_init(env->irq[4]); - DMA_init(0); + isa_bus_new(NULL); + isa_bus_irqs(i8259); + cpu_exit_irq = qemu_allocate_irqs(cpu_request_exit, NULL, 1); + DMA_init(0, cpu_exit_irq); pit = pit_init(0x40, i8259[0]); pcspk_init(pit); /* ISA IO space at 0x90000000 */ - isa_mmio_init(0x90000000, 0x01000000); +#ifdef TARGET_WORDS_BIGENDIAN + isa_mmio_init(0x90000000, 0x01000000, 1); +#else + isa_mmio_init(0x90000000, 0x01000000, 0); +#endif + isa_mem_base = 0x11000000; /* Video card */ switch (jazz_model) { case JAZZ_MAGNUM: - g364fb_mm_init(phys_ram_base + ram_size, ram_size, vga_ram_size, - 0x40000000, 0x60000000, 0, rc4030[3]); + g364fb_mm_init(0x40000000, 0x60000000, 0, rc4030[3]); break; case JAZZ_PICA61: - isa_vga_mm_init(phys_ram_base + ram_size, ram_size, vga_ram_size, - 0x40000000, 0x60000000, 0); + isa_vga_mm_init(0x40000000, 0x60000000, 0); break; default: break; } /* Network controller */ - /* FIXME: missing NS SONIC DP83932 */ - - /* SCSI adapter */ - scsi_hba = esp_init(0x80002000, 0, - dma_read, dma_write, dmas[0], - rc4030[5], &esp_reset); - for (n = 0; n < ESP_MAX_DEVS; n++) { - hd = drive_get_index(IF_SCSI, 0, n); - if (hd != -1) { - esp_scsi_attach(scsi_hba, drives_table[hd].bdrv, n); + for (n = 0; n < nb_nics; n++) { + nd = &nd_table[n]; + if (!nd->model) + nd->model = qemu_strdup("dp83932"); + if (strcmp(nd->model, "dp83932") == 0) { + dp83932_init(nd, 0x80001000, 2, rc4030[4], + rc4030_opaque, rc4030_dma_memory_rw); + break; + } else if (strcmp(nd->model, "?") == 0) { + fprintf(stderr, "qemu: Supported NICs: dp83932\n"); + exit(1); + } else { + fprintf(stderr, "qemu: Unsupported NIC: %s\n", nd->model); + exit(1); } } + /* SCSI adapter */ + esp_init(0x80002000, 0, + rc4030_dma_read, rc4030_dma_write, dmas[0], + rc4030[5], &esp_reset); + /* Floppy */ if (drive_get_max_bus(IF_FLOPPY) >= MAX_FD) { fprintf(stderr, "qemu: too many floppy drives\n"); exit(1); } for (n = 0; n < MAX_FD; n++) { - int fd = drive_get_index(IF_FLOPPY, 0, n); - if (fd != -1) - fds[n] = drives_table[fd].bdrv; - else - fds[n] = NULL; + fds[n] = drive_get(IF_FLOPPY, 0, n); } - fdctrl_init(rc4030[1], 0, 1, 0x80003000, fds); + fdctrl_init_sysbus(rc4030[1], 0, 0x80003000, fds); /* Real time clock */ - rtc_init(0x70, i8259[8], 1980); - s_rtc = cpu_register_io_memory(0, rtc_read, rtc_write, env); + rtc_init(1980, NULL); + s_rtc = cpu_register_io_memory(rtc_read, rtc_write, NULL); cpu_register_physical_memory(0x80004000, 0x00001000, s_rtc); /* Keyboard (i8042) */ i8042_mm_init(rc4030[6], rc4030[7], 0x80005000, 0x1000, 0x1); /* Serial ports */ - if (serial_hds[0]) - serial_mm_init(0x80006000, 0, rc4030[8], 8000000/16, serial_hds[0], 1); - if (serial_hds[1]) - serial_mm_init(0x80007000, 0, rc4030[9], 8000000/16, serial_hds[1], 1); + if (serial_hds[0]) { +#ifdef TARGET_WORDS_BIGENDIAN + serial_mm_init(0x80006000, 0, rc4030[8], 8000000/16, serial_hds[0], 1, 1); +#else + serial_mm_init(0x80006000, 0, rc4030[8], 8000000/16, serial_hds[0], 1, 0); +#endif + } + if (serial_hds[1]) { +#ifdef TARGET_WORDS_BIGENDIAN + serial_mm_init(0x80007000, 0, rc4030[9], 8000000/16, serial_hds[1], 1, 1); +#else + serial_mm_init(0x80007000, 0, rc4030[9], 8000000/16, serial_hds[1], 1, 0); +#endif + } /* Parallel port */ if (parallel_hds[0]) @@ -260,9 +286,7 @@ void mips_jazz_init (ram_addr_t ram_size /* Sound card */ /* FIXME: missing Jazz sound at 0x8000c000, rc4030[2] */ -#ifdef HAS_AUDIO audio_init(i8259); -#endif /* NVRAM: Unprotected at 0x9000, Protected at 0xa000, Read only at 0xb000 */ ds1225y_init(0x80009000, "nvram"); @@ -272,37 +296,41 @@ void mips_jazz_init (ram_addr_t ram_size } static -void mips_magnum_init (ram_addr_t ram_size, int vga_ram_size, +void mips_magnum_init (ram_addr_t ram_size, const char *boot_device, const char *kernel_filename, const char *kernel_cmdline, const char *initrd_filename, const char *cpu_model) { - mips_jazz_init(ram_size, vga_ram_size, cpu_model, JAZZ_MAGNUM); + mips_jazz_init(ram_size, cpu_model, JAZZ_MAGNUM); } static -void mips_pica61_init (ram_addr_t ram_size, int vga_ram_size, +void mips_pica61_init (ram_addr_t ram_size, const char *boot_device, const char *kernel_filename, const char *kernel_cmdline, const char *initrd_filename, const char *cpu_model) { - mips_jazz_init(ram_size, vga_ram_size, cpu_model, JAZZ_PICA61); + mips_jazz_init(ram_size, cpu_model, JAZZ_PICA61); } -QEMUMachine mips_magnum_machine = { +static QEMUMachine mips_magnum_machine = { .name = "magnum", .desc = "MIPS Magnum", .init = mips_magnum_init, - .ram_require = MAGNUM_BIOS_SIZE + VGA_RAM_SIZE, - .nodisk_ok = 1, .use_scsi = 1, }; -QEMUMachine mips_pica61_machine = { +static QEMUMachine mips_pica61_machine = { .name = "pica61", .desc = "Acer Pica 61", .init = mips_pica61_init, - .ram_require = MAGNUM_BIOS_SIZE + VGA_RAM_SIZE, - .nodisk_ok = 1, .use_scsi = 1, }; + +static void mips_jazz_machine_init(void) +{ + qemu_register_machine(&mips_magnum_machine); + qemu_register_machine(&mips_pica61_machine); +} + +machine_init(mips_jazz_machine_init);