Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1030408AbVIAVfV (ORCPT ); Thu, 1 Sep 2005 17:35:21 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1030411AbVIAVfV (ORCPT ); Thu, 1 Sep 2005 17:35:21 -0400 Received: from gate.crashing.org ([63.228.1.57]:42375 "EHLO gate.crashing.org") by vger.kernel.org with ESMTP id S1030408AbVIAVfU (ORCPT ); Thu, 1 Sep 2005 17:35:20 -0400 Subject: Re: [PATCH] ppc32: Added cputable entry for 7448 From: Benjamin Herrenschmidt To: Kumar Gala Cc: Andrew Morton , linux-kernel@vger.kernel.org, linuxppc-dev@ozlabs.org In-Reply-To: References: Content-Type: text/plain Date: Fri, 02 Sep 2005 07:34:19 +1000 Message-Id: <1125610460.8726.63.camel@gaston> Mime-Version: 1.0 X-Mailer: Evolution 2.2.3 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3551 Lines: 95 On Thu, 2005-09-01 at 13:14 -0500, Kumar Gala wrote: > Added cputable entry for 7448 as well adding it to checks for saving and > restoring of cpu state. > > Signed-off-by: Kumar Gala Looks ok fine. Not that it's soon time to change the save/restore state code to be hooks in the cputable, we are running out of CR's :) Ben. > --- > commit 10c7d4720428b8b8486a45e5c4086b8ab7088967 > tree ec3b0bda4cf730b6872b62a7a8b33acca1d95dd0 > parent 18428d3c5db638b3d92e662890bedbc95737e052 > author Kumar K. Gala Thu, 01 Sep 2005 13:13:03 -0500 > committer Kumar K. Gala Thu, 01 Sep 2005 13:13:03 -0500 > > arch/ppc/kernel/cpu_setup_6xx.S | 4 ++++ > arch/ppc/kernel/cputable.c | 16 ++++++++++++++++ > 2 files changed, 20 insertions(+), 0 deletions(-) > > diff --git a/arch/ppc/kernel/cpu_setup_6xx.S b/arch/ppc/kernel/cpu_setup_6xx.S > --- a/arch/ppc/kernel/cpu_setup_6xx.S > +++ b/arch/ppc/kernel/cpu_setup_6xx.S > @@ -327,6 +327,7 @@ _GLOBAL(__save_cpu_setup) > cmplwi cr4,r3,0x8002 /* 7457 */ > cmplwi cr5,r3,0x8003 /* 7447A */ > cmplwi cr6,r3,0x7000 /* 750FX */ > + cmplwi cr7,r3,0x8004 /* 7448 */ > /* cr1 is 7400 || 7410 */ > cror 4*cr1+eq,4*cr1+eq,4*cr2+eq > /* cr0 is 74xx */ > @@ -334,6 +335,7 @@ _GLOBAL(__save_cpu_setup) > cror 4*cr0+eq,4*cr0+eq,4*cr4+eq > cror 4*cr0+eq,4*cr0+eq,4*cr1+eq > cror 4*cr0+eq,4*cr0+eq,4*cr5+eq > + cror 4*cr0+eq,4*cr0+eq,4*cr7+eq > bne 1f > /* Backup 74xx specific regs */ > mfspr r4,SPRN_MSSCR0 > @@ -396,6 +398,7 @@ _GLOBAL(__restore_cpu_setup) > cmplwi cr4,r3,0x8002 /* 7457 */ > cmplwi cr5,r3,0x8003 /* 7447A */ > cmplwi cr6,r3,0x7000 /* 750FX */ > + cmplwi cr7,r3,0x8004 /* 7448 */ > /* cr1 is 7400 || 7410 */ > cror 4*cr1+eq,4*cr1+eq,4*cr2+eq > /* cr0 is 74xx */ > @@ -403,6 +406,7 @@ _GLOBAL(__restore_cpu_setup) > cror 4*cr0+eq,4*cr0+eq,4*cr4+eq > cror 4*cr0+eq,4*cr0+eq,4*cr1+eq > cror 4*cr0+eq,4*cr0+eq,4*cr5+eq > + cror 4*cr0+eq,4*cr0+eq,4*cr7+eq > bne 2f > /* Restore 74xx specific regs */ > lwz r4,CS_MSSCR0(r5) > diff --git a/arch/ppc/kernel/cputable.c b/arch/ppc/kernel/cputable.c > --- a/arch/ppc/kernel/cputable.c > +++ b/arch/ppc/kernel/cputable.c > @@ -536,6 +536,22 @@ struct cpu_spec cpu_specs[] = { > .num_pmcs = 6, > .cpu_setup = __setup_cpu_745x > }, > + { /* 7448 */ > + .pvr_mask = 0xffff0000, > + .pvr_value = 0x80040000, > + .cpu_name = "7448", > + .cpu_features = CPU_FTR_COMMON | > + CPU_FTR_SPLIT_ID_CACHE | CPU_FTR_USE_TB | > + CPU_FTR_MAYBE_CAN_NAP | CPU_FTR_L2CR | > + CPU_FTR_ALTIVEC_COMP | CPU_FTR_HPTE_TABLE | > + CPU_FTR_SPEC7450 | CPU_FTR_NAP_DISABLE_L2_PR | > + CPU_FTR_HAS_HIGH_BATS | CPU_FTR_NEED_COHERENT, > + .cpu_user_features = COMMON_PPC | PPC_FEATURE_ALTIVEC_COMP, > + .icache_bsize = 32, > + .dcache_bsize = 32, > + .num_pmcs = 6, > + .cpu_setup = __setup_cpu_745x > + }, > { /* 82xx (8240, 8245, 8260 are all 603e cores) */ > .pvr_mask = 0x7fff0000, > .pvr_value = 0x00810000, > - > To unsubscribe from this list: send the line "unsubscribe linux-kernel" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html > Please read the FAQ at http://www.tux.org/lkml/ - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/