diff options
author | Ingo Molnar <mingo@kernel.org> | 2012-05-04 03:53:34 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2012-05-04 03:53:34 -0400 |
commit | 239e7bad43dadc43ccf4bbf51f798189fd2cc120 (patch) | |
tree | 0370d3b29e8cfe549fb8ec1a8a571de084ec1984 /arch | |
parent | ac001e76546523ec2ef05b2f7001d8fdc588d069 (diff) | |
parent | 575203b4747c371698dd686b1fa6d0a3a0c47ac6 (diff) |
Merge tag 'amd-thresholding-fixes-for-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras into x86/mce
- make the APIC LVT interrupt optional because a subset
of AMD F15h models don't support it.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/x86/kernel/cpu/mcheck/mce.c | 37 | ||||
-rw-r--r-- | arch/x86/kernel/cpu/mcheck/mce_amd.c | 65 |
2 files changed, 88 insertions, 14 deletions
diff --git a/arch/x86/kernel/cpu/mcheck/mce.c b/arch/x86/kernel/cpu/mcheck/mce.c index d086a09c087..888fbf9d0ad 100644 --- a/arch/x86/kernel/cpu/mcheck/mce.c +++ b/arch/x86/kernel/cpu/mcheck/mce.c | |||
@@ -1423,6 +1423,43 @@ static int __cpuinit __mcheck_cpu_apply_quirks(struct cpuinfo_x86 *c) | |||
1423 | */ | 1423 | */ |
1424 | if (c->x86 == 6 && banks > 0) | 1424 | if (c->x86 == 6 && banks > 0) |
1425 | mce_banks[0].ctl = 0; | 1425 | mce_banks[0].ctl = 0; |
1426 | |||
1427 | /* | ||
1428 | * Turn off MC4_MISC thresholding banks on those models since | ||
1429 | * they're not supported there. | ||
1430 | */ | ||
1431 | if (c->x86 == 0x15 && | ||
1432 | (c->x86_model >= 0x10 && c->x86_model <= 0x1f)) { | ||
1433 | int i; | ||
1434 | u64 val, hwcr; | ||
1435 | bool need_toggle; | ||
1436 | u32 msrs[] = { | ||
1437 | 0x00000413, /* MC4_MISC0 */ | ||
1438 | 0xc0000408, /* MC4_MISC1 */ | ||
1439 | }; | ||
1440 | |||
1441 | rdmsrl(MSR_K7_HWCR, hwcr); | ||
1442 | |||
1443 | /* McStatusWrEn has to be set */ | ||
1444 | need_toggle = !(hwcr & BIT(18)); | ||
1445 | |||
1446 | if (need_toggle) | ||
1447 | wrmsrl(MSR_K7_HWCR, hwcr | BIT(18)); | ||
1448 | |||
1449 | for (i = 0; i < ARRAY_SIZE(msrs); i++) { | ||
1450 | rdmsrl(msrs[i], val); | ||
1451 | |||
1452 | /* CntP bit set? */ | ||
1453 | if (val & BIT(62)) { | ||
1454 | val &= ~BIT(62); | ||
1455 | wrmsrl(msrs[i], val); | ||
1456 | } | ||
1457 | } | ||
1458 | |||
1459 | /* restore old settings */ | ||
1460 | if (need_toggle) | ||
1461 | wrmsrl(MSR_K7_HWCR, hwcr); | ||
1462 | } | ||
1426 | } | 1463 | } |
1427 | 1464 | ||
1428 | if (c->x86_vendor == X86_VENDOR_INTEL) { | 1465 | if (c->x86_vendor == X86_VENDOR_INTEL) { |
diff --git a/arch/x86/kernel/cpu/mcheck/mce_amd.c b/arch/x86/kernel/cpu/mcheck/mce_amd.c index 99b57179f91..f4873a64f46 100644 --- a/arch/x86/kernel/cpu/mcheck/mce_amd.c +++ b/arch/x86/kernel/cpu/mcheck/mce_amd.c | |||
@@ -51,6 +51,7 @@ struct threshold_block { | |||
51 | unsigned int cpu; | 51 | unsigned int cpu; |
52 | u32 address; | 52 | u32 address; |
53 | u16 interrupt_enable; | 53 | u16 interrupt_enable; |
54 | bool interrupt_capable; | ||
54 | u16 threshold_limit; | 55 | u16 threshold_limit; |
55 | struct kobject kobj; | 56 | struct kobject kobj; |
56 | struct list_head miscj; | 57 | struct list_head miscj; |
@@ -83,6 +84,21 @@ struct thresh_restart { | |||
83 | u16 old_limit; | 84 | u16 old_limit; |
84 | }; | 85 | }; |
85 | 86 | ||
87 | static bool lvt_interrupt_supported(unsigned int bank, u32 msr_high_bits) | ||
88 | { | ||
89 | /* | ||
90 | * bank 4 supports APIC LVT interrupts implicitly since forever. | ||
91 | */ | ||
92 | if (bank == 4) | ||
93 | return true; | ||
94 | |||
95 | /* | ||
96 | * IntP: interrupt present; if this bit is set, the thresholding | ||
97 | * bank can generate APIC LVT interrupts | ||
98 | */ | ||
99 | return msr_high_bits & BIT(28); | ||
100 | } | ||
101 | |||
86 | static int lvt_off_valid(struct threshold_block *b, int apic, u32 lo, u32 hi) | 102 | static int lvt_off_valid(struct threshold_block *b, int apic, u32 lo, u32 hi) |
87 | { | 103 | { |
88 | int msr = (hi & MASK_LVTOFF_HI) >> 20; | 104 | int msr = (hi & MASK_LVTOFF_HI) >> 20; |
@@ -104,8 +120,10 @@ static int lvt_off_valid(struct threshold_block *b, int apic, u32 lo, u32 hi) | |||
104 | return 1; | 120 | return 1; |
105 | }; | 121 | }; |
106 | 122 | ||
107 | /* must be called with correct cpu affinity */ | 123 | /* |
108 | /* Called via smp_call_function_single() */ | 124 | * Called via smp_call_function_single(), must be called with correct |
125 | * cpu affinity. | ||
126 | */ | ||
109 | static void threshold_restart_bank(void *_tr) | 127 | static void threshold_restart_bank(void *_tr) |
110 | { | 128 | { |
111 | struct thresh_restart *tr = _tr; | 129 | struct thresh_restart *tr = _tr; |
@@ -128,6 +146,12 @@ static void threshold_restart_bank(void *_tr) | |||
128 | (new_count & THRESHOLD_MAX); | 146 | (new_count & THRESHOLD_MAX); |
129 | } | 147 | } |
130 | 148 | ||
149 | /* clear IntType */ | ||
150 | hi &= ~MASK_INT_TYPE_HI; | ||
151 | |||
152 | if (!tr->b->interrupt_capable) | ||
153 | goto done; | ||
154 | |||
131 | if (tr->set_lvt_off) { | 155 | if (tr->set_lvt_off) { |
132 | if (lvt_off_valid(tr->b, tr->lvt_off, lo, hi)) { | 156 | if (lvt_off_valid(tr->b, tr->lvt_off, lo, hi)) { |
133 | /* set new lvt offset */ | 157 | /* set new lvt offset */ |
@@ -136,9 +160,10 @@ static void threshold_restart_bank(void *_tr) | |||
136 | } | 160 | } |
137 | } | 161 | } |
138 | 162 | ||
139 | tr->b->interrupt_enable ? | 163 | if (tr->b->interrupt_enable) |
140 | (hi = (hi & ~MASK_INT_TYPE_HI) | INT_TYPE_APIC) : | 164 | hi |= INT_TYPE_APIC; |
141 | (hi &= ~MASK_INT_TYPE_HI); | 165 | |
166 | done: | ||
142 | 167 | ||
143 | hi |= MASK_COUNT_EN_HI; | 168 | hi |= MASK_COUNT_EN_HI; |
144 | wrmsr(tr->b->address, lo, hi); | 169 | wrmsr(tr->b->address, lo, hi); |
@@ -202,14 +227,17 @@ void mce_amd_feature_init(struct cpuinfo_x86 *c) | |||
202 | if (shared_bank[bank] && c->cpu_core_id) | 227 | if (shared_bank[bank] && c->cpu_core_id) |
203 | break; | 228 | break; |
204 | 229 | ||
205 | offset = setup_APIC_mce(offset, | ||
206 | (high & MASK_LVTOFF_HI) >> 20); | ||
207 | |||
208 | memset(&b, 0, sizeof(b)); | 230 | memset(&b, 0, sizeof(b)); |
209 | b.cpu = cpu; | 231 | b.cpu = cpu; |
210 | b.bank = bank; | 232 | b.bank = bank; |
211 | b.block = block; | 233 | b.block = block; |
212 | b.address = address; | 234 | b.address = address; |
235 | b.interrupt_capable = lvt_interrupt_supported(bank, high); | ||
236 | |||
237 | if (b.interrupt_capable) { | ||
238 | int new = (high & MASK_LVTOFF_HI) >> 20; | ||
239 | offset = setup_APIC_mce(offset, new); | ||
240 | } | ||
213 | 241 | ||
214 | mce_threshold_block_init(&b, offset); | 242 | mce_threshold_block_init(&b, offset); |
215 | mce_threshold_vector = amd_threshold_interrupt; | 243 | mce_threshold_vector = amd_threshold_interrupt; |
@@ -309,6 +337,9 @@ store_interrupt_enable(struct threshold_block *b, const char *buf, size_t size) | |||
309 | struct thresh_restart tr; | 337 | struct thresh_restart tr; |
310 | unsigned long new; | 338 | unsigned long new; |
311 | 339 | ||
340 | if (!b->interrupt_capable) | ||
341 | return -EINVAL; | ||
342 | |||
312 | if (strict_strtoul(buf, 0, &new) < 0) | 343 | if (strict_strtoul(buf, 0, &new) < 0) |
313 | return -EINVAL; | 344 | return -EINVAL; |
314 | 345 | ||
@@ -390,10 +421,10 @@ RW_ATTR(threshold_limit); | |||
390 | RW_ATTR(error_count); | 421 | RW_ATTR(error_count); |
391 | 422 | ||
392 | static struct attribute *default_attrs[] = { | 423 | static struct attribute *default_attrs[] = { |
393 | &interrupt_enable.attr, | ||
394 | &threshold_limit.attr, | 424 | &threshold_limit.attr, |
395 | &error_count.attr, | 425 | &error_count.attr, |
396 | NULL | 426 | NULL, /* possibly interrupt_enable if supported, see below */ |
427 | NULL, | ||
397 | }; | 428 | }; |
398 | 429 | ||
399 | #define to_block(k) container_of(k, struct threshold_block, kobj) | 430 | #define to_block(k) container_of(k, struct threshold_block, kobj) |
@@ -467,8 +498,14 @@ static __cpuinit int allocate_threshold_blocks(unsigned int cpu, | |||
467 | b->cpu = cpu; | 498 | b->cpu = cpu; |
468 | b->address = address; | 499 | b->address = address; |
469 | b->interrupt_enable = 0; | 500 | b->interrupt_enable = 0; |
501 | b->interrupt_capable = lvt_interrupt_supported(bank, high); | ||
470 | b->threshold_limit = THRESHOLD_MAX; | 502 | b->threshold_limit = THRESHOLD_MAX; |
471 | 503 | ||
504 | if (b->interrupt_capable) | ||
505 | threshold_ktype.default_attrs[2] = &interrupt_enable.attr; | ||
506 | else | ||
507 | threshold_ktype.default_attrs[2] = NULL; | ||
508 | |||
472 | INIT_LIST_HEAD(&b->miscj); | 509 | INIT_LIST_HEAD(&b->miscj); |
473 | 510 | ||
474 | if (per_cpu(threshold_banks, cpu)[bank]->blocks) { | 511 | if (per_cpu(threshold_banks, cpu)[bank]->blocks) { |