Re: [Qemu-devel] [6271] Use ESCC for PowerMac serial

[Aurelien Jarno <aurelien@aurel32.net>]

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