X-Git-Url: https://vcs.maemo.org/git/?a=blobdiff_plain;f=hw%2Fpc.c;h=cd28998e1e34805ce2a8eddc890531bd767cf7e1;hb=bb36d4708bc93874af95db54da2a9cee0d30a84d;hp=eef120e0eecbcacd58ba0ebdb44f051662afd776;hpb=ee22c2f7dbcc59d9b0c0c9e08fafc9c4759b37fc;p=qemu diff --git a/hw/pc.c b/hw/pc.c index eef120e..cd28998 100644 --- a/hw/pc.c +++ b/hw/pc.c @@ -28,6 +28,7 @@ #define BIOS_FILENAME "bios.bin" #define VGABIOS_FILENAME "vgabios.bin" +#define VGABIOS_CIRRUS_FILENAME "vgabios-cirrus.bin" #define LINUX_BOOT_FILENAME "linux_boot.bin" #define KERNEL_LOAD_ADDR 0x00100000 @@ -40,6 +41,7 @@ int dummy_refresh_clock; static fdctrl_t *floppy_controller; static RTCState *rtc_state; static PITState *pit; +static IOAPICState *ioapic; static void ioport80_write(void *opaque, uint32_t addr, uint32_t data) { @@ -64,6 +66,31 @@ uint64_t cpu_get_tsc(CPUX86State *env) return qemu_get_clock(vm_clock); } +/* IRQ handling */ +int cpu_get_pic_interrupt(CPUState *env) +{ + int intno; + + intno = apic_get_interrupt(env); + if (intno >= 0) { + /* set irq request if a PIC irq is still pending */ + /* XXX: improve that */ + pic_update_irq(isa_pic); + return intno; + } + /* read the irq from the PIC */ + intno = pic_read_irq(isa_pic); + return intno; +} + +static void pic_irq_request(void *opaque, int level) +{ + if (level) + cpu_interrupt(cpu_single_env, CPU_INTERRUPT_HARD); + else + cpu_reset_interrupt(cpu_single_env, CPU_INTERRUPT_HARD); +} + /* PC cmos mappings */ #define REG_EQUIPMENT_BYTE 0x14 @@ -100,13 +127,32 @@ static int cmos_get_fd_drive_type(int fd0) return val; } -static void cmos_init(int ram_size, int boot_device) +static void cmos_init_hd(int type_ofs, int info_ofs, BlockDriverState *hd) +{ + RTCState *s = rtc_state; + int cylinders, heads, sectors; + bdrv_get_geometry_hint(hd, &cylinders, &heads, §ors); + rtc_set_memory(s, type_ofs, 47); + rtc_set_memory(s, info_ofs, cylinders); + rtc_set_memory(s, info_ofs + 1, cylinders >> 8); + rtc_set_memory(s, info_ofs + 2, heads); + rtc_set_memory(s, info_ofs + 3, 0xff); + rtc_set_memory(s, info_ofs + 4, 0xff); + rtc_set_memory(s, info_ofs + 5, 0xc0 | ((heads > 8) << 3)); + rtc_set_memory(s, info_ofs + 6, cylinders); + rtc_set_memory(s, info_ofs + 7, cylinders >> 8); + rtc_set_memory(s, info_ofs + 8, sectors); +} + +/* hd_table must contain 4 block drivers */ +static void cmos_init(int ram_size, int boot_device, BlockDriverState **hd_table) { RTCState *s = rtc_state; int val; int fd0, fd1, nb; time_t ti; struct tm *tm; + int i; /* set the CMOS date */ time(&ti); @@ -135,7 +181,10 @@ static void cmos_init(int ram_size, int boot_device) rtc_set_memory(s, 0x30, val); rtc_set_memory(s, 0x31, val >> 8); - val = (ram_size / 65536) - ((16 * 1024 * 1024) / 65536); + if (ram_size > (16 * 1024 * 1024)) + val = (ram_size / 65536) - ((16 * 1024 * 1024) / 65536); + else + val = 0; if (val > 65535) val = 65535; rtc_set_memory(s, 0x34, val); @@ -183,6 +232,43 @@ static void cmos_init(int ram_size, int boot_device) val |= 0x04; /* PS/2 mouse installed */ rtc_set_memory(s, REG_EQUIPMENT_BYTE, val); + /* hard drives */ + + rtc_set_memory(s, 0x12, (hd_table[0] ? 0xf0 : 0) | (hd_table[1] ? 0x0f : 0)); + if (hd_table[0]) + cmos_init_hd(0x19, 0x1b, hd_table[0]); + if (hd_table[1]) + cmos_init_hd(0x1a, 0x24, hd_table[1]); + + val = 0; + for (i = 0; i < 4; i++) { + if (hd_table[i]) { + int cylinders, heads, sectors, translation; + /* NOTE: bdrv_get_geometry_hint() returns the physical + geometry. It is always such that: 1 <= sects <= 63, 1 + <= heads <= 16, 1 <= cylinders <= 16383. The BIOS + geometry can be different if a translation is done. */ + translation = bdrv_get_translation_hint(hd_table[i]); + if (translation == BIOS_ATA_TRANSLATION_AUTO) { + bdrv_get_geometry_hint(hd_table[i], &cylinders, &heads, §ors); + if (cylinders <= 1024 && heads <= 16 && sectors <= 63) { + /* No translation. */ + translation = 0; + } else { + /* LBA translation. */ + translation = 1; + } + } else { + translation--; + } + val |= translation << (i * 2); + } + } + rtc_set_memory(s, 0x39, val); + + /* Disable check of 0x55AA signature on the last two bytes of + first sector of disk. XXX: make it the default ? */ + // rtc_set_memory(s, 0x38, 1); } static void speaker_ioport_write(void *opaque, uint32_t addr, uint32_t val) @@ -216,6 +302,9 @@ static uint32_t ioport92_read(void *opaque, uint32_t addr) void bochs_bios_write(void *opaque, uint32_t addr, uint32_t val) { + static const char shutdown_str[8] = "Shutdown"; + static int shutdown_index = 0; + switch(addr) { /* Bochs BIOS messages */ case 0x400: @@ -228,6 +317,18 @@ void bochs_bios_write(void *opaque, uint32_t addr, uint32_t val) fprintf(stderr, "%c", val); #endif break; + case 0x8900: + /* same as Bochs power off */ + if (val == shutdown_str[shutdown_index]) { + shutdown_index++; + if (shutdown_index == 8) { + shutdown_index = 0; + qemu_system_shutdown_request(); + } + } else { + shutdown_index = 0; + } + break; /* LGPL'ed VGA BIOS messages */ case 0x501: @@ -249,6 +350,7 @@ void bochs_bios_init(void) register_ioport_write(0x401, 1, 2, bochs_bios_write, NULL); register_ioport_write(0x402, 1, 1, bochs_bios_write, NULL); register_ioport_write(0x403, 1, 1, bochs_bios_write, NULL); + register_ioport_write(0x8900, 1, 1, bochs_bios_write, NULL); register_ioport_write(0x501, 1, 2, bochs_bios_write, NULL); register_ioport_write(0x502, 1, 2, bochs_bios_write, NULL); @@ -263,7 +365,7 @@ int load_kernel(const char *filename, uint8_t *addr, int fd, size; int setup_sects; - fd = open(filename, O_RDONLY); + fd = open(filename, O_RDONLY | O_BINARY); if (fd < 0) return -1; @@ -294,17 +396,26 @@ static const int ide_irq[2] = { 14, 15 }; #define NE2000_NB_MAX 6 -static uint32_t ne2000_io[NE2000_NB_MAX] = { 0x300, 0x320, 0x340, 0x360, 0x280, 0x380 }; +static int ne2000_io[NE2000_NB_MAX] = { 0x300, 0x320, 0x340, 0x360, 0x280, 0x380 }; static int ne2000_irq[NE2000_NB_MAX] = { 9, 10, 11, 3, 4, 5 }; +static int serial_io[MAX_SERIAL_PORTS] = { 0x3f8, 0x2f8, 0x3e8, 0x2e8 }; +static int serial_irq[MAX_SERIAL_PORTS] = { 4, 3, 4, 3 }; + +static int parallel_io[MAX_PARALLEL_PORTS] = { 0x378, 0x278, 0x3bc }; +static int parallel_irq[MAX_PARALLEL_PORTS] = { 7, 7, 7 }; + /* PC hardware initialisation */ -void pc_init(int ram_size, int vga_ram_size, int boot_device, - DisplayState *ds, const char **fd_filename, int snapshot, - const char *kernel_filename, const char *kernel_cmdline, - const char *initrd_filename) +static void pc_init1(int ram_size, int vga_ram_size, int boot_device, + DisplayState *ds, const char **fd_filename, int snapshot, + const char *kernel_filename, const char *kernel_cmdline, + const char *initrd_filename) { char buf[1024]; - int ret, linux_boot, initrd_size, i, nb_nics1, fd; + int ret, linux_boot, initrd_size, i, nb_nics1; + unsigned long bios_offset, vga_bios_offset; + int bios_size, isa_bios_size; + PCIBus *pci_bus; linux_boot = (kernel_filename != NULL); @@ -312,21 +423,47 @@ void pc_init(int ram_size, int vga_ram_size, int boot_device, cpu_register_physical_memory(0, ram_size, 0); /* BIOS load */ + bios_offset = ram_size + vga_ram_size; + vga_bios_offset = bios_offset + 256 * 1024; + snprintf(buf, sizeof(buf), "%s/%s", bios_dir, BIOS_FILENAME); - ret = load_image(buf, phys_ram_base + 0x000f0000); - if (ret != 0x10000) { + bios_size = get_image_size(buf); + if (bios_size <= 0 || + (bios_size % 65536) != 0 || + bios_size > (256 * 1024)) { + goto bios_error; + } + ret = load_image(buf, phys_ram_base + bios_offset); + if (ret != bios_size) { + bios_error: fprintf(stderr, "qemu: could not load PC bios '%s'\n", buf); exit(1); } - + /* VGA BIOS load */ - snprintf(buf, sizeof(buf), "%s/%s", bios_dir, VGABIOS_FILENAME); - ret = load_image(buf, phys_ram_base + 0x000c0000); + if (cirrus_vga_enabled) { + snprintf(buf, sizeof(buf), "%s/%s", bios_dir, VGABIOS_CIRRUS_FILENAME); + } else { + snprintf(buf, sizeof(buf), "%s/%s", bios_dir, VGABIOS_FILENAME); + } + ret = load_image(buf, phys_ram_base + vga_bios_offset); /* setup basic memory access */ - cpu_register_physical_memory(0xc0000, 0x10000, 0xc0000 | IO_MEM_ROM); - cpu_register_physical_memory(0xd0000, 0x20000, IO_MEM_UNASSIGNED); - cpu_register_physical_memory(0xf0000, 0x10000, 0xf0000 | IO_MEM_ROM); + cpu_register_physical_memory(0xc0000, 0x10000, + vga_bios_offset | IO_MEM_ROM); + + /* map the last 128KB of the BIOS in ISA space */ + isa_bios_size = bios_size; + if (isa_bios_size > (128 * 1024)) + isa_bios_size = 128 * 1024; + cpu_register_physical_memory(0xd0000, (192 * 1024) - isa_bios_size, + IO_MEM_UNASSIGNED); + cpu_register_physical_memory(0x100000 - isa_bios_size, + isa_bios_size, + (bios_offset + bios_size - isa_bios_size) | IO_MEM_ROM); + /* map all the bios at the top of memory */ + cpu_register_physical_memory((uint32_t)(-bios_size), + bios_size, bios_offset | IO_MEM_ROM); bochs_bios_init(); @@ -387,8 +524,10 @@ void pc_init(int ram_size, int vga_ram_size, int boot_device, } if (pci_enabled) { - i440fx_init(); - piix3_init(); + pci_bus = i440fx_init(); + piix3_init(pci_bus); + } else { + pci_bus = NULL; } /* init basic PC hardware */ @@ -396,8 +535,19 @@ void pc_init(int ram_size, int vga_ram_size, int boot_device, register_ioport_write(0xf0, 1, 1, ioportF0_write, NULL); - vga_initialize(ds, phys_ram_base + ram_size, ram_size, - vga_ram_size, pci_enabled); + if (cirrus_vga_enabled) { + if (pci_enabled) { + pci_cirrus_vga_init(pci_bus, + ds, phys_ram_base + ram_size, ram_size, + vga_ram_size); + } else { + isa_cirrus_vga_init(ds, phys_ram_base + ram_size, ram_size, + vga_ram_size); + } + } else { + vga_initialize(pci_bus, ds, phys_ram_base + ram_size, ram_size, + vga_ram_size, 0, 0); + } rtc_state = rtc_init(0x70, 8); register_ioport_read(0x61, 1, 1, speaker_ioport_read, NULL); @@ -406,17 +556,33 @@ void pc_init(int ram_size, int vga_ram_size, int boot_device, register_ioport_read(0x92, 1, 1, ioport92_read, NULL); register_ioport_write(0x92, 1, 1, ioport92_write, NULL); - pic_init(); + if (pci_enabled) { + apic_init(cpu_single_env); + ioapic = ioapic_init(); + } + isa_pic = pic_init(pic_irq_request, cpu_single_env); pit = pit_init(0x40, 0); + if (pci_enabled) { + pic_set_alt_irq_func(isa_pic, ioapic_set_irq, ioapic); + } - fd = serial_open_device(); - serial_init(0x3f8, 4, fd); + for(i = 0; i < MAX_SERIAL_PORTS; i++) { + if (serial_hds[i]) { + serial_init(serial_io[i], serial_irq[i], serial_hds[i]); + } + } + + for(i = 0; i < MAX_PARALLEL_PORTS; i++) { + if (parallel_hds[i]) { + parallel_init(parallel_io[i], parallel_irq[i], parallel_hds[i]); + } + } if (pci_enabled) { for(i = 0; i < nb_nics; i++) { - pci_ne2000_init(&nd_table[i]); + pci_ne2000_init(pci_bus, &nd_table[i]); } - pci_piix3_ide_init(bs_table); + pci_piix3_ide_init(pci_bus, bs_table); } else { nb_nics1 = nb_nics; if (nb_nics1 > NE2000_NB_MAX) @@ -432,19 +598,49 @@ void pc_init(int ram_size, int vga_ram_size, int boot_device, } kbd_init(); - DMA_init(); + DMA_init(0); -#ifndef _WIN32 if (audio_enabled) { - /* no audio supported yet for win32 */ AUD_init(); - SB16_init(); - } + if (sb16_enabled) + SB16_init (); +#ifdef CONFIG_ADLIB + if (adlib_enabled) + Adlib_init (); #endif +#ifdef CONFIG_GUS + if (gus_enabled) + GUS_init (); +#endif + if (pci_enabled && es1370_enabled) + es1370_init (pci_bus); + } floppy_controller = fdctrl_init(6, 2, 0, 0x3f0, fd_table); - cmos_init(ram_size, boot_device); + cmos_init(ram_size, boot_device, bs_table); + + if (pci_enabled && usb_enabled) { + USBPort *usb_root_ports[2]; + USBDevice *usb_hub; + usb_uhci_init(pci_bus, usb_root_ports); +#if 0 + { + USBPort *usb_hub1_ports[4]; + USBPort *usb_hub2_ports[2]; + /* test: we simulate a USB hub */ + usb_hub = usb_hub_init(usb_hub1_ports, 4); + usb_attach(usb_root_ports[0], usb_hub); + + /* test: we simulate a USB hub */ + usb_hub = usb_hub_init(usb_hub2_ports, 2); + usb_attach(usb_hub1_ports[0], usb_hub); + } +#endif + /* simulated hub with the host USB devices connected to it */ + usb_hub = usb_host_hub_init(); + usb_attach(usb_root_ports[0], usb_hub); + } /* must be done after all PCI devices are instanciated */ /* XXX: should be done in the Bochs BIOS */ @@ -452,3 +648,9 @@ void pc_init(int ram_size, int vga_ram_size, int boot_device, pci_bios_init(); } } + +QEMUMachine pc_machine = { + "pc", + "Standard PC", + pc_init1, +};