From: Mikael Pettersson <mikpe@csd.uu.se>
To: Dave Jones <davej@codemonkey.org.uk>
Cc: torvalds@transmeta.com, fxkuehl@gmx.de,
linux-kernel@vger.kernel.org, willy@w.ods.org
Subject: [PATCH][2.6.0-test3] Disable APIC on reboot.
Date: Tue, 12 Aug 2003 01:33:11 +0200 [thread overview]
Message-ID: <16184.10167.743824.668791@gargle.gargle.HOWL> (raw)
In-Reply-To: <16183.51974.508883.472043@gargle.gargle.HOWL>
Here is a patch for 2.6.0-test3 to disable the local APIC before
reboot. This fixes BIOS reboot problems reported by a few people.
disable_local_APIC() now checks if detect_init_APIC() enabled the
local APIC via the APIC_BASE MSR, and if so it now disables APIC_BASE.
Previously we would leave APIC_BASE enabled, and that made some
BIOSen unhappy.
The SMP reboot code calls disable_local_APIC(). On SMP HW there is
no change since detect_init_APIC() isn't called and APIC_BASE isn't
enabled by us. An SMP kernel on UP HW behaves just like an UP_APIC
kernel, so it disables APIC_BASE if we enabled it at boot.
The UP_APIC disable-before-suspend code is simplified since the existing
code to disable APIC_BASE is moved into disable_local_APIC().
(Felix Kühling originally reported the BIOS reboot problem. This is a
fixed-up version of his preliminary patch.)
/Mikael
--- linux-2.6.0-test3/arch/i386/kernel/apic.c.~1~ 2003-07-03 12:32:41.000000000 +0200
+++ linux-2.6.0-test3/arch/i386/kernel/apic.c 2003-08-11 23:49:06.000000000 +0200
@@ -61,6 +61,8 @@
static DEFINE_PER_CPU(int, prof_old_multiplier) = 1;
static DEFINE_PER_CPU(int, prof_counter) = 1;
+static int enabled_via_apicbase;
+
void enable_NMI_through_LVT0 (void * dummy)
{
unsigned int v, ver;
@@ -190,6 +192,13 @@
value = apic_read(APIC_SPIV);
value &= ~APIC_SPIV_APIC_ENABLED;
apic_write_around(APIC_SPIV, value);
+
+ if (enabled_via_apicbase) {
+ unsigned int l, h;
+ rdmsr(MSR_IA32_APICBASE, l, h);
+ l &= ~MSR_IA32_APICBASE_ENABLE;
+ wrmsr(MSR_IA32_APICBASE, l, h);
+ }
}
/*
@@ -485,7 +494,6 @@
static int lapic_suspend(struct sys_device *dev, u32 state)
{
- unsigned int l, h;
unsigned long flags;
if (!apic_pm_state.active)
@@ -507,9 +515,6 @@
local_irq_save(flags);
disable_local_APIC();
- rdmsr(MSR_IA32_APICBASE, l, h);
- l &= ~MSR_IA32_APICBASE_ENABLE;
- wrmsr(MSR_IA32_APICBASE, l, h);
local_irq_restore(flags);
return 0;
}
@@ -636,6 +641,7 @@
l &= ~MSR_IA32_APICBASE_BASE;
l |= MSR_IA32_APICBASE_ENABLE | APIC_DEFAULT_PHYS_BASE;
wrmsr(MSR_IA32_APICBASE, l, h);
+ enabled_via_apicbase = 1;
}
}
/*
--- linux-2.6.0-test3/arch/i386/kernel/reboot.c.~1~ 2003-05-28 22:15:58.000000000 +0200
+++ linux-2.6.0-test3/arch/i386/kernel/reboot.c 2003-08-11 23:55:58.000000000 +0200
@@ -8,6 +8,7 @@
#include <linux/interrupt.h>
#include <linux/mc146818rtc.h>
#include <asm/uaccess.h>
+#include <asm/apic.h>
#include "mach_reboot.h"
/*
@@ -249,6 +250,14 @@
* other OSs see a clean IRQ state.
*/
smp_send_stop();
+#elif CONFIG_X86_LOCAL_APIC
+ if (cpu_has_apic) {
+ local_irq_disable();
+ disable_local_APIC();
+ local_irq_enable();
+ }
+#endif
+#ifdef CONFIG_X86_IO_APIC
disable_IO_APIC();
#endif
next prev parent reply other threads:[~2003-08-11 23:33 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2003-08-11 13:40 [PATCH] " davej
2003-08-11 15:33 ` [PATCH-2.4] " Willy Tarreau
2003-08-11 16:29 ` [PATCH] " Mikael Pettersson
2003-08-11 16:38 ` Dave Jones
2003-08-11 16:57 ` Mikael Pettersson
2003-08-11 23:33 ` Mikael Pettersson [this message]
2003-08-12 13:48 ` [PATCH][2.6.0-test3] " Maciej W. Rozycki
2003-08-12 13:57 ` Mikael Pettersson
2003-08-12 14:31 ` Maciej W. Rozycki
2003-08-11 23:33 ` [PATCH][2.4.22-rc2] " Mikael Pettersson
2003-08-12 6:09 ` Willy Tarreau
2003-08-15 19:22 ` Marc-Christian Petersen
2003-08-27 7:19 ` Luca Montecchiani
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=16184.10167.743824.668791@gargle.gargle.HOWL \
--to=mikpe@csd.uu.se \
--cc=davej@codemonkey.org.uk \
--cc=fxkuehl@gmx.de \
--cc=linux-kernel@vger.kernel.org \
--cc=torvalds@transmeta.com \
--cc=willy@w.ods.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®