summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorHillf Danton <dhillf@gmail.com>2011-11-16 00:21:29 +0000
committerRalf Baechle <ralf@linux-mips.org>2011-12-07 22:04:57 +0000
commitb3ea581834c1e36cc76589e63dedcd99fd6abf51 (patch)
treefa32093d96a9b9469a0d2a39fdc169628db9981e /arch
parent2aa54b2009bb4f85cdc42d16dde18093dd832a31 (diff)
downloadlinux-stable-b3ea581834c1e36cc76589e63dedcd99fd6abf51.tar.gz
linux-stable-b3ea581834c1e36cc76589e63dedcd99fd6abf51.tar.bz2
linux-stable-b3ea581834c1e36cc76589e63dedcd99fd6abf51.zip
MIPS: Netlogic: Mark Netlogic chips as SMT capable
Netlogic XLR chip has multiple cores. Each core includes four integrated hardware threads, and they share L1 data and instruction caches. If the chip is marked to be SMT capable, scheduler then could do more, say, idle load balancing. Changes are now confined only to the code of XLR, and hardware is probed to get core ID for correct setup. [jayachandranc: simplified and adapted for new merged XLR/XLP code] Signed-off-by: Hillf Danton <dhillf@gmail.com> Signed-off-by: Jayachandran C <jayachandranc@netlogicmicro.com> Cc: linux-mips@linux-mips.org Patchwork: https://patchwork.linux-mips.org/patch/2972/ Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/mips/netlogic/common/smp.c11
1 files changed, 7 insertions, 4 deletions
diff --git a/arch/mips/netlogic/common/smp.c b/arch/mips/netlogic/common/smp.c
index 476c93ef3037..db17f49886c2 100644
--- a/arch/mips/netlogic/common/smp.c
+++ b/arch/mips/netlogic/common/smp.c
@@ -108,9 +108,16 @@ void nlm_early_init_secondary(int cpu)
*/
static void __cpuinit nlm_init_secondary(void)
{
+ current_cpu_data.core = hard_smp_processor_id() / 4;
nlm_smp_irq_init();
}
+void nlm_prepare_cpus(unsigned int max_cpus)
+{
+ /* declare we are SMT capable */
+ smp_num_siblings = nlm_threads_per_core;
+}
+
void nlm_smp_finish(void)
{
#ifdef notyet
@@ -183,10 +190,6 @@ void __init nlm_smp_setup(void)
nlm_set_nmi_handler(nlm_boot_secondary_cpus);
}
-void nlm_prepare_cpus(unsigned int max_cpus)
-{
-}
-
static int nlm_parse_cpumask(u32 cpu_mask)
{
uint32_t core0_thr_mask, core_thr_mask;