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

Commit 097c1bd5 authored by H. Peter Anvin's avatar H. Peter Anvin
Browse files

x86, cpu: Make APERF/MPERF a normal table-driven flag 



APERF/MPERF can be handled via the table like all the other scattered
CPU flags.

Signed-off-by: default avatarH. Peter Anvin <hpa@zytor.com>
Cc: Thomas Renninger <trenn@suse.de>
Cc: Borislav Petkov <borislav.petkov@amd.com>
LKML-Reference: <1270065406-1814-4-git-send-email-bp@amd64.org>
parent d88d95eb

arch/x86/kernel/cpu/addon_cpuid_features.c

+8 −15
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ void __cpuinit init_scattered_cpuid_features(struct cpuinfo_x86 *c) 
	static const struct cpuid_bit __cpuinitconst cpuid_bits[] = {

		{ X86_FEATURE_IDA,   		CR_EAX, 1, 0x00000006 },

		{ X86_FEATURE_ARAT,  		CR_EAX, 2, 0x00000006 },

		{ X86_FEATURE_APERFMPERF,	CR_ECX, 0, 0x00000006 },

		{ X86_FEATURE_CPB,   		CR_EDX, 9, 0x80000007 },

		{ X86_FEATURE_NPT,   		CR_EDX, 0, 0x8000000a },

		{ X86_FEATURE_LBRV,  		CR_EDX, 1, 0x8000000a },
@@ -54,14 +55,6 @@ void __cpuinit init_scattered_cpuid_features(struct cpuinfo_x86 *c) 
		if (regs[cb->reg] & (1 << cb->bit))

			set_cpu_cap(c, cb->feature);

	}



	/*

	 * common AMD/Intel features

	 */

	if (c->cpuid_level >= 6) {

		if (cpuid_ecx(6) & 0x1)

			set_cpu_cap(c, X86_FEATURE_APERFMPERF);

	}

}



/* leaf 0xb SMT level */