From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1KVpPx-0004KN-TJ for qemu-devel@nongnu.org; Wed, 20 Aug 2008 11:16:14 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1KVpPx-0004Jf-6B for qemu-devel@nongnu.org; Wed, 20 Aug 2008 11:16:13 -0400 Received: from [199.232.76.173] (port=54388 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1KVpPw-0004JQ-Mk for qemu-devel@nongnu.org; Wed, 20 Aug 2008 11:16:12 -0400 Received: from gecko.sbs.de ([194.138.37.40]:16095) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1KVpPw-0007bi-5L for qemu-devel@nongnu.org; Wed, 20 Aug 2008 11:16:12 -0400 Received: from mail2.sbs.de (localhost [127.0.0.1]) by gecko.sbs.de (8.12.11.20060308/8.12.11) with ESMTP id m7KFG9w2025523 for ; Wed, 20 Aug 2008 17:16:10 +0200 Received: from [139.25.109.167] (mchn012c.ww002.siemens.net [139.25.109.167] (may be forged)) by mail2.sbs.de (8.12.11.20060308/8.12.11) with ESMTP id m7KFG9K8022114 for ; Wed, 20 Aug 2008 17:16:09 +0200 Message-ID: <48AC353A.3030109@siemens.com> Date: Wed, 20 Aug 2008 17:16:10 +0200 From: Jan Kiszka MIME-Version: 1.0 References: <48A998AB.5080409@web.de> In-Reply-To: <48A998AB.5080409@web.de> Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: 7bit Subject: [Qemu-devel] [PATCH 2/2] De-assert PIC IRQs properly at APIC level Reply-To: qemu-devel@nongnu.org List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org [ Taking latest isapc changes into account. ] 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 --- 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);