Commit a967ceac authored by Hiroshi Shimamoto's avatar Hiroshi Shimamoto Committed by Ingo Molnar
Browse files

x86: make cpu/proc|_64.c similar 



clean up for unification.

Signed-off-by: default avatarHiroshi Shimamoto <h-shimamoto@ct.jp.nec.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 8fa6878f

arch/x86/kernel/cpu/proc.c

+69 −51
Original line number Diff line number Diff line
@@ -8,21 +8,61 @@ 
/*

 *	Get CPU information for use by the procfs.

 */

static void show_cpuinfo_core(struct seq_file *m, struct cpuinfo_x86 *c,

			      unsigned int cpu)

{

#ifdef CONFIG_X86_HT

	if (c->x86_max_cores * smp_num_siblings > 1) {

		seq_printf(m, "physical id\t: %d\n", c->phys_proc_id);

		seq_printf(m, "siblings\t: %d\n",

			   cpus_weight(per_cpu(cpu_core_map, cpu)));

		seq_printf(m, "core id\t\t: %d\n", c->cpu_core_id);

		seq_printf(m, "cpu cores\t: %d\n", c->booted_cores);

	}

#endif

}



static void show_cpuinfo_misc(struct seq_file *m, struct cpuinfo_x86 *c)

{

	/*

	 * We use exception 16 if we have hardware math and we've either seen

	 * it or the CPU claims it is internal

	 */

	int fpu_exception = c->hard_math && (ignore_fpu_irq || cpu_has_fpu);

	seq_printf(m,

		   "fdiv_bug\t: %s\n"

		   "hlt_bug\t\t: %s\n"

		   "f00f_bug\t: %s\n"

		   "coma_bug\t: %s\n"

		   "fpu\t\t: %s\n"

		   "fpu_exception\t: %s\n"

		   "cpuid level\t: %d\n"

		   "wp\t\t: %s\n",

		   c->fdiv_bug ? "yes" : "no",

		   c->hlt_works_ok ? "no" : "yes",

		   c->f00f_bug ? "yes" : "no",

		   c->coma_bug ? "yes" : "no",

		   c->hard_math ? "yes" : "no",

		   fpu_exception ? "yes" : "no",

		   c->cpuid_level,

		   c->wp_works_ok ? "yes" : "no");

}



static int show_cpuinfo(struct seq_file *m, void *v)

