Re: [Qemu-devel] [PATCH 2/2] De-assert PIC IRQs properly at APIC level

[Aurelien Jarno]

On Wed, Aug 20, 2008 at 05:16:10PM +0200, Jan Kiszka wrote:
> [ Taking latest isapc changes into account. ]
 
Applied, thanks.

> Ensure that PIC-delivered IRQs are properly de-asserted in case the APIC
> is in EXTINT or FIXED mode (with level-triggering selected) on LINT0.
> Fixes EFI-BIOS boot issues.
> 
> This patch also cleans up a bit the interface between PIC and APIC,
> making apic_local_deliver private again.
> 
> Signed-off-by: Jan Kiszka <address@hidden>
> ---
>  hw/apic.c |   23 ++++++++++++++++++++++-
>  hw/pc.c   |    4 +---
>  hw/pc.h   |    4 +---
>  3 files changed, 24 insertions(+), 7 deletions(-)
> 
> Index: b/hw/apic.c
> ===================================================================
> --- a/hw/apic.c
> +++ b/hw/apic.c
> @@ -166,7 +166,7 @@ static inline void reset_bit(uint32_t *t
>      tab[i] &= ~mask;
>  }
>  
> -void apic_local_deliver(CPUState *env, int vector)
> +static void apic_local_deliver(CPUState *env, int vector)
>  {
>      APICState *s = env->apic_state;
>      uint32_t lvt = s->lvt[vector];
> @@ -197,6 +197,27 @@ void apic_local_deliver(CPUState *env, i
>      }
>  }
>  
> +void apic_deliver_pic_intr(CPUState *env, int level)
> +{
> +    if (level)
> +        apic_local_deliver(env, APIC_LVT_LINT0);
> +    else {
> +        APICState *s = env->apic_state;
> +        uint32_t lvt = s->lvt[APIC_LVT_LINT0];
> +
> +        switch ((lvt >> 8) & 7) {
> +        case APIC_DM_FIXED:
> +            if (!(lvt & APIC_LVT_LEVEL_TRIGGER))
> +                break;
> +            reset_bit(s->irr, lvt & 0xff);
> +            /* fall through */
> +        case APIC_DM_EXTINT:
> +            cpu_reset_interrupt(env, CPU_INTERRUPT_HARD);
> +            break;
> +        }
> +    }
> +}
> +
>  #define foreach_apic(apic, deliver_bitmask, code) \
>  {\
>      int __i, __j, __mask;\
> Index: b/hw/pc.c
> ===================================================================
> --- a/hw/pc.c
> +++ b/hw/pc.c
> @@ -119,11 +119,9 @@ static void pic_irq_request(void *opaque
>      CPUState *env = first_cpu;
>  
>      if (env->apic_state) {
> -        if (!level)
> -            return;
>          while (env) {
>              if (apic_accept_pic_intr(env))
> -                apic_local_deliver(env, APIC_LINT0);
> +                apic_deliver_pic_intr(env, level);
>              env = env->next_cpu;
>          }
>      } else {
> Index: b/hw/pc.h
> ===================================================================
> --- a/hw/pc.h
> +++ b/hw/pc.h
> @@ -40,11 +40,9 @@ void irq_info(void);
>  /* APIC */
>  typedef struct IOAPICState IOAPICState;
>  
> -#define APIC_LINT0   3
> -
>  int apic_init(CPUState *env);
>  int apic_accept_pic_intr(CPUState *env);
> -void apic_local_deliver(CPUState *env, int vector);
> +void apic_deliver_pic_intr(CPUState *env, int level);
>  int apic_get_interrupt(CPUState *env);
>  IOAPICState *ioapic_init(void);
>  void ioapic_set_irq(void *opaque, int vector, int level);
> 
> 
> 

-- 
  .''`.  Aurelien Jarno             | GPG: 1024D/F1BCDB73
 : :' :  Debian developer           | Electrical Engineer
 `. `'   address@hidden         | address@hidden
   `-    people.debian.org/~aurel32 | www.aurel32.net