aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2008-01-30 07:30:38 -0500
committerIngo Molnar <mingo@elte.hu>2008-01-30 07:30:38 -0500
commit3367e56f26a3a8647784328ffa846fe8021a5b79 (patch)
tree03c4b07179f3b4d98ff76209ad50fadc2a418a16 /include
parentb4ea9299df1fa04dbd51840f60918a63ff6a8a44 (diff)
x86: merge topology.h variants
Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include')
-rw-r--r--include/asm-x86/topology.h143
-rw-r--r--include/asm-x86/topology_32.h116
-rw-r--r--include/asm-x86/topology_64.h91
3 files changed, 141 insertions, 209 deletions
diff --git a/include/asm-x86/topology.h b/include/asm-x86/topology.h
index b10fde9798ea..9c251604ecc4 100644
--- a/include/asm-x86/topology.h
+++ b/include/asm-x86/topology.h
@@ -1,5 +1,144 @@
1/*
2 * Written by: Matthew Dobson, IBM Corporation
3 *
4 * Copyright (C) 2002, IBM Corp.
5 *
6 * All rights reserved.
7 *
8 * This program is free software; you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation; either version 2 of the License, or
11 * (at your option) any later version.
12 *
13 * This program is distributed in the hope that it will be useful, but
14 * WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE, GOOD TITLE or
16 * NON INFRINGEMENT. See the GNU General Public License for more
17 * details.
18 *
19 * You should have received a copy of the GNU General Public License
20 * along with this program; if not, write to the Free Software
21 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
22 *
23 * Send feedback to <colpatch@us.ibm.com>
24 */
25#ifndef _ASM_X86_TOPOLOGY_H
26#define _ASM_X86_TOPOLOGY_H
27
28#ifdef CONFIG_NUMA
29#include <linux/cpumask.h>
30#include <asm/mpspec.h>
31
32/* Mappings between logical cpu number and node number */
33extern int cpu_to_node_map[];
34extern cpumask_t node_to_cpumask_map[];
35
36/* Returns the number of the node containing CPU 'cpu' */
37static inline int cpu_to_node(int cpu)
38{
39 return cpu_to_node_map[cpu];
40}
41
42/*
43 * Returns the number of the node containing Node 'node'. This
44 * architecture is flat, so it is a pretty simple function!
45 */
46#define parent_node(node) (node)
47
48/* Returns a bitmask of CPUs on Node 'node'. */
49static inline cpumask_t node_to_cpumask(int node)
50{
51 return node_to_cpumask_map[node];
52}
53
54/* Returns the number of the first CPU on Node 'node'. */
55static inline int node_to_first_cpu(int node)
56{
57 cpumask_t mask = node_to_cpumask(node);
58
59 return first_cpu(mask);
60}
61
62#define pcibus_to_node(bus) __pcibus_to_node(bus)
63#define pcibus_to_cpumask(bus) __pcibus_to_cpumask(bus)
64
1#ifdef CONFIG_X86_32 65#ifdef CONFIG_X86_32
2# include "topology_32.h" 66extern unsigned long node_start_pfn[];
67extern unsigned long node_end_pfn[];
68extern unsigned long node_remap_size[];
69#define node_has_online_mem(nid) (node_start_pfn[nid] != node_end_pfn[nid])
70
71# ifdef CONFIG_X86_HT
72# define ENABLE_TOPO_DEFINES
73# endif
74
75# define SD_CACHE_NICE_TRIES 1
76# define SD_IDLE_IDX 1
77# define SD_NEWIDLE_IDX 2
78# define SD_FORKEXEC_IDX 0
79
3#else 80#else
4# include "topology_64.h" 81
82# ifdef CONFIG_SMP
83# define ENABLE_TOPO_DEFINES
84# endif
85
86# define SD_CACHE_NICE_TRIES 2
87# define SD_IDLE_IDX 2
88# define SD_NEWIDLE_IDX 0
89# define SD_FORKEXEC_IDX 1
90
91#endif
92
93/* sched_domains SD_NODE_INIT for NUMAQ machines */
94#define SD_NODE_INIT (struct sched_domain) { \
95 .span = CPU_MASK_NONE, \
96 .parent = NULL, \
97 .child = NULL, \
98 .groups = NULL, \
99 .min_interval = 8, \
100 .max_interval = 32, \
101 .busy_factor = 32, \
102 .imbalance_pct = 125, \
103 .cache_nice_tries = SD_CACHE_NICE_TRIES, \
104 .busy_idx = 3, \
105 .idle_idx = SD_IDLE_IDX, \
106 .newidle_idx = SD_NEWIDLE_IDX, \
107 .wake_idx = 1, \
108 .forkexec_idx = SD_FORKEXEC_IDX, \
109 .flags = SD_LOAD_BALANCE \
110 | SD_BALANCE_EXEC \
111 | SD_BALANCE_FORK \
112 | SD_SERIALIZE \
113 | SD_WAKE_BALANCE, \
114 .last_balance = jiffies, \
115 .balance_interval = 1, \
116 .nr_balance_failed = 0, \
117}
118
119#ifdef CONFIG_X86_64_ACPI_NUMA
120extern int __node_distance(int, int);
121#define node_distance(a, b) __node_distance(a, b)
122#endif
123
124#else /* CONFIG_NUMA */
125
126#include <asm-generic/topology.h>
127
128#endif
129
130extern cpumask_t cpu_coregroup_map(int cpu);
131
132#ifdef ENABLE_TOPO_DEFINES
133#define topology_physical_package_id(cpu) (cpu_data(cpu).phys_proc_id)
134#define topology_core_id(cpu) (cpu_data(cpu).cpu_core_id)
135#define topology_core_siblings(cpu) (per_cpu(cpu_core_map, cpu))
136#define topology_thread_siblings(cpu) (per_cpu(cpu_sibling_map, cpu))
137#endif
138
139#ifdef CONFIG_SMP
140#define mc_capable() (boot_cpu_data.x86_max_cores > 1)
141#define smt_capable() (smp_num_siblings > 1)
142#endif
143
5#endif 144#endif
diff --git a/include/asm-x86/topology_32.h b/include/asm-x86/topology_32.h
deleted file mode 100644
index 35b00067587d..000000000000
--- a/include/asm-x86/topology_32.h
+++ /dev/null
@@ -1,116 +0,0 @@
1/*
2 * Written by: Matthew Dobson, IBM Corporation
3 *
4 * Copyright (C) 2002, IBM Corp.
5 *
6 * All rights reserved.
7 *
8 * This program is free software; you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation; either version 2 of the License, or
11 * (at your option) any later version.
12 *
13 * This program is distributed in the hope that it will be useful, but
14 * WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE, GOOD TITLE or
16 * NON INFRINGEMENT. See the GNU General Public License for more
17 * details.
18 *
19 * You should have received a copy of the GNU General Public License
20 * along with this program; if not, write to the Free Software
21 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
22 *
23 * Send feedback to <colpatch@us.ibm.com>
24 */
25#ifndef _ASM_X86_TOPOLOGY_H
26#define _ASM_X86_TOPOLOGY_H
27
28#ifdef CONFIG_NUMA
29#include <linux/cpumask.h>
30#include <asm/mpspec.h>
31
32/* Mappings between logical cpu number and node number */
33extern int cpu_to_node_map[];
34extern cpumask_t node_to_cpumask_map[];
35
36/* Returns the number of the node containing CPU 'cpu' */
37static inline int cpu_to_node(int cpu)
38{
39 return cpu_to_node_map[cpu];
40}
41
42/*
43 * Returns the number of the node containing Node 'node'. This
44 * architecture is flat, so it is a pretty simple function!
45 */
46#define parent_node(node) (node)
47
48/* Returns a bitmask of CPUs on Node 'node'. */
49static inline cpumask_t node_to_cpumask(int node)
50{
51 return node_to_cpumask_map[node];
52}
53
54/* Returns the number of the first CPU on Node 'node'. */
55static inline int node_to_first_cpu(int node)
56{
57 cpumask_t mask = node_to_cpumask(node);
58
59 return first_cpu(mask);
60}
61
62#define pcibus_to_node(bus) __pcibus_to_node(bus)
63#define pcibus_to_cpumask(bus) __pcibus_to_cpumask(bus)
64
65/* sched_domains SD_NODE_INIT for NUMAQ machines */
66#define SD_NODE_INIT (struct sched_domain) { \
67 .span = CPU_MASK_NONE, \
68 .parent = NULL, \
69 .child = NULL, \
70 .groups = NULL, \
71 .min_interval = 8, \
72 .max_interval = 32, \
73 .busy_factor = 32, \
74 .imbalance_pct = 125, \
75 .cache_nice_tries = 1, \
76 .busy_idx = 3, \
77 .idle_idx = 1, \
78 .newidle_idx = 2, \
79 .wake_idx = 1, \
80 .flags = SD_LOAD_BALANCE \
81 | SD_BALANCE_EXEC \
82 | SD_BALANCE_FORK \
83 | SD_SERIALIZE \
84 | SD_WAKE_BALANCE, \
85 .last_balance = jiffies, \
86 .balance_interval = 1, \
87 .nr_balance_failed = 0, \
88}
89
90extern unsigned long node_start_pfn[];
91extern unsigned long node_end_pfn[];
92extern unsigned long node_remap_size[];
93
94#define node_has_online_mem(nid) (node_start_pfn[nid] != node_end_pfn[nid])
95
96#else /* CONFIG_NUMA */
97
98#include <asm-generic/topology.h>
99
100#endif
101
102extern cpumask_t cpu_coregroup_map(int cpu);
103
104#ifdef CONFIG_X86_HT
105#define topology_physical_package_id(cpu) (cpu_data(cpu).phys_proc_id)
106#define topology_core_id(cpu) (cpu_data(cpu).cpu_core_id)
107#define topology_core_siblings(cpu) (per_cpu(cpu_core_map, cpu))
108#define topology_thread_siblings(cpu) (per_cpu(cpu_sibling_map, cpu))
109#endif
110
111#ifdef CONFIG_SMP
112#define mc_capable() (boot_cpu_data.x86_max_cores > 1)
113#define smt_capable() (smp_num_siblings > 1)
114#endif
115
116#endif
diff --git a/include/asm-x86/topology_64.h b/include/asm-x86/topology_64.h
deleted file mode 100644
index 93de948bd337..000000000000
--- a/include/asm-x86/topology_64.h
+++ /dev/null
@@ -1,91 +0,0 @@
1#ifndef _ASM_X86_TOPOLOGY_H
2#define _ASM_X86_TOPOLOGY_H
3
4#ifdef CONFIG_NUMA
5#include <linux/cpumask.h>
6#include <asm/mpspec.h>
7
8/* Mappings between logical cpu number and node number */
9extern int cpu_to_node_map[];
10extern cpumask_t node_to_cpumask_map[];
11
12#ifdef CONFIG_ACPI_NUMA
13extern int __node_distance(int, int);
14#define node_distance(a,b) __node_distance(a,b)
15#endif
16
17/* Returns the number of the node containing CPU 'cpu' */
18static inline int cpu_to_node(int cpu)
19{
20 return cpu_to_node_map[cpu];
21}
22
23/*
24 * Returns the number of the node containing Node 'node'. This
25 * architecture is flat, so it is a pretty simple function!
26 */
27#define parent_node(node) (node)
28
29/* Returns a bitmask of CPUs on Node 'node'. */
30static inline cpumask_t node_to_cpumask(int node)
31{
32 return node_to_cpumask_map[node];
33}
34
35/* Returns the number of the first CPU on Node 'node'. */
36static inline int node_to_first_cpu(int node)
37{
38 cpumask_t mask = node_to_cpumask(node);
39
40 return first_cpu(mask);
41}
42
43#define pcibus_to_node(bus) __pcibus_to_node(bus)
44#define pcibus_to_cpumask(bus) __pcibus_to_cpumask(bus)
45
46#define numa_node_id() read_pda(nodenumber)
47
48/* sched_domains SD_NODE_INIT for x86_64 machines */
49#define SD_NODE_INIT (struct sched_domain) { \
50 .span = CPU_MASK_NONE, \
51 .parent = NULL, \
52 .child = NULL, \
53 .groups = NULL, \
54 .min_interval = 8, \
55 .max_interval = 32, \
56 .busy_factor = 32, \
57 .imbalance_pct = 125, \
58 .cache_nice_tries = 2, \
59 .busy_idx = 3, \
60 .idle_idx = 2, \
61 .newidle_idx = 0, \
62 .wake_idx = 1, \
63 .forkexec_idx = 1, \
64 .flags = SD_LOAD_BALANCE \
65 | SD_BALANCE_EXEC \
66 | SD_BALANCE_FORK \
67 | SD_SERIALIZE \
68 | SD_WAKE_BALANCE, \
69 .last_balance = jiffies, \
70 .balance_interval = 1, \
71 .nr_balance_failed = 0, \
72}
73
74#else /* CONFIG_NUMA */
75
76#include <asm-generic/topology.h>
77
78#endif
79
80extern cpumask_t cpu_coregroup_map(int cpu);
81
82#ifdef CONFIG_SMP
83#define topology_physical_package_id(cpu) (cpu_data(cpu).phys_proc_id)
84#define topology_core_id(cpu) (cpu_data(cpu).cpu_core_id)
85#define topology_core_siblings(cpu) (per_cpu(cpu_core_map, cpu))
86#define topology_thread_siblings(cpu) (per_cpu(cpu_sibling_map, cpu))
87#define mc_capable() (boot_cpu_data.x86_max_cores > 1)
88#define smt_capable() (smp_num_siblings > 1)
89#endif
90
91#endif
generated by cgit v1.2.2 (git 2.25.0) at 2024-10-05 06:25:14 -0400