Skip to contentSkip to conversation

timer TSC check suspend notifier change

PATCH In review Shaohua Li 2 participants 2 messages Apr 30, 2006 – May 2, 2006

lore
Share & tools
lore

Shaohua Li

author
#0 lore raw

PATCH 1/1 timer TSC check suspend notifier change

in suspend time, the TSC CPUFREQ_SUSPENDCHANGE notifier change might wrongly enable interrupt. cpufreq driver suspend/resume is in interrupt disabled environment.

---

 linux-2.6.17-rc3-root/arch/i386/kernel/timers/timer_tsc.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
arch/i386/kernel/timers/timer_tsc.c renamed from arch/i386/kernel/timers/timer_tsc.c~timer_tsc_check_suspend_change +2 -2
diff -puN arch/i386/kernel/timers/timer_tsc.c~timer_tsc_check_suspend_change arch/i386/kernel/timers/timer_tsc.c
@@ -279,7 +279,7 @@ time_cpufreq_notifier(struct notifier_bl
 {
 	struct cpufreq_freqs *freq = data;
 
-	if (val != CPUFREQ_RESUMECHANGE)
+	if (val != CPUFREQ_RESUMECHANGE && val != CPUFREQ_SUSPENDCHANGE)
 		write_seqlock_irq(&xtime_lock);
 	if (!ref_freq) {
 		if (!freq->old){
@@ -312,7 +312,7 @@ time_cpufreq_notifier(struct notifier_bl
 	}
 
 end:
-	if (val != CPUFREQ_RESUMECHANGE)
+	if (val != CPUFREQ_RESUMECHANGE && val != CPUFREQ_SUSPENDCHANGE)
 		write_sequnlock_irq(&xtime_lock);
 
 	return 0;

_

#1 lore raw
Quoted 13 lines · Shaohua Li

in suspend time, the TSC CPUFREQ_SUSPENDCHANGE notifier change might wrongly enable interrupt. cpufreq driver suspend/resume is in interrupt disabled environment.

---

 linux-2.6.17-rc3-root/arch/i386/kernel/timers/timer_tsc.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff -puN arch/i386/kernel/timers/timer_tsc.c~timer_tsc_check_suspend_change arch/i386/kernel/timers/timer_tsc.c

arch/i386/kernel/timers/timer_tsc.c time_cpufreq_notifier(struct notifier_bl · line 283

Quoted 6 lines
arch/i386/kernel/timers/timer_tsc.c renamed from arch/i386/kernel/timers/timer_tsc.c~timer_tsc_check_suspend_change +1 -1
@@ -279,7 +279,7 @@ time_cpufreq_notifier(struct notifier_bl
 {
 	struct cpufreq_freqs *freq = data;
 
-	if (val != CPUFREQ_RESUMECHANGE)
+	if (val != CPUFREQ_RESUMECHANGE && val != CPUFREQ_SUSPENDCHANGE)
 		write_seqlock_irq(&xtime_lock);

Better would be to change it to write_seqlock_irqsave() (if that exists, if not add it)

arch/i386/kernel/timers/timer_tsc.c time_cpufreq_notifier(struct notifier_bl · line 316

Quoted 9 lines
arch/i386/kernel/timers/timer_tsc.c renamed from arch/i386/kernel/timers/timer_tsc.c~timer_tsc_check_suspend_change +1 -1
 	if (!ref_freq) {
 		if (!freq->old){
@@ -312,7 +312,7 @@ time_cpufreq_notifier(struct notifier_bl
 	}
 
 end:
-	if (val != CPUFREQ_RESUMECHANGE)
+	if (val != CPUFREQ_RESUMECHANGE && val != CPUFREQ_SUSPENDCHANGE)
 		write_sequnlock_irq(&xtime_lock);

and _restore

-Andi