Andi,
The driver model conversion left x86-64's apic.c and nmi.c with
obsolete #includes and comments, and some poor code formatting.
nmi.c also lacks the 'nmi_pm_active' change which went into
i386 recently. It's needed to prevent enabling the watchdog
after resume if it was disabled before suspend: this happens
if another driver has claimed the HW and disabled the watchdog.
This won't hit until you remove the #if 0 in lapic_nmi_resume(),
however. (Why do you need that?)
Patch below fixes these issues. (Against 2.5.71 + x86_64-2.5.71-1)
/Mikael
diff -ruN linux-2.5.71-andi/arch/x86_64/kernel/apic.c linux-2.5.71-mikpe/arch/x86_64/kernel/apic.c
--- linux-2.5.71-andi/arch/x86_64/kernel/apic.c 2003-06-16 16:08:35.000000000 +0200
+++ linux-2.5.71-mikpe/arch/x86_64/kernel/apic.c 2003-06-16 16:17:38.000000000 +0200
@@ -441,9 +441,6 @@
#ifdef CONFIG_PM
-#include <linux/device.h>
-#include <linux/module.h>
-
static struct {
/* 'active' is true if the local APIC was enabled by us and
not the BIOS; this signifies that we are also responsible
@@ -540,7 +537,6 @@
.suspend = lapic_suspend,
};
-/* not static, needed by child devices */
static struct sys_device device_lapic = {
.id = 0,
.cls = &lapic_sysclass,
diff -ruN linux-2.5.71-andi/arch/x86_64/kernel/nmi.c linux-2.5.71-mikpe/arch/x86_64/kernel/nmi.c
--- linux-2.5.71-andi/arch/x86_64/kernel/nmi.c 2003-06-16 16:08:35.000000000 +0200
+++ linux-2.5.71-mikpe/arch/x86_64/kernel/nmi.c 2003-06-16 16:20:29.000000000 +0200
@@ -141,20 +141,22 @@
/* tell do_nmi() and others that we're not active any more */
nmi_watchdog = 0;
}
+
void enable_lapic_nmi_watchdog(void)
- {
+{
if (nmi_active < 0) {
nmi_watchdog = NMI_LOCAL_APIC;
setup_apic_nmi_watchdog();
}
- }
+}
#ifdef CONFIG_PM
-#include <linux/device.h>
+static int nmi_pm_active; /* nmi_active before suspend */
static int lapic_nmi_suspend(struct sys_device *dev, u32 state)
{
+ nmi_pm_active = nmi_active;
disable_lapic_nmi_watchdog();
return 0;
}
@@ -162,7 +164,8 @@
static int lapic_nmi_resume(struct sys_device *dev)
{
#if 0
- enable_lapic_nmi_watchdog();
+ if (nmi_pm_active > 0)
+ enable_lapic_nmi_watchdog();
#endif
return 0;
}
@@ -174,7 +177,7 @@
};
static struct sys_device device_lapic_nmi = {
- .id = 0,
+ .id = 0,
.cls = &nmi_sysclass,
};
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
This archive was generated by hypermail 2b29 : Mon Jun 23 2003 - 22:00:18 EST