From patchwork Fri Jan 13 03:09:28 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Andreas_F=C3=A4rber?= X-Patchwork-Id: 135711 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id D46C9B6FBC for ; Fri, 13 Jan 2012 14:29:33 +1100 (EST) Received: from localhost ([::1]:57908 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RlXYl-0001Qs-0q for incoming@patchwork.ozlabs.org; Thu, 12 Jan 2012 22:12:07 -0500 Received: from eggs.gnu.org ([140.186.70.92]:52853) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RlXY9-0007zw-KT for qemu-devel@nongnu.org; Thu, 12 Jan 2012 22:11:30 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RlXY7-0006Xe-9Z for qemu-devel@nongnu.org; Thu, 12 Jan 2012 22:11:29 -0500 Received: from mout.web.de ([212.227.15.3]:50149) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RlXY6-0006XJ-S7; Thu, 12 Jan 2012 22:11:27 -0500 Received: from localhost.localdomain ([84.148.23.44]) by smtp.web.de (mrweb002) with ESMTPA (Nemesis) id 0LbZpT-1SQLt018El-00kss2; Fri, 13 Jan 2012 04:11:25 +0100 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= To: qemu-devel@nongnu.org Date: Fri, 13 Jan 2012 04:09:28 +0100 Message-Id: <1326424168-15705-9-git-send-email-andreas.faerber@web.de> X-Mailer: git-send-email 1.7.7 In-Reply-To: <1326424168-15705-1-git-send-email-andreas.faerber@web.de> References: <1325894809-17322-1-git-send-email-andreas.faerber@web.de> <1326424168-15705-1-git-send-email-andreas.faerber@web.de> MIME-Version: 1.0 X-Provags-ID: V02:K0:btUxEZnEPjopjgubBBs5cROY1GHEGu+vVR1LtuxiNtu BXeR0UwvZTNOFs+qpm8VDbozJqwgReioLLphPV4JsRX9qNORyX Ex1L8zlU4mGq4F5U8Vucs9b6urFWJK4bV2sC3CJt2+L+qTZAAQ EjcEqnQSVDDEfPcPfacVbz1j/2kkawyVhDQHxYgcul+FdnKUPt IfxphqTilgm5caMVdzEJQ== X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 212.227.15.3 Cc: =?UTF-8?q?Herv=C3=A9=20Poussineau?= , =?UTF-8?q?Andreas=20F=C3=A4rber?= , qemu-ppc@nongnu.org, Alexander Graf , Jan Kiszka Subject: [Qemu-devel] [PATCH v3 8/8] prep: Use i82378 PCI->ISA bridge for 'prep' machine X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Speaker I/O, ISA bus, i8259 PIC, RTC and DMA are no longer set up individually by the machine. Effectively, no-op speaker I/O is replaced by pcspk; PIT and i82374 DMA are introduced. Signed-off-by: Hervé Poussineau Remove related dead, alternative code. Access i8259 IRQs via ISA bus to resolve cyclic dependency with PCI host bridge. Signed-off-by: Andreas Färber Cc: Alexander Graf Cc: Jan Kiszka --- hw/ppc_prep.c | 54 +++++++++++------------------------------------------- 1 files changed, 11 insertions(+), 43 deletions(-) diff --git a/hw/ppc_prep.c b/hw/ppc_prep.c index 747539f..9485d45 100644 --- a/hw/ppc_prep.c +++ b/hw/ppc_prep.c @@ -83,37 +83,9 @@ static const int ide_irq[2] = { 13, 13 }; static uint32_t 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 ISADevice *pit; - /* ISA IO ports bridge */ #define PPC_IO_BASE 0x80000000 -#if 0 -/* Speaker port 0x61 */ -static int speaker_data_on; -static int dummy_refresh_clock; -#endif - -static void speaker_ioport_write (void *opaque, uint32_t addr, uint32_t val) -{ -#if 0 - speaker_data_on = (val >> 1) & 1; - pit_set_gate(pit, 2, val & 1); -#endif -} - -static uint32_t speaker_ioport_read (void *opaque, uint32_t addr) -{ -#if 0 - int out; - out = pit_get_out(pit, 2, qemu_get_clock_ns(vm_clock)); - dummy_refresh_clock ^= 1; - return (speaker_data_on << 1) | pit_get_gate(pit, 2) | (out << 5) | - (dummy_refresh_clock << 4); -#endif - return 0; -} - /* PCI intack register */ /* Read-only register (?) */ static void PPC_intack_write (void *opaque, target_phys_addr_t addr, @@ -526,6 +498,7 @@ static void ppc_prep_init (ram_addr_t ram_size, SysBusDevice *sys; PCIHostState *pcihost; PCIBus *pci_bus; + PCIDevice *pci; ISABus *isa_bus; qemu_irq *i8259; qemu_irq *cpu_exit_irq; @@ -629,13 +602,9 @@ static void ppc_prep_init (ram_addr_t ram_size, } } - isa_mem_base = 0xc0000000; if (PPC_INPUT(env) != PPC_FLAGS_INPUT_6xx) { hw_error("Only 6xx bus is supported on PREP machine\n"); } - /* Hmm, prep has no pci-isa bridge ??? */ - isa_bus = isa_bus_new(NULL, get_system_io()); - i8259 = i8259_init(isa_bus, first_cpu->irq_inputs[PPC6xx_INPUT_INT]); dev = qdev_create(NULL, "raven-pcihost"); sys = sysbus_from_qdev(dev); @@ -648,13 +617,21 @@ static void ppc_prep_init (ram_addr_t ram_size, fprintf(stderr, "Couldn't create PCI host controller.\n"); exit(1); } + + /* PCI -> ISA bridge */ + pci = pci_create_simple(pci_bus, PCI_DEVFN(1, 0), "i82378"); + cpu_exit_irq = qemu_allocate_irqs(cpu_request_exit, NULL, 1); + qdev_connect_gpio_out(&pci->qdev, 0, + first_cpu->irq_inputs[PPC6xx_INPUT_INT]); + qdev_connect_gpio_out(&pci->qdev, 1, *cpu_exit_irq); + isa_bus = DO_UPCAST(ISABus, qbus, qdev_get_child_bus(&pci->qdev, "isa.0")); + + i8259 = isa_bus->irqs; sysbus_connect_irq(&pcihost->busdev, 0, i8259[9]); sysbus_connect_irq(&pcihost->busdev, 1, i8259[11]); sysbus_connect_irq(&pcihost->busdev, 2, i8259[9]); sysbus_connect_irq(&pcihost->busdev, 3, i8259[11]); - isa_bus_irqs(isa_bus, i8259); - // pci_bus = i440fx_init(); /* Register 8 MB of ISA IO space (needed for non-contiguous map) */ memory_region_init_io(PPC_io_memory, &PPC_prep_io_ops, sysctrl, "ppc-io", 0x00800000); @@ -662,9 +639,6 @@ static void ppc_prep_init (ram_addr_t ram_size, /* init basic PC hardware */ pci_vga_init(pci_bus); - // openpic = openpic_init(0x00000000, 0xF0000000, 1); - // pit = pit_init(0x40, 0); - rtc_init(isa_bus, 2000, NULL); if (serial_hds[0]) serial_isa_init(isa_bus, 0, serial_hds[0]); @@ -691,9 +665,6 @@ static void ppc_prep_init (ram_addr_t ram_size, } isa_create_simple(isa_bus, "i8042"); - cpu_exit_irq = qemu_allocate_irqs(cpu_request_exit, NULL, 1); - DMA_init(1, cpu_exit_irq); - // SB16_init(); for(i = 0; i < MAX_FD; i++) { @@ -701,9 +672,6 @@ static void ppc_prep_init (ram_addr_t ram_size, } fdctrl_init_isa(isa_bus, fd); - /* Register speaker port */ - register_ioport_read(0x61, 1, 1, speaker_ioport_read, NULL); - register_ioport_write(0x61, 1, 1, speaker_ioport_write, NULL); /* Register fake IO ports for PREP */ sysctrl->reset_irq = first_cpu->irq_inputs[PPC6xx_INPUT_HRESET]; register_ioport_read(0x398, 2, 1, &PREP_io_read, sysctrl);