From: Sam Ravnborg <sam@ravnborg.org>
To: sparclinux@vger.kernel.org
Subject: Re: [PATCH 1/3] sparc64: correctly recognise M7 cpu type
Date: Tue, 19 Aug 2014 15:21:57 +0000 [thread overview]
Message-ID: <20140819152157.GA22398@ravnborg.org> (raw)
In-Reply-To: <1408424013-20390-1-git-send-email-allen.pais@oracle.com>
On Tue, Aug 19, 2014 at 10:23:32AM +0530, Allen Pais wrote:
> The following patch adds support for correctly
> recognising M7 cpu type.
>
> Signed-off-by: Allen Pais <allen.pais@oracle.com>
> ---
> arch/sparc/include/asm/spitfire.h | 1 +
> arch/sparc/kernel/cpu.c | 6 ++++++
> arch/sparc/kernel/head_64.S | 13 +++++++++++++
> 3 files changed, 20 insertions(+), 0 deletions(-)
>
> diff --git a/arch/sparc/include/asm/spitfire.h b/arch/sparc/include/asm/spitfire.h
> index 3fc5869..9aec17b 100644
> --- a/arch/sparc/include/asm/spitfire.h
> +++ b/arch/sparc/include/asm/spitfire.h
> @@ -45,6 +45,7 @@
> #define SUN4V_CHIP_NIAGARA3 0x03
> #define SUN4V_CHIP_NIAGARA4 0x04
> #define SUN4V_CHIP_NIAGARA5 0x05
> +#define SUN4V_CHIP_SPARC_M7 0x08
> #define SUN4V_CHIP_SPARC64X 0x8a
> #define SUN4V_CHIP_UNKNOWN 0xff
>
> diff --git a/arch/sparc/kernel/cpu.c b/arch/sparc/kernel/cpu.c
> index 82a3a71..55dfb62 100644
> --- a/arch/sparc/kernel/cpu.c
> +++ b/arch/sparc/kernel/cpu.c
> @@ -494,6 +494,12 @@ static void __init sun4v_cpu_probe(void)
> sparc_pmu_type = "niagara5";
> break;
>
> + case SUN4V_CHIP_SPARC_M7:
> + sparc_cpu_type = "SPARC-M7";
> + sparc_fpu_type = "SPARC-M7 integrated FPU";
> + sparc_pmu_type = "sparc-m7";
> + break;
> +
> case SUN4V_CHIP_SPARC64X:
> sparc_cpu_type = "SPARC64-X";
> sparc_fpu_type = "SPARC64-X integrated FPU";
> diff --git a/arch/sparc/kernel/head_64.S b/arch/sparc/kernel/head_64.S
> index 452f04f..508a542 100644
> --- a/arch/sparc/kernel/head_64.S
> +++ b/arch/sparc/kernel/head_64.S
> @@ -414,6 +414,7 @@ sun4v_chip_type:
> cmp %g2, 'T'
> be,pt %xcc, 70f
> cmp %g2, 'M'
> + be,pt %xcc, 71f
> bne,pn %xcc, 49f
Looks like you are missing a nop in the delay slot?
Sam
next prev parent reply other threads:[~2014-08-19 15:21 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-08-19 4:53 [PATCH 1/3] sparc64: correctly recognise M7 cpu type Allen Pais
2014-08-19 15:21 ` Sam Ravnborg [this message]
2014-08-21 10:15 ` Allen Pais
2014-08-21 12:14 ` Sam Ravnborg
2014-08-21 12:29 ` Richard Mortimer
2014-08-21 13:52 ` Allen Pais
2014-08-22 5:09 ` David Miller
2014-08-22 5:10 ` David Miller
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=20140819152157.GA22398@ravnborg.org \
--to=sam@ravnborg.org \
--cc=sparclinux@vger.kernel.org \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.