From patchwork Fri Apr 8 15:20:41 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulrich Obergfell X-Patchwork-Id: 90396 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id CE0D3B6F76 for ; Sat, 9 Apr 2011 01:59:54 +1000 (EST) Received: from localhost ([127.0.0.1]:44008 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Q8DaY-0003FW-EU for incoming@patchwork.ozlabs.org; Fri, 08 Apr 2011 11:27:10 -0400 Received: from [140.186.70.92] (port=47480 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Q8DUi-0000dH-Q5 for qemu-devel@nongnu.org; Fri, 08 Apr 2011 11:21:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Q8DUU-0005YI-7m for qemu-devel@nongnu.org; Fri, 08 Apr 2011 11:20:55 -0400 Received: from mx1.redhat.com ([209.132.183.28]:23279) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Q8DUT-0005Y5-VI for qemu-devel@nongnu.org; Fri, 08 Apr 2011 11:20:54 -0400 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id p38FKrXU004107 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Fri, 8 Apr 2011 11:20:53 -0400 Received: from localhost.localdomain (vpn1-4-212.ams2.redhat.com [10.36.4.212]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id p38FKgc4018813; Fri, 8 Apr 2011 11:20:51 -0400 From: Ulrich Obergfell To: qemu-devel@nongnu.org Date: Fri, 8 Apr 2011 17:20:41 +0200 Message-Id: <1302276042-3497-5-git-send-email-uobergfe@redhat.com> In-Reply-To: <1302276042-3497-1-git-send-email-uobergfe@redhat.com> References: <1302276042-3497-1-git-send-email-uobergfe@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.132.183.28 Cc: aliguori@us.ibm.com, kvm@vger.kernel.org, jan.kiszka@siemens.com, uobergfe@redhat.com, gcosta@redhat.com, avi@redhat.com Subject: [Qemu-devel] [PATCH v2 4/5] hpet 'driftfix': add code in update_irq() to detect coalesced interrupts (x86 apic only) X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org update_irq() uses a similar method as in 'rtc_td_hack' to detect coalesced interrupts. The function entry addresses are retrieved from 'target_get_irq_delivered' and 'target_reset_irq_delivered'. Signed-off-by: Ulrich Obergfell --- hw/hpet.c | 15 +++++++++++++-- 1 files changed, 13 insertions(+), 2 deletions(-) diff --git a/hw/hpet.c b/hw/hpet.c index c150da5..b5625fb 100644 --- a/hw/hpet.c +++ b/hw/hpet.c @@ -31,6 +31,7 @@ #include "hpet_emul.h" #include "sysbus.h" #include "mc146818rtc.h" +#include "sysemu.h" //#define HPET_DEBUG #ifdef HPET_DEBUG @@ -176,11 +177,12 @@ static inline uint64_t hpet_calculate_diff(HPETTimer *t, uint64_t current) } } -static void update_irq(struct HPETTimer *timer, int set) +static int update_irq(struct HPETTimer *timer, int set) { uint64_t mask; HPETState *s; int route; + int irq_delivered = 1; if (timer->tn <= 1 && hpet_in_legacy_mode(timer->state)) { /* if LegacyReplacementRoute bit is set, HPET specification requires @@ -205,8 +207,17 @@ static void update_irq(struct HPETTimer *timer, int set) qemu_irq_raise(s->irqs[route]); } else { s->isr &= ~mask; - qemu_irq_pulse(s->irqs[route]); + if (s->driftfix && target_get_irq_delivered + && target_reset_irq_delivered) { + target_reset_irq_delivered(); + qemu_irq_raise(s->irqs[route]); + irq_delivered = target_get_irq_delivered(); + qemu_irq_lower(s->irqs[route]); + } else { + qemu_irq_pulse(s->irqs[route]); + } } + return irq_delivered; } static void hpet_pre_save(void *opaque)