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

Commit 16ad0b63 authored by Borislav Petkov's avatar Borislav Petkov Committed by Greg Kroah-Hartman
Browse files

x86/cpufeatures: Carve out CQM features retrieval 



commit 45fc56e629caa451467e7664fbd4c797c434a6c4 upstream

... into a separate function for better readability. Split out from a
patch from Fenghua Yu <fenghua.yu@intel.com> to keep the mechanical,
sole code movement separate for easy review.

No functional changes.

Signed-off-by: default avatarBorislav Petkov <bp@suse.de>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Cc: Fenghua Yu <fenghua.yu@intel.com>
Cc: x86@kernel.org
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 9e034c61

arch/x86/kernel/cpu/common.c

+33 −27
Original line number Diff line number Diff line
@@ -808,6 +808,38 @@ static void init_speculation_control(struct cpuinfo_x86 *c) 
	}

}



static void init_cqm(struct cpuinfo_x86 *c)

{

	u32 eax, ebx, ecx, edx;



	/* Additional Intel-defined flags: level 0x0000000F */

	if (c->cpuid_level >= 0x0000000F) {



		/* QoS sub-leaf, EAX=0Fh, ECX=0 */

		cpuid_count(0x0000000F, 0, &eax, &ebx, &ecx, &edx);

		c->x86_capability[CPUID_F_0_EDX] = edx;



		if (cpu_has(c, X86_FEATURE_CQM_LLC)) {

			/* will be overridden if occupancy monitoring exists */

			c->x86_cache_max_rmid = ebx;



			/* QoS sub-leaf, EAX=0Fh, ECX=1 */

			cpuid_count(0x0000000F, 1, &eax, &ebx, &ecx, &edx);

			c->x86_capability[CPUID_F_1_EDX] = edx;



			if ((cpu_has(c, X86_FEATURE_CQM_OCCUP_LLC)) ||

			      ((cpu_has(c, X86_FEATURE_CQM_MBM_TOTAL)) ||

			       (cpu_has(c, X86_FEATURE_CQM_MBM_LOCAL)))) {

				c->x86_cache_max_rmid = ecx;

				c->x86_cache_occ_scale = ebx;

			}

		} else {

			c->x86_cache_max_rmid = -1;

			c->x86_cache_occ_scale = -1;

		}

	}

}



void get_cpu_cap(struct cpuinfo_x86 *c)

{

	u32 eax, ebx, ecx, edx;
@@ -839,33 +871,6 @@ void get_cpu_cap(struct cpuinfo_x86 *c) 
		c->x86_capability[CPUID_D_1_EAX] = eax;

	}



	/* Additional Intel-defined flags: level 0x0000000F */

	if (c->cpuid_level >= 0x0000000F) {



		/* QoS sub-leaf, EAX=0Fh, ECX=0 */

		cpuid_count(0x0000000F, 0, &eax, &ebx, &ecx, &edx);

		c->x86_capability[CPUID_F_0_EDX] = edx;



		if (cpu_has(c, X86_FEATURE_CQM_LLC)) {

			/* will be overridden if occupancy monitoring exists */

			c->x86_cache_max_rmid = ebx;



			/* QoS sub-leaf, EAX=0Fh, ECX=1 */

			cpuid_count(0x0000000F, 1, &eax, &ebx, &ecx, &edx);

			c->x86_capability[CPUID_F_1_EDX] = edx;



			if ((cpu_has(c, X86_FEATURE_CQM_OCCUP_LLC)) ||

			      ((cpu_has(c, X86_FEATURE_CQM_MBM_TOTAL)) ||

			       (cpu_has(c, X86_FEATURE_CQM_MBM_LOCAL)))) {

				c->x86_cache_max_rmid = ecx;

				c->x86_cache_occ_scale = ebx;

			}

		} else {

			c->x86_cache_max_rmid = -1;

			c->x86_cache_occ_scale = -1;

		}

	}



	/* AMD-defined flags: level 0x80000001 */

	eax = cpuid_eax(0x80000000);

	c->extended_cpuid_level = eax;
@@ -896,6 +901,7 @@ void get_cpu_cap(struct cpuinfo_x86 *c) 


	init_scattered_cpuid_features(c);

	init_speculation_control(c);

	init_cqm(c);



	/*

	 * Clear/Set all flags overridden by options, after probe.