hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[PATCH] x86_64: mce_amd cleanup 

Clean up mce_amd.c for readability and remove code no
longer needed.

Signed-off-by: Jacob Shin <jacob.shin@amd.com>
Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Jacob Shin 2006-06-26 13:58:56 +02:00 committed by Linus Torvalds
parent 9526866439
commit 2903ee85ce
1 changed files with 29 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
arch/x86_64/kernel/mce_amd.c
View File

@ -31,7 +31,7 @@
#include <asm/idle.h> #include <asm/idle.h>
#define PFX "mce_threshold: " #define PFX "mce_threshold: "
#define VERSION "version 1.1.0" #define VERSION "version 1.1.1"
#define NR_BANKS 6 #define NR_BANKS 6
#define NR_BLOCKS 9 #define NR_BLOCKS 9
#define THRESHOLD_MAX 0xFFF #define THRESHOLD_MAX 0xFFF
@ -325,13 +325,13 @@ static ssize_t store_error_count(struct threshold_block *b,
.store = _store, \ .store = _store, \
}; };
#define ATTR_FIELDS(name) \ #define RW_ATTR(name) \
static struct threshold_attr name = \ static struct threshold_attr name = \
THRESHOLD_ATTR(name, 0644, show_## name, store_## name) THRESHOLD_ATTR(name, 0644, show_## name, store_## name)
ATTR_FIELDS(interrupt_enable); RW_ATTR(interrupt_enable);
ATTR_FIELDS(threshold_limit); RW_ATTR(threshold_limit);
ATTR_FIELDS(error_count); RW_ATTR(error_count);
static struct attribute *default_attrs[] = { static struct attribute *default_attrs[] = {
&interrupt_enable.attr, &interrupt_enable.attr,
@ -537,7 +537,7 @@ out_free:
/* create dir/files for all valid threshold banks */ /* create dir/files for all valid threshold banks */
static __cpuinit int threshold_create_device(unsigned int cpu) static __cpuinit int threshold_create_device(unsigned int cpu)
{ {
int bank; unsigned int bank;
int err = 0; int err = 0;
for (bank = 0; bank < NR_BANKS; ++bank) { for (bank = 0; bank < NR_BANKS; ++bank) {
@ -620,7 +620,7 @@ free_out:
static __cpuinit void threshold_remove_device(unsigned int cpu) static __cpuinit void threshold_remove_device(unsigned int cpu)
{ {
int bank; unsigned int bank;
for (bank = 0; bank < NR_BANKS; ++bank) { for (bank = 0; bank < NR_BANKS; ++bank) {
if (!(per_cpu(bank_map, cpu) & 1 << bank)) if (!(per_cpu(bank_map, cpu) & 1 << bank))
@ -629,54 +629,7 @@ static __cpuinit void threshold_remove_device(unsigned int cpu)
} }
} }
/* link all existing siblings when first core comes up */
static __cpuinit int threshold_create_symlinks(unsigned int cpu)
{
int bank, err = 0;
unsigned int lcpu = 0;
if (cpu_data[cpu].cpu_core_id)
return 0;
for_each_cpu_mask(lcpu, cpu_core_map[cpu]) {
if (lcpu == cpu)
continue;
for (bank = 0; bank < NR_BANKS; ++bank) {
if (!(per_cpu(bank_map, cpu) & 1 << bank))
continue;
if (!shared_bank[bank])
continue;
err = threshold_create_bank(lcpu, bank);
}
}
return err;
}
/* remove all symlinks before first core dies. */
static __cpuinit void threshold_remove_symlinks(unsigned int cpu)
{
int bank;
unsigned int lcpu = 0;
if (cpu_data[cpu].cpu_core_id)
return;
for_each_cpu_mask(lcpu, cpu_core_map[cpu]) {
if (lcpu == cpu)
continue;
for (bank = 0; bank < NR_BANKS; ++bank) {
if (!(per_cpu(bank_map, cpu) & 1 << bank))
continue;
if (!shared_bank[bank])
continue;
threshold_remove_bank(lcpu, bank);
}
}
}
#else /* !CONFIG_HOTPLUG_CPU */ #else /* !CONFIG_HOTPLUG_CPU */
static __cpuinit void threshold_create_symlinks(unsigned int cpu)
{
}
static __cpuinit void threshold_remove_symlinks(unsigned int cpu)
{
}
static void threshold_remove_device(unsigned int cpu) static void threshold_remove_device(unsigned int cpu)
{ {
} }
@ -695,13 +648,6 @@ static int threshold_cpu_callback(struct notifier_block *nfb,
switch (action) { switch (action) {
case CPU_ONLINE: case CPU_ONLINE:
threshold_create_device(cpu); threshold_create_device(cpu);
threshold_create_symlinks(cpu);
break;
case CPU_DOWN_PREPARE:
threshold_remove_symlinks(cpu);
break;
case CPU_DOWN_FAILED:
threshold_create_symlinks(cpu);
break; break;
case CPU_DEAD: case CPU_DEAD:
threshold_remove_device(cpu); threshold_remove_device(cpu);
@ -719,7 +665,7 @@ static struct notifier_block threshold_cpu_notifier = {
static __init int threshold_init_device(void) static __init int threshold_init_device(void)
{ {
int lcpu = 0; unsigned lcpu = 0;
/* to hit CPUs online before the notifier is up */ /* to hit CPUs online before the notifier is up */
for_each_online_cpu(lcpu) { for_each_online_cpu(lcpu) {