]>
Commit | Line | Data |
---|---|---|
69c60c88 | 1 | #include <linux/export.h> |
1da177e4 | 2 | #include <linux/bitops.h> |
5cdd174f | 3 | #include <linux/elf.h> |
1da177e4 | 4 | #include <linux/mm.h> |
8d71a2ea | 5 | |
8bdbd962 | 6 | #include <linux/io.h> |
c98fdeaa | 7 | #include <linux/sched.h> |
4e26d11f | 8 | #include <linux/random.h> |
1da177e4 | 9 | #include <asm/processor.h> |
d3f7eae1 | 10 | #include <asm/apic.h> |
1f442d70 | 11 | #include <asm/cpu.h> |
26bfa5f8 | 12 | #include <asm/smp.h> |
42937e81 | 13 | #include <asm/pci-direct.h> |
b466bdb6 | 14 | #include <asm/delay.h> |
1da177e4 | 15 | |
8d71a2ea | 16 | #ifdef CONFIG_X86_64 |
8d71a2ea YL |
17 | # include <asm/mmconfig.h> |
18 | # include <asm/cacheflush.h> | |
19 | #endif | |
20 | ||
1da177e4 LT |
21 | #include "cpu.h" |
22 | ||
cc2749e4 AG |
23 | /* |
24 | * nodes_per_socket: Stores the number of nodes per socket. | |
25 | * Refer to Fam15h Models 00-0fh BKDG - CPUID Fn8000_001E_ECX | |
26 | * Node Identifiers[10:8] | |
27 | */ | |
28 | static u32 nodes_per_socket = 1; | |
29 | ||
2c929ce6 BP |
30 | static inline int rdmsrl_amd_safe(unsigned msr, unsigned long long *p) |
31 | { | |
2c929ce6 BP |
32 | u32 gprs[8] = { 0 }; |
33 | int err; | |
34 | ||
682469a5 BP |
35 | WARN_ONCE((boot_cpu_data.x86 != 0xf), |
36 | "%s should only be used on K8!\n", __func__); | |
2c929ce6 BP |
37 | |
38 | gprs[1] = msr; | |
39 | gprs[7] = 0x9c5a203a; | |
40 | ||
41 | err = rdmsr_safe_regs(gprs); | |
42 | ||
43 | *p = gprs[0] | ((u64)gprs[2] << 32); | |
44 | ||
45 | return err; | |
46 | } | |
47 | ||
48 | static inline int wrmsrl_amd_safe(unsigned msr, unsigned long long val) | |
49 | { | |
2c929ce6 BP |
50 | u32 gprs[8] = { 0 }; |
51 | ||
682469a5 BP |
52 | WARN_ONCE((boot_cpu_data.x86 != 0xf), |
53 | "%s should only be used on K8!\n", __func__); | |
2c929ce6 BP |
54 | |
55 | gprs[0] = (u32)val; | |
56 | gprs[1] = msr; | |
57 | gprs[2] = val >> 32; | |
58 | gprs[7] = 0x9c5a203a; | |
59 | ||
60 | return wrmsr_safe_regs(gprs); | |
61 | } | |
62 | ||
1da177e4 LT |
63 | /* |
64 | * B step AMD K6 before B 9730xxxx have hardware bugs that can cause | |
65 | * misexecution of code under Linux. Owners of such processors should | |
66 | * contact AMD for precise details and a CPU swap. | |
67 | * | |
68 | * See http://www.multimania.com/poulot/k6bug.html | |
d7de8649 AH |
69 | * and section 2.6.2 of "AMD-K6 Processor Revision Guide - Model 6" |
70 | * (Publication # 21266 Issue Date: August 1998) | |
1da177e4 LT |
71 | * |
72 | * The following test is erm.. interesting. AMD neglected to up | |
73 | * the chip setting when fixing the bug but they also tweaked some | |
74 | * performance at the same time.. | |
75 | */ | |
fb87a298 | 76 | |
277d5b40 AK |
77 | extern __visible void vide(void); |
78 | __asm__(".globl vide\n\t.align 4\nvide: ret"); | |
1da177e4 | 79 | |
148f9bb8 | 80 | static void init_amd_k5(struct cpuinfo_x86 *c) |
11fdd252 | 81 | { |
26bfa5f8 | 82 | #ifdef CONFIG_X86_32 |
11fdd252 YL |
83 | /* |
84 | * General Systems BIOSen alias the cpu frequency registers | |
6a6256f9 | 85 | * of the Elan at 0x000df000. Unfortunately, one of the Linux |
11fdd252 YL |
86 | * drivers subsequently pokes it, and changes the CPU speed. |
87 | * Workaround : Remove the unneeded alias. | |
88 | */ | |
89 | #define CBAR (0xfffc) /* Configuration Base Address (32-bit) */ | |
90 | #define CBAR_ENB (0x80000000) | |
91 | #define CBAR_KEY (0X000000CB) | |
92 | if (c->x86_model == 9 || c->x86_model == 10) { | |
8bdbd962 AC |
93 | if (inl(CBAR) & CBAR_ENB) |
94 | outl(0 | CBAR_KEY, CBAR); | |
11fdd252 | 95 | } |
26bfa5f8 | 96 | #endif |
11fdd252 YL |
97 | } |
98 | ||
148f9bb8 | 99 | static void init_amd_k6(struct cpuinfo_x86 *c) |
11fdd252 | 100 | { |
26bfa5f8 | 101 | #ifdef CONFIG_X86_32 |
11fdd252 | 102 | u32 l, h; |
46a84132 | 103 | int mbytes = get_num_physpages() >> (20-PAGE_SHIFT); |
11fdd252 YL |
104 | |
105 | if (c->x86_model < 6) { | |
106 | /* Based on AMD doc 20734R - June 2000 */ | |
107 | if (c->x86_model == 0) { | |
108 | clear_cpu_cap(c, X86_FEATURE_APIC); | |
109 | set_cpu_cap(c, X86_FEATURE_PGE); | |
110 | } | |
111 | return; | |
112 | } | |
113 | ||
114 | if (c->x86_model == 6 && c->x86_mask == 1) { | |
115 | const int K6_BUG_LOOP = 1000000; | |
116 | int n; | |
117 | void (*f_vide)(void); | |
37963666 | 118 | u64 d, d2; |
11fdd252 | 119 | |
1b74dde7 | 120 | pr_info("AMD K6 stepping B detected - "); |
11fdd252 YL |
121 | |
122 | /* | |
123 | * It looks like AMD fixed the 2.6.2 bug and improved indirect | |
124 | * calls at the same time. | |
125 | */ | |
126 | ||
127 | n = K6_BUG_LOOP; | |
128 | f_vide = vide; | |
4ea1636b | 129 | d = rdtsc(); |
11fdd252 YL |
130 | while (n--) |
131 | f_vide(); | |
4ea1636b | 132 | d2 = rdtsc(); |
11fdd252 YL |
133 | d = d2-d; |
134 | ||
135 | if (d > 20*K6_BUG_LOOP) | |
1b74dde7 | 136 | pr_cont("system stability may be impaired when more than 32 MB are used.\n"); |
11fdd252 | 137 | else |
1b74dde7 | 138 | pr_cont("probably OK (after B9730xxxx).\n"); |
11fdd252 YL |
139 | } |
140 | ||
141 | /* K6 with old style WHCR */ | |
142 | if (c->x86_model < 8 || | |
143 | (c->x86_model == 8 && c->x86_mask < 8)) { | |
144 | /* We can only write allocate on the low 508Mb */ | |
145 | if (mbytes > 508) | |
146 | mbytes = 508; | |
147 | ||
148 | rdmsr(MSR_K6_WHCR, l, h); | |
149 | if ((l&0x0000FFFF) == 0) { | |
150 | unsigned long flags; | |
151 | l = (1<<0)|((mbytes/4)<<1); | |
152 | local_irq_save(flags); | |
153 | wbinvd(); | |
154 | wrmsr(MSR_K6_WHCR, l, h); | |
155 | local_irq_restore(flags); | |
1b74dde7 | 156 | pr_info("Enabling old style K6 write allocation for %d Mb\n", |
11fdd252 YL |
157 | mbytes); |
158 | } | |
159 | return; | |
160 | } | |
161 | ||
162 | if ((c->x86_model == 8 && c->x86_mask > 7) || | |
163 | c->x86_model == 9 || c->x86_model == 13) { | |
164 | /* The more serious chips .. */ | |
165 | ||
166 | if (mbytes > 4092) | |
167 | mbytes = 4092; | |
168 | ||
169 | rdmsr(MSR_K6_WHCR, l, h); | |
170 | if ((l&0xFFFF0000) == 0) { | |
171 | unsigned long flags; | |
172 | l = ((mbytes>>2)<<22)|(1<<16); | |
173 | local_irq_save(flags); | |
174 | wbinvd(); | |
175 | wrmsr(MSR_K6_WHCR, l, h); | |
176 | local_irq_restore(flags); | |
1b74dde7 | 177 | pr_info("Enabling new style K6 write allocation for %d Mb\n", |
11fdd252 YL |
178 | mbytes); |
179 | } | |
180 | ||
181 | return; | |
182 | } | |
183 | ||
184 | if (c->x86_model == 10) { | |
185 | /* AMD Geode LX is model 10 */ | |
186 | /* placeholder for any needed mods */ | |
187 | return; | |
188 | } | |
26bfa5f8 | 189 | #endif |
11fdd252 YL |
190 | } |
191 | ||
26bfa5f8 | 192 | static void init_amd_k7(struct cpuinfo_x86 *c) |
1f442d70 | 193 | { |
26bfa5f8 BP |
194 | #ifdef CONFIG_X86_32 |
195 | u32 l, h; | |
196 | ||
197 | /* | |
198 | * Bit 15 of Athlon specific MSR 15, needs to be 0 | |
199 | * to enable SSE on Palomino/Morgan/Barton CPU's. | |
200 | * If the BIOS didn't enable it already, enable it here. | |
201 | */ | |
202 | if (c->x86_model >= 6 && c->x86_model <= 10) { | |
203 | if (!cpu_has(c, X86_FEATURE_XMM)) { | |
1b74dde7 | 204 | pr_info("Enabling disabled K7/SSE Support.\n"); |
26bfa5f8 BP |
205 | msr_clear_bit(MSR_K7_HWCR, 15); |
206 | set_cpu_cap(c, X86_FEATURE_XMM); | |
207 | } | |
208 | } | |
209 | ||
210 | /* | |
211 | * It's been determined by AMD that Athlons since model 8 stepping 1 | |
212 | * are more robust with CLK_CTL set to 200xxxxx instead of 600xxxxx | |
213 | * As per AMD technical note 27212 0.2 | |
214 | */ | |
215 | if ((c->x86_model == 8 && c->x86_mask >= 1) || (c->x86_model > 8)) { | |
216 | rdmsr(MSR_K7_CLK_CTL, l, h); | |
217 | if ((l & 0xfff00000) != 0x20000000) { | |
1b74dde7 CY |
218 | pr_info("CPU: CLK_CTL MSR was %x. Reprogramming to %x\n", |
219 | l, ((l & 0x000fffff)|0x20000000)); | |
26bfa5f8 BP |
220 | wrmsr(MSR_K7_CLK_CTL, (l & 0x000fffff)|0x20000000, h); |
221 | } | |
222 | } | |
223 | ||
224 | set_cpu_cap(c, X86_FEATURE_K7); | |
225 | ||
1f442d70 | 226 | /* calling is from identify_secondary_cpu() ? */ |
f6e9456c | 227 | if (!c->cpu_index) |
1f442d70 YL |
228 | return; |
229 | ||
230 | /* | |
231 | * Certain Athlons might work (for various values of 'work') in SMP | |
232 | * but they are not certified as MP capable. | |
233 | */ | |
234 | /* Athlon 660/661 is valid. */ | |
235 | if ((c->x86_model == 6) && ((c->x86_mask == 0) || | |
236 | (c->x86_mask == 1))) | |
1077c932 | 237 | return; |
1f442d70 YL |
238 | |
239 | /* Duron 670 is valid */ | |
240 | if ((c->x86_model == 7) && (c->x86_mask == 0)) | |
1077c932 | 241 | return; |
1f442d70 YL |
242 | |
243 | /* | |
244 | * Athlon 662, Duron 671, and Athlon >model 7 have capability | |
245 | * bit. It's worth noting that the A5 stepping (662) of some | |
246 | * Athlon XP's have the MP bit set. | |
247 | * See http://www.heise.de/newsticker/data/jow-18.10.01-000 for | |
248 | * more. | |
249 | */ | |
250 | if (((c->x86_model == 6) && (c->x86_mask >= 2)) || | |
251 | ((c->x86_model == 7) && (c->x86_mask >= 1)) || | |
252 | (c->x86_model > 7)) | |
26bfa5f8 | 253 | if (cpu_has(c, X86_FEATURE_MP)) |
1077c932 | 254 | return; |
1f442d70 YL |
255 | |
256 | /* If we get here, not a certified SMP capable AMD system. */ | |
257 | ||
258 | /* | |
259 | * Don't taint if we are running SMP kernel on a single non-MP | |
260 | * approved Athlon | |
261 | */ | |
262 | WARN_ONCE(1, "WARNING: This combination of AMD" | |
7da8b6dd | 263 | " processors is not suitable for SMP.\n"); |
8c90487c | 264 | add_taint(TAINT_CPU_OUT_OF_SPEC, LOCKDEP_NOW_UNRELIABLE); |
6c62aa4a | 265 | #endif |
26bfa5f8 | 266 | } |
6c62aa4a | 267 | |
645a7919 | 268 | #ifdef CONFIG_NUMA |
bbc9e2f4 TH |
269 | /* |
270 | * To workaround broken NUMA config. Read the comment in | |
271 | * srat_detect_node(). | |
272 | */ | |
148f9bb8 | 273 | static int nearby_node(int apicid) |
6c62aa4a YL |
274 | { |
275 | int i, node; | |
276 | ||
277 | for (i = apicid - 1; i >= 0; i--) { | |
bbc9e2f4 | 278 | node = __apicid_to_node[i]; |
6c62aa4a YL |
279 | if (node != NUMA_NO_NODE && node_online(node)) |
280 | return node; | |
281 | } | |
282 | for (i = apicid + 1; i < MAX_LOCAL_APIC; i++) { | |
bbc9e2f4 | 283 | node = __apicid_to_node[i]; |
6c62aa4a YL |
284 | if (node != NUMA_NO_NODE && node_online(node)) |
285 | return node; | |
286 | } | |
287 | return first_node(node_online_map); /* Shouldn't happen */ | |
288 | } | |
289 | #endif | |
11fdd252 | 290 | |
4a376ec3 | 291 | /* |
23588c38 AH |
292 | * Fixup core topology information for |
293 | * (1) AMD multi-node processors | |
294 | * Assumption: Number of cores in each internal node is the same. | |
6057b4d3 | 295 | * (2) AMD processors supporting compute units |
4a376ec3 | 296 | */ |
c8e56d20 | 297 | #ifdef CONFIG_SMP |
148f9bb8 | 298 | static void amd_get_topology(struct cpuinfo_x86 *c) |
4a376ec3 | 299 | { |
cc2749e4 | 300 | u32 cores_per_cu = 1; |
23588c38 | 301 | u8 node_id; |
4a376ec3 AH |
302 | int cpu = smp_processor_id(); |
303 | ||
23588c38 | 304 | /* get information required for multi-node processors */ |
362f924b | 305 | if (boot_cpu_has(X86_FEATURE_TOPOEXT)) { |
6057b4d3 AH |
306 | u32 eax, ebx, ecx, edx; |
307 | ||
308 | cpuid(0x8000001e, &eax, &ebx, &ecx, &edx); | |
6057b4d3 AH |
309 | node_id = ecx & 7; |
310 | ||
311 | /* get compute unit information */ | |
312 | smp_num_siblings = ((ebx >> 8) & 3) + 1; | |
313 | c->compute_unit_id = ebx & 0xff; | |
9e81509e | 314 | cores_per_cu += ((ebx >> 8) & 3); |
23588c38 | 315 | } else if (cpu_has(c, X86_FEATURE_NODEID_MSR)) { |
6057b4d3 AH |
316 | u64 value; |
317 | ||
23588c38 | 318 | rdmsrl(MSR_FAM10H_NODE_ID, value); |
23588c38 AH |
319 | node_id = value & 7; |
320 | } else | |
4a376ec3 AH |
321 | return; |
322 | ||
23588c38 | 323 | /* fixup multi-node processor information */ |
cc2749e4 | 324 | if (nodes_per_socket > 1) { |
6057b4d3 | 325 | u32 cores_per_node; |
d518573d | 326 | u32 cus_per_node; |
6057b4d3 | 327 | |
23588c38 | 328 | set_cpu_cap(c, X86_FEATURE_AMD_DCM); |
cc2749e4 | 329 | cores_per_node = c->x86_max_cores / nodes_per_socket; |
d518573d | 330 | cus_per_node = cores_per_node / cores_per_cu; |
9d260ebc | 331 | |
23588c38 AH |
332 | /* store NodeID, use llc_shared_map to store sibling info */ |
333 | per_cpu(cpu_llc_id, cpu) = node_id; | |
4a376ec3 | 334 | |
9e81509e | 335 | /* core id has to be in the [0 .. cores_per_node - 1] range */ |
d518573d AH |
336 | c->cpu_core_id %= cores_per_node; |
337 | c->compute_unit_id %= cus_per_node; | |
23588c38 | 338 | } |
4a376ec3 AH |
339 | } |
340 | #endif | |
341 | ||
11fdd252 | 342 | /* |
aa5e5dc2 | 343 | * On a AMD dual core setup the lower bits of the APIC id distinguish the cores. |
11fdd252 YL |
344 | * Assumes number of cores is a power of two. |
345 | */ | |
148f9bb8 | 346 | static void amd_detect_cmp(struct cpuinfo_x86 *c) |
11fdd252 | 347 | { |
c8e56d20 | 348 | #ifdef CONFIG_SMP |
11fdd252 | 349 | unsigned bits; |
99bd0c0f | 350 | int cpu = smp_processor_id(); |
3849e91f | 351 | unsigned int socket_id, core_complex_id; |
11fdd252 YL |
352 | |
353 | bits = c->x86_coreid_bits; | |
11fdd252 YL |
354 | /* Low order bits define the core id (index of core in socket) */ |
355 | c->cpu_core_id = c->initial_apicid & ((1 << bits)-1); | |
356 | /* Convert the initial APIC ID into the socket ID */ | |
357 | c->phys_proc_id = c->initial_apicid >> bits; | |
99bd0c0f AH |
358 | /* use socket ID also for last level cache */ |
359 | per_cpu(cpu_llc_id, cpu) = c->phys_proc_id; | |
23588c38 | 360 | amd_get_topology(c); |
3849e91f AG |
361 | |
362 | /* | |
363 | * Fix percpu cpu_llc_id here as LLC topology is different | |
364 | * for Fam17h systems. | |
365 | */ | |
366 | if (c->x86 != 0x17 || !cpuid_edx(0x80000006)) | |
367 | return; | |
368 | ||
369 | socket_id = (c->apicid >> bits) - 1; | |
370 | core_complex_id = (c->apicid & ((1 << bits) - 1)) >> 3; | |
371 | ||
372 | per_cpu(cpu_llc_id, cpu) = (socket_id << 3) | core_complex_id; | |
11fdd252 YL |
373 | #endif |
374 | } | |
375 | ||
8b84c8df | 376 | u16 amd_get_nb_id(int cpu) |
6a812691 | 377 | { |
8b84c8df | 378 | u16 id = 0; |
6a812691 AH |
379 | #ifdef CONFIG_SMP |
380 | id = per_cpu(cpu_llc_id, cpu); | |
381 | #endif | |
382 | return id; | |
383 | } | |
384 | EXPORT_SYMBOL_GPL(amd_get_nb_id); | |
385 | ||
cc2749e4 AG |
386 | u32 amd_get_nodes_per_socket(void) |
387 | { | |
388 | return nodes_per_socket; | |
389 | } | |
390 | EXPORT_SYMBOL_GPL(amd_get_nodes_per_socket); | |
391 | ||
148f9bb8 | 392 | static void srat_detect_node(struct cpuinfo_x86 *c) |
6c62aa4a | 393 | { |
645a7919 | 394 | #ifdef CONFIG_NUMA |
6c62aa4a YL |
395 | int cpu = smp_processor_id(); |
396 | int node; | |
0d96b9ff | 397 | unsigned apicid = c->apicid; |
6c62aa4a | 398 | |
bbc9e2f4 TH |
399 | node = numa_cpu_node(cpu); |
400 | if (node == NUMA_NO_NODE) | |
401 | node = per_cpu(cpu_llc_id, cpu); | |
6c62aa4a | 402 | |
64be4c1c | 403 | /* |
68894632 AH |
404 | * On multi-fabric platform (e.g. Numascale NumaChip) a |
405 | * platform-specific handler needs to be called to fixup some | |
406 | * IDs of the CPU. | |
64be4c1c | 407 | */ |
68894632 | 408 | if (x86_cpuinit.fixup_cpu_id) |
64be4c1c DB |
409 | x86_cpuinit.fixup_cpu_id(c, node); |
410 | ||
6c62aa4a | 411 | if (!node_online(node)) { |
bbc9e2f4 TH |
412 | /* |
413 | * Two possibilities here: | |
414 | * | |
415 | * - The CPU is missing memory and no node was created. In | |
416 | * that case try picking one from a nearby CPU. | |
417 | * | |
418 | * - The APIC IDs differ from the HyperTransport node IDs | |
419 | * which the K8 northbridge parsing fills in. Assume | |
420 | * they are all increased by a constant offset, but in | |
421 | * the same order as the HT nodeids. If that doesn't | |
422 | * result in a usable node fall back to the path for the | |
423 | * previous case. | |
424 | * | |
425 | * This workaround operates directly on the mapping between | |
426 | * APIC ID and NUMA node, assuming certain relationship | |
427 | * between APIC ID, HT node ID and NUMA topology. As going | |
428 | * through CPU mapping may alter the outcome, directly | |
429 | * access __apicid_to_node[]. | |
430 | */ | |
6c62aa4a YL |
431 | int ht_nodeid = c->initial_apicid; |
432 | ||
7030a7e9 | 433 | if (__apicid_to_node[ht_nodeid] != NUMA_NO_NODE) |
bbc9e2f4 | 434 | node = __apicid_to_node[ht_nodeid]; |
6c62aa4a YL |
435 | /* Pick a nearby node */ |
436 | if (!node_online(node)) | |
437 | node = nearby_node(apicid); | |
438 | } | |
439 | numa_set_node(cpu, node); | |
6c62aa4a YL |
440 | #endif |
441 | } | |
442 | ||
148f9bb8 | 443 | static void early_init_amd_mc(struct cpuinfo_x86 *c) |
11fdd252 | 444 | { |
c8e56d20 | 445 | #ifdef CONFIG_SMP |
11fdd252 YL |
446 | unsigned bits, ecx; |
447 | ||
448 | /* Multi core CPU? */ | |
449 | if (c->extended_cpuid_level < 0x80000008) | |
450 | return; | |
451 | ||
452 | ecx = cpuid_ecx(0x80000008); | |
453 | ||
454 | c->x86_max_cores = (ecx & 0xff) + 1; | |
455 | ||
456 | /* CPU telling us the core id bits shift? */ | |
457 | bits = (ecx >> 12) & 0xF; | |
458 | ||
459 | /* Otherwise recompute */ | |
460 | if (bits == 0) { | |
461 | while ((1 << bits) < c->x86_max_cores) | |
462 | bits++; | |
463 | } | |
464 | ||
465 | c->x86_coreid_bits = bits; | |
466 | #endif | |
467 | } | |
468 | ||
148f9bb8 | 469 | static void bsp_init_amd(struct cpuinfo_x86 *c) |
8fa8b035 | 470 | { |
26bfa5f8 BP |
471 | |
472 | #ifdef CONFIG_X86_64 | |
473 | if (c->x86 >= 0xf) { | |
474 | unsigned long long tseg; | |
475 | ||
476 | /* | |
477 | * Split up direct mapping around the TSEG SMM area. | |
478 | * Don't do it for gbpages because there seems very little | |
479 | * benefit in doing so. | |
480 | */ | |
481 | if (!rdmsrl_safe(MSR_K8_TSEG_ADDR, &tseg)) { | |
482 | unsigned long pfn = tseg >> PAGE_SHIFT; | |
483 | ||
1b74dde7 | 484 | pr_debug("tseg: %010llx\n", tseg); |
26bfa5f8 BP |
485 | if (pfn_range_is_mapped(pfn, pfn + 1)) |
486 | set_memory_4k((unsigned long)__va(tseg), 1); | |
487 | } | |
488 | } | |
489 | #endif | |
490 | ||
8fa8b035 BP |
491 | if (cpu_has(c, X86_FEATURE_CONSTANT_TSC)) { |
492 | ||
493 | if (c->x86 > 0x10 || | |
494 | (c->x86 == 0x10 && c->x86_model >= 0x2)) { | |
495 | u64 val; | |
496 | ||
497 | rdmsrl(MSR_K7_HWCR, val); | |
498 | if (!(val & BIT(24))) | |
1b74dde7 | 499 | pr_warn(FW_BUG "TSC doesn't count with P0 frequency!\n"); |
8fa8b035 BP |
500 | } |
501 | } | |
502 | ||
503 | if (c->x86 == 0x15) { | |
504 | unsigned long upperbit; | |
505 | u32 cpuid, assoc; | |
506 | ||
507 | cpuid = cpuid_edx(0x80000005); | |
508 | assoc = cpuid >> 16 & 0xff; | |
509 | upperbit = ((cpuid >> 24) << 10) / assoc; | |
510 | ||
511 | va_align.mask = (upperbit - 1) & PAGE_MASK; | |
512 | va_align.flags = ALIGN_VA_32 | ALIGN_VA_64; | |
4e26d11f HMG |
513 | |
514 | /* A random value per boot for bit slice [12:upper_bit) */ | |
515 | va_align.bits = get_random_int() & va_align.mask; | |
8fa8b035 | 516 | } |
b466bdb6 HR |
517 | |
518 | if (cpu_has(c, X86_FEATURE_MWAITX)) | |
519 | use_mwaitx_delay(); | |
8dfeae0d HR |
520 | |
521 | if (boot_cpu_has(X86_FEATURE_TOPOEXT)) { | |
522 | u32 ecx; | |
523 | ||
524 | ecx = cpuid_ecx(0x8000001e); | |
525 | nodes_per_socket = ((ecx >> 8) & 7) + 1; | |
526 | } else if (boot_cpu_has(X86_FEATURE_NODEID_MSR)) { | |
527 | u64 value; | |
528 | ||
529 | rdmsrl(MSR_FAM10H_NODE_ID, value); | |
530 | nodes_per_socket = ((value >> 3) & 7) + 1; | |
531 | } | |
8fa8b035 BP |
532 | } |
533 | ||
148f9bb8 | 534 | static void early_init_amd(struct cpuinfo_x86 *c) |
2b16a235 | 535 | { |
11fdd252 YL |
536 | early_init_amd_mc(c); |
537 | ||
40fb1715 VP |
538 | /* |
539 | * c->x86_power is 8000_0007 edx. Bit 8 is TSC runs at constant rate | |
540 | * with P/T states and does not stop in deep C-states | |
541 | */ | |
542 | if (c->x86_power & (1 << 8)) { | |
e3224234 | 543 | set_cpu_cap(c, X86_FEATURE_CONSTANT_TSC); |
40fb1715 | 544 | set_cpu_cap(c, X86_FEATURE_NONSTOP_TSC); |
c98fdeaa | 545 | if (!check_tsc_unstable()) |
35af99e6 | 546 | set_sched_clock_stable(); |
40fb1715 | 547 | } |
5fef55fd | 548 | |
6c62aa4a YL |
549 | #ifdef CONFIG_X86_64 |
550 | set_cpu_cap(c, X86_FEATURE_SYSCALL32); | |
551 | #else | |
5fef55fd | 552 | /* Set MTRR capability flag if appropriate */ |
6c62aa4a YL |
553 | if (c->x86 == 5) |
554 | if (c->x86_model == 13 || c->x86_model == 9 || | |
555 | (c->x86_model == 8 && c->x86_mask >= 8)) | |
556 | set_cpu_cap(c, X86_FEATURE_K6_MTRR); | |
557 | #endif | |
42937e81 | 558 | #if defined(CONFIG_X86_LOCAL_APIC) && defined(CONFIG_PCI) |
b9d16a2a AG |
559 | /* |
560 | * ApicID can always be treated as an 8-bit value for AMD APIC versions | |
561 | * >= 0x10, but even old K8s came out of reset with version 0x10. So, we | |
562 | * can safely set X86_FEATURE_EXTD_APICID unconditionally for families | |
563 | * after 16h. | |
564 | */ | |
565 | if (cpu_has_apic && c->x86 > 0x16) { | |
566 | set_cpu_cap(c, X86_FEATURE_EXTD_APICID); | |
567 | } else if (cpu_has_apic && c->x86 >= 0xf) { | |
568 | /* check CPU config space for extended APIC ID */ | |
42937e81 AH |
569 | unsigned int val; |
570 | val = read_pci_config(0, 24, 0, 0x68); | |
571 | if ((val & ((1 << 17) | (1 << 18))) == ((1 << 17) | (1 << 18))) | |
572 | set_cpu_cap(c, X86_FEATURE_EXTD_APICID); | |
573 | } | |
574 | #endif | |
3b564968 | 575 | |
c1118b36 PB |
576 | /* |
577 | * This is only needed to tell the kernel whether to use VMCALL | |
578 | * and VMMCALL. VMMCALL is never executed except under virt, so | |
579 | * we can set it unconditionally. | |
580 | */ | |
581 | set_cpu_cap(c, X86_FEATURE_VMMCALL); | |
582 | ||
3b564968 | 583 | /* F16h erratum 793, CVE-2013-6885 */ |
8f86a737 BP |
584 | if (c->x86 == 0x16 && c->x86_model <= 0xf) |
585 | msr_set_bit(MSR_AMD64_LS_CFG, 15); | |
2b16a235 AK |
586 | } |
587 | ||
e6ee94d5 | 588 | static const int amd_erratum_383[]; |
7d7dc116 | 589 | static const int amd_erratum_400[]; |
8c6b79bb | 590 | static bool cpu_has_amd_erratum(struct cpuinfo_x86 *cpu, const int *erratum); |
e6ee94d5 | 591 | |
26bfa5f8 BP |
592 | static void init_amd_k8(struct cpuinfo_x86 *c) |
593 | { | |
594 | u32 level; | |
595 | u64 value; | |
596 | ||
597 | /* On C+ stepping K8 rep microcode works well for copy/memset */ | |
598 | level = cpuid_eax(1); | |
599 | if ((level >= 0x0f48 && level < 0x0f50) || level >= 0x0f58) | |
600 | set_cpu_cap(c, X86_FEATURE_REP_GOOD); | |
601 | ||
602 | /* | |
603 | * Some BIOSes incorrectly force this feature, but only K8 revision D | |
604 | * (model = 0x14) and later actually support it. | |
605 | * (AMD Erratum #110, docId: 25759). | |
606 | */ | |
607 | if (c->x86_model < 0x14 && cpu_has(c, X86_FEATURE_LAHF_LM)) { | |
608 | clear_cpu_cap(c, X86_FEATURE_LAHF_LM); | |
609 | if (!rdmsrl_amd_safe(0xc001100d, &value)) { | |
610 | value &= ~BIT_64(32); | |
611 | wrmsrl_amd_safe(0xc001100d, value); | |
612 | } | |
613 | } | |
614 | ||
615 | if (!c->x86_model_id[0]) | |
616 | strcpy(c->x86_model_id, "Hammer"); | |
6f9b63a0 BP |
617 | |
618 | #ifdef CONFIG_SMP | |
619 | /* | |
620 | * Disable TLB flush filter by setting HWCR.FFDIS on K8 | |
621 | * bit 6 of msr C001_0015 | |
622 | * | |
623 | * Errata 63 for SH-B3 steppings | |
624 | * Errata 122 for all steppings (F+ have it disabled by default) | |
625 | */ | |
626 | msr_set_bit(MSR_K7_HWCR, 6); | |
627 | #endif | |
26bfa5f8 BP |
628 | } |
629 | ||
630 | static void init_amd_gh(struct cpuinfo_x86 *c) | |
631 | { | |
632 | #ifdef CONFIG_X86_64 | |
633 | /* do this for boot cpu */ | |
634 | if (c == &boot_cpu_data) | |
635 | check_enable_amd_mmconf_dmi(); | |
636 | ||
637 | fam10h_check_enable_mmcfg(); | |
638 | #endif | |
639 | ||
640 | /* | |
641 | * Disable GART TLB Walk Errors on Fam10h. We do this here because this | |
642 | * is always needed when GART is enabled, even in a kernel which has no | |
643 | * MCE support built in. BIOS should disable GartTlbWlk Errors already. | |
644 | * If it doesn't, we do it here as suggested by the BKDG. | |
645 | * | |
646 | * Fixes: https://bugzilla.kernel.org/show_bug.cgi?id=33012 | |
647 | */ | |
648 | msr_set_bit(MSR_AMD64_MCx_MASK(4), 10); | |
649 | ||
650 | /* | |
651 | * On family 10h BIOS may not have properly enabled WC+ support, causing | |
652 | * it to be converted to CD memtype. This may result in performance | |
653 | * degradation for certain nested-paging guests. Prevent this conversion | |
654 | * by clearing bit 24 in MSR_AMD64_BU_CFG2. | |
655 | * | |
656 | * NOTE: we want to use the _safe accessors so as not to #GP kvm | |
657 | * guests on older kvm hosts. | |
658 | */ | |
659 | msr_clear_bit(MSR_AMD64_BU_CFG2, 24); | |
660 | ||
661 | if (cpu_has_amd_erratum(c, amd_erratum_383)) | |
662 | set_cpu_bug(c, X86_BUG_AMD_TLB_MMATCH); | |
663 | } | |
664 | ||
665 | static void init_amd_bd(struct cpuinfo_x86 *c) | |
666 | { | |
667 | u64 value; | |
668 | ||
669 | /* re-enable TopologyExtensions if switched off by BIOS */ | |
670 | if ((c->x86_model >= 0x10) && (c->x86_model <= 0x1f) && | |
671 | !cpu_has(c, X86_FEATURE_TOPOEXT)) { | |
672 | ||
673 | if (msr_set_bit(0xc0011005, 54) > 0) { | |
674 | rdmsrl(0xc0011005, value); | |
675 | if (value & BIT_64(54)) { | |
676 | set_cpu_cap(c, X86_FEATURE_TOPOEXT); | |
677 | pr_info(FW_INFO "CPU: Re-enabling disabled Topology Extensions Support.\n"); | |
678 | } | |
679 | } | |
680 | } | |
681 | ||
682 | /* | |
683 | * The way access filter has a performance penalty on some workloads. | |
684 | * Disable it on the affected CPUs. | |
685 | */ | |
686 | if ((c->x86_model >= 0x02) && (c->x86_model < 0x20)) { | |
ae8b7875 | 687 | if (!rdmsrl_safe(MSR_F15H_IC_CFG, &value) && !(value & 0x1E)) { |
26bfa5f8 | 688 | value |= 0x1E; |
ae8b7875 | 689 | wrmsrl_safe(MSR_F15H_IC_CFG, value); |
26bfa5f8 BP |
690 | } |
691 | } | |
692 | } | |
693 | ||
148f9bb8 | 694 | static void init_amd(struct cpuinfo_x86 *c) |
1da177e4 | 695 | { |
8e8da023 | 696 | u32 dummy; |
7d318d77 | 697 | |
2b16a235 AK |
698 | early_init_amd(c); |
699 | ||
fb87a298 PC |
700 | /* |
701 | * Bit 31 in normal CPUID used for nonstandard 3DNow ID; | |
16282a8e | 702 | * 3DNow is IDd by bit 31 in extended CPUID (1*32+31) anyway |
fb87a298 | 703 | */ |
16282a8e | 704 | clear_cpu_cap(c, 0*32+31); |
fb87a298 | 705 | |
12d8a961 | 706 | if (c->x86 >= 0x10) |
6c62aa4a | 707 | set_cpu_cap(c, X86_FEATURE_REP_GOOD); |
0d96b9ff YL |
708 | |
709 | /* get apicid instead of initial apic id from cpuid */ | |
710 | c->apicid = hard_smp_processor_id(); | |
11fdd252 YL |
711 | |
712 | /* K6s reports MCEs but don't actually have all the MSRs */ | |
713 | if (c->x86 < 6) | |
714 | clear_cpu_cap(c, X86_FEATURE_MCE); | |
26bfa5f8 BP |
715 | |
716 | switch (c->x86) { | |
717 | case 4: init_amd_k5(c); break; | |
718 | case 5: init_amd_k6(c); break; | |
719 | case 6: init_amd_k7(c); break; | |
720 | case 0xf: init_amd_k8(c); break; | |
721 | case 0x10: init_amd_gh(c); break; | |
722 | case 0x15: init_amd_bd(c); break; | |
723 | } | |
11fdd252 | 724 | |
6c62aa4a | 725 | /* Enable workaround for FXSAVE leak */ |
18bd057b | 726 | if (c->x86 >= 6) |
9b13a93d | 727 | set_cpu_bug(c, X86_BUG_FXSAVE_LEAK); |
1da177e4 | 728 | |
27c13ece | 729 | cpu_detect_cache_sizes(c); |
3dd9d514 | 730 | |
11fdd252 | 731 | /* Multi core CPU? */ |
6c62aa4a | 732 | if (c->extended_cpuid_level >= 0x80000008) { |
11fdd252 | 733 | amd_detect_cmp(c); |
6c62aa4a YL |
734 | srat_detect_node(c); |
735 | } | |
faee9a5d | 736 | |
6c62aa4a | 737 | #ifdef CONFIG_X86_32 |
11fdd252 | 738 | detect_ht(c); |
6c62aa4a | 739 | #endif |
39b3a791 | 740 | |
04a15418 | 741 | init_amd_cacheinfo(c); |
3556ddfa | 742 | |
12d8a961 | 743 | if (c->x86 >= 0xf) |
11fdd252 | 744 | set_cpu_cap(c, X86_FEATURE_K8); |
de421863 | 745 | |
11fdd252 YL |
746 | if (cpu_has_xmm2) { |
747 | /* MFENCE stops RDTSC speculation */ | |
16282a8e | 748 | set_cpu_cap(c, X86_FEATURE_MFENCE_RDTSC); |
11fdd252 | 749 | } |
6c62aa4a | 750 | |
e9cdd343 BO |
751 | /* |
752 | * Family 0x12 and above processors have APIC timer | |
753 | * running in deep C states. | |
754 | */ | |
755 | if (c->x86 > 0x11) | |
b87cf80a | 756 | set_cpu_cap(c, X86_FEATURE_ARAT); |
5bbc097d | 757 | |
8c6b79bb | 758 | if (cpu_has_amd_erratum(c, amd_erratum_400)) |
7d7dc116 BP |
759 | set_cpu_bug(c, X86_BUG_AMD_APIC_C1E); |
760 | ||
8e8da023 | 761 | rdmsr_safe(MSR_AMD64_PATCH_LEVEL, &c->microcode, &dummy); |
a930dc45 BP |
762 | |
763 | /* 3DNow or LM implies PREFETCHW */ | |
764 | if (!cpu_has(c, X86_FEATURE_3DNOWPREFETCH)) | |
765 | if (cpu_has(c, X86_FEATURE_3DNOW) || cpu_has(c, X86_FEATURE_LM)) | |
766 | set_cpu_cap(c, X86_FEATURE_3DNOWPREFETCH); | |
61f01dd9 AL |
767 | |
768 | /* AMD CPUs don't reset SS attributes on SYSRET */ | |
769 | set_cpu_bug(c, X86_BUG_SYSRET_SS_ATTRS); | |
1da177e4 LT |
770 | } |
771 | ||
6c62aa4a | 772 | #ifdef CONFIG_X86_32 |
148f9bb8 | 773 | static unsigned int amd_size_cache(struct cpuinfo_x86 *c, unsigned int size) |
1da177e4 LT |
774 | { |
775 | /* AMD errata T13 (order #21922) */ | |
776 | if ((c->x86 == 6)) { | |
8bdbd962 AC |
777 | /* Duron Rev A0 */ |
778 | if (c->x86_model == 3 && c->x86_mask == 0) | |
1da177e4 | 779 | size = 64; |
8bdbd962 | 780 | /* Tbird rev A1/A2 */ |
1da177e4 | 781 | if (c->x86_model == 4 && |
8bdbd962 | 782 | (c->x86_mask == 0 || c->x86_mask == 1)) |
1da177e4 LT |
783 | size = 256; |
784 | } | |
785 | return size; | |
786 | } | |
6c62aa4a | 787 | #endif |
1da177e4 | 788 | |
148f9bb8 | 789 | static void cpu_detect_tlb_amd(struct cpuinfo_x86 *c) |
b46882e4 BP |
790 | { |
791 | u32 ebx, eax, ecx, edx; | |
792 | u16 mask = 0xfff; | |
793 | ||
794 | if (c->x86 < 0xf) | |
795 | return; | |
796 | ||
797 | if (c->extended_cpuid_level < 0x80000006) | |
798 | return; | |
799 | ||
800 | cpuid(0x80000006, &eax, &ebx, &ecx, &edx); | |
801 | ||
802 | tlb_lld_4k[ENTRIES] = (ebx >> 16) & mask; | |
803 | tlb_lli_4k[ENTRIES] = ebx & mask; | |
804 | ||
805 | /* | |
806 | * K8 doesn't have 2M/4M entries in the L2 TLB so read out the L1 TLB | |
807 | * characteristics from the CPUID function 0x80000005 instead. | |
808 | */ | |
809 | if (c->x86 == 0xf) { | |
810 | cpuid(0x80000005, &eax, &ebx, &ecx, &edx); | |
811 | mask = 0xff; | |
812 | } | |
813 | ||
814 | /* Handle DTLB 2M and 4M sizes, fall back to L1 if L2 is disabled */ | |
d1393367 BP |
815 | if (!((eax >> 16) & mask)) |
816 | tlb_lld_2m[ENTRIES] = (cpuid_eax(0x80000005) >> 16) & 0xff; | |
817 | else | |
b46882e4 | 818 | tlb_lld_2m[ENTRIES] = (eax >> 16) & mask; |
b46882e4 BP |
819 | |
820 | /* a 4M entry uses two 2M entries */ | |
821 | tlb_lld_4m[ENTRIES] = tlb_lld_2m[ENTRIES] >> 1; | |
822 | ||
823 | /* Handle ITLB 2M and 4M sizes, fall back to L1 if L2 is disabled */ | |
824 | if (!(eax & mask)) { | |
825 | /* Erratum 658 */ | |
826 | if (c->x86 == 0x15 && c->x86_model <= 0x1f) { | |
827 | tlb_lli_2m[ENTRIES] = 1024; | |
828 | } else { | |
829 | cpuid(0x80000005, &eax, &ebx, &ecx, &edx); | |
830 | tlb_lli_2m[ENTRIES] = eax & 0xff; | |
831 | } | |
832 | } else | |
833 | tlb_lli_2m[ENTRIES] = eax & mask; | |
834 | ||
835 | tlb_lli_4m[ENTRIES] = tlb_lli_2m[ENTRIES] >> 1; | |
836 | } | |
837 | ||
148f9bb8 | 838 | static const struct cpu_dev amd_cpu_dev = { |
1da177e4 | 839 | .c_vendor = "AMD", |
fb87a298 | 840 | .c_ident = { "AuthenticAMD" }, |
6c62aa4a | 841 | #ifdef CONFIG_X86_32 |
09dc68d9 JB |
842 | .legacy_models = { |
843 | { .family = 4, .model_names = | |
1da177e4 LT |
844 | { |
845 | [3] = "486 DX/2", | |
846 | [7] = "486 DX/2-WB", | |
fb87a298 PC |
847 | [8] = "486 DX/4", |
848 | [9] = "486 DX/4-WB", | |
1da177e4 | 849 | [14] = "Am5x86-WT", |
fb87a298 | 850 | [15] = "Am5x86-WB" |
1da177e4 LT |
851 | } |
852 | }, | |
853 | }, | |
09dc68d9 | 854 | .legacy_cache_size = amd_size_cache, |
6c62aa4a | 855 | #endif |
03ae5768 | 856 | .c_early_init = early_init_amd, |
b46882e4 | 857 | .c_detect_tlb = cpu_detect_tlb_amd, |
8fa8b035 | 858 | .c_bsp_init = bsp_init_amd, |
1da177e4 | 859 | .c_init = init_amd, |
10a434fc | 860 | .c_x86_vendor = X86_VENDOR_AMD, |
1da177e4 LT |
861 | }; |
862 | ||
10a434fc | 863 | cpu_dev_register(amd_cpu_dev); |
d78d671d HR |
864 | |
865 | /* | |
866 | * AMD errata checking | |
867 | * | |
868 | * Errata are defined as arrays of ints using the AMD_LEGACY_ERRATUM() or | |
869 | * AMD_OSVW_ERRATUM() macros. The latter is intended for newer errata that | |
870 | * have an OSVW id assigned, which it takes as first argument. Both take a | |
871 | * variable number of family-specific model-stepping ranges created by | |
7d7dc116 | 872 | * AMD_MODEL_RANGE(). |
d78d671d HR |
873 | * |
874 | * Example: | |
875 | * | |
876 | * const int amd_erratum_319[] = | |
877 | * AMD_LEGACY_ERRATUM(AMD_MODEL_RANGE(0x10, 0x2, 0x1, 0x4, 0x2), | |
878 | * AMD_MODEL_RANGE(0x10, 0x8, 0x0, 0x8, 0x0), | |
879 | * AMD_MODEL_RANGE(0x10, 0x9, 0x0, 0x9, 0x0)); | |
880 | */ | |
881 | ||
7d7dc116 BP |
882 | #define AMD_LEGACY_ERRATUM(...) { -1, __VA_ARGS__, 0 } |
883 | #define AMD_OSVW_ERRATUM(osvw_id, ...) { osvw_id, __VA_ARGS__, 0 } | |
884 | #define AMD_MODEL_RANGE(f, m_start, s_start, m_end, s_end) \ | |
885 | ((f << 24) | (m_start << 16) | (s_start << 12) | (m_end << 4) | (s_end)) | |
886 | #define AMD_MODEL_RANGE_FAMILY(range) (((range) >> 24) & 0xff) | |
887 | #define AMD_MODEL_RANGE_START(range) (((range) >> 12) & 0xfff) | |
888 | #define AMD_MODEL_RANGE_END(range) ((range) & 0xfff) | |
889 | ||
890 | static const int amd_erratum_400[] = | |
328935e6 | 891 | AMD_OSVW_ERRATUM(1, AMD_MODEL_RANGE(0xf, 0x41, 0x2, 0xff, 0xf), |
9d8888c2 HR |
892 | AMD_MODEL_RANGE(0x10, 0x2, 0x1, 0xff, 0xf)); |
893 | ||
e6ee94d5 | 894 | static const int amd_erratum_383[] = |
1be85a6d | 895 | AMD_OSVW_ERRATUM(3, AMD_MODEL_RANGE(0x10, 0, 0, 0xff, 0xf)); |
9d8888c2 | 896 | |
8c6b79bb TK |
897 | |
898 | static bool cpu_has_amd_erratum(struct cpuinfo_x86 *cpu, const int *erratum) | |
d78d671d | 899 | { |
d78d671d HR |
900 | int osvw_id = *erratum++; |
901 | u32 range; | |
902 | u32 ms; | |
903 | ||
d78d671d HR |
904 | if (osvw_id >= 0 && osvw_id < 65536 && |
905 | cpu_has(cpu, X86_FEATURE_OSVW)) { | |
906 | u64 osvw_len; | |
907 | ||
908 | rdmsrl(MSR_AMD64_OSVW_ID_LENGTH, osvw_len); | |
909 | if (osvw_id < osvw_len) { | |
910 | u64 osvw_bits; | |
911 | ||
912 | rdmsrl(MSR_AMD64_OSVW_STATUS + (osvw_id >> 6), | |
913 | osvw_bits); | |
914 | return osvw_bits & (1ULL << (osvw_id & 0x3f)); | |
915 | } | |
916 | } | |
917 | ||
918 | /* OSVW unavailable or ID unknown, match family-model-stepping range */ | |
07a7795c | 919 | ms = (cpu->x86_model << 4) | cpu->x86_mask; |
d78d671d HR |
920 | while ((range = *erratum++)) |
921 | if ((cpu->x86 == AMD_MODEL_RANGE_FAMILY(range)) && | |
922 | (ms >= AMD_MODEL_RANGE_START(range)) && | |
923 | (ms <= AMD_MODEL_RANGE_END(range))) | |
924 | return true; | |
925 | ||
926 | return false; | |
927 | } | |
d6d55f0b JS |
928 | |
929 | void set_dr_addr_mask(unsigned long mask, int dr) | |
930 | { | |
362f924b | 931 | if (!boot_cpu_has(X86_FEATURE_BPEXT)) |
d6d55f0b JS |
932 | return; |
933 | ||
934 | switch (dr) { | |
935 | case 0: | |
936 | wrmsr(MSR_F16H_DR0_ADDR_MASK, mask, 0); | |
937 | break; | |
938 | case 1: | |
939 | case 2: | |
940 | case 3: | |
941 | wrmsr(MSR_F16H_DR1_ADDR_MASK - 1 + dr, mask, 0); | |
942 | break; | |
943 | default: | |
944 | break; | |
945 | } | |
946 | } |