Attachment 155903 Details for Bug 242088 – Patch from 1.3143 which broke booting on Xen

[patch] Patch from 1.3143 which broke booting on Xen

3142.3143.tree.diff (text/plain), 1.90 KB, created by Stephen Tweedie on 2007-06-01 16:27:36 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Stephen Tweedie

Created: 2007-06-01 16:27:36 UTC

Size: 1.90 KB

patch

obsolete

>diff --exclude-from=/dev/fd/63 -urp devel.3142/kernel-2.6.21/linux-2.6.21.noarch/arch/i386/kernel/i8253.c devel.3143/kernel-2.6.21/linux-2.6.21.noarch/arch/i386/kernel/i8253.c
>--- devel.3142/kernel-2.6.21/linux-2.6.21.noarch/arch/i386/kernel/i8253.c	2007-06-01 13:25:29.000000000 +0100
>+++ devel.3143/kernel-2.6.21/linux-2.6.21.noarch/arch/i386/kernel/i8253.c	2007-06-01 13:26:09.000000000 +0100
>@@ -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,19 @@ 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:

Actions: View | Diff

Attachments on bug 242088: 155903 | 155904 | 192991