lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge tag 'mce-for-tip' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras into x86/mce

Browse Source 
Apply two miscellaneous MCE fixes.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Ingo Molnar
2012-03-14 07:44:48 +01:00
parent cd593accdc fadd85f16a
commit ea281a9eba
3 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/x86/include/asm/mce.h
View File

@@ -151,7 +151,7 @@ static inline void enable_p5_mce(void) {}
void mce_setup(struct mce *m); void mce_setup(struct mce *m);
void mce_log(struct mce *m); void mce_log(struct mce *m);
extern struct device *mce_device[CONFIG_NR_CPUS]; DECLARE_PER_CPU(struct device *, mce_device);
/* /*
* Maximum banks number. * Maximum banks number.

14
arch/x86/kernel/cpu/mcheck/mce.c
View File

@@ -1614,6 +1614,12 @@ static int __mce_read_apei(char __user **ubuf, size_t usize)
/* Error or no more MCE record */ /* Error or no more MCE record */
if (rc <= 0) { if (rc <= 0) {
mce_apei_read_done = 1; mce_apei_read_done = 1;
/*
* When ERST is disabled, mce_chrdev_read() should return
* "no record" instead of "no device."
*/
if (rc == -ENODEV)
return 0;
return rc; return rc;
} }
rc = -EFAULT; rc = -EFAULT;
@@ -1932,7 +1938,7 @@ static struct bus_type mce_subsys = {
.dev_name = "machinecheck", .dev_name = "machinecheck",
}; };
struct device *mce_device[CONFIG_NR_CPUS]; DEFINE_PER_CPU(struct device *, mce_device);
__cpuinitdata __cpuinitdata
void (*threshold_cpu_callback)(unsigned long action, unsigned int cpu); void (*threshold_cpu_callback)(unsigned long action, unsigned int cpu);
@@ -2111,7 +2117,7 @@ static __cpuinit int mce_device_create(unsigned int cpu)
goto error2; goto error2;
} }
cpumask_set_cpu(cpu, mce_device_initialized); cpumask_set_cpu(cpu, mce_device_initialized);
mce_device[cpu] = dev; per_cpu(mce_device, cpu) = dev;
return 0; return 0;
error2: error2:
@@ -2128,7 +2134,7 @@ error:
static __cpuinit void mce_device_remove(unsigned int cpu) static __cpuinit void mce_device_remove(unsigned int cpu)
{ {
struct device *dev = mce_device[cpu]; struct device *dev = per_cpu(mce_device, cpu);
int i; int i;
if (!cpumask_test_cpu(cpu, mce_device_initialized)) if (!cpumask_test_cpu(cpu, mce_device_initialized))
@@ -2142,7 +2148,7 @@ static __cpuinit void mce_device_remove(unsigned int cpu)
device_unregister(dev); device_unregister(dev);
cpumask_clear_cpu(cpu, mce_device_initialized); cpumask_clear_cpu(cpu, mce_device_initialized);
mce_device[cpu] = NULL; per_cpu(mce_device, cpu) = NULL;
} }
/* Make sure there are no machine checks on offlined CPUs. */ /* Make sure there are no machine checks on offlined CPUs. */

9
arch/x86/kernel/cpu/mcheck/mce_amd.c
View File

@@ -523,7 +523,7 @@ static __cpuinit int threshold_create_bank(unsigned int cpu, unsigned int bank)
{ {
int i, err = 0; int i, err = 0;
struct threshold_bank *b = NULL; struct threshold_bank *b = NULL;
struct device *dev = mce_device[cpu]; struct device *dev = per_cpu(mce_device, cpu);
char name[32]; char name[32];
sprintf(name, "threshold_bank%i", bank); sprintf(name, "threshold_bank%i", bank);
@@ -587,7 +587,7 @@ static __cpuinit int threshold_create_bank(unsigned int cpu, unsigned int bank)
if (i == cpu) if (i == cpu)
continue; continue;
dev = mce_device[i]; dev = per_cpu(mce_device, i);
if (dev) if (dev)
err = sysfs_create_link(&dev->kobj,b->kobj, name); err = sysfs_create_link(&dev->kobj,b->kobj, name);
if (err) if (err)
@@ -667,7 +667,8 @@ static void threshold_remove_bank(unsigned int cpu, int bank)
#ifdef CONFIG_SMP #ifdef CONFIG_SMP
/* sibling symlink */ /* sibling symlink */
if (shared_bank[bank] && b->blocks->cpu != cpu) { if (shared_bank[bank] && b->blocks->cpu != cpu) {
sysfs_remove_link(&mce_device[cpu]->kobj, name); dev = per_cpu(mce_device, cpu);
sysfs_remove_link(&dev->kobj, name);
per_cpu(threshold_banks, cpu)[bank] = NULL; per_cpu(threshold_banks, cpu)[bank] = NULL;
return; return;
@@ -679,7 +680,7 @@ static void threshold_remove_bank(unsigned int cpu, int bank)
if (i == cpu) if (i == cpu)
continue; continue;
dev = mce_device[i]; dev = per_cpu(mce_device, i);
if (dev) if (dev)
sysfs_remove_link(&dev->kobj, name); sysfs_remove_link(&dev->kobj, name);
per_cpu(threshold_banks, i)[bank] = NULL; per_cpu(threshold_banks, i)[bank] = NULL;