Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fa1408e4 authored by H. Peter Anvin's avatar H. Peter Anvin Committed by Ingo Molnar
Browse files

x86: unify CPU feature string names 



Move the CPU feature string names to a separate file (common to 32
and 64 bits); additionally, make <asm/cpufeature.h> includable by host
code in preparation for including the CPU feature strings in the boot
code.

Signed-off-by: default avatarH. Peter Anvin <hpa@zytor.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 84fb144b

arch/x86/kernel/cpu/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 
#



obj-y			:= intel_cacheinfo.o addon_cpuid_features.o

obj-y			+= feature_names.o



obj-$(CONFIG_X86_32)	+= common.o proc.o bugs.o

obj-$(CONFIG_X86_32)	+= amd.o

arch/x86/kernel/cpu/feature_names.c

0 → 100644
+83 −0
Original line number Diff line number Diff line 
/*

 * Strings for the various x86 capability flags.

 *

 * This file must not contain any executable code.

 */



#include "asm/cpufeature.h"



/*

 * These flag bits must match the definitions in <asm/cpufeature.h>.

 * NULL means this bit is undefined or reserved; either way it doesn't

 * have meaning as far as Linux is concerned.  Note that it's important

 * to realize there is a difference between this table and CPUID -- if

 * applications want to get the raw CPUID data, they should access

 * /dev/cpu/<cpu_nr>/cpuid instead.

 */

const char * const x86_cap_flags[NCAPINTS*32] = {

	/* Intel-defined */

	"fpu", "vme", "de", "pse", "tsc", "msr", "pae", "mce",

	"cx8", "apic", NULL, "sep", "mtrr", "pge", "mca", "cmov",

	"pat", "pse36", "pn", "clflush", NULL, "dts", "acpi", "mmx",

	"fxsr", "sse", "sse2", "ss", "ht", "tm", "ia64", "pbe",



	/* AMD-defined */

	NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,

	NULL, NULL, NULL, "syscall", NULL, NULL, NULL, NULL,

	NULL, NULL, NULL, "mp", "nx", NULL, "mmxext", NULL,

	NULL, "fxsr_opt", "pdpe1gb", "rdtscp", NULL, "lm",

	"3dnowext", "3dnow",



	/* Transmeta-defined */

	"recovery", "longrun", NULL, "lrti", NULL, NULL, NULL, NULL,

	NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,

	NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,

	NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,



	/* Other (Linux-defined) */

	"cxmmx", "k6_mtrr", "cyrix_arr", "centaur_mcr",

	NULL, NULL, NULL, NULL,

	"constant_tsc", "up", NULL, "arch_perfmon",

	"pebs", "bts", NULL, NULL,

	"rep_good", NULL, NULL, NULL, NULL, NULL, NULL, NULL,

	NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,



	/* Intel-defined (#2) */

	"pni", NULL, NULL, "monitor", "ds_cpl", "vmx", "smx", "est",

	"tm2", "ssse3", "cid", NULL, NULL, "cx16", "xtpr", NULL,

	NULL, NULL, "dca", "sse4_1", "sse4_2", NULL, NULL, "popcnt",

	NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,



	/* VIA/Cyrix/Centaur-defined */

	NULL, NULL, "rng", "rng_en", NULL, NULL, "ace", "ace_en",

	"ace2", "ace2_en", "phe", "phe_en", "pmm", "pmm_en", NULL, NULL,

	NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,

	NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,



	/* AMD-defined (#2) */

	"lahf_lm", "cmp_legacy", "svm", "extapic",

	"cr8_legacy", "abm", "sse4a", "misalignsse",

	"3dnowprefetch", "osvw", "ibs", "sse5",

	"skinit", "wdt", NULL, NULL,

	NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,

	NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,



	/* Auxiliary (Linux-defined) */

	"ida", NULL, NULL, NULL, NULL, NULL, NULL, NULL,

	NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,

	NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,

	NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,

};



const char *const x86_power_flags[32] = {

	"ts",	/* temperature sensor */

	"fid",  /* frequency id control */

	"vid",  /* voltage id control */

	"ttp",  /* thermal trip */

	"tm",

	"stc",

	"100mhzsteps",

	"hwpstate",

	"",	/* tsc invariant mapped to constant_tsc */

		/* nothing */

};

