From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38525) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VEENU-0007OZ-2F for qemu-devel@nongnu.org; Tue, 27 Aug 2013 04:11:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VEENM-0000tb-KN for qemu-devel@nongnu.org; Tue, 27 Aug 2013 04:11:51 -0400 Received: from mail-ob0-f171.google.com ([209.85.214.171]:37467) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VEENM-0000tT-Fb for qemu-devel@nongnu.org; Tue, 27 Aug 2013 04:11:44 -0400 Received: by mail-ob0-f171.google.com with SMTP id tb18so4413248obb.30 for ; Tue, 27 Aug 2013 01:11:29 -0700 (PDT) From: Liu Ping Fan Date: Tue, 27 Aug 2013 16:10:46 +0800 Message-Id: <1377591046-1944-3-git-send-email-pingfank@linux.vnet.ibm.com> In-Reply-To: <1377591046-1944-1-git-send-email-pingfank@linux.vnet.ibm.com> References: <1377591046-1944-1-git-send-email-pingfank@linux.vnet.ibm.com> Subject: [Qemu-devel] [PATCH v2 3/3] hpet: entitle more irq pins for hpet List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Anthony Liguori , Jan Kiszka On q35 machine, IRQ2/8 can be reserved for hpet timer 0/1. And pin 16~23 of ioapic can be dynamically assigned to hpet as guest chooses. Signed-off-by: Liu Ping Fan --- hw/timer/hpet.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/hw/timer/hpet.c b/hw/timer/hpet.c index 1139448..92cd4fa 100644 --- a/hw/timer/hpet.c +++ b/hw/timer/hpet.c @@ -25,6 +25,7 @@ */ #include "hw/hw.h" +#include "hw/boards.h" #include "hw/i386/pc.h" #include "ui/console.h" #include "qemu/timer.h" @@ -42,6 +43,11 @@ #define HPET_MSI_SUPPORT 0 +/* only IRQ2 allowed for pc-1.6 and former */ +#define HPET_TN_INT_CAP_PC (0x4ULL << 32) +/* Hpet can use non-legacy IRQ16~23, and an IRQ2 ,IRQ8 */ +#define HPET_TN_INT_CAP_Q35 (0xff0104ULL << 32) + #define TYPE_HPET "hpet" #define HPET(obj) OBJECT_CHECK(HPETState, (obj), TYPE_HPET) @@ -663,8 +669,12 @@ static void hpet_reset(DeviceState *d) if (s->flags & (1 << HPET_MSI_SUPPORT)) { timer->config |= HPET_TN_FSB_CAP; } - /* advertise availability of ioapic inti2 */ - timer->config |= 0x00000004ULL << 32; + /* advertise availability of ioapic int */ + if (qemu_check_machine("pc-q35")) { + timer->config |= HPET_TN_INT_CAP_Q35; + } else { + timer->config |= HPET_TN_INT_CAP_PC; + } timer->period = 0ULL; timer->wrap_flag = 0; } -- 1.8.1.4