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

Commit de02797a authored by Paul Mundt's avatar Paul Mundt Committed by Linus Torvalds
Browse files

[PATCH] sh: Cleanup struct sh_cpuinfo for clock framework changes 



Now that the clock framework changes have been integrated, the manual clock
accounting that was done in sh_cpuinfo can be dropped.

Also correct a bug with running past the end of the CPU flags when there's a
mismatch between the added flags and printed ones.

Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 091904ae

arch/sh/kernel/setup.c

+15 −23
Original line number Diff line number Diff line
@@ -22,10 +22,10 @@ 
#include <linux/cpu.h>

#include <asm/uaccess.h>

#include <asm/io.h>

#include <asm/io_generic.h>

#include <asm/sections.h>

#include <asm/irq.h>

#include <asm/setup.h>

#include <asm/clock.h>



#ifdef CONFIG_SH_KGDB

#include <asm/kgdb.h>
@@ -41,7 +41,7 @@ extern void * __rd_start, * __rd_end; 
 * This value will be used at the very early stage of serial setup.

 * The bigger value means no problem.

 */

struct sh_cpuinfo boot_cpu_data = { CPU_SH_NONE, 0, 10000000, };

struct sh_cpuinfo boot_cpu_data = { CPU_SH_NONE, 10000000, };

struct screen_info screen_info;



#if defined(CONFIG_SH_UNKNOWN)
@@ -273,10 +273,10 @@ void __init setup_arch(char **cmdline_p) 
	init_mm.end_data = (unsigned long) _edata;

	init_mm.brk = (unsigned long) _end;



	code_resource.start = virt_to_bus(_text);

	code_resource.end = virt_to_bus(_etext)-1;

	data_resource.start = virt_to_bus(_etext);

	data_resource.end = virt_to_bus(_edata)-1;

	code_resource.start = (unsigned long)virt_to_phys(_text);

	code_resource.end = (unsigned long)virt_to_phys(_etext)-1;

	data_resource.start = (unsigned long)virt_to_phys(_etext);

	data_resource.end = (unsigned long)virt_to_phys(_edata)-1;



	sh_mv_setup(cmdline_p);
@@ -435,6 +435,9 @@ static const char *cpu_name[] = { 
	[CPU_ST40GX1]	= "ST40GX1",

	[CPU_SH4_202]	= "SH4-202",

	[CPU_SH4_501]	= "SH4-501",

	[CPU_SH7770]	= "SH7770",

	[CPU_SH7780]	= "SH7780",

	[CPU_SH7781]	= "SH7781",

	[CPU_SH_NONE]	= "Unknown"

};
@@ -445,7 +448,7 @@ const char *get_cpu_subtype(void) 


#ifdef CONFIG_PROC_FS

static const char *cpu_flags[] = {

	"none", "fpu", "p2flush", "mmuassoc", "dsp", "perfctr",

	"none", "fpu", "p2flush", "mmuassoc", "dsp", "perfctr", "ptea", NULL

};



static void show_cpuflags(struct seq_file *m)
@@ -459,7 +462,7 @@ static void show_cpuflags(struct seq_file *m) 
		return;

	}



	for (i = 0; i < cpu_data->flags; i++)

	for (i = 0; cpu_flags[i]; i++)

		if ((cpu_data->flags & (1 << i)))

			seq_printf(m, " %s", cpu_flags[i+1]);
@@ -472,7 +475,8 @@ static void show_cacheinfo(struct seq_file *m, const char *type, struct cache_in 


	cache_size = info.ways * info.sets * info.linesz;



	seq_printf(m, "%s size\t: %dKiB\n", type, cache_size >> 10);

	seq_printf(m, "%s size\t: %2dKiB (%d-way)\n",

		   type, cache_size >> 10, info.ways);

}



/*
@@ -511,21 +515,9 @@ static int show_cpuinfo(struct seq_file *m, void *v) 
		     boot_cpu_data.loops_per_jiffy/(500000/HZ),

		     (boot_cpu_data.loops_per_jiffy/(5000/HZ)) % 100);



#define PRINT_CLOCK(name, value) \

	seq_printf(m, name " clock\t: %d.%02dMHz\n", \

		     ((value) / 1000000), ((value) % 1000000)/10000)

	

	PRINT_CLOCK("cpu", boot_cpu_data.cpu_clock);

	PRINT_CLOCK("bus", boot_cpu_data.bus_clock);

#ifdef CONFIG_CPU_SUBTYPE_ST40STB1

	PRINT_CLOCK("memory", boot_cpu_data.memory_clock);

#endif

	PRINT_CLOCK("module", boot_cpu_data.module_clock);



	return 0;

	return show_clocks(m);

}





static void *c_start(struct seq_file *m, loff_t *pos)

{

	return *pos < NR_CPUS ? cpu_data + *pos : NULL;

include/asm-sh/processor.h

+15 −21
Original line number Diff line number Diff line
@@ -12,7 +12,6 @@ 
#include <asm/page.h>

#include <asm/types.h>

#include <asm/cache.h>

#include <linux/threads.h>

#include <asm/ptrace.h>



/*
@@ -30,7 +29,7 @@ 
 *  CPU type and hardware bug flags. Kept separately for each CPU.

 *

 *  Each one of these also needs a CONFIG_CPU_SUBTYPE_xxx entry

 *  in arch/sh/Kconfig, as well as an entry in arch/sh/kernel/setup.c

 *  in arch/sh/mm/Kconfig, as well as an entry in arch/sh/kernel/setup.c

 *  for parsing the subtype in get_cpu_subtype().

 */

enum cpu_type {
@@ -44,7 +43,7 @@ enum cpu_type { 
	/* SH-4 types */

	CPU_SH7750, CPU_SH7750S, CPU_SH7750R, CPU_SH7751, CPU_SH7751R,

	CPU_SH7760, CPU_ST40RA, CPU_ST40GX1, CPU_SH4_202, CPU_SH4_501,

	CPU_SH73180,

	CPU_SH73180, CPU_SH7770, CPU_SH7780, CPU_SH7781,



	/* Unknown subtype */

	CPU_SH_NONE
@@ -52,14 +51,8 @@ enum cpu_type { 


struct sh_cpuinfo {

	enum cpu_type type;

	char	hard_math;

	unsigned long loops_per_jiffy;



	unsigned int cpu_clock, master_clock, bus_clock, module_clock;

#ifdef CONFIG_CPU_SUBTYPE_ST40STB1

	unsigned int memory_clock;

#endif



	struct cache_info icache;

	struct cache_info dcache;
@@ -140,6 +133,7 @@ union sh_fpu_union { 
#define CPU_HAS_MMU_PAGE_ASSOC	0x0004	/* SH3: TLB way selection bit support */

#define CPU_HAS_DSP		0x0008	/* SH-DSP: DSP support */

#define CPU_HAS_PERF_COUNTER	0x0010	/* Hardware performance counters */

#define CPU_HAS_PTEA		0x0020	/* PTEA register */



struct thread_struct {

	unsigned long sp;