All of lore.kernel.org
 help / color / mirror / Atom feed
From: Jayachandran C. <jayachandranc@netlogicmicro.com>
To: Hillf Danton <dhillf@gmail.com>
Cc: <linux-mips@linux-mips.org>, Ralf Baechle <ralf@linux-mips.org>
Subject: Re: [RFC] mark Netlogic XLR chip as SMT capable
Date: Sun, 2 Oct 2011 14:00:45 +0530	[thread overview]
Message-ID: <20111002083044.GA23668@jayachandranc.netlogicmicro.com> (raw)
In-Reply-To: <CAJd=RBAc8Zv1JZfrAx2Ajj7fdJv=oA+eYHVBLfcFNOoZNyG7fg@mail.gmail.com>

On Sun, Oct 02, 2011 at 03:26:14PM +0800, Hillf Danton wrote:
> Netlogic XLR chip has multiple cores. Each core includes four integrated
> hardware threads, and they share L1 data and instruction caches.
> 
> If XLR chip is marked to be SMT capable, linux scheduler then could do more,
> say idle load balancing.
> 
> Any comment is welcom, thanks.

I may be missing something here, but how about just setting cpu_data[].core in
the init_secondary method?  That would avoid the change to kernel/smp.c. 

> 
> Signed-off-by: Hillf Danton <dhillf@gmail.com>
> ---
> 
> --- a/arch/mips/netlogic/xlr/smp.c	Sun Oct  2 14:15:28 2011
> +++ b/arch/mips/netlogic/xlr/smp.c	Sun Oct  2 14:15:58 2011
> @@ -176,6 +176,7 @@ void __init nlm_smp_setup(void)
> 
>  void nlm_prepare_cpus(unsigned int max_cpus)
>  {
> +	smp_num_siblings = 4;
>  }
> 
>  struct plat_smp_ops nlm_smp_ops = {
> --- a/arch/mips/kernel/smp.c	Sun Oct  2 14:12:09 2011
> +++ b/arch/mips/kernel/smp.c	Sun Oct  2 14:14:58 2011
> @@ -73,7 +73,12 @@ static inline void set_cpu_sibling_map(i
> 
>  	if (smp_num_siblings > 1) {
>  		for_each_cpu_mask(i, cpu_sibling_setup_map) {
> -			if (cpu_data[cpu].core == cpu_data[i].core) {
> +			if (current_cpu_type() == CPU_XLR) {
> +				if (((i>>2) & 0x7) == ((cpu>>2) & 0x7))
> +					goto set;
> +			}
> +			else if (cpu_data[cpu].core == cpu_data[i].core) {
> +set:
>  				cpu_set(i, cpu_sibling_map[cpu]);
>  				cpu_set(cpu, cpu_sibling_map[i]);
>  			}

JC.

WARNING: multiple messages have this Message-ID (diff)
From: Jayachandran C. <jayachandranc@netlogicmicro.com>
To: Hillf Danton <dhillf@gmail.com>
Cc: linux-mips@linux-mips.org, Ralf Baechle <ralf@linux-mips.org>
Subject: Re: [RFC] mark Netlogic XLR chip as SMT capable
Date: Sun, 2 Oct 2011 14:00:45 +0530	[thread overview]
Message-ID: <20111002083044.GA23668@jayachandranc.netlogicmicro.com> (raw)
Message-ID: <20111002083045.oCrJiW9WHgVeIf7D4Hzwhrc1H-tkMCW7_GKZeHwAA-w@z> (raw)
In-Reply-To: <CAJd=RBAc8Zv1JZfrAx2Ajj7fdJv=oA+eYHVBLfcFNOoZNyG7fg@mail.gmail.com>

On Sun, Oct 02, 2011 at 03:26:14PM +0800, Hillf Danton wrote:
> Netlogic XLR chip has multiple cores. Each core includes four integrated
> hardware threads, and they share L1 data and instruction caches.
> 
> If XLR chip is marked to be SMT capable, linux scheduler then could do more,
> say idle load balancing.
> 
> Any comment is welcom, thanks.

I may be missing something here, but how about just setting cpu_data[].core in
the init_secondary method?  That would avoid the change to kernel/smp.c. 

> 
> Signed-off-by: Hillf Danton <dhillf@gmail.com>
> ---
> 
> --- a/arch/mips/netlogic/xlr/smp.c	Sun Oct  2 14:15:28 2011
> +++ b/arch/mips/netlogic/xlr/smp.c	Sun Oct  2 14:15:58 2011
> @@ -176,6 +176,7 @@ void __init nlm_smp_setup(void)
> 
>  void nlm_prepare_cpus(unsigned int max_cpus)
>  {
> +	smp_num_siblings = 4;
>  }
> 
>  struct plat_smp_ops nlm_smp_ops = {
> --- a/arch/mips/kernel/smp.c	Sun Oct  2 14:12:09 2011
> +++ b/arch/mips/kernel/smp.c	Sun Oct  2 14:14:58 2011
> @@ -73,7 +73,12 @@ static inline void set_cpu_sibling_map(i
> 
>  	if (smp_num_siblings > 1) {
>  		for_each_cpu_mask(i, cpu_sibling_setup_map) {
> -			if (cpu_data[cpu].core == cpu_data[i].core) {
> +			if (current_cpu_type() == CPU_XLR) {
> +				if (((i>>2) & 0x7) == ((cpu>>2) & 0x7))
> +					goto set;
> +			}
> +			else if (cpu_data[cpu].core == cpu_data[i].core) {
> +set:
>  				cpu_set(i, cpu_sibling_map[cpu]);
>  				cpu_set(cpu, cpu_sibling_map[i]);
>  			}

JC.

  reply	other threads:[~2011-10-02  8:31 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-10-02  7:26 [RFC] mark Netlogic XLR chip as SMT capable Hillf Danton
2011-10-02  8:30 ` Jayachandran C. [this message]
2011-10-02  8:30   ` Jayachandran C.
2011-10-03  5:46   ` Hillf Danton
2011-10-03 10:32     ` Ralf Baechle
2011-10-03 10:39       ` Jayachandran C.
2011-10-03 10:39         ` Jayachandran C.
2011-10-04 10:48         ` Hillf Danton

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=20111002083044.GA23668@jayachandranc.netlogicmicro.com \
    --to=jayachandranc@netlogicmicro.com \
    --cc=dhillf@gmail.com \
    --cc=linux-mips@linux-mips.org \
    --cc=ralf@linux-mips.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.