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

Commit 770d132f authored by Andi Kleen's avatar Andi Kleen Committed by Andi Kleen
Browse files

[PATCH] i386: Retrieve CLFLUSH size from CPUID 



Also report it in /proc/cpuinfo similar to x86-64.

Needed for followon patch

Signed-off-by: default avatarAndi Kleen <ak@suse.de>
parent ea7322de

arch/i386/kernel/cpu/common.c

+3 −0
Original line number Diff line number Diff line
@@ -309,6 +309,8 @@ static void __cpuinit generic_identify(struct cpuinfo_x86 * c) 
#else

			c->apicid = (ebx >> 24) & 0xFF;

#endif

			if (c->x86_capability[0] & (1<<19))

				c->x86_clflush_size = ((ebx >> 8) & 0xff) * 8;

		} else {

			/* Have CPUID level 0 only - unheard of */

			c->x86 = 4;
@@ -373,6 +375,7 @@ void __cpuinit identify_cpu(struct cpuinfo_x86 *c) 
	c->x86_vendor_id[0] = '\0'; /* Unset */

	c->x86_model_id[0] = '\0';  /* Unset */

	c->x86_max_cores = 1;

	c->x86_clflush_size = 32;

	memset(&c->x86_capability, 0, sizeof c->x86_capability);



	if (!have_cpuid_p()) {

arch/i386/kernel/cpu/proc.c

+2 −1
Original line number Diff line number Diff line
@@ -152,9 +152,10 @@ static int show_cpuinfo(struct seq_file *m, void *v) 
				seq_printf(m, " [%d]", i);

		}



	seq_printf(m, "\nbogomips\t: %lu.%02lu\n\n",

	seq_printf(m, "\nbogomips\t: %lu.%02lu\n",

		     c->loops_per_jiffy/(500000/HZ),

		     (c->loops_per_jiffy/(5000/HZ)) % 100);

	seq_printf(m, "clflush size\t: %u\n\n", c->x86_clflush_size);



	return 0;

}

include/asm-i386/processor.h

+1 −0
Original line number Diff line number Diff line
@@ -72,6 +72,7 @@ struct cpuinfo_x86 { 
#endif

	unsigned char x86_max_cores;	/* cpuid returned max cores value */

	unsigned char apicid;

	unsigned short x86_clflush_size;

#ifdef CONFIG_SMP

	unsigned char booted_cores;	/* number of cores as seen by OS */

	__u8 phys_proc_id; 		/* Physical processor id. */