From: Len Brown <lenb@kernel.org>
To: x86@kernel.org
Cc: linux-kernel@vger.kernel.org,
linux-pm@lists.linux-foundation.org,
Len Brown <len.brown@intel.com>
Subject: [PATCH 2/9] x86 idle: remove NOP cpuinfo_x86.hlt_works_ok flag
Date: Thu, 31 Mar 2011 02:03:17 -0400 [thread overview]
Message-ID: <b048802b0285a5ff28e74a4309d833116174904a.1301550524.git.len.brown@intel.com> (raw)
In-Reply-To: <1301551404-8263-1-git-send-email-lenb@kernel.org>
In-Reply-To: <67e90d97e0a77df4acd0c75e1bacc7714e011f3e.1301550524.git.len.brown@intel.com>
From: Len Brown <len.brown@intel.com>
hlt_works_ok was X86_32 only, initialized to 1, and never cleared.
On 32-bit kernels, this deletes a line from /proc/cpuinfo: "hlt_bug : no"
Signed-off-by: Len Brown <len.brown@intel.com>
---
arch/x86/include/asm/processor.h | 5 -----
arch/x86/kernel/cpu/bugs.c | 5 +----
arch/x86/kernel/cpu/proc.c | 2 --
arch/x86/kernel/process.c | 2 +-
arch/x86/kernel/setup.c | 4 ++--
arch/x86/xen/setup.c | 3 ---
6 files changed, 4 insertions(+), 17 deletions(-)
diff --git a/arch/x86/include/asm/processor.h b/arch/x86/include/asm/processor.h
index 45636ce..b5c83f1 100644
--- a/arch/x86/include/asm/processor.h
+++ b/arch/x86/include/asm/processor.h
@@ -67,7 +67,6 @@ struct cpuinfo_x86 {
char wp_works_ok; /* It doesn't on 386's */
/* Problems on some 486Dx4's and old 386's: */
- char hlt_works_ok;
char hard_math;
char rfu;
char fdiv_bug;
@@ -150,11 +149,7 @@ extern const struct seq_operations cpuinfo_op;
static inline int hlt_works(int cpu)
{
-#ifdef CONFIG_X86_32
- return cpu_data(cpu).hlt_works_ok;
-#else
return 1;
-#endif
}
#define cache_line_size() (boot_cpu_data.x86_cache_alignment)
diff --git a/arch/x86/kernel/cpu/bugs.c b/arch/x86/kernel/cpu/bugs.c
index 4c91631..b5e2910 100644
--- a/arch/x86/kernel/cpu/bugs.c
+++ b/arch/x86/kernel/cpu/bugs.c
@@ -82,10 +82,7 @@ static void __init check_hlt(void)
return;
printk(KERN_INFO "Checking 'hlt' instruction... ");
- if (!boot_cpu_data.hlt_works_ok) {
- printk("disabled\n");
- return;
- }
+
halt();
halt();
halt();
diff --git a/arch/x86/kernel/cpu/proc.c b/arch/x86/kernel/cpu/proc.c
index 62ac8cb..203feb7 100644
--- a/arch/x86/kernel/cpu/proc.c
+++ b/arch/x86/kernel/cpu/proc.c
@@ -33,7 +33,6 @@ static void show_cpuinfo_misc(struct seq_file *m, struct cpuinfo_x86 *c)
int fpu_exception = c->hard_math && (ignore_fpu_irq || cpu_has_fpu);
seq_printf(m,
"fdiv_bug\t: %s\n"
- "hlt_bug\t\t: %s\n"
"f00f_bug\t: %s\n"
"coma_bug\t: %s\n"
"fpu\t\t: %s\n"
@@ -41,7 +40,6 @@ static void show_cpuinfo_misc(struct seq_file *m, struct cpuinfo_x86 *c)
"cpuid level\t: %d\n"
"wp\t\t: %s\n",
c->fdiv_bug ? "yes" : "no",
- c->hlt_works_ok ? "no" : "yes",
c->f00f_bug ? "yes" : "no",
c->coma_bug ? "yes" : "no",
c->hard_math ? "yes" : "no",
diff --git a/arch/x86/kernel/process.c b/arch/x86/kernel/process.c
index ff45541..4966c7e 100644
--- a/arch/x86/kernel/process.c
+++ b/arch/x86/kernel/process.c
@@ -362,7 +362,7 @@ EXPORT_SYMBOL(enable_hlt);
static inline int hlt_use_halt(void)
{
- return (!hlt_counter && boot_cpu_data.hlt_works_ok);
+ return (!hlt_counter);
}
#else
static inline int hlt_use_halt(void)
diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
index d3cfe26..fab5631 100644
--- a/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
@@ -175,9 +175,9 @@ static struct resource bss_resource = {
#ifdef CONFIG_X86_32
/* cpu data as detected by the assembly code in head.S */
-struct cpuinfo_x86 new_cpu_data __cpuinitdata = {0, 0, 0, 0, -1, 1, 0, 0, -1};
+struct cpuinfo_x86 new_cpu_data __cpuinitdata = {0, 0, 0, 0, -1, 0, 0, -1};
/* common cpu data for all cpus */
-struct cpuinfo_x86 boot_cpu_data __read_mostly = {0, 0, 0, 0, -1, 1, 0, 0, -1};
+struct cpuinfo_x86 boot_cpu_data __read_mostly = {0, 0, 0, 0, -1, 0, 0, -1};
EXPORT_SYMBOL(boot_cpu_data);
static void set_mca_bus(int x)
{
diff --git a/arch/x86/xen/setup.c b/arch/x86/xen/setup.c
index a8a66a5..97d2fbd 100644
--- a/arch/x86/xen/setup.c
+++ b/arch/x86/xen/setup.c
@@ -351,9 +351,6 @@ void __init xen_arch_setup(void)
COMMAND_LINE_SIZE : MAX_GUEST_CMDLINE);
/* Set up idle, making sure it calls safe_halt() pvop */
-#ifdef CONFIG_X86_32
- boot_cpu_data.hlt_works_ok = 1;
-#endif
pm_idle = default_idle;
boot_option_idle_override = IDLE_HALT;
--
1.7.4.2.406.gbe91
next prev parent reply other threads:[~2011-03-31 6:03 UTC|newest]
Thread overview: 75+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-03-24 7:08 [PATCH 0/5] x86 idle cruft removal Len Brown
2011-03-24 7:08 ` [PATCH 1/5] x86 idle: remove "no-hlt" cmdline param Len Brown
2011-03-24 7:08 ` [PATCH 2/5] x86 idle: remove NOP cpuinfo_x86.hlt_works_ok flag Len Brown
2011-03-24 7:08 ` [PATCH 3/5] x86 idle: remove NOP halt_works() Len Brown
2011-03-24 7:08 ` [PATCH 4/5] x86 idle floppy: delete disable_hlt()/enable_hlt() Len Brown
2011-03-24 15:58 ` Andi Kleen
2011-03-24 7:08 ` [PATCH 5/5] x86 idle: remove NOP hlt_use_halt() Len Brown
2011-03-25 19:02 ` [linux-pm] " Vaidyanathan Srinivasan
2011-03-31 6:03 ` [PATCH 0/9] x86 idle cruft removal - v2 Len Brown
2011-03-31 6:03 ` [PATCH 1/9] x86 idle: remove "no-hlt" cmdline param Len Brown
2011-03-31 6:03 ` Len Brown [this message]
2011-03-31 6:12 ` [PATCH 2/9] x86 idle: remove NOP cpuinfo_x86.hlt_works_ok flag Ingo Molnar
2011-03-31 7:02 ` Len Brown
2011-03-31 8:18 ` Ingo Molnar
2011-03-31 9:23 ` Alan Cox
2011-03-31 9:27 ` Ingo Molnar
2011-03-31 9:33 ` Alan Cox
2011-03-31 9:35 ` Ingo Molnar
2011-03-31 14:19 ` H. Peter Anvin
2011-03-31 14:41 ` Alan Cox
2011-03-31 15:09 ` H. Peter Anvin
2011-03-31 18:07 ` Len Brown
2011-03-31 18:28 ` H. Peter Anvin
2011-03-31 6:03 ` [PATCH 3/9] x86 idle: remove NOP halt_works() Len Brown
2011-03-31 6:03 ` [PATCH 4/9] x86 idle floppy: delete disable_hlt()/enable_hlt() Len Brown
2011-03-31 6:03 ` [PATCH 5/9] x86 idle: remove NOP hlt_use_halt() Len Brown
2011-03-31 6:03 ` [PATCH 6/9] x86 idle APM: delete apm_cpu_idle(), and its use of (pm_idle)() Len Brown
2011-03-31 6:03 ` [PATCH 7/9] x86 idle: do not EXPORT_SYMBOL pm_idle and default_idle Len Brown
2011-03-31 6:03 ` [PATCH 8/9] x86 idle: move mwait_idle_with_hints() to where it is used Len Brown
2011-03-31 6:03 ` [PATCH 9/9] x86 idle: delete mwait_idle() Len Brown
2011-04-01 11:02 ` Andreas Herrmann
2011-03-31 6:39 ` [linux-pm] [PATCH 0/9] x86 idle cruft removal - v2 Trinabh Gupta
2011-03-31 7:21 ` Len Brown
2011-03-31 9:45 ` Alan Cox
2011-03-31 10:28 ` Ingo Molnar
2011-04-01 4:24 ` Len Brown
2011-04-01 9:38 ` [linux-pm] " Trinabh Gupta
2011-04-01 18:33 ` Len Brown
2011-04-02 6:22 ` idle cleanup - v3 Len Brown
2011-04-02 6:22 ` [PATCH 01/18] cpuidle: menu: fixed wrapping timers at 4.294 seconds Len Brown
2011-04-02 6:22 ` [PATCH 02/18] x86 idle floppy: deprecate disable_hlt() Len Brown
2011-04-02 6:22 ` [PATCH 03/18] x86 idle APM: deprecate CONFIG_APM_CPU_IDLE Len Brown
2011-04-02 11:28 ` Alan Cox
2011-04-02 18:28 ` Len Brown
2011-04-02 19:44 ` Alan Cox
2011-04-08 6:22 ` Pavel Machek
2011-04-02 6:22 ` [PATCH 04/18] x86 idle: EXPORT_SYMBOL(default_idle, pm_idle) only when APM demands it Len Brown
2011-04-02 11:28 ` Alan Cox
2011-04-02 12:21 ` [linux-pm] " Trinabh Gupta
2011-04-02 6:22 ` [PATCH 05/18] x86 idle: deprecate "no-hlt" cmdline param Len Brown
2011-04-02 6:22 ` [PATCH 06/18] x86 idle: deprecate mwait_idle() and "idle=mwait" " Len Brown
2011-04-02 6:22 ` [PATCH 07/18] x86 idle: clarify AMD erratum 400 workaround Len Brown
2011-04-02 8:23 ` Borislav Petkov
2011-04-02 19:19 ` Len Brown
2011-04-02 19:22 ` [PATCH 07/18] x86 idle: clarify AMD erratum 400 workaround -v2 Len Brown
2011-04-03 9:00 ` Borislav Petkov
2011-04-02 6:22 ` [PATCH 08/18] cpuidle: create bootparam "cpuidle.off=1" Len Brown
2011-07-15 11:27 ` [linux-pm] " Deepthi Dharwar
2011-04-02 6:22 ` [PATCH 09/18] cpuidle: replace xen access to x86 pm_idle and default_idle Len Brown
2011-04-04 15:33 ` [Xen-devel] " Konrad Rzeszutek Wilk
2011-04-02 6:22 ` [PATCH 10/18] x86 idle: move mwait_idle_with_hints() to where it is used Len Brown
2011-04-02 6:22 ` [PATCH 11/18] cpuidle: stop using pm_idle Len Brown
2011-04-25 10:41 ` [linux-pm] " Trinabh Gupta
2011-04-02 6:22 ` [PATCH 12/18] 2.6.40: x86 idle: remove deprecated "no-hlt" cmdline param Len Brown
2011-04-02 6:22 ` [PATCH 13/18] 2.6.40: x86 idle: remove deprecated "hlt_bug: no" in 32-bit /proc/cpuinfo Len Brown
2011-04-02 6:22 ` [PATCH 14/18] 2.6.40: x86 idle floppy: remove deprecated disable_hlt()/enable_hlt() Len Brown
2011-04-02 6:22 ` [PATCH 15/18] 2.6.40: x86 idle: remove deprecated hlt_use_halt() Len Brown
2011-04-02 6:22 ` [PATCH 16/18] 2.6.40: x86 idle APM: remove deprecated apm_cpu_idle() Len Brown
2011-04-02 11:40 ` Alan Cox
2011-04-02 19:44 ` Len Brown
2011-04-02 21:00 ` Alan Cox
2011-04-03 2:48 ` [linux-pm] " Trinabh Gupta
2011-04-04 10:05 ` Alan Cox
2011-04-02 6:22 ` [PATCH 17/18] 2.6.40: x86 idle: do not export default_idle() and (pm_idle)() Len Brown
2011-04-02 6:23 ` [PATCH 18/18] 2.6.40: x86 idle: remove deprecated mwait_idle() Len Brown
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=b048802b0285a5ff28e74a4309d833116174904a.1301550524.git.len.brown@intel.com \
--to=lenb@kernel.org \
--cc=len.brown@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@lists.linux-foundation.org \
--cc=x86@kernel.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®