From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1LMTFE-0000pt-P8 for qemu-devel@nongnu.org; Mon, 12 Jan 2009 15:18:44 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1LMTFC-0000n0-9K for qemu-devel@nongnu.org; Mon, 12 Jan 2009 15:18:43 -0500 Received: from [199.232.76.173] (port=51660 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1LMTFC-0000mr-5o for qemu-devel@nongnu.org; Mon, 12 Jan 2009 15:18:42 -0500 Received: from hall.aurel32.net ([88.191.82.174]:55298) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1LMTFB-0007Lj-RK for qemu-devel@nongnu.org; Mon, 12 Jan 2009 15:18:42 -0500 Date: Mon, 12 Jan 2009 21:18:36 +0100 From: Aurelien Jarno Subject: Re: [Qemu-devel] [6271] Use ESCC for PowerMac serial Message-ID: <20090112201836.GF29483@hall.aurel32.net> References: MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-15 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: Sender: Aurelien Jarno Reply-To: qemu-devel@nongnu.org List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Blue Swirl Cc: qemu-devel@nongnu.org On Mon, Jan 12, 2009 at 05:40:24PM +0000, Blue Swirl wrote: > Revision: 6271 > http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=6271 > Author: blueswir1 > Date: 2009-01-12 17:40:23 +0000 (Mon, 12 Jan 2009) > > Log Message: > ----------- > Use ESCC for PowerMac serial > [snip] > Modified: trunk/hw/ppc_oldworld.c > =================================================================== > --- trunk/hw/ppc_oldworld.c 2009-01-12 17:38:28 UTC (rev 6270) > +++ trunk/hw/ppc_oldworld.c 2009-01-12 17:40:23 UTC (rev 6271) > @@ -33,6 +33,7 @@ > #include "pci.h" > #include "boards.h" > #include "fw_cfg.h" > +#include "escc.h" > > #define MAX_IDE_BUS 2 > #define VGA_BIOS_SIZE 65536 > @@ -126,7 +127,7 @@ > int vga_bios_size, bios_size; > qemu_irq *dummy_irq; > int pic_mem_index, nvram_mem_index, dbdma_mem_index, cuda_mem_index; > - int ide_mem_index[2]; > + int escc_mem_index, ide_mem_index[2]; > int ppc_boot_device; > BlockDriverState *hd[MAX_IDE_BUS * MAX_IDE_DEVS]; > int index; > @@ -296,8 +297,8 @@ > /* XXX: suppress that */ > dummy_irq = i8259_init(NULL); > > - /* XXX: use Mac Serial port */ > - serial_init(0x3f8, dummy_irq[4], 115200, serial_hds[0]); > + escc_mem_index = escc_init(0x80013000, pic[0x10], serial_hds[0], > + serial_hds[1], ESCC_CLOCK, 4); I don't think this address is correct. Also this is later mapped by macio_init() later. Also I have tried with the latest SVN of OpenBIOS (which includes the corresponding patches for ESCC), and the machine doesn't boot anymore. Using -serial stdio, I see | >> ============================================================= | >> OpenBIOS 1.0RC1 [Jan 12 2009 19:28] | >> Configuration device id QEMU version 1 machine id 2 | >> CPUs: 1 | >> Memory: 144M | >> UUID: 00000000-0000-0000-0000-000000000000 | >> CPU type PowerPC,750 | >> Initializing PCI devices... | >> 0:0.0 - 1057:2 - /pci - | >> 0:1.0 - 1234:1111 - /pci/QEMU,VGA - Then it hangs there. -- .''`. Aurelien Jarno | GPG: 1024D/F1BCDB73 : :' : Debian developer | Electrical Engineer `. `' aurel32@debian.org | aurelien@aurel32.net `- people.debian.org/~aurel32 | www.aurel32.net