lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

powerpc: Return the_cpu_ spec from identify_cpu

Browse Source 
Commit af9eef3c7b caused cpu_setup to see
the_cpu_spec, rather than the source struct.  However, on 32-bit, the
return value of identify_cpu was being used for feature fixups, and
identify_cpu was returning the source struct.  So if cpu_setup patches
the feature bits, the update won't affect the fixups.

Signed-off-by: Scott Wood <scottwood@freescale.com>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
This commit is contained in:
Scott Wood
2011-07-25 11:04:36 +00:00
committed by Benjamin Herrenschmidt
parent 326ed6a9bc
commit 26ee97672e
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
arch/powerpc/kernel/cputable.c
View File

@@ -2051,7 +2051,8 @@ static struct cpu_spec __initdata cpu_specs[] = {
static struct cpu_spec the_cpu_spec; static struct cpu_spec the_cpu_spec;
static void __init setup_cpu_spec(unsigned long offset, struct cpu_spec *s) static struct cpu_spec * __init setup_cpu_spec(unsigned long offset,
struct cpu_spec *s)
{ {
struct cpu_spec *t = &the_cpu_spec; struct cpu_spec *t = &the_cpu_spec;
struct cpu_spec old; struct cpu_spec old;
@@ -2114,6 +2115,8 @@ static void __init setup_cpu_spec(unsigned long offset, struct cpu_spec *s)
t->cpu_setup(offset, t); t->cpu_setup(offset, t);
} }
#endif /* CONFIG_PPC64 || CONFIG_BOOKE */ #endif /* CONFIG_PPC64 || CONFIG_BOOKE */
return t;
} }
struct cpu_spec * __init identify_cpu(unsigned long offset, unsigned int pvr) struct cpu_spec * __init identify_cpu(unsigned long offset, unsigned int pvr)
@@ -2124,10 +2127,8 @@ struct cpu_spec * __init identify_cpu(unsigned long offset, unsigned int pvr)
s = PTRRELOC(s); s = PTRRELOC(s);
for (i = 0; i < ARRAY_SIZE(cpu_specs); i++,s++) { for (i = 0; i < ARRAY_SIZE(cpu_specs); i++,s++) {
if ((pvr & s->pvr_mask) == s->pvr_value) { if ((pvr & s->pvr_mask) == s->pvr_value)
setup_cpu_spec(offset, s); return setup_cpu_spec(offset, s);
return s;
}
} }
BUG(); BUG();