From patchwork Wed Oct 21 15:03:21 2009
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Alexander Graf <agraf@suse.de>
X-Patchwork-Id: 55119
Received: from vger.kernel.org (vger.kernel.org [209.132.176.167])
	by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n9LF4PX0020996
	for <patchwork-kvm@patchwork.kernel.org>;
	Wed, 21 Oct 2009 15:04:28 GMT
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1754010AbZJUPEG (ORCPT
	<rfc822;patchwork-kvm@patchwork.kernel.org>);
	Wed, 21 Oct 2009 11:04:06 -0400
Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754023AbZJUPEG
	(ORCPT <rfc822;kvm-outgoing>); Wed, 21 Oct 2009 11:04:06 -0400
Received: from cantor2.suse.de ([195.135.220.15]:53812 "EHLO mx2.suse.de"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1753959AbZJUPDh (ORCPT <rfc822;kvm@vger.kernel.org>);
	Wed, 21 Oct 2009 11:03:37 -0400
Received: from relay2.suse.de (mail2.suse.de [195.135.221.8])
	by mx2.suse.de (Postfix) with ESMTP id 00F078ACEB;
	Wed, 21 Oct 2009 17:03:39 +0200 (CEST)
From: Alexander Graf <agraf@suse.de>
To: kvm@vger.kernel.org
Cc: Avi Kivity <avi@redhat.com>, kvm-ppc <kvm-ppc@vger.kernel.org>,
	Hollis Blanchard <hollisb@us.ibm.com>, Arnd Bergmann <arnd@arndb.de>,
	Benjamin Herrenschmidt <benh@kernel.crashing.org>,
	Kevin Wolf <kwolf@redhat.com>, bphilips@suse.de,
	Marcelo Tosatti <mtosatti@redhat.com>
Subject: [PATCH 15/27] Add mfdec emulation
Date: Wed, 21 Oct 2009 17:03:21 +0200
Message-Id: <1256137413-15256-16-git-send-email-agraf@suse.de>
X-Mailer: git-send-email 1.6.0.2
In-Reply-To: <1256137413-15256-15-git-send-email-agraf@suse.de>
References: <1256137413-15256-1-git-send-email-agraf@suse.de>
	<1256137413-15256-2-git-send-email-agraf@suse.de>
	<1256137413-15256-3-git-send-email-agraf@suse.de>
	<1256137413-15256-4-git-send-email-agraf@suse.de>
	<1256137413-15256-5-git-send-email-agraf@suse.de>
	<1256137413-15256-6-git-send-email-agraf@suse.de>
	<1256137413-15256-7-git-send-email-agraf@suse.de>
	<1256137413-15256-8-git-send-email-agraf@suse.de>
	<1256137413-15256-9-git-send-email-agraf@suse.de>
	<1256137413-15256-10-git-send-email-agraf@suse.de>
	<1256137413-15256-11-git-send-email-agraf@suse.de>
	<1256137413-15256-12-git-send-email-agraf@suse.de>
	<1256137413-15256-13-git-send-email-agraf@suse.de>
	<1256137413-15256-14-git-send-email-agraf@suse.de>
	<1256137413-15256-15-git-send-email-agraf@suse.de>
Sender: kvm-owner@vger.kernel.org
Precedence: bulk
List-ID: <kvm.vger.kernel.org>
X-Mailing-List: kvm@vger.kernel.org


diff --git a/arch/powerpc/kvm/emulate.c b/arch/powerpc/kvm/emulate.c
index 7737146..50d411d 100644
--- a/arch/powerpc/kvm/emulate.c
+++ b/arch/powerpc/kvm/emulate.c
@@ -66,12 +66,14 @@
 
 void kvmppc_emulate_dec(struct kvm_vcpu *vcpu)
 {
+	unsigned long nr_jiffies;
+
 	if (vcpu->arch.tcr & TCR_DIE) {
 		/* The decrementer ticks at the same rate as the timebase, so
 		 * that's how we convert the guest DEC value to the number of
 		 * host ticks. */
-		unsigned long nr_jiffies;
 
+		vcpu->arch.dec_jiffies = mftb();
 		nr_jiffies = vcpu->arch.dec / tb_ticks_per_jiffy;
 		mod_timer(&vcpu->arch.dec_timer,
 		          get_jiffies_64() + nr_jiffies);
@@ -211,6 +213,15 @@ int kvmppc_emulate_instruction(struct kvm_run *run, struct kvm_vcpu *vcpu)
 			/* Note: SPRG4-7 are user-readable, so we don't get
 			 * a trap. */
 
+			case SPRN_DEC:
+			{
+				u64 jd = mftb() - vcpu->arch.dec_jiffies;
+				vcpu->arch.gpr[rt] = vcpu->arch.dec - jd;
+#ifdef DEBUG_EMUL
+				printk(KERN_INFO "mfDEC: %x - %llx = %lx\n", vcpu->arch.dec, jd, vcpu->arch.gpr[rt]);
+#endif
+				break;
+			}
 			default:
 				emulated = kvmppc_core_emulate_mfspr(vcpu, sprn, rt);
 				if (emulated == EMULATE_FAIL) {