From mboxrd@z Thu Jan 1 00:00:00 1970 From: Beth Kon Subject: [PATCH 4/4] Userspace changes for KVM HPET (v3) Date: Mon, 11 May 2009 13:29:46 -0400 Message-ID: <1242062986-29383-4-git-send-email-eak@us.ibm.com> References: <1242062986-29383-1-git-send-email-eak@us.ibm.com> Cc: kvm@vger.kernel.org, Beth Kon To: avi@redhat.com Return-path: Received: from e4.ny.us.ibm.com ([32.97.182.144]:36562 "EHLO e4.ny.us.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757327AbZEKR3c (ORCPT ); Mon, 11 May 2009 13:29:32 -0400 Received: from d01relay02.pok.ibm.com (d01relay02.pok.ibm.com [9.56.227.234]) by e4.ny.us.ibm.com (8.13.1/8.13.1) with ESMTP id n4BHPNRv025740 for ; Mon, 11 May 2009 13:25:23 -0400 Received: from d01av04.pok.ibm.com (d01av04.pok.ibm.com [9.56.224.64]) by d01relay02.pok.ibm.com (8.13.8/8.13.8/NCO v9.2) with ESMTP id n4BHTXog257874 for ; Mon, 11 May 2009 13:29:33 -0400 Received: from d01av04.pok.ibm.com (loopback [127.0.0.1]) by d01av04.pok.ibm.com (8.12.11.20060308/8.13.3) with ESMTP id n4BHTWRc016328 for ; Mon, 11 May 2009 13:29:33 -0400 In-Reply-To: <1242062986-29383-1-git-send-email-eak@us.ibm.com> Sender: kvm-owner@vger.kernel.org List-ID: Signed-off-by: Beth Kon diff --git a/hw/hpet.c b/hw/hpet.c index c7945ec..100abf5 100644 --- a/hw/hpet.c +++ b/hw/hpet.c @@ -30,6 +30,7 @@ #include "console.h" #include "qemu-timer.h" #include "hpet_emul.h" +#include "qemu-kvm.h" //#define HPET_DEBUG #ifdef HPET_DEBUG @@ -48,6 +49,28 @@ uint32_t hpet_in_legacy_mode(void) return 0; } +static void hpet_legacy_enable(void) +{ + if (qemu_kvm_pit_in_kernel()) { + kvm_kpit_disable(); + dprintf("qemu: hpet disabled kernel pit\n"); + } else { + hpet_pit_disable(); + dprintf("qemu: hpet disabled userspace pit\n"); + } +} + +static void hpet_legacy_disable(void) +{ + if (qemu_kvm_pit_in_kernel()) { + kvm_kpit_enable(); + dprintf("qemu: hpet enabled kernel pit\n"); + } else { + hpet_pit_enable(); + dprintf("qemu: hpet enabled userspace pit\n"); + } +} + static uint32_t timer_int_route(struct HPETTimer *timer) { uint32_t route; @@ -475,9 +498,9 @@ static void hpet_ram_writel(void *opaque, target_phys_addr_t addr, } /* i8254 and RTC are disabled when HPET is in legacy mode */ if (activating_bit(old_val, new_val, HPET_CFG_LEGACY)) { - hpet_pit_disable(); + hpet_legacy_enable(); } else if (deactivating_bit(old_val, new_val, HPET_CFG_LEGACY)) { - hpet_pit_enable(); + hpet_legacy_disable(); } break; case HPET_CFG + 4: @@ -560,7 +583,7 @@ static void hpet_reset(void *opaque) { * hpet_reset is called due to system reset. At this point control must * be returned to pit until SW reenables hpet. */ - hpet_pit_enable(); + hpet_legacy_disable(); count = 1; } diff --git a/qemu-kvm.c b/qemu-kvm.c index f55cee8..1bb853b 100644 --- a/qemu-kvm.c +++ b/qemu-kvm.c @@ -463,6 +463,25 @@ void kvm_init_vcpu(CPUState *env) qemu_cond_wait(&qemu_vcpu_cond); } +void kvm_kpit_enable(void) +{ + struct kvm_pit_state ps; + if (qemu_kvm_pit_in_kernel()) { + kvm_get_pit(kvm_context, &ps); + kvm_set_pit(kvm_context, &ps); + } +} + +void kvm_kpit_disable(void) +{ + struct kvm_pit_state ps; + if (qemu_kvm_pit_in_kernel()) { + kvm_get_pit(kvm_context, &ps); + ps.channels[0].mode = 0xff; + kvm_set_pit(kvm_context, &ps); + } +} + int kvm_init_ap(void) { #ifdef TARGET_I386 diff --git a/qemu-kvm.h b/qemu-kvm.h index 6a1968a..13353ec 100644 --- a/qemu-kvm.h +++ b/qemu-kvm.h @@ -31,6 +31,8 @@ int kvm_update_guest_debug(CPUState *env, unsigned long reinject_trap); int kvm_qemu_init_env(CPUState *env); int kvm_qemu_check_extension(int ext); void kvm_apic_init(CPUState *env); +void kvm_kpit_enable(void); +void kvm_kpit_disable(void); int kvm_set_irq(int irq, int level, int *status); int kvm_physical_memory_set_dirty_tracking(int enable); diff --git a/vl.c b/vl.c index 0bffc82..8f120c5 100644 --- a/vl.c +++ b/vl.c @@ -6132,10 +6132,15 @@ int main(int argc, char **argv, char **envp) } if (kvm_enabled()) { - kvm_init_ap(); + kvm_init_ap(); #ifdef USE_KVM if (kvm_irqchip && !qemu_kvm_has_gsi_routing()) { irq0override = 0; + /* if kernel can't do irq routing, interrupt source + * override 0->2 can not be set up as required by hpet, + * so disable hpet. + */ + no_hpet=1; } #endif }