linuxppc-dev.lists.ozlabs.org archive mirror
 help / color / mirror / Atom feed
From: Will Schmidt <will_schmidt@vnet.ibm.com>
To: Nishanth Aravamudan <nacc@linux.vnet.ibm.com>
Cc: Michael Neuling <mikey@neuling.org>,
	Michael R Meissner <mrmeissn@us.ibm.com>,
	Steve Munroe <sjmunroe@us.ibm.com>,
	Peter Bergner <bergner@us.ibm.com>,
	Ryan Arnold <ryanarn@us.ibm.com>,
	linuxppc-dev@lists.ozlabs.org
Subject: Re: [PATCH v2 2/4] powerpc/cputable: advertise DSCR support on P7/P7+
Date: Mon, 20 May 2013 10:04:18 -0500	[thread overview]
Message-ID: <1369062258.18289.3.camel@brimstone> (raw)
In-Reply-To: <20130504004838.GB3532@linux.vnet.ibm.com>

On Fri, 2013-05-03 at 17:48 -0700, Nishanth Aravamudan wrote:
> Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com>
> 
> diff --git a/arch/powerpc/kernel/cputable.c b/arch/powerpc/kernel/cputable.c
> index ae9f433..a792157 100644
> --- a/arch/powerpc/kernel/cputable.c
> +++ b/arch/powerpc/kernel/cputable.c
> @@ -98,6 +98,7 @@ extern void __restore_cpu_e6500(void);
>  				 PPC_FEATURE_SMT | PPC_FEATURE_ICACHE_SNOOP | \
>  				 PPC_FEATURE_TRUE_LE | \
>  				 PPC_FEATURE_PSERIES_PERFMON_COMPAT)
> +#define COMMON_USER2_POWER7	(PPC_FEATURE2_DSCR)
>  #define COMMON_USER_POWER8	(COMMON_USER_PPC64 | PPC_FEATURE_ARCH_2_06 |\
>  				 PPC_FEATURE_SMT | PPC_FEATURE_ICACHE_SNOOP | \
>  				 PPC_FEATURE_TRUE_LE | \
> @@ -428,6 +429,7 @@ static struct cpu_spec __initdata cpu_specs[] = {
>  		.cpu_name		= "POWER7 (architected)",
>  		.cpu_features		= CPU_FTRS_POWER7,
>  		.cpu_user_features	= COMMON_USER_POWER7,
> +		.cpu_user_features2	= COMMON_USER2_POWER7,
>  		.mmu_features		= MMU_FTRS_POWER7,
>  		.icache_bsize		= 128,
>  		.dcache_bsize		= 128,
> @@ -458,6 +460,7 @@ static struct cpu_spec __initdata cpu_specs[] = {
>  		.cpu_name		= "POWER7 (raw)",
>  		.cpu_features		= CPU_FTRS_POWER7,
>  		.cpu_user_features	= COMMON_USER_POWER7,
> +		.cpu_user_features2	= COMMON_USER2_POWER7,
>  		.mmu_features		= MMU_FTRS_POWER7,
>  		.icache_bsize		= 128,
>  		.dcache_bsize		= 128,
> @@ -475,6 +478,7 @@ static struct cpu_spec __initdata cpu_specs[] = {
>  		.cpu_name		= "POWER7+ (raw)",
>  		.cpu_features		= CPU_FTRS_POWER7,
>  		.cpu_user_features	= COMMON_USER_POWER7,
> +		.cpu_user_features	= COMMON_USER2_POWER7,

^ Oops here, I think.    Please consider applying this on top.
Untested, but seems obvious.

Fix a typo in setting COMMON_USER2_POWER7 bits to .cpu_user_features2
cpu specs table.

Signed-off-by: Will Schmidt <will_schmidt@vnet.ibm.com>


diff --git a/arch/powerpc/kernel/cputable.c
b/arch/powerpc/kernel/cputable.c
index c60bbec..51eecb5 100644
--- a/arch/powerpc/kernel/cputable.c
+++ b/arch/powerpc/kernel/cputable.c
@@ -482,7 +482,7 @@ static struct cpu_spec __initdata cpu_specs[] = {
                .cpu_name               = "POWER7+ (raw)",
                .cpu_features           = CPU_FTRS_POWER7,
                .cpu_user_features      = COMMON_USER_POWER7,
-               .cpu_user_features      = COMMON_USER2_POWER7,
+               .cpu_user_features2     = COMMON_USER2_POWER7,
                .mmu_features           = MMU_FTRS_POWER7,
                .icache_bsize           = 128,
                .dcache_bsize           = 128,

















>  		.mmu_features		= MMU_FTRS_POWER7,
>  		.icache_bsize		= 128,
>  		.dcache_bsize		= 128,
> 
> _______________________________________________
> Linuxppc-dev mailing list
> Linuxppc-dev@lists.ozlabs.org
> https://lists.ozlabs.org/listinfo/linuxppc-dev
> 

  parent reply	other threads:[~2013-05-20 15:04 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-05-03 23:19 [PATCH] arch/powerpc: advertise ISA2.07, HTM, DSCR, EBB and ISEL bits in HWCAP2 Nishanth Aravamudan
2013-05-03 23:23 ` Benjamin Herrenschmidt
2013-05-03 23:40   ` Nishanth Aravamudan
2013-05-06 14:38     ` Ryan Arnold
2013-05-06 21:37       ` Benjamin Herrenschmidt
2013-05-07 15:11         ` Ryan Arnold
2013-05-07 20:33         ` Nishanth Aravamudan
2013-05-07 20:49           ` Benjamin Herrenschmidt
2013-05-07 21:11             ` Nishanth Aravamudan
2013-05-03 23:26 ` Michael R Meissner
2013-05-04 21:42   ` Segher Boessenkool
2013-05-04  0:04 ` Michael Neuling
2013-05-04  0:47   ` [PATCH v2 1/4] powerpc/cputable: reserve bits in HWCAP2 for new features Nishanth Aravamudan
2013-05-04  0:48     ` [PATCH v2 2/4] powerpc/cputable: advertise DSCR support on P7/P7+ Nishanth Aravamudan
2013-05-04  0:49       ` [PATCH v2 3/4] powerpc/cputable: advertise ISEL support on appropriate embedded processors Nishanth Aravamudan
2013-05-04  0:49         ` [PATCH v2 4/4] powerpc/cputable: advertise support for ISEL/HTM/DSCR/TAR on POWER8 Nishanth Aravamudan
2013-05-05  2:01         ` [PATCH v3 3/4] powerpc/cputable: advertise ISEL support on appropriate embedded processors Nishanth Aravamudan
2013-05-20 15:04       ` Will Schmidt [this message]
2013-05-20 23:41         ` [PATCH v2 2/4] powerpc/cputable: advertise DSCR support on P7/P7+ Michael Neuling
2013-05-06 19:07     ` [PATCH v2 1/4] powerpc/cputable: reserve bits in HWCAP2 for new features Ryan Arnold
2013-05-06 21:41       ` Benjamin Herrenschmidt
2013-05-07 15:07         ` Ryan Arnold

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=1369062258.18289.3.camel@brimstone \
    --to=will_schmidt@vnet.ibm.com \
    --cc=bergner@us.ibm.com \
    --cc=linuxppc-dev@lists.ozlabs.org \
    --cc=mikey@neuling.org \
    --cc=mrmeissn@us.ibm.com \
    --cc=nacc@linux.vnet.ibm.com \
    --cc=ryanarn@us.ibm.com \
    --cc=sjmunroe@us.ibm.com \
    /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).