Commit 0bb1fb71 authored by Alexander Graf's avatar Alexander Graf Committed by Marcelo Tosatti

KVM: powerpc: Remove AGGRESSIVE_DEC

Because we now emulate the DEC interrupt according to real life behavior,
there's no need to keep the AGGRESSIVE_DEC hack around.

Let's just remove it.
Signed-off-by: default avatarAlexander Graf <agraf@suse.de>
Acked-by: default avatarAcked-by: Hollis Blanchard <hollis@penguinppc.org>
Signed-off-by: default avatarAvi Kivity <avi@redhat.com>
parent 7706664d
...@@ -34,12 +34,6 @@ ...@@ -34,12 +34,6 @@
/* #define EXIT_DEBUG */ /* #define EXIT_DEBUG */
/* #define EXIT_DEBUG_SIMPLE */ /* #define EXIT_DEBUG_SIMPLE */
/* Without AGGRESSIVE_DEC we only fire off a DEC interrupt when DEC turns 0.
* When set, we retrigger a DEC interrupt after that if DEC <= 0.
* PPC32 Linux runs faster without AGGRESSIVE_DEC, PPC64 Linux requires it. */
/* #define AGGRESSIVE_DEC */
struct kvm_stats_debugfs_item debugfs_entries[] = { struct kvm_stats_debugfs_item debugfs_entries[] = {
{ "exits", VCPU_STAT(sum_exits) }, { "exits", VCPU_STAT(sum_exits) },
{ "mmio", VCPU_STAT(mmio_exits) }, { "mmio", VCPU_STAT(mmio_exits) },
...@@ -81,7 +75,7 @@ void kvmppc_core_vcpu_put(struct kvm_vcpu *vcpu) ...@@ -81,7 +75,7 @@ void kvmppc_core_vcpu_put(struct kvm_vcpu *vcpu)
to_book3s(vcpu)->slb_shadow_max = get_paca()->kvm_slb_max; to_book3s(vcpu)->slb_shadow_max = get_paca()->kvm_slb_max;
} }
#if defined(AGGRESSIVE_DEC) || defined(EXIT_DEBUG) #if defined(EXIT_DEBUG)
static u32 kvmppc_get_dec(struct kvm_vcpu *vcpu) static u32 kvmppc_get_dec(struct kvm_vcpu *vcpu)
{ {
u64 jd = mftb() - vcpu->arch.dec_jiffies; u64 jd = mftb() - vcpu->arch.dec_jiffies;
...@@ -273,14 +267,6 @@ void kvmppc_core_deliver_interrupts(struct kvm_vcpu *vcpu) ...@@ -273,14 +267,6 @@ void kvmppc_core_deliver_interrupts(struct kvm_vcpu *vcpu)
unsigned long *pending = &vcpu->arch.pending_exceptions; unsigned long *pending = &vcpu->arch.pending_exceptions;
unsigned int priority; unsigned int priority;
/* XXX be more clever here - no need to mftb() on every entry */
/* Issue DEC again if it's still active */
#ifdef AGGRESSIVE_DEC
if (vcpu->arch.msr & MSR_EE)
if (kvmppc_get_dec(vcpu) & 0x80000000)
kvmppc_core_queue_dec(vcpu);
#endif
#ifdef EXIT_DEBUG #ifdef EXIT_DEBUG
if (vcpu->arch.pending_exceptions) if (vcpu->arch.pending_exceptions)
printk(KERN_EMERG "KVM: Check pending: %lx\n", vcpu->arch.pending_exceptions); printk(KERN_EMERG "KVM: Check pending: %lx\n", vcpu->arch.pending_exceptions);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment