[net-next-2.6.git] / arch / x86 / kernel / cpu / scattered.c

/*
 *	Routines to indentify additional cpu features that are scattered in
 *	cpuid space.
 */
#include <linux/cpu.h>

#include <asm/pat.h>
#include <asm/processor.h>

#include <asm/apic.h>

struct cpuid_bit {
	u16 feature;
	u8 reg;
	u8 bit;
	u32 level;
	u32 sub_leaf;
};

enum cpuid_regs {
	CR_EAX = 0,
	CR_ECX,
	CR_EDX,
	CR_EBX
};

void __cpuinit init_scattered_cpuid_features(struct cpuinfo_x86 *c)
{
	u32 max_level;
	u32 regs[4];
	const struct cpuid_bit *cb;

	static const struct cpuid_bit __cpuinitconst cpuid_bits[] = {
		{ X86_FEATURE_DTS,		CR_EAX, 0, 0x00000006, 0 },
		{ X86_FEATURE_IDA,		CR_EAX, 1, 0x00000006, 0 },
		{ X86_FEATURE_ARAT,		CR_EAX, 2, 0x00000006, 0 },
		{ X86_FEATURE_PLN,		CR_EAX, 4, 0x00000006, 0 },
		{ X86_FEATURE_PTS,		CR_EAX, 6, 0x00000006, 0 },
		{ X86_FEATURE_APERFMPERF,	CR_ECX, 0, 0x00000006, 0 },
		{ X86_FEATURE_EPB,		CR_ECX, 3, 0x00000006, 0 },
		{ X86_FEATURE_XSAVEOPT,		CR_EAX,	0, 0x0000000d, 1 },
		{ X86_FEATURE_CPB,		CR_EDX, 9, 0x80000007, 0 },
		{ X86_FEATURE_NPT,		CR_EDX, 0, 0x8000000a, 0 },
		{ X86_FEATURE_LBRV,		CR_EDX, 1, 0x8000000a, 0 },
		{ X86_FEATURE_SVML,		CR_EDX, 2, 0x8000000a, 0 },
		{ X86_FEATURE_NRIPS,		CR_EDX, 3, 0x8000000a, 0 },
		{ 0, 0, 0, 0, 0 }
	};

	for (cb = cpuid_bits; cb->feature; cb++) {

		/* Verify that the level is valid */
		max_level = cpuid_eax(cb->level & 0xffff0000);
		if (max_level < cb->level ||
		    max_level > (cb->level | 0xffff))
			continue;

		cpuid_count(cb->level, cb->sub_leaf, &regs[CR_EAX],
			    &regs[CR_EBX], &regs[CR_ECX], &regs[CR_EDX]);

		if (regs[cb->reg] & (1 << cb->bit))
			set_cpu_cap(c, cb->feature);
	}
}
Commit	Line	Data
2decb194 PA	1	/*
	2	* Routines to indentify additional cpu features that are scattered in
	3	* cpuid space.
	4	*/
	5	#include <linux/cpu.h>
	6
	7	#include <asm/pat.h>
	8	#include <asm/processor.h>
	9
	10	#include <asm/apic.h>
	11
	12	struct cpuid_bit {
	13	u16 feature;
	14	u8 reg;
	15	u8 bit;
	16	u32 level;
	17	u32 sub_leaf;
	18	};
	19
	20	enum cpuid_regs {
	21	CR_EAX = 0,
	22	CR_ECX,
	23	CR_EDX,
	24	CR_EBX
	25	};
	26
	27	void __cpuinit init_scattered_cpuid_features(struct cpuinfo_x86 *c)
	28	{
	29	u32 max_level;
	30	u32 regs[4];
	31	const struct cpuid_bit *cb;
	32
	33	static const struct cpuid_bit __cpuinitconst cpuid_bits[] = {
a4659053	34	{ X86_FEATURE_DTS, CR_EAX, 0, 0x00000006, 0 },
2decb194 PA	35	{ X86_FEATURE_IDA, CR_EAX, 1, 0x00000006, 0 },
2decb194 PA	36	{ X86_FEATURE_ARAT, CR_EAX, 2, 0x00000006, 0 },
9792db61 FY	37	{ X86_FEATURE_PLN, CR_EAX, 4, 0x00000006, 0 },
9792db61 FY	38	{ X86_FEATURE_PTS, CR_EAX, 6, 0x00000006, 0 },
2decb194 PA	39	{ X86_FEATURE_APERFMPERF, CR_ECX, 0, 0x00000006, 0 },
	40	{ X86_FEATURE_EPB, CR_ECX, 3, 0x00000006, 0 },
	41	{ X86_FEATURE_XSAVEOPT, CR_EAX, 0, 0x0000000d, 1 },
	42	{ X86_FEATURE_CPB, CR_EDX, 9, 0x80000007, 0 },
	43	{ X86_FEATURE_NPT, CR_EDX, 0, 0x8000000a, 0 },
	44	{ X86_FEATURE_LBRV, CR_EDX, 1, 0x8000000a, 0 },
	45	{ X86_FEATURE_SVML, CR_EDX, 2, 0x8000000a, 0 },
	46	{ X86_FEATURE_NRIPS, CR_EDX, 3, 0x8000000a, 0 },
	47	{ 0, 0, 0, 0, 0 }
	48	};
	49
	50	for (cb = cpuid_bits; cb->feature; cb++) {
	51
	52	/* Verify that the level is valid */
	53	max_level = cpuid_eax(cb->level & 0xffff0000);
	54	if (max_level < cb->level \|\|
	55	max_level > (cb->level \| 0xffff))
	56	continue;
	57
	58	cpuid_count(cb->level, cb->sub_leaf, &regs[CR_EAX],
	59	&regs[CR_EBX], &regs[CR_ECX], &regs[CR_EDX]);
	60
	61	if (regs[cb->reg] & (1 << cb->bit))
	62	set_cpu_cap(c, cb->feature);
	63	}
	64	}