{

	struct cpuinfo_x86 *c = v;

	int i, n = 0;

	int fpu_exception;

	unsigned int cpu = 0;

	int i;



#ifdef CONFIG_SMP

	n = c->cpu_index;

	cpu = c->cpu_index;

#endif

	seq_printf(m, "processor\t: %d\n"

	seq_printf(m, "processor\t: %u\n"

		   "vendor_id\t: %s\n"

		   "cpu family\t: %d\n"

		"model\t\t: %d\n"

		   "model\t\t: %u\n"

		   "model name\t: %s\n",

		n,

		   cpu,

		   c->x86_vendor_id[0] ? c->x86_vendor_id : "unknown",

		   c->x86,

		   c->x86_model,
@@ -34,7 +74,8 @@ static int show_cpuinfo(struct seq_file *m, void *v) 
		seq_printf(m, "stepping\t: unknown\n");



	if (cpu_has(c, X86_FEATURE_TSC)) {

		unsigned int freq = cpufreq_quick_get(n);

		unsigned int freq = cpufreq_quick_get(cpu);



		if (!freq)

			freq = cpu_khz;

		seq_printf(m, "cpu MHz\t\t: %u.%03u\n",
@@ -44,39 +85,13 @@ static int show_cpuinfo(struct seq_file *m, void *v) 
	/* Cache size */

	if (c->x86_cache_size >= 0)

		seq_printf(m, "cache size\t: %d KB\n", c->x86_cache_size);

#ifdef CONFIG_X86_HT

	if (c->x86_max_cores * smp_num_siblings > 1) {

		seq_printf(m, "physical id\t: %d\n", c->phys_proc_id);

		seq_printf(m, "siblings\t: %d\n",

				cpus_weight(per_cpu(cpu_core_map, n)));

		seq_printf(m, "core id\t\t: %d\n", c->cpu_core_id);

		seq_printf(m, "cpu cores\t: %d\n", c->booted_cores);

	}

#endif



	/* We use exception 16 if we have hardware math and we've either seen it or the CPU claims it is internal */

	fpu_exception = c->hard_math && (ignore_fpu_irq || cpu_has_fpu);

	seq_printf(m, "fdiv_bug\t: %s\n"

			"hlt_bug\t\t: %s\n"

			"f00f_bug\t: %s\n"

			"coma_bug\t: %s\n"

			"fpu\t\t: %s\n"

			"fpu_exception\t: %s\n"

			"cpuid level\t: %d\n"

			"wp\t\t: %s\n"

			"flags\t\t:",

		     c->fdiv_bug ? "yes" : "no",

		     c->hlt_works_ok ? "no" : "yes",

		     c->f00f_bug ? "yes" : "no",

		     c->coma_bug ? "yes" : "no",

		     c->hard_math ? "yes" : "no",

		     fpu_exception ? "yes" : "no",

		     c->cpuid_level,

		     c->wp_works_ok ? "yes" : "no");

	show_cpuinfo_core(m, c, cpu);

	show_cpuinfo_misc(m, c);



	seq_printf(m, "flags\t\t:");

	for (i = 0; i < 32*NCAPINTS; i++)

		if ( test_bit(i, c->x86_capability) &&

		     x86_cap_flags[i] != NULL )

		if (cpu_has(c, i) && x86_cap_flags[i] != NULL)

			seq_printf(m, " %s", x86_cap_flags[i]);



	for (i = 0; i < 32; i++)
@@ -106,14 +121,17 @@ static void *c_start(struct seq_file *m, loff_t *pos) 
		return &cpu_data(*pos);

	return NULL;

}



static void *c_next(struct seq_file *m, void *v, loff_t *pos)

{

	*pos = next_cpu(*pos, cpu_online_map);

	return c_start(m, pos);

}



static void c_stop(struct seq_file *m, void *v)

{

}



const struct seq_operations cpuinfo_op = {

	.start	= c_start,

	.next	= c_next,

arch/x86/kernel/cpu/proc_64.c

+36 −27
Original line number Diff line number Diff line
@@ -8,25 +8,48 @@ 
/*

 *	Get CPU information for use by the procfs.

 */

static void show_cpuinfo_core(struct seq_file *m, struct cpuinfo_x86 *c,

			      unsigned int cpu)

{

#ifdef CONFIG_SMP

	if (c->x86_max_cores * smp_num_siblings > 1) {

		seq_printf(m, "physical id\t: %d\n", c->phys_proc_id);

		seq_printf(m, "siblings\t: %d\n",

			   cpus_weight(per_cpu(cpu_core_map, cpu)));

		seq_printf(m, "core id\t\t: %d\n", c->cpu_core_id);

		seq_printf(m, "cpu cores\t: %d\n", c->booted_cores);

	}

#endif

}



static void show_cpuinfo_misc(struct seq_file *m, struct cpuinfo_x86 *c)

{

	seq_printf(m,

		   "fpu\t\t: yes\n"

		   "fpu_exception\t: yes\n"

		   "cpuid level\t: %d\n"

		   "wp\t\t: yes\n",

		   c->cpuid_level);

}



static int show_cpuinfo(struct seq_file *m, void *v)

{

	struct cpuinfo_x86 *c = v;

	int cpu = 0, i;

	unsigned int cpu = 0;

	int i;



#ifdef CONFIG_SMP

	cpu = c->cpu_index;

#endif



	seq_printf(m, "processor\t: %u\n"

		   "vendor_id\t: %s\n"

		   "cpu family\t: %d\n"

		   "model\t\t: %d\n"

		   "model\t\t: %u\n"

		   "model name\t: %s\n",

		   (unsigned)cpu,

		   cpu,

		   c->x86_vendor_id[0] ? c->x86_vendor_id : "unknown",

		   c->x86,

		   (int)c->x86_model,

		   c->x86_model,

		   c->x86_model_id[0] ? c->x86_model_id : "unknown");



	if (c->x86_mask || c->cpuid_level >= 0)
@@ -35,7 +58,7 @@ static int show_cpuinfo(struct seq_file *m, void *v) 
		seq_printf(m, "stepping\t: unknown\n");



	if (cpu_has(c, X86_FEATURE_TSC)) {

		unsigned int freq = cpufreq_quick_get((unsigned)cpu);

		unsigned int freq = cpufreq_quick_get(cpu);



		if (!freq)

			freq = cpu_khz;
@@ -47,24 +70,10 @@ static int show_cpuinfo(struct seq_file *m, void *v) 
	if (c->x86_cache_size >= 0)

		seq_printf(m, "cache size\t: %d KB\n", c->x86_cache_size);



#ifdef CONFIG_SMP

	if (smp_num_siblings * c->x86_max_cores > 1) {

		seq_printf(m, "physical id\t: %d\n", c->phys_proc_id);

		seq_printf(m, "siblings\t: %d\n",

			       cpus_weight(per_cpu(cpu_core_map, cpu)));

		seq_printf(m, "core id\t\t: %d\n", c->cpu_core_id);

		seq_printf(m, "cpu cores\t: %d\n", c->booted_cores);

	}

#endif



	seq_printf(m,

		   "fpu\t\t: yes\n"

		   "fpu_exception\t: yes\n"

		   "cpuid level\t: %d\n"

		   "wp\t\t: yes\n"

		   "flags\t\t:",

		   c->cpuid_level);

	show_cpuinfo_core(m, c, cpu);

	show_cpuinfo_misc(m, c);



	seq_printf(m, "flags\t\t:");

	for (i = 0; i < 32*NCAPINTS; i++)

		if (cpu_has(c, i) && x86_cap_flags[i] != NULL)

			seq_printf(m, " %s", x86_cap_flags[i]);