aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPreeti U Murthy <preeti@linux.vnet.ibm.com>2014-03-28 12:38:54 +0530
committerEli Qiao <taget@linux.vnet.ibm.com>2014-04-01 14:45:08 +0800
commit7f2cc2ee99d283c187fca23b9b7e390e765868b1 (patch)
tree58e163b23c52e5229566780454ef10ace61e8ef5
parent6c45251bf7b23b187e58f5f8fc271606d46fb463 (diff)
downloadpowerkvm-7f2cc2ee99d283c187fca23b9b7e390e765868b1.tar.gz
cpuidle:Remove the debug messages printed on exit from idle state
We had added the debug prints to confirm the idle state exit by the cpus. This was mainly to test if fast sleep was working fine. Now that we are confident about its functioning we can get rid of these prints. Signed-off-by: Preeti U Murthy <preeti@linux.vnet.ibm.com>
-rw-r--r--drivers/cpuidle/cpuidle-powerpc-book3s.c21
1 files changed, 2 insertions, 19 deletions
diff --git a/drivers/cpuidle/cpuidle-powerpc-book3s.c b/drivers/cpuidle/cpuidle-powerpc-book3s.c
index f549cd6c39169..f0c1157634920 100644
--- a/drivers/cpuidle/cpuidle-powerpc-book3s.c
+++ b/drivers/cpuidle/cpuidle-powerpc-book3s.c
@@ -264,11 +264,6 @@ static int fastsleep_loop(struct cpuidle_device *dev,
unsigned long new_lpcr;
unsigned long flags;
int bc_cpu_status;
- static cpumask_t printed_mask = CPU_MASK_NONE;
- static DEFINE_SPINLOCK(printed_lock);
- unsigned int mycpu = smp_processor_id();
- unsigned long wakeup_srr1=0;
- char *srr1_wakeup_bits[]={"???","NoNAP","NAP","SLEEP"};
/*
* Verify if snooze is the only valid cpuidle state
@@ -297,7 +292,7 @@ static int fastsleep_loop(struct cpuidle_device *dev,
mtspr(SPRN_LPCR, new_lpcr);
clockevents_notify(CLOCK_EVT_NOTIFY_BROADCAST_ENTER, &cpu);
spin_unlock_irqrestore(&fastsleep_idle_lock, flags);
- wakeup_srr1 = power7_sleep();
+ power7_sleep();
spin_lock_irqsave(&fastsleep_idle_lock, flags);
clockevents_notify(CLOCK_EVT_NOTIFY_BROADCAST_EXIT, &cpu);
spin_unlock_irqrestore(&fastsleep_idle_lock, flags);
@@ -305,23 +300,11 @@ static int fastsleep_loop(struct cpuidle_device *dev,
new_lpcr |= LPCR_PECE1;
mtspr(SPRN_LPCR, new_lpcr);
spin_unlock_irqrestore(&fastsleep_idle_lock, flags);
- wakeup_srr1 = power7_nap();
+ power7_nap();
} else {
spin_unlock_irqrestore(&fastsleep_idle_lock, flags);
}
- /* debug print */
- if (!cpu_isset(mycpu, printed_mask)) {
- spin_lock(&printed_lock);
- cpu_set(mycpu, printed_mask);
- spin_unlock(&printed_lock);
- printk(KERN_NOTICE "powersave exit on cpu %d SRR1 %lx <%s>\n", mycpu,
- wakeup_srr1, srr1_wakeup_bits[(wakeup_srr1 >> 16) & 0x3]);
- }
-
- trace_printk("powersave exit on cpu %d SRR1 %lx <%s>\n", mycpu,
- wakeup_srr1, srr1_wakeup_bits[(wakeup_srr1 >> 16) & 0x3]);
-
mtspr(SPRN_LPCR, old_lpcr);
return index;
}