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

Commit d65ad45c authored by Borislav Petkov's avatar Borislav Petkov Committed by H. Peter Anvin
Browse files

x86: Unify APERF/MPERF support 



Initialize this CPUID flag feature in common code. It could be made a
standalone function later, maybe, if more functionality is duplicated.

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

arch/x86/kernel/cpu/addon_cpuid_features.c

+8 −0
Original line number Diff line number Diff line
@@ -54,6 +54,14 @@ 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 */

arch/x86/kernel/cpu/intel.c

+0 −6
Original line number Diff line number Diff line
@@ -352,12 +352,6 @@ static void __cpuinit init_intel(struct cpuinfo_x86 *c) 
			set_cpu_cap(c, X86_FEATURE_ARCH_PERFMON);

	}



	if (c->cpuid_level > 6) {

		unsigned ecx = cpuid_ecx(6);

		if (ecx & 0x01)

			set_cpu_cap(c, X86_FEATURE_APERFMPERF);

	}



	if (cpu_has_xmm2)

		set_cpu_cap(c, X86_FEATURE_LFENCE_RDTSC);

	if (cpu_has_ds) {