]> xenbits.xensource.com Git - qemu-upstream-4.5-testing.git/commitdiff
PPC: Fix dma interrupt
authorAmadeusz Sławiński <amade@asmblr.net>
Thu, 21 Feb 2013 07:34:10 +0000 (07:34 +0000)
committerAlexander Graf <agraf@suse.de>
Fri, 8 Mar 2013 20:04:53 +0000 (21:04 +0100)
In openbios (drivers/ide.c) they are set to

0000000d 00000000 00000002 00000000
0000000e 00000000 00000003 00000000
0000000f 00000000 00000004 00000000
(The last one seems to be not implemented in qemu)

It follows convention of how they are set on real machines,
both ide and dma ones are increased

Real machine one:
http://web.archive.org/web/20090107151044/http://penguinppc.org/historical/dev-trees-html/g4_agp_500_2.html
00000013 00000001 0000000b 00000000
00000014 00000001 0000000c 00000000
00000015 00000001 0000000d 00000000

Signed-off-by: Amadeusz Sławiński <amade@asmblr.net>
Signed-off-by: Alexander Graf <agraf@suse.de>
hw/ppc/mac_newworld.c

index 065ea871b375e76cf7ba5b5e90ef2cf27c833367..a08a6b2086247b2bd7d17dfd9b99cc38a8cd84a4 100644 (file)
@@ -370,7 +370,7 @@ static void ppc_core99_init(QEMUMachineInitArgs *args)
     qdev_connect_gpio_out(dev, 1, pic[0x0d]); /* IDE */
     qdev_connect_gpio_out(dev, 2, pic[0x02]); /* IDE DMA */
     qdev_connect_gpio_out(dev, 3, pic[0x0e]); /* IDE */
-    qdev_connect_gpio_out(dev, 4, pic[0x02]); /* IDE DMA */
+    qdev_connect_gpio_out(dev, 4, pic[0x03]); /* IDE DMA */
     macio_init(macio, pic_mem, escc_bar);
 
     /* We only emulate 2 out of 3 IDE controllers for now */