linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Cyrill Gorcunov <gorcunov@gmail.com>
To: mingo@elte.hu, macro@linux-mips.org
Cc: hpa@zytor.com, tglx@linutronix.de, linux-kernel@vger.kernel.org,
	Cyrill Gorcunov <gorcunov@gmail.com>
Subject: [PATCH 04/15] x86: apic - unify lapic_shutdown
Date: Mon, 18 Aug 2008 20:45:52 +0400	[thread overview]
Message-ID: <a4b7c856ac5d5d1c57fd43524d97a1c4503ee594.1219073223.git.gorcunov@gmail.com> (raw)
In-Reply-To: <1219077963-22883-1-git-send-email-gorcunov@gmail.com>
In-Reply-To: <8d555f8d496693d05b9e0836f18f62b1adb313c8.1219073223.git.gorcunov@gmail.com>

Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
---
 arch/x86/kernel/apic_32.c |    9 ++++++---
 arch/x86/kernel/apic_64.c |   14 +++++++++++++-
 2 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/arch/x86/kernel/apic_32.c b/arch/x86/kernel/apic_32.c
index 13c4b79..d4efe86 100644
--- a/arch/x86/kernel/apic_32.c
+++ b/arch/x86/kernel/apic_32.c
@@ -838,10 +838,13 @@ void lapic_shutdown(void)
 
 	local_irq_save(flags);
 
-	if (enabled_via_apicbase)
-		disable_local_APIC();
-	else
+#ifdef CONFIG_X86_32
+	if (!enabled_via_apicbase)
 		clear_local_APIC();
+	else
+#endif
+		disable_local_APIC();
+
 
 	local_irq_restore(flags);
 }
diff --git a/arch/x86/kernel/apic_64.c b/arch/x86/kernel/apic_64.c
index 4fb903b..4880654 100644
--- a/arch/x86/kernel/apic_64.c
+++ b/arch/x86/kernel/apic_64.c
@@ -707,6 +707,12 @@ void disable_local_APIC(void)
 #endif
 }
 
+/*
+ * If Linux enabled the LAPIC against the BIOS default disable it down before
+ * re-entering the BIOS on shutdown.  Otherwise the BIOS may get confused and
+ * not power-off.  Additionally clear all LVT entries before disable_local_APIC
+ * for the case where Linux didn't enable the LAPIC.
+ */
 void lapic_shutdown(void)
 {
 	unsigned long flags;
@@ -716,7 +722,13 @@ void lapic_shutdown(void)
 
 	local_irq_save(flags);
 
-	disable_local_APIC();
+#ifdef CONFIG_X86_32
+	if (!enabled_via_apicbase)
+		clear_local_APIC();
+	else
+#endif
+		disable_local_APIC();
+
 
 	local_irq_restore(flags);
 }
-- 
1.6.0.rc1.34.g0fe8c


  parent reply	other threads:[~2008-08-18 16:46 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-08-18 16:45 [PATCH 0/15] apic: unification series 5 Cyrill Gorcunov
2008-08-18 16:45 ` [PATCH 01/15] x86: apic - rearrange maxcpu definition Cyrill Gorcunov
2008-08-18 16:45   ` [PATCH 02/15] x86: apic - unify setup_boot_APIC_clock Cyrill Gorcunov
2008-08-18 16:45   ` [PATCH 03/15] x86: apic - unify disable_local_APIC Cyrill Gorcunov
2008-08-18 16:45   ` Cyrill Gorcunov [this message]
2008-08-18 16:45   ` [PATCH 05/15] x86: apic - unify connect_bsp_APIC Cyrill Gorcunov
2008-08-18 16:45   ` [PATCH 06/15] x86: apic - unify lapic_setup_esr Cyrill Gorcunov
2008-08-18 16:45   ` [PATCH 07/15] x86: apic - unify __setup_APIC_LVTT Cyrill Gorcunov
2008-08-18 16:45   ` [PATCH 08/15] x86: apic - unify disconnect_bsp_APIC Cyrill Gorcunov
2008-08-18 16:45   ` [PATCH 09/15] x86: apic - generic_processor_info Cyrill Gorcunov
2008-08-18 16:45   ` [PATCH 10/15] x86: apic - unify end_local_APIC_setup Cyrill Gorcunov
2008-08-18 16:45   ` [PATCH 11/15] x86: apic - unify local_apic_timer_interrupt Cyrill Gorcunov
2008-08-18 16:46   ` [PATCH 12/15] x86: apic - unify apic_set_verbosity Cyrill Gorcunov
2008-08-18 16:46   ` [PATCH 13/15] x86: apic - unify disableapic and nolapic setup handlers Cyrill Gorcunov
2008-08-18 16:46   ` [PATCH 14/15] x86: apic - rearrange parse_lapic_timer_c2_ok Cyrill Gorcunov
2008-08-18 16:46   ` [PATCH 15/15] x86: apic - lapic_resume 32bit - unification fix Cyrill Gorcunov
2008-08-18 16:59   ` [PATCH 01/15] x86: apic - rearrange maxcpu definition Cyrill Gorcunov
2008-08-18 17:22 ` [PATCH 0/15] apic: unification series 5 H. Peter Anvin
2008-08-18 17:28   ` Cyrill Gorcunov
2008-08-18 19:12   ` Cyrill Gorcunov
2008-08-19  0:09     ` Ingo Molnar

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=a4b7c856ac5d5d1c57fd43524d97a1c4503ee594.1219073223.git.gorcunov@gmail.com \
    --to=gorcunov@gmail.com \
    --cc=hpa@zytor.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=macro@linux-mips.org \
    --cc=mingo@elte.hu \
    --cc=tglx@linutronix.de \
    /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;
as well as URLs for NNTP newsgroup(s).