linuxppc-dev.lists.ozlabs.org archive mirror
 help / color / mirror / Atom feed
From: Benjamin Herrenschmidt <benh@kernel.crashing.org>
To: Stefan Roese <sr@denx.de>
Cc: linuxppc-dev@ozlabs.org
Subject: Re: [PATCH 1/5] [POWERPC] Add AMCC 460EX/460GT support to cputable.c & cpu_setup_44x.S
Date: Fri, 22 Feb 2008 17:23:33 +1100	[thread overview]
Message-ID: <1203661413.10422.283.camel@pasglop> (raw)
In-Reply-To: <1203602435-11302-1-git-send-email-sr@denx.de>


On Thu, 2008-02-21 at 15:00 +0100, Stefan Roese wrote:
> Signed-off-by: Stefan Roese <sr@denx.de>

Ack.

> ---
>  arch/powerpc/kernel/cpu_setup_44x.S |    5 ++++-
>  arch/powerpc/kernel/cputable.c      |   28 +++++++++++++++++++++++++++-
>  2 files changed, 31 insertions(+), 2 deletions(-)
> 
> diff --git a/arch/powerpc/kernel/cpu_setup_44x.S b/arch/powerpc/kernel/cpu_setup_44x.S
> index 6250443..5465e8d 100644
> --- a/arch/powerpc/kernel/cpu_setup_44x.S
> +++ b/arch/powerpc/kernel/cpu_setup_44x.S
> @@ -3,7 +3,7 @@
>   * Valentine Barshak <vbarshak@ru.mvista.com>
>   * MontaVista Software, Inc (c) 2007
>   *
> - * Based on cpu_setup_6xx code by 
> + * Based on cpu_setup_6xx code by
>   * Benjamin Herrenschmidt <benh@kernel.crashing.org>
>   *
>   * This program is free software; you can redistribute it and/or
> @@ -32,6 +32,9 @@ _GLOBAL(__setup_cpu_440grx)
>  	bl	__fixup_440A_mcheck
>  	mtlr	r4
>  	blr
> +_GLOBAL(__setup_cpu_460ex)
> +_GLOBAL(__setup_cpu_460gt)
> +	b	__init_fpu_44x
>  _GLOBAL(__setup_cpu_440gx)
>  _GLOBAL(__setup_cpu_440spe)
>  	b	__fixup_440A_mcheck
> diff --git a/arch/powerpc/kernel/cputable.c b/arch/powerpc/kernel/cputable.c
> index 2a8f5cc..26ffb44 100644
> --- a/arch/powerpc/kernel/cputable.c
> +++ b/arch/powerpc/kernel/cputable.c
> @@ -36,6 +36,8 @@ extern void __setup_cpu_440epx(unsigned long offset, struct cpu_spec* spec);
>  extern void __setup_cpu_440gx(unsigned long offset, struct cpu_spec* spec);
>  extern void __setup_cpu_440grx(unsigned long offset, struct cpu_spec* spec);
>  extern void __setup_cpu_440spe(unsigned long offset, struct cpu_spec* spec);
> +extern void __setup_cpu_460ex(unsigned long offset, struct cpu_spec* spec);
> +extern void __setup_cpu_460gt(unsigned long offset, struct cpu_spec* spec);
>  extern void __setup_cpu_603(unsigned long offset, struct cpu_spec* spec);
>  extern void __setup_cpu_604(unsigned long offset, struct cpu_spec* spec);
>  extern void __setup_cpu_750(unsigned long offset, struct cpu_spec* spec);
> @@ -1397,6 +1399,30 @@ static struct cpu_spec __initdata cpu_specs[] = {
>  		.machine_check		= machine_check_440A,
>  		.platform		= "ppc440",
>  	},
> +	{ /* 460EX */
> +		.pvr_mask		= 0xffff0002,
> +		.pvr_value		= 0x13020002,
> +		.cpu_name		= "460EX",
> +		.cpu_features		= CPU_FTRS_44X,
> +		.cpu_user_features	= COMMON_USER_BOOKE | PPC_FEATURE_HAS_FPU,
> +		.icache_bsize		= 32,
> +		.dcache_bsize		= 32,
> +		.cpu_setup		= __setup_cpu_460ex,
> +		.machine_check		= machine_check_440A,
> +		.platform		= "ppc440",
> +	},
> +	{ /* 460GT */
> +		.pvr_mask		= 0xffff0002,
> +		.pvr_value		= 0x13020000,
> +		.cpu_name		= "460GT",
> +		.cpu_features		= CPU_FTRS_44X,
> +		.cpu_user_features	= COMMON_USER_BOOKE | PPC_FEATURE_HAS_FPU,
> +		.icache_bsize		= 32,
> +		.dcache_bsize		= 32,
> +		.cpu_setup		= __setup_cpu_460gt,
> +		.machine_check		= machine_check_440A,
> +		.platform		= "ppc440",
> +	},
>  #endif /* CONFIG_44x */
>  #ifdef CONFIG_FSL_BOOKE
>  #ifdef CONFIG_E200
> @@ -1512,7 +1538,7 @@ struct cpu_spec * __init identify_cpu(unsigned long offset, unsigned int pvr)
>  				*t = *s;
>  			*PTRRELOC(&cur_cpu_spec) = &the_cpu_spec;
>  #if defined(CONFIG_PPC64) || defined(CONFIG_BOOKE)
> -			/* ppc64 and booke expect identify_cpu to also call 
> +			/* ppc64 and booke expect identify_cpu to also call
>  			 * setup_cpu for that processor. I will consolidate
>  			 * that at a later time, for now, just use #ifdef.
>  			 * we also don't need to PTRRELOC the function pointer

  reply	other threads:[~2008-02-22  6:23 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-02-21 14:00 [PATCH 1/5] [POWERPC] Add AMCC 460EX/460GT support to cputable.c & cpu_setup_44x.S Stefan Roese
2008-02-22  6:23 ` Benjamin Herrenschmidt [this message]
2008-02-23  2:30 ` Paul Mackerras
2008-02-23  7:11   ` Stefan Roese
2008-02-23 13:00   ` Josh Boyer

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1203661413.10422.283.camel@pasglop \
    --to=benh@kernel.crashing.org \
    --cc=linuxppc-dev@ozlabs.org \
    --cc=sr@denx.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).