|
26 | 26 | #include <linux/of.h>
|
27 | 27 |
|
28 | 28 | #include <asm/acpi.h>
|
| 29 | +#include <asm/sections.h> |
29 | 30 |
|
30 | 31 | struct pglist_data *node_data[MAX_NUMNODES] __read_mostly;
|
31 | 32 | EXPORT_SYMBOL(node_data);
|
@@ -131,6 +132,57 @@ void __init early_map_cpu_to_node(unsigned int cpu, int nid)
|
131 | 132 | cpu_to_node_map[cpu] = nid;
|
132 | 133 | }
|
133 | 134 |
|
| 135 | +#ifdef CONFIG_HAVE_SETUP_PER_CPU_AREA |
| 136 | +unsigned long __per_cpu_offset[NR_CPUS] __read_mostly; |
| 137 | +EXPORT_SYMBOL(__per_cpu_offset); |
| 138 | + |
| 139 | +static int __init early_cpu_to_node(int cpu) |
| 140 | +{ |
| 141 | + return cpu_to_node_map[cpu]; |
| 142 | +} |
| 143 | + |
| 144 | +static int __init pcpu_cpu_distance(unsigned int from, unsigned int to) |
| 145 | +{ |
| 146 | + return node_distance(from, to); |
| 147 | +} |
| 148 | + |
| 149 | +static void * __init pcpu_fc_alloc(unsigned int cpu, size_t size, |
| 150 | + size_t align) |
| 151 | +{ |
| 152 | + int nid = early_cpu_to_node(cpu); |
| 153 | + |
| 154 | + return memblock_virt_alloc_try_nid(size, align, |
| 155 | + __pa(MAX_DMA_ADDRESS), MEMBLOCK_ALLOC_ACCESSIBLE, nid); |
| 156 | +} |
| 157 | + |
| 158 | +static void __init pcpu_fc_free(void *ptr, size_t size) |
| 159 | +{ |
| 160 | + memblock_free_early(__pa(ptr), size); |
| 161 | +} |
| 162 | + |
| 163 | +void __init setup_per_cpu_areas(void) |
| 164 | +{ |
| 165 | + unsigned long delta; |
| 166 | + unsigned int cpu; |
| 167 | + int rc; |
| 168 | + |
| 169 | + /* |
| 170 | + * Always reserve area for module percpu variables. That's |
| 171 | + * what the legacy allocator did. |
| 172 | + */ |
| 173 | + rc = pcpu_embed_first_chunk(PERCPU_MODULE_RESERVE, |
| 174 | + PERCPU_DYNAMIC_RESERVE, PAGE_SIZE, |
| 175 | + pcpu_cpu_distance, |
| 176 | + pcpu_fc_alloc, pcpu_fc_free); |
| 177 | + if (rc < 0) |
| 178 | + panic("Failed to initialize percpu areas."); |
| 179 | + |
| 180 | + delta = (unsigned long)pcpu_base_addr - (unsigned long)__per_cpu_start; |
| 181 | + for_each_possible_cpu(cpu) |
| 182 | + __per_cpu_offset[cpu] = delta + pcpu_unit_offsets[cpu]; |
| 183 | +} |
| 184 | +#endif |
| 185 | + |
134 | 186 | /**
|
135 | 187 | * numa_add_memblk - Set node id to memblk
|
136 | 188 | * @nid: NUMA node ID of the new memblk
|
|
0 commit comments