rpms/kernel/devel kernel-2.6.spec, 1.3142, 1.3143 linux-2.6-clockevents-fix-resume-logic.patch, 1.1, 1.2 linux-2.6-timer-tick-broadcast.patch, 1.1, NONE

[Dave Jones (davej)]

Author: davej

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21095

Modified Files:
	kernel-2.6.spec linux-2.6-clockevents-fix-resume-logic.patch 
Removed Files:
	linux-2.6-timer-tick-broadcast.patch 
Log Message:
* Tue May 08 2007 Dave Jones <davej at redhat.com>
- Some tweaks to the recent timer fixes.



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.3142
retrieving revision 1.3143
diff -u -r1.3142 -r1.3143
--- kernel-2.6.spec	8 May 2007 00:53:17 -0000	1.3142
+++ kernel-2.6.spec	8 May 2007 15:28:38 -0000	1.3143
@@ -590,7 +590,6 @@
 Patch2401: linux-2.6-clocksource-fix-resume-logic.patch
 Patch2402: linux-2.6-acpi-keep-tsc-stable-when-lapic-timer-c2-ok-is-set.patch
 Patch2403: linux-2.6-clockevents-fix-resume-logic.patch
-Patch2404: linux-2.6-timer-tick-broadcast.patch
 
 # ACPI bits
 Patch2500: linux-2.6-acpi-clear-fadt_cstate-control.patch
@@ -1329,7 +1328,6 @@
 %patch2401 -p1
 %patch2402 -p1
 %patch2403 -p1
-%patch2404 -p1
 
 # ACPI patches
 # ACPI: Fix 2.6.21 boot regression on P4/HT
@@ -2306,6 +2304,9 @@
 %endif
 
 %changelog
+* Tue May 08 2007 Dave Jones <davej at redhat.com>
+- Some tweaks to the recent timer fixes.
+
 * Mon May 07 2007 John W. Linville <linville at tuxdriver.com>
 - Some iwl3945 updates related to rate control
 

linux-2.6-clockevents-fix-resume-logic.patch:

Index: linux-2.6-clockevents-fix-resume-logic.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-clockevents-fix-resume-logic.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-clockevents-fix-resume-logic.patch	3 May 2007 18:54:51 -0000	1.1
+++ linux-2.6-clockevents-fix-resume-logic.patch	8 May 2007 15:28:38 -0000	1.2
@@ -13,11 +13,11 @@
 ---
  arch/i386/kernel/apic.c      |    3 +
  arch/i386/kernel/hpet.c      |   71 +++----------------------------------------
- arch/i386/kernel/i8253.c     |    4 ++
+ arch/i386/kernel/i8253.c     |   43 +++++++++++++++++---------
  include/linux/clockchips.h   |    1 
- kernel/time/tick-broadcast.c |    2 +
+ kernel/time/tick-broadcast.c |    4 +-
  kernel/time/tick-common.c    |   16 ++++++---
- 6 files changed, 25 insertions(+), 72 deletions(-)
+ 6 files changed, 51 insertions(+), 87 deletions(-)
 
 Index: linux-2.6.21/arch/i386/kernel/apic.c
 ===================================================================
@@ -137,17 +137,81 @@
 ===================================================================
 --- linux-2.6.21.orig/arch/i386/kernel/i8253.c
 +++ linux-2.6.21/arch/i386/kernel/i8253.c
-@@ -62,6 +62,10 @@ static void init_pit_timer(enum clock_ev
- 		outb_p(0x38, PIT_MODE);
- 		udelay(10);
+@@ -3,11 +3,11 @@
+  *
+  */
+ #include <linux/clockchips.h>
+-#include <linux/spinlock.h>
++#include <linux/init.h>
++#include <linux/interrupt.h>
+ #include <linux/jiffies.h>
+-#include <linux/sysdev.h>
+ #include <linux/module.h>
+-#include <linux/init.h>
++#include <linux/spinlock.h>
+ 
+ #include <asm/smp.h>
+ #include <asm/delay.h>
+@@ -25,6 +25,24 @@ EXPORT_SYMBOL(i8253_lock);
+  */
+ struct clock_event_device *global_clock_event;
+ 
++/* Status of the PIT interrupt */
++static int pit_irq_disabled;
++
++/*
++ * Control pit interrupt enable / disable
++ */
++static void pit_control_irq(int disable)
++{
++	if (pit_irq_disabled == disable)
++		return;
++
++	pit_irq_disabled = disable;
++	if (disable)
++		disable_irq(0);
++	else
++		enable_irq(0);
++}
++
+ /*
+  * Initialize the PIT timer.
+  *
+@@ -41,26 +59,23 @@ static void init_pit_timer(enum clock_ev
+ 	case CLOCK_EVT_MODE_PERIODIC:
+ 		/* binary, mode 2, LSB/MSB, ch 0 */
+ 		outb_p(0x34, PIT_MODE);
+-		udelay(10);
+ 		outb_p(LATCH & 0xff , PIT_CH0);	/* LSB */
+-		udelay(10);
+ 		outb(LATCH >> 8 , PIT_CH0);	/* MSB */
++		pit_control_irq(0);
  		break;
+ 
+-	/*
+-	 * Avoid unnecessary state transitions, as it confuses
+-	 * Geode / Cyrix based boxen.
+-	 */
+ 	case CLOCK_EVT_MODE_SHUTDOWN:
+-		if (evt->mode == CLOCK_EVT_MODE_UNUSED)
+-			break;
+ 	case CLOCK_EVT_MODE_UNUSED:
+-		if (evt->mode == CLOCK_EVT_MODE_SHUTDOWN)
+-			break;
++		pit_control_irq(1);
++		break;
+ 	case CLOCK_EVT_MODE_ONESHOT:
+ 		/* One shot setup */
+ 		outb_p(0x38, PIT_MODE);
+-		udelay(10);
++		pit_control_irq(0);
++		break;
 +
 +	case CLOCK_EVT_MODE_RESUME:
 +		/* Nothing to do here */
-+		break;
+ 		break;
  	}
  	spin_unlock_irqrestore(&i8253_lock, flags);
- }
 Index: linux-2.6.21/include/linux/clockchips.h
 ===================================================================
 --- linux-2.6.21.orig/include/linux/clockchips.h
@@ -164,6 +228,15 @@
 ===================================================================
 --- linux-2.6.21.orig/kernel/time/tick-broadcast.c
 +++ linux-2.6.21/kernel/time/tick-broadcast.c
+@@ -292,7 +292,7 @@ void tick_suspend_broadcast(void)
+ 	spin_lock_irqsave(&tick_broadcast_lock, flags);
+ 
+ 	bc = tick_broadcast_device.evtdev;
+-	if (bc && tick_broadcast_device.mode == TICKDEV_MODE_PERIODIC)
++	if (bc)
+ 		clockevents_set_mode(bc, CLOCK_EVT_MODE_SHUTDOWN);
+ 
+ 	spin_unlock_irqrestore(&tick_broadcast_lock, flags);
 @@ -309,6 +309,8 @@ int tick_resume_broadcast(void)
  	bc = tick_broadcast_device.evtdev;
  


--- linux-2.6-timer-tick-broadcast.patch DELETED ---