blob: 948fdb65693384826b77dbc6024a93bcb88246bd [file] [log] [blame]
Paul Mundt05a11782007-06-07 11:29:37 +09001/*
2 * arch/sh/kernel/topology.c
3 *
4 * Copyright (C) 2007 Paul Mundt
5 *
6 * This file is subject to the terms and conditions of the GNU General Public
7 * License. See the file "COPYING" in the main directory of this archive
8 * for more details.
9 */
Paul Mundt7a302a92007-05-14 12:50:43 +090010#include <linux/cpu.h>
11#include <linux/cpumask.h>
12#include <linux/init.h>
13#include <linux/percpu.h>
Paul Mundtd22d9b32007-06-01 14:21:13 +090014#include <linux/node.h>
15#include <linux/nodemask.h>
Paul Mundt7a302a92007-05-14 12:50:43 +090016
17static DEFINE_PER_CPU(struct cpu, cpu_devices);
18
Paul Mundt896f0c02009-10-16 18:00:02 +090019cpumask_t cpu_core_map[NR_CPUS];
20
21static cpumask_t cpu_coregroup_map(unsigned int cpu)
22{
23 /*
24 * Presently all SH-X3 SMP cores are multi-cores, so just keep it
25 * simple until we have a method for determining topology..
26 */
27 return cpu_possible_map;
28}
29
30const struct cpumask *cpu_coregroup_mask(unsigned int cpu)
31{
32 return &cpu_core_map[cpu];
33}
34
35int arch_update_cpu_topology(void)
36{
37 unsigned int cpu;
38
39 for_each_possible_cpu(cpu)
40 cpu_core_map[cpu] = cpu_coregroup_map(cpu);
41
42 return 0;
43}
44
Paul Mundt7a302a92007-05-14 12:50:43 +090045static int __init topology_init(void)
46{
47 int i, ret;
48
Paul Mundtd22d9b32007-06-01 14:21:13 +090049#ifdef CONFIG_NEED_MULTIPLE_NODES
50 for_each_online_node(i)
51 register_one_node(i);
52#endif
53
Paul Mundt7a302a92007-05-14 12:50:43 +090054 for_each_present_cpu(i) {
Paul Mundt9e8c5be2010-04-26 18:20:29 +090055 struct cpu *c = &per_cpu(cpu_devices, i);
56
57 c->hotpluggable = 1;
58
59 ret = register_cpu(c, i);
Paul Mundt7a302a92007-05-14 12:50:43 +090060 if (unlikely(ret))
61 printk(KERN_WARNING "%s: register_cpu %d failed (%d)\n",
Harvey Harrison866e6b92008-03-04 15:23:47 -080062 __func__, i, ret);
Paul Mundt7a302a92007-05-14 12:50:43 +090063 }
64
Paul Mundt05a11782007-06-07 11:29:37 +090065#if defined(CONFIG_NUMA) && !defined(CONFIG_SMP)
66 /*
67 * In the UP case, make sure the CPU association is still
68 * registered under each node. Without this, sysfs fails
69 * to make the connection between nodes other than node0
70 * and cpu0.
71 */
72 for_each_online_node(i)
73 if (i != numa_node_id())
74 register_cpu_under_node(raw_smp_processor_id(), i);
75#endif
76
Paul Mundt7a302a92007-05-14 12:50:43 +090077 return 0;
78}
79subsys_initcall(topology_init);