Patchwork [1/2] Fix dma interrupt

login
register
mail settings
Submitter Amadeusz Sławiński
Date Feb. 21, 2013, 5:34 p.m.
Message ID <1361468051-19292-1-git-send-email-amade@asmblr.net>
Download mbox | patch
Permalink /patch/222386/
State New
Headers show

Comments

Amadeusz Sławiński - Feb. 21, 2013, 5:34 p.m.
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>
---
 hw/ppc/mac_newworld.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Alexander Graf - Feb. 25, 2013, 1:02 p.m.
On 21.02.2013, at 18:34, Amadeusz Sławiński wrote:

> 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>

Thanks, applied both to ppc-next.


Alex

> ---
> hw/ppc/mac_newworld.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/hw/ppc/mac_newworld.c b/hw/ppc/mac_newworld.c
> index 065ea87..a08a6b2 100644
> --- a/hw/ppc/mac_newworld.c
> +++ b/hw/ppc/mac_newworld.c
> @@ -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 */
> -- 
> 1.8.1.4
> 
>

Patch

diff --git a/hw/ppc/mac_newworld.c b/hw/ppc/mac_newworld.c
index 065ea87..a08a6b2 100644
--- a/hw/ppc/mac_newworld.c
+++ b/hw/ppc/mac_newworld.c
@@ -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 */