| Message ID | 1305753895-24845-2-git-send-email-ericvh@gmail.com (mailing list archive) |
|---|---|
| State | Changes Requested |
| Headers | show |
On Wed, 2011-05-18 at 16:24 -0500, Eric Van Hensbergen wrote: > Signed-off-by: Eric Van Hensbergen <ericvh@gmail.com> > --- > arch/powerpc/kernel/cputable.c | 14 ++++++++++++++ > 1 files changed, 14 insertions(+), 0 deletions(-) > > diff --git a/arch/powerpc/kernel/cputable.c b/arch/powerpc/kernel/cputable.c > index b9602ee..0eb245e 100644 > --- a/arch/powerpc/kernel/cputable.c > +++ b/arch/powerpc/kernel/cputable.c > @@ -1732,6 +1732,20 @@ static struct cpu_spec __initdata cpu_specs[] = { > .machine_check = machine_check_440A, > .platform = "ppc440", > }, > + { /* Blue Gene/P */ > + .pvr_mask = 0xfffffff0, > + .pvr_value = 0x52131880, > + .cpu_name = "450 Blue Gene/P", > + .cpu_features = CPU_FTRS_440x6, > + .cpu_user_features = COMMON_USER_BOOKE | > + PPC_FEATURE_HAS_FPU, > + .mmu_features = MMU_FTR_TYPE_44x, > + .icache_bsize = 32, > + .dcache_bsize = 32, > + .cpu_setup = __setup_cpu_460gt, ^^^^^^^^^^^^^^^^^^ Are you sure ? Cheers, Ben. > + .machine_check = machine_check_440A, > + .platform = "ppc440", > + }, > { /* 460EX */ > .pvr_mask = 0xffff0006, > .pvr_value = 0x13020002,
On Thu, May 19, 2011 at 7:35 PM, Benjamin Herrenschmidt <benh@kernel.crashing.org> wrote: > On Wed, 2011-05-18 at 16:24 -0500, Eric Van Hensbergen wrote: >> + .dcache_bsize = 32, >> + .cpu_setup = __setup_cpu_460gt, > ^^^^^^^^^^^^^^^^^^ > Are you sure ? > That surprised me too, I figured it must have been a close enough match (at least in the 2.6.29.1 time frame which is where I'm trying to merge the BG/P patches up from. The kittyhawk patches don't even use this, so its possible we could just remove it. _GLOBAL(__setup_cpu_460ex) _GLOBAL(__setup_cpu_460gt) mflr r4 bl __init_fpu_44x bl __fixup_440A_mcheck mtlr r4 blr Looks like the 460 setup invokes a bunch of 440 calls! Would you prefer I setup my own entry point (setup_cpu_bgp or setup_cpu_450) which makes the same calls? -eric
On Thu, 2011-05-19 at 20:08 -0500, Eric Van Hensbergen wrote: > On Thu, May 19, 2011 at 7:35 PM, Benjamin Herrenschmidt > <benh@kernel.crashing.org> wrote: > > On Wed, 2011-05-18 at 16:24 -0500, Eric Van Hensbergen wrote: > >> + .dcache_bsize = 32, > >> + .cpu_setup = __setup_cpu_460gt, > > ^^^^^^^^^^^^^^^^^^ > > Are you sure ? > > > > That surprised me too, I figured it must have been a close enough > match (at least in the 2.6.29.1 time frame which is where I'm trying > to merge the BG/P patches up from. The kittyhawk patches don't even > use this, so its possible we could just remove it. > > _GLOBAL(__setup_cpu_460ex) > _GLOBAL(__setup_cpu_460gt) > mflr r4 > bl __init_fpu_44x > bl __fixup_440A_mcheck > mtlr r4 > blr > > Looks like the 460 setup invokes a bunch of 440 calls! Would you > prefer I setup my own entry point (setup_cpu_bgp or setup_cpu_450) > which makes the same calls? Yes, add an entry. 460's are just 440's btw :-) Cheers, Ben.
diff --git a/arch/powerpc/kernel/cputable.c b/arch/powerpc/kernel/cputable.c index b9602ee..0eb245e 100644 --- a/arch/powerpc/kernel/cputable.c +++ b/arch/powerpc/kernel/cputable.c @@ -1732,6 +1732,20 @@ static struct cpu_spec __initdata cpu_specs[] = { .machine_check = machine_check_440A, .platform = "ppc440", }, + { /* Blue Gene/P */ + .pvr_mask = 0xfffffff0, + .pvr_value = 0x52131880, + .cpu_name = "450 Blue Gene/P", + .cpu_features = CPU_FTRS_440x6, + .cpu_user_features = COMMON_USER_BOOKE | + PPC_FEATURE_HAS_FPU, + .mmu_features = MMU_FTR_TYPE_44x, + .icache_bsize = 32, + .dcache_bsize = 32, + .cpu_setup = __setup_cpu_460gt, + .machine_check = machine_check_440A, + .platform = "ppc440", + }, { /* 460EX */ .pvr_mask = 0xffff0006, .pvr_value = 0x13020002,
Signed-off-by: Eric Van Hensbergen <ericvh@gmail.com> --- arch/powerpc/kernel/cputable.c | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-)