arch/x86/kernel/cpu/proc.c

+0 −74
Original line number Diff line number Diff line
@@ -10,80 +10,6 @@ 
 */

static int show_cpuinfo(struct seq_file *m, void *v)

{

	/* 

	 * These flag bits must match the definitions in <asm/cpufeature.h>.

	 * NULL means this bit is undefined or reserved; either way it doesn't

	 * have meaning as far as Linux is concerned.  Note that it's important

	 * to realize there is a difference between this table and CPUID -- if

	 * applications want to get the raw CPUID data, they should access

	 * /dev/cpu/<cpu_nr>/cpuid instead.

	 */

	static const char * const x86_cap_flags[] = {

		/* Intel-defined */

	        "fpu", "vme", "de", "pse", "tsc", "msr", "pae", "mce",

	        "cx8", "apic", NULL, "sep", "mtrr", "pge", "mca", "cmov",

	        "pat", "pse36", "pn", "clflush", NULL, "dts", "acpi", "mmx",

	        "fxsr", "sse", "sse2", "ss", "ht", "tm", "ia64", "pbe",



		/* AMD-defined */

		NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,

		NULL, NULL, NULL, "syscall", NULL, NULL, NULL, NULL,

		NULL, NULL, NULL, "mp", "nx", NULL, "mmxext", NULL,

		NULL, "fxsr_opt", "pdpe1gb", "rdtscp", NULL, "lm",

		"3dnowext", "3dnow",



		/* Transmeta-defined */

		"recovery", "longrun", NULL, "lrti", NULL, NULL, NULL, NULL,

		NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,

		NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,

		NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,



		/* Other (Linux-defined) */

		"cxmmx", "k6_mtrr", "cyrix_arr", "centaur_mcr",

		NULL, NULL, NULL, NULL,

		"constant_tsc", "up", NULL, "arch_perfmon",

		"pebs", "bts", NULL, "sync_rdtsc",

		"rep_good", NULL, NULL, NULL, NULL, NULL, NULL, NULL,

		NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,



		/* Intel-defined (#2) */

		"pni", NULL, NULL, "monitor", "ds_cpl", "vmx", "smx", "est",

		"tm2", "ssse3", "cid", NULL, NULL, "cx16", "xtpr", NULL,

		NULL, NULL, "dca", "sse4_1", "sse4_2", NULL, NULL, "popcnt",

		NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,



		/* VIA/Cyrix/Centaur-defined */

		NULL, NULL, "rng", "rng_en", NULL, NULL, "ace", "ace_en",

		"ace2", "ace2_en", "phe", "phe_en", "pmm", "pmm_en", NULL, NULL,

		NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,

		NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,



		/* AMD-defined (#2) */

		"lahf_lm", "cmp_legacy", "svm", "extapic",

		"cr8_legacy", "abm", "sse4a", "misalignsse",

		"3dnowprefetch", "osvw", "ibs", "sse5",

		"skinit", "wdt", NULL, NULL,

		NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,

		NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,



		/* Auxiliary (Linux-defined) */

		"ida", NULL, NULL, NULL, NULL, NULL, NULL, NULL,

		NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,

		NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,

		NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,

	};

	static const char * const x86_power_flags[] = {

		"ts",	/* temperature sensor */

		"fid",  /* frequency id control */

		"vid",  /* voltage id control */

		"ttp",  /* thermal trip */

		"tm",

		"stc",

		"100mhzsteps",

		"hwpstate",

		"",	/* constant_tsc - moved to flags */

		/* nothing */

	};

	struct cpuinfo_x86 *c = v;

	int i, n = 0;

	int fpu_exception;

arch/x86/kernel/setup_64.c

+0 −76
Original line number Diff line number Diff line
@@ -1068,82 +1068,6 @@ static int show_cpuinfo(struct seq_file *m, void *v) 
	struct cpuinfo_x86 *c = v;

	int cpu = 0, i;



	/*

	 * These flag bits must match the definitions in <asm/cpufeature.h>.

	 * NULL means this bit is undefined or reserved; either way it doesn't

	 * have meaning as far as Linux is concerned.  Note that it's important

	 * to realize there is a difference between this table and CPUID -- if

	 * applications want to get the raw CPUID data, they should access

	 * /dev/cpu/<cpu_nr>/cpuid instead.

	 */

	static const char *const x86_cap_flags[] = {

		/* Intel-defined */

		"fpu", "vme", "de", "pse", "tsc", "msr", "pae", "mce",

		"cx8", "apic", NULL, "sep", "mtrr", "pge", "mca", "cmov",

		"pat", "pse36", "pn", "clflush", NULL, "dts", "acpi", "mmx",

		"fxsr", "sse", "sse2", "ss", "ht", "tm", "ia64", "pbe",



		/* AMD-defined */

		NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,

		NULL, NULL, NULL, "syscall", NULL, NULL, NULL, NULL,

		NULL, NULL, NULL, NULL, "nx", NULL, "mmxext", NULL,

		NULL, "fxsr_opt", "pdpe1gb", "rdtscp", NULL, "lm",

		"3dnowext", "3dnow",



		/* Transmeta-defined */

		"recovery", "longrun", NULL, "lrti", NULL, NULL, NULL, NULL,

		NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,

		NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,

		NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,



		/* Other (Linux-defined) */

		"cxmmx", "k6_mtrr", "cyrix_arr", "centaur_mcr",

		NULL, NULL, NULL, NULL,

		"constant_tsc", "up", NULL, "arch_perfmon",

		"pebs", "bts", NULL, "sync_rdtsc",

		"rep_good", NULL, NULL, NULL, NULL, NULL, NULL, NULL,

		NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,



		/* Intel-defined (#2) */

		"pni", NULL, NULL, "monitor", "ds_cpl", "vmx", "smx", "est",

		"tm2", "ssse3", "cid", NULL, NULL, "cx16", "xtpr", NULL,

		NULL, NULL, "dca", "sse4_1", "sse4_2", NULL, NULL, "popcnt",

		NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,



		/* VIA/Cyrix/Centaur-defined */

		NULL, NULL, "rng", "rng_en", NULL, NULL, "ace", "ace_en",

		"ace2", "ace2_en", "phe", "phe_en", "pmm", "pmm_en", NULL, NULL,

		NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,

		NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,



		/* AMD-defined (#2) */

		"lahf_lm", "cmp_legacy", "svm", "extapic",

		"cr8_legacy", "abm", "sse4a", "misalignsse",

		"3dnowprefetch", "osvw", "ibs", "sse5",

		"skinit", "wdt", NULL, NULL,

		NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,

		NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,



		/* Auxiliary (Linux-defined) */

		"ida", NULL, NULL, NULL, NULL, NULL, NULL, NULL,

		NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,

		NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,

		NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,

	};

	static const char *const x86_power_flags[] = {

		"ts",	/* temperature sensor */

		"fid",  /* frequency id control */

		"vid",  /* voltage id control */

		"ttp",  /* thermal trip */

		"tm",

		"stc",

		"100mhzsteps",

		"hwpstate",

		"",	/* tsc invariant mapped to constant_tsc */

		/* nothing */

	};





#ifdef CONFIG_SMP

	cpu = c->cpu_index;

#endif

include/asm-x86/cpufeature.h

+9 −3
Original line number Diff line number Diff line
@@ -4,9 +4,6 @@ 
#ifndef _ASM_X86_CPUFEATURE_H

#define _ASM_X86_CPUFEATURE_H



#ifndef __ASSEMBLY__

#include <linux/bitops.h>

#endif

#include <asm/required-features.h>



#define NCAPINTS	8	/* N 32-bit words worth of info */
@@ -115,6 +112,13 @@ 
 */

#define X86_FEATURE_IDA		(7*32+ 0) /* Intel Dynamic Acceleration */



#if defined(__KERNEL__) && !defined(__ASSEMBLY__)



#include <linux/bitops.h>



extern const char * const x86_cap_flags[NCAPINTS*32];

extern const char * const x86_power_flags[32];



#define cpu_has(c, bit)							\

	(__builtin_constant_p(bit) &&					\

	 ( (((bit)>>5)==0 && (1UL<<((bit)&31) & REQUIRED_MASK0)) ||	\
@@ -204,4 +208,6 @@ 


#endif /* CONFIG_X86_64 */



#endif /* defined(__KERNEL__) && !defined(__ASSEMBLY__) */



#endif /* _ASM_X86_CPUFEATURE_H */