[Qemu-devel] [PATCH v2] macio: remove nonexistent interrupt on pin 1

[Qemu-devel] [PATCH v2] macio: remove nonexistent interrupt on pin 1

[Cormac O'Brien]

The current macio implementation declares an interrupt that doesn't appear to
exist in the hardware or any other emulator implementation. OpenBIOS detects
this interrupt and generates an 'interrupts' property in the macio device tree
entry. Mac OS 9 halts boot when it detects this interrupt, so it has been
removed to permit further progress in the boot process.

Signed-off-by: Cormac O'Brien <i.am.cormac.obrien@gmail.com>

---
 hw/misc/macio/macio.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/hw/misc/macio/macio.c b/hw/misc/macio/macio.c
index 063ad80..306c95e 100644
--- a/hw/misc/macio/macio.c
+++ b/hw/misc/macio/macio.c
@@ -132,8 +132,6 @@ static int macio_common_initfn(PCIDevice *d)
     SysBusDevice *sysbus_dev;
     int ret;
 
-    d->config[0x3d] = 0x01; // interrupt on pin 1
-
     ret = qdev_init(DEVICE(&s->cuda));
     if (ret < 0) {
         return ret;
-- 
2.4.3

Re: [Qemu-devel] [PATCH v2] macio: remove nonexistent interrupt on pin 1

[Mark Cave-Ayland]

On 17/06/15 23:04, Cormac O'Brien wrote:

> The current macio implementation declares an interrupt that doesn't appear to
> exist in the hardware or any other emulator implementation. OpenBIOS detects
> this interrupt and generates an 'interrupts' property in the macio device tree
> entry. Mac OS 9 halts boot when it detects this interrupt, so it has been
> removed to permit further progress in the boot process.
> 
> Signed-off-by: Cormac O'Brien <i.am.cormac.obrien@gmail.com>
> 
> ---
>  hw/misc/macio/macio.c | 2 --
>  1 file changed, 2 deletions(-)
> 
> diff --git a/hw/misc/macio/macio.c b/hw/misc/macio/macio.c
> index 063ad80..306c95e 100644
> --- a/hw/misc/macio/macio.c
> +++ b/hw/misc/macio/macio.c
> @@ -132,8 +132,6 @@ static int macio_common_initfn(PCIDevice *d)
>      SysBusDevice *sysbus_dev;
>      int ret;
>  
> -    d->config[0x3d] = 0x01; // interrupt on pin 1
> -
>      ret = qdev_init(DEVICE(&s->cuda));
>      if (ret < 0) {
>          return ret;
> 

Reviewed-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>


ATB,

Mark.

Re: [Qemu-devel] [PATCH v2] macio: remove nonexistent interrupt on pin 1

[Alexander Graf]

On 06/18/15 00:04, Cormac O'Brien wrote:
> The current macio implementation declares an interrupt that doesn't appear to
> exist in the hardware or any other emulator implementation. OpenBIOS detects
> this interrupt and generates an 'interrupts' property in the macio device tree
> entry. Mac OS 9 halts boot when it detects this interrupt, so it has been
> removed to permit further progress in the boot process.
>
> Signed-off-by: Cormac O'Brien <i.am.cormac.obrien@gmail.com>

Which tree is this against? It doesn't apply as is to current ppc-next.

Either way, I've fixed it up and applied it. Thanks!


Alex