Re: [Qemu-devel] [PATCH] Fix non-ACPI Timer Interrupt Routing

[Ryan Harper <ryanh@us.ibm.com>]

* Elizabeth Kon <eak@us.ibm.com> [2009-04-13 19:35]:
> Replicate ACPI irq0->inti2 override in mp table for non-acpi case.
> 
> Signed-off-by: Beth Kon <eak@us.ibm.com>

> diff --git a/bios/BIOS-bochs-latest b/bios/BIOS-bochs-latest
> index ebec71b..82d7792 100644
> Binary files a/bios/BIOS-bochs-latest and b/bios/BIOS-bochs-latest differ
> diff --git a/bios/rombios32.c b/bios/rombios32.c
> index 7be4216..bc17118 100644
> --- a/bios/rombios32.c
> +++ b/bios/rombios32.c
> @@ -1,4 +1,4 @@
> -/////////////////////////////////////////////////////////////////////////
> +////////////////////////////////////////////////////////////////////////

Did you mean to change the number of slashs? =)

>  // $Id$
>  /////////////////////////////////////////////////////////////////////////
>  //
> @@ -1168,6 +1168,10 @@ static void mptable_init(void)
> 
>      /* irqs */
>      for(i = 0; i < 16; i++) {
> +#ifdef BX_QEMU
> +        if (i == 2)
> +            continue;
> +#endif        

I'd think that deserves a comment on why we're skipping i==2.

>          putb(&q, 3); /* entry type = I/O interrupt */
>          putb(&q, 0); /* interrupt type = vectored interrupt */
>          putb(&q, 0); /* flags: po=0, el=0 */
> @@ -1175,7 +1179,11 @@ static void mptable_init(void)
>          putb(&q, 0); /* source bus ID = ISA */
>          putb(&q, i); /* source bus IRQ */
>          putb(&q, ioapic_id); /* dest I/O APIC ID */
> +#ifdef BX_QEMU
> +        putb(&q, i == 0 ? 2 : i); /* dest I/O APIC interrupt in */
> +#else
>          putb(&q, i); /* dest I/O APIC interrupt in */
> +#endif        
>      }
>      /* patch length */
>      len = q - mp_config_table;


-- 
Ryan Harper
Software Engineer; Linux Technology Center
IBM Corp., Austin, Tx
ryanh@us.ibm.com