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

Commit 26ee9767 authored by Scott Wood's avatar Scott Wood Committed by Benjamin Herrenschmidt
Browse files

powerpc: Return the_cpu_ spec from identify_cpu 



Commit af9eef3c 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: default avatarScott Wood <scottwood@freescale.com>
Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
parent 326ed6a9

arch/powerpc/kernel/cputable.c

+6 −5
Original line number Diff line number Diff line
@@ -2051,7 +2051,8 @@ static struct cpu_spec __initdata cpu_specs[] = { 


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 old;
@@ -2114,6 +2115,8 @@ static void __init setup_cpu_spec(unsigned long offset, struct cpu_spec *s) 
		t->cpu_setup(offset, t);

	}

#endif /* CONFIG_PPC64 || CONFIG_BOOKE */



	return t;

}



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);



	for (i = 0; i < ARRAY_SIZE(cpu_specs); i++,s++) {

		if ((pvr & s->pvr_mask) == s->pvr_value) {

			setup_cpu_spec(offset, s);

			return s;

		}

		if ((pvr & s->pvr_mask) == s->pvr_value)

			return setup_cpu_spec(offset, s);

	}



	BUG();