From 049a9f7b946fe1d3ff97127f8905881dbb78cb00 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herv=C3=A9=20Poussineau?= Date: Sat, 17 Mar 2012 15:39:41 +0100 Subject: [PATCH 1/5] i82378/i82374: Do not create DMA controller twice MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This fixes a crash in PReP emulation when using DMA controller to access floppy drive. Signed-off-by: Hervé Poussineau Signed-off-by: Andreas Färber --- hw/i82374.c | 5 ++++- hw/i82378.c | 5 +++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/hw/i82374.c b/hw/i82374.c index 67298a39f5..4a922c3f4e 100644 --- a/hw/i82374.c +++ b/hw/i82374.c @@ -38,6 +38,7 @@ do { fprintf(stderr, "i82374 ERROR: " fmt , ## __VA_ARGS__); } while (0) typedef struct I82374State { uint8_t commands[8]; + qemu_irq out; } I82374State; static const VMStateDescription vmstate_i82374 = { @@ -99,7 +100,7 @@ static uint32_t i82374_read_descriptor(void *opaque, uint32_t nport) static void i82374_init(I82374State *s) { - DMA_init(1, NULL); + DMA_init(1, &s->out); memset(s->commands, 0, sizeof(s->commands)); } @@ -132,6 +133,8 @@ static int i82374_isa_init(ISADevice *dev) i82374_init(s); + qdev_init_gpio_out(&dev->qdev, &s->out, 1); + return 0; } diff --git a/hw/i82378.c b/hw/i82378.c index faad1a365b..9b11d907eb 100644 --- a/hw/i82378.c +++ b/hw/i82378.c @@ -170,6 +170,7 @@ static void i82378_init(DeviceState *dev, I82378State *s) { ISABus *isabus = DO_UPCAST(ISABus, qbus, qdev_get_child_bus(dev, "isa.0")); ISADevice *pit; + ISADevice *isa; qemu_irq *out0_irq; /* This device has: @@ -199,8 +200,8 @@ static void i82378_init(DeviceState *dev, I82378State *s) pcspk_init(isabus, pit); /* 2 82C37 (dma) */ - DMA_init(1, &s->out[1]); - isa_create_simple(isabus, "i82374"); + isa = isa_create_simple(isabus, "i82374"); + qdev_connect_gpio_out(&isa->qdev, 0, s->out[1]); /* timer */ isa_create_simple(isabus, "mc146818rtc"); From c9ae703dd16f7ada889e88127a5e60527a62a005 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herv=C3=A9=20Poussineau?= Date: Sat, 17 Mar 2012 15:39:44 +0100 Subject: [PATCH 2/5] fdc: Parametrize ISA base, IRQ and DMA MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Keep the PC values as defaults but allow to override them for PReP. Signed-off-by: Hervé Poussineau Signed-off-by: Andreas Färber Reviewed-by: Markus Armbruster --- hw/fdc.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/hw/fdc.c b/hw/fdc.c index a0236b7295..756d4cefd5 100644 --- a/hw/fdc.c +++ b/hw/fdc.c @@ -438,6 +438,9 @@ typedef struct FDCtrlSysBus { typedef struct FDCtrlISABus { ISADevice busdev; + uint32_t iobase; + uint32_t irq; + uint32_t dma; struct FDCtrl state; int32_t bootindexA; int32_t bootindexB; @@ -1971,17 +1974,14 @@ static int isabus_fdc_init1(ISADevice *dev) { FDCtrlISABus *isa = DO_UPCAST(FDCtrlISABus, busdev, dev); FDCtrl *fdctrl = &isa->state; - int iobase = 0x3f0; - int isairq = 6; - int dma_chann = 2; int ret; - isa_register_portio_list(dev, iobase, fdc_portio_list, fdctrl, "fdc"); + isa_register_portio_list(dev, isa->iobase, fdc_portio_list, fdctrl, "fdc"); - isa_init_irq(&isa->busdev, &fdctrl->irq, isairq); - fdctrl->dma_chann = dma_chann; + isa_init_irq(&isa->busdev, &fdctrl->irq, isa->irq); + fdctrl->dma_chann = isa->dma; - qdev_set_legacy_instance_id(&dev->qdev, iobase, 2); + qdev_set_legacy_instance_id(&dev->qdev, isa->iobase, 2); ret = fdctrl_init_common(fdctrl); add_boot_device_path(isa->bootindexA, &dev->qdev, "/floppy@0"); @@ -2046,6 +2046,9 @@ static const VMStateDescription vmstate_isa_fdc ={ }; static Property isa_fdc_properties[] = { + DEFINE_PROP_HEX32("iobase", FDCtrlISABus, iobase, 0x3f0), + DEFINE_PROP_UINT32("irq", FDCtrlISABus, irq, 6), + DEFINE_PROP_UINT32("dma", FDCtrlISABus, dma, 2), DEFINE_PROP_DRIVE("driveA", FDCtrlISABus, state.drives[0].bs), DEFINE_PROP_DRIVE("driveB", FDCtrlISABus, state.drives[1].bs), DEFINE_PROP_INT32("bootindexA", FDCtrlISABus, bootindexA, -1), From a527b5452eb6bb7ee00c940c450e592f0b448042 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herv=C3=A9=20Poussineau?= Date: Sat, 17 Mar 2012 15:39:43 +0100 Subject: [PATCH 3/5] isa: Add isa_bus_from_device() method MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Hervé Poussineau Acked-by: Gerd Hoffmann Signed-off-by: Andreas Färber --- hw/isa.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/hw/isa.h b/hw/isa.h index 40373fb107..f7bc4b5a95 100644 --- a/hw/isa.h +++ b/hw/isa.h @@ -76,6 +76,11 @@ void isa_register_portio_list(ISADevice *dev, uint16_t start, const MemoryRegionPortio *portio, void *opaque, const char *name); +static inline ISABus *isa_bus_from_device(ISADevice *d) +{ + return DO_UPCAST(ISABus, qbus, d->qdev.parent_bus); +} + extern target_phys_addr_t isa_mem_base; void isa_mmio_setup(MemoryRegion *mr, target_phys_addr_t size); From 9357b1449a6daa6fd79e2375f0aa8b1f60635bcb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herv=C3=A9=20Poussineau?= Date: Sat, 14 Apr 2012 22:51:34 +0200 Subject: [PATCH 4/5] prep: Initialize PC speaker MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Speaker init has been added in 506b7ddf889312659b36c667f7ae17bc9e909418, but audio subsystem init was missing. Signed-off-by: Hervé Poussineau Signed-off-by: Andreas Färber --- hw/ppc_prep.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/hw/ppc_prep.c b/hw/ppc_prep.c index 9d8e6592e1..61c655c60e 100644 --- a/hw/ppc_prep.c +++ b/hw/ppc_prep.c @@ -37,6 +37,7 @@ #include "loader.h" #include "mc146818rtc.h" #include "blockdev.h" +#include "arch_init.h" #include "exec-memory.h" //#define HARD_DEBUG_PPC_IO @@ -716,6 +717,9 @@ static void ppc_prep_init (ram_addr_t ram_size, /* Special port to get debug messages from Open-Firmware */ register_ioport_write(0x0F00, 4, 1, &PPC_debug_write, NULL); + + /* Initialize audio subsystem */ + audio_init(isa_bus, pci_bus); } static QEMUMachine prep_machine = { From 6c84ce0dc762999591bbef9e76e45cb260fe84e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herv=C3=A9=20Poussineau?= Date: Sat, 14 Apr 2012 22:48:37 +0200 Subject: [PATCH 5/5] prep: Move int-ack register from PReP to Raven PCI emulation MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Register is one byte-wide (as per specification), so there is no need to specify endianness. Signed-off-by: Hervé Poussineau [AF: Limit access validity to size 1] Signed-off-by: Andreas Färber --- hw/ppc_prep.c | 36 ------------------------------------ hw/prep_pci.c | 17 +++++++++++++++++ 2 files changed, 17 insertions(+), 36 deletions(-) diff --git a/hw/ppc_prep.c b/hw/ppc_prep.c index 61c655c60e..b1da114114 100644 --- a/hw/ppc_prep.c +++ b/hw/ppc_prep.c @@ -86,38 +86,6 @@ static int ne2000_irq[NE2000_NB_MAX] = { 9, 10, 11, 3, 4, 5 }; /* ISA IO ports bridge */ #define PPC_IO_BASE 0x80000000 -/* PCI intack register */ -/* Read-only register (?) */ -static void PPC_intack_write (void *opaque, target_phys_addr_t addr, - uint64_t value, unsigned size) -{ -#if 0 - printf("%s: 0x" TARGET_FMT_plx " => 0x%08" PRIx64 "\n", __func__, addr, - value); -#endif -} - -static uint64_t PPC_intack_read(void *opaque, target_phys_addr_t addr, - unsigned size) -{ - uint32_t retval = 0; - - if ((addr & 0xf) == 0) - retval = pic_read_irq(isa_pic); -#if 0 - printf("%s: 0x" TARGET_FMT_plx " <= %08" PRIx32 "\n", __func__, addr, - retval); -#endif - - return retval; -} - -static const MemoryRegionOps PPC_intack_ops = { - .read = PPC_intack_read, - .write = PPC_intack_write, - .endianness = DEVICE_LITTLE_ENDIAN, -}; - /* PowerPC control and status registers */ #if 0 // Not used static struct { @@ -492,7 +460,6 @@ static void ppc_prep_init (ram_addr_t ram_size, nvram_t nvram; M48t59State *m48t59; MemoryRegion *PPC_io_memory = g_new(MemoryRegion, 1); - MemoryRegion *intack = g_new(MemoryRegion, 1); #if 0 MemoryRegion *xcsr = g_new(MemoryRegion, 1); #endif @@ -685,9 +652,6 @@ static void ppc_prep_init (ram_addr_t ram_size, register_ioport_write(0x0092, 0x01, 1, &PREP_io_800_writeb, sysctrl); register_ioport_read(0x0800, 0x52, 1, &PREP_io_800_readb, sysctrl); register_ioport_write(0x0800, 0x52, 1, &PREP_io_800_writeb, sysctrl); - /* PCI intack location */ - memory_region_init_io(intack, &PPC_intack_ops, NULL, "ppc-intack", 4); - memory_region_add_subregion(sysmem, 0xBFFFFFF0, intack); /* PowerPC control and status register group */ #if 0 memory_region_init_io(xcsr, &PPC_XCSR_ops, NULL, "ppc-xcsr", 0x1000); diff --git a/hw/prep_pci.c b/hw/prep_pci.c index 8b29da9948..38dbff44a1 100644 --- a/hw/prep_pci.c +++ b/hw/prep_pci.c @@ -25,10 +25,12 @@ #include "hw.h" #include "pci.h" #include "pci_host.h" +#include "pc.h" #include "exec-memory.h" typedef struct PRePPCIState { PCIHostState host_state; + MemoryRegion intack; qemu_irq irq[4]; } PREPPCIState; @@ -67,6 +69,19 @@ static const MemoryRegionOps PPC_PCIIO_ops = { .endianness = DEVICE_LITTLE_ENDIAN, }; +static uint64_t ppc_intack_read(void *opaque, target_phys_addr_t addr, + unsigned int size) +{ + return pic_read_irq(isa_pic); +} + +static const MemoryRegionOps PPC_intack_ops = { + .read = ppc_intack_read, + .valid = { + .max_access_size = 1, + }, +}; + static int prep_map_irq(PCIDevice *pci_dev, int irq_num) { return (irq_num + (pci_dev->devfn >> 3)) & 1; @@ -110,6 +125,8 @@ static int raven_pcihost_init(SysBusDevice *dev) memory_region_init_io(&h->mmcfg, &PPC_PCIIO_ops, s, "pciio", 0x00400000); memory_region_add_subregion(address_space_mem, 0x80800000, &h->mmcfg); + memory_region_init_io(&s->intack, &PPC_intack_ops, s, "pci-intack", 1); + memory_region_add_subregion(address_space_mem, 0xbffffff0, &s->intack); pci_create_simple(bus, 0, "raven"); return 0;