Skip to content

K
kernel_linux

OpenHarmony / kernel_linux
上一次同步 3 年多

通知 13
Star 8
Fork 2
K
kernel_linux
提交 079708b9 编写于 作者: D Douglas Thompson 提交者： Linus Torvalds
浏览文件
操作

drivers/edac: core Lindent cleanup 

Run the EDAC CORE files through Lindent for cleanup
Signed-off-by: NDouglas Thompson <dougthompson@xmission.com>
Signed-off-by: NDave Jiang <djiang@mvista.com>
Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
上级 4de78c68
展开全部 隐藏空白更改
内联 并排
Showing with 722 addition and 821 deletion
drivers/edac/edac_core.h
浏览文件 @ 079708b9
...@@ -84,7 +84,7 @@ extern int edac_debug_level; ...@@ -84,7 +84,7 @@ extern int edac_debug_level;
#define debugf3( ... ) edac_debug_printk(3, __VA_ARGS__ ) #define debugf3( ... ) edac_debug_printk(3, __VA_ARGS__ )
#define debugf4( ... ) edac_debug_printk(4, __VA_ARGS__ ) #define debugf4( ... ) edac_debug_printk(4, __VA_ARGS__ )
#else /* !CONFIG_EDAC_DEBUG */ #else /* !CONFIG_EDAC_DEBUG */
#define debugf0( ... ) #define debugf0( ... )
#define debugf1( ... ) #define debugf1( ... )
...@@ -92,7 +92,7 @@ extern int edac_debug_level; ...@@ -92,7 +92,7 @@ extern int edac_debug_level;
#define debugf3( ... ) #define debugf3( ... )
#define debugf4( ... ) #define debugf4( ... )
#endif /* !CONFIG_EDAC_DEBUG */ #endif /* !CONFIG_EDAC_DEBUG */
#define BIT(x) (1 << (x)) #define BIT(x) (1 << (x))
...@@ -135,9 +135,9 @@ enum mem_type { ...@@ -135,9 +135,9 @@ enum mem_type {
MEM_DDR, /* Double data rate SDRAM */ MEM_DDR, /* Double data rate SDRAM */
MEM_RDDR, /* Registered Double data rate SDRAM */ MEM_RDDR, /* Registered Double data rate SDRAM */
MEM_RMBS, /* Rambus DRAM */ MEM_RMBS, /* Rambus DRAM */
MEM_DDR2, /* DDR2 RAM */ MEM_DDR2, /* DDR2 RAM */
MEM_FB_DDR2, /* fully buffered DDR2 */ MEM_FB_DDR2, /* fully buffered DDR2 */
MEM_RDDR2, /* Registered DDR2 RAM */ MEM_RDDR2, /* Registered DDR2 RAM */
}; };
#define MEM_FLAG_EMPTY BIT(MEM_EMPTY) #define MEM_FLAG_EMPTY BIT(MEM_EMPTY)
...@@ -211,7 +211,7 @@ enum scrub_type { ...@@ -211,7 +211,7 @@ enum scrub_type {
#define OP_RUNNING_POLL_INTR 0x203 #define OP_RUNNING_POLL_INTR 0x203
#define OP_OFFLINE 0x300 #define OP_OFFLINE 0x300
extern char * edac_align_ptr(void *ptr, unsigned size); extern char *edac_align_ptr(void *ptr, unsigned size);
/* /*
* There are several things to be aware of that aren't at all obvious: * There are several things to be aware of that aren't at all obvious:
...@@ -298,7 +298,7 @@ extern char * edac_align_ptr(void *ptr, unsigned size); ...@@ -298,7 +298,7 @@ extern char * edac_align_ptr(void *ptr, unsigned size);
struct channel_info { struct channel_info {
int chan_idx; /* channel index */ int chan_idx; /* channel index */
u32 ce_count; /* Correctable Errors for this CHANNEL */ u32 ce_count; /* Correctable Errors for this CHANNEL */
char label[EDAC_MC_LABEL_LEN + 1]; /* DIMM label on motherboard */ char label[EDAC_MC_LABEL_LEN + 1]; /* DIMM label on motherboard */
struct csrow_info *csrow; /* the parent */ struct csrow_info *csrow; /* the parent */
}; };
...@@ -327,7 +327,7 @@ struct csrow_info { ...@@ -327,7 +327,7 @@ struct csrow_info {
}; };
struct mem_ctl_info { struct mem_ctl_info {
struct list_head link; /* for global list of mem_ctl_info structs */ struct list_head link; /* for global list of mem_ctl_info structs */
unsigned long mtype_cap; /* memory types supported by mc */ unsigned long mtype_cap; /* memory types supported by mc */
unsigned long edac_ctl_cap; /* Mem controller EDAC capabilities */ unsigned long edac_ctl_cap; /* Mem controller EDAC capabilities */
unsigned long edac_cap; /* configuration capabilities - this is unsigned long edac_cap; /* configuration capabilities - this is
...@@ -344,14 +344,14 @@ struct mem_ctl_info { ...@@ -344,14 +344,14 @@ struct mem_ctl_info {
/* Translates sdram memory scrub rate given in bytes/sec to the /* Translates sdram memory scrub rate given in bytes/sec to the
internal representation and configures whatever else needs internal representation and configures whatever else needs
to be configured. to be configured.
*/ */
int (*set_sdram_scrub_rate) (struct mem_ctl_info *mci, u32 *bw); int (*set_sdram_scrub_rate) (struct mem_ctl_info * mci, u32 * bw);
/* Get the current sdram memory scrub rate from the internal /* Get the current sdram memory scrub rate from the internal
representation and converts it to the closest matching representation and converts it to the closest matching
bandwith in bytes/sec. bandwith in bytes/sec.
*/ */
int (*get_sdram_scrub_rate) (struct mem_ctl_info *mci, u32 *bw); int (*get_sdram_scrub_rate) (struct mem_ctl_info * mci, u32 * bw);
/* pointer to edac checking routine */ /* pointer to edac checking routine */
void (*edac_check) (struct mem_ctl_info * mci); void (*edac_check) (struct mem_ctl_info * mci);
...@@ -362,7 +362,7 @@ struct mem_ctl_info { ...@@ -362,7 +362,7 @@ struct mem_ctl_info {
*/ */
/* FIXME - why not send the phys page to begin with? */ /* FIXME - why not send the phys page to begin with? */
unsigned long (*ctl_page_to_phys) (struct mem_ctl_info * mci, unsigned long (*ctl_page_to_phys) (struct mem_ctl_info * mci,
unsigned long page); unsigned long page);
int mc_idx; int mc_idx;
int nr_csrows; int nr_csrows;
struct csrow_info *csrows; struct csrow_info *csrows;
...@@ -444,8 +444,8 @@ struct mem_ctl_info { ...@@ -444,8 +444,8 @@ struct mem_ctl_info {
*/ */
struct edac_device_counter { struct edac_device_counter {
u32 ue_count; u32 ue_count;
u32 ce_count; u32 ce_count;
}; };
#define INC_COUNTER(cnt) (cnt++) #define INC_COUNTER(cnt) (cnt++)
...@@ -455,14 +455,13 @@ struct edac_device_counter { ...@@ -455,14 +455,13 @@ struct edac_device_counter {
* to specify attributes of the edac_block * to specify attributes of the edac_block
*/ */
struct edac_attrib_spec { struct edac_attrib_spec {
char name[EDAC_DEVICE_NAME_LEN + 1]; char name[EDAC_DEVICE_NAME_LEN + 1];
int type; int type;
#define EDAC_ATTR_INT 0x01 #define EDAC_ATTR_INT 0x01
#define EDAC_ATTR_CHAR 0x02 #define EDAC_ATTR_CHAR 0x02
}; };
/* Attribute control structure /* Attribute control structure
* In this structure is a pointer to the driver's edac_attrib_spec * In this structure is a pointer to the driver's edac_attrib_spec
* The life of this pointer is inclusive in the life of the driver's * The life of this pointer is inclusive in the life of the driver's
...@@ -471,9 +470,9 @@ struct edac_attrib_spec { ...@@ -471,9 +470,9 @@ struct edac_attrib_spec {
struct edac_attrib { struct edac_attrib {
struct edac_device_block *block; /* Up Pointer */ struct edac_device_block *block; /* Up Pointer */
struct edac_attrib_spec *spec; /* ptr to module spec entry */ struct edac_attrib_spec *spec; /* ptr to module spec entry */
union { /* actual value */ union { /* actual value */
int edac_attrib_int_value; int edac_attrib_int_value;
char edac_attrib_char_value[EDAC_ATTRIB_VALUE_LEN + 1]; char edac_attrib_char_value[EDAC_ATTRIB_VALUE_LEN + 1];
} edac_attrib_value; } edac_attrib_value;
...@@ -482,12 +481,12 @@ struct edac_attrib { ...@@ -482,12 +481,12 @@ struct edac_attrib {
/* device block control structure */ /* device block control structure */
struct edac_device_block { struct edac_device_block {
struct edac_device_instance *instance; /* Up Pointer */ struct edac_device_instance *instance; /* Up Pointer */
char name[EDAC_DEVICE_NAME_LEN + 1]; char name[EDAC_DEVICE_NAME_LEN + 1];
struct edac_device_counter counters; /* basic UE and CE counters */ struct edac_device_counter counters; /* basic UE and CE counters */
int nr_attribs; /* how many attributes */ int nr_attribs; /* how many attributes */
struct edac_attrib *attribs; /* this block's attributes */ struct edac_attrib *attribs; /* this block's attributes */
/* edac sysfs device control */ /* edac sysfs device control */
struct kobject kobj; struct kobject kobj;
...@@ -501,7 +500,7 @@ struct edac_device_instance { ...@@ -501,7 +500,7 @@ struct edac_device_instance {
struct edac_device_counter counters; /* instance counters */ struct edac_device_counter counters; /* instance counters */
u32 nr_blocks; /* how many blocks */ u32 nr_blocks; /* how many blocks */
struct edac_device_block *blocks; /* block array */ struct edac_device_block *blocks; /* block array */
/* edac sysfs device control */ /* edac sysfs device control */
...@@ -509,7 +508,6 @@ struct edac_device_instance { ...@@ -509,7 +508,6 @@ struct edac_device_instance {
struct completion kobj_complete; struct completion kobj_complete;
}; };
/* /*
* Abstract edac_device control info structure * Abstract edac_device control info structure
* *
...@@ -539,9 +537,9 @@ struct edac_device_ctl_info { ...@@ -539,9 +537,9 @@ struct edac_device_ctl_info {
#endif #endif
/* pointer to edac polling checking routine: /* pointer to edac polling checking routine:
* If NOT NULL: points to polling check routine * If NOT NULL: points to polling check routine
* If NULL: Then assumes INTERRUPT operation, where * If NULL: Then assumes INTERRUPT operation, where
* MC driver will receive events * MC driver will receive events
*/ */
void (*edac_check) (struct edac_device_ctl_info * edac_dev); void (*edac_check) (struct edac_device_ctl_info * edac_dev);
...@@ -553,7 +551,7 @@ struct edac_device_ctl_info { ...@@ -553,7 +551,7 @@ struct edac_device_ctl_info {
void *pvt_info; /* pointer to 'private driver' info */ void *pvt_info; /* pointer to 'private driver' info */
unsigned long start_time;/* edac_device load start time (jiffies)*/ unsigned long start_time; /* edac_device load start time (jiffies) */
/* these are for safe removal of mc devices from global list while /* these are for safe removal of mc devices from global list while
* NMI handlers may be traversing list * NMI handlers may be traversing list
...@@ -563,10 +561,10 @@ struct edac_device_ctl_info { ...@@ -563,10 +561,10 @@ struct edac_device_ctl_info {
/* sysfs top name under 'edac' directory /* sysfs top name under 'edac' directory
* and instance name: * and instance name:
* cpu/cpu0/... * cpu/cpu0/...
* cpu/cpu1/... * cpu/cpu1/...
* cpu/cpu2/... * cpu/cpu2/...
* ... * ...
*/ */
char name[EDAC_DEVICE_NAME_LEN + 1]; char name[EDAC_DEVICE_NAME_LEN + 1];
...@@ -594,8 +592,7 @@ struct edac_device_ctl_info { ...@@ -594,8 +592,7 @@ struct edac_device_ctl_info {
container_of(w,struct edac_device_ctl_info,work) container_of(w,struct edac_device_ctl_info,work)
/* Function to calc the number of delay jiffies from poll_msec */ /* Function to calc the number of delay jiffies from poll_msec */
static inline void edac_device_calc_delay( static inline void edac_device_calc_delay(struct edac_device_ctl_info *edac_dev)
struct edac_device_ctl_info *edac_dev)
{ {
/* convert from msec to jiffies */ /* convert from msec to jiffies */
edac_dev->delay = edac_dev->poll_msec * HZ / 1000; edac_dev->delay = edac_dev->poll_msec * HZ / 1000;
...@@ -609,15 +606,14 @@ static inline void edac_device_calc_delay( ...@@ -609,15 +606,14 @@ static inline void edac_device_calc_delay(
* it is going to control/register with the EDAC CORE. * it is going to control/register with the EDAC CORE.
*/ */
extern struct edac_device_ctl_info *edac_device_alloc_ctl_info( extern struct edac_device_ctl_info *edac_device_alloc_ctl_info(
unsigned sizeof_private, unsigned sizeof_private,
char *edac_device_name, char *edac_device_name,
unsigned nr_instances, unsigned nr_instances,
char *edac_block_name, char *edac_block_name,
unsigned nr_blocks, unsigned nr_blocks,
unsigned offset_value, unsigned offset_value,
struct edac_attrib_spec *attrib_spec, struct edac_attrib_spec *attrib_spec,
unsigned nr_attribs unsigned nr_attribs);
);
/* The offset value can be: /* The offset value can be:
* -1 indicating no offset value * -1 indicating no offset value
...@@ -627,13 +623,13 @@ extern struct edac_device_ctl_info *edac_device_alloc_ctl_info( ...@@ -627,13 +623,13 @@ extern struct edac_device_ctl_info *edac_device_alloc_ctl_info(
*/ */
#define BLOCK_OFFSET_VALUE_OFF ((unsigned) -1) #define BLOCK_OFFSET_VALUE_OFF ((unsigned) -1)
extern void edac_device_free_ctl_info( struct edac_device_ctl_info *ctl_info); extern void edac_device_free_ctl_info(struct edac_device_ctl_info *ctl_info);
#ifdef CONFIG_PCI #ifdef CONFIG_PCI
struct edac_pci_counter { struct edac_pci_counter {
atomic_t pe_count; atomic_t pe_count;
atomic_t npe_count; atomic_t npe_count;
}; };
/* /*
...@@ -658,9 +654,9 @@ struct edac_pci_ctl_info { ...@@ -658,9 +654,9 @@ struct edac_pci_ctl_info {
#endif #endif
/* pointer to edac polling checking routine: /* pointer to edac polling checking routine:
* If NOT NULL: points to polling check routine * If NOT NULL: points to polling check routine
* If NULL: Then assumes INTERRUPT operation, where * If NULL: Then assumes INTERRUPT operation, where
* MC driver will receive events * MC driver will receive events
*/ */
void (*edac_check) (struct edac_pci_ctl_info * edac_dev); void (*edac_check) (struct edac_pci_ctl_info * edac_dev);
...@@ -672,7 +668,7 @@ struct edac_pci_ctl_info { ...@@ -672,7 +668,7 @@ struct edac_pci_ctl_info {
void *pvt_info; /* pointer to 'private driver' info */ void *pvt_info; /* pointer to 'private driver' info */
unsigned long start_time;/* edac_pci load start time (jiffies)*/ unsigned long start_time; /* edac_pci load start time (jiffies) */
/* these are for safe removal of devices from global list while /* these are for safe removal of devices from global list while
* NMI handlers may be traversing list * NMI handlers may be traversing list
...@@ -682,10 +678,10 @@ struct edac_pci_ctl_info { ...@@ -682,10 +678,10 @@ struct edac_pci_ctl_info {
/* sysfs top name under 'edac' directory /* sysfs top name under 'edac' directory
* and instance name: * and instance name:
* cpu/cpu0/... * cpu/cpu0/...
* cpu/cpu1/... * cpu/cpu1/...
* cpu/cpu2/... * cpu/cpu2/...
* ... * ...
*/ */
char name[EDAC_DEVICE_NAME_LEN + 1]; char name[EDAC_DEVICE_NAME_LEN + 1];
...@@ -704,7 +700,7 @@ struct edac_pci_ctl_info { ...@@ -704,7 +700,7 @@ struct edac_pci_ctl_info {
/* write all or some bits in a byte-register*/ /* write all or some bits in a byte-register*/
static inline void pci_write_bits8(struct pci_dev *pdev, int offset, u8 value, static inline void pci_write_bits8(struct pci_dev *pdev, int offset, u8 value,
u8 mask) u8 mask)
{ {
if (mask != 0xff) { if (mask != 0xff) {
u8 buf; u8 buf;
...@@ -720,7 +716,7 @@ static inline void pci_write_bits8(struct pci_dev *pdev, int offset, u8 value, ...@@ -720,7 +716,7 @@ static inline void pci_write_bits8(struct pci_dev *pdev, int offset, u8 value,
/* write all or some bits in a word-register*/ /* write all or some bits in a word-register*/
static inline void pci_write_bits16(struct pci_dev *pdev, int offset, static inline void pci_write_bits16(struct pci_dev *pdev, int offset,
u16 value, u16 mask) u16 value, u16 mask)
{ {
if (mask != 0xffff) { if (mask != 0xffff) {
u16 buf; u16 buf;
...@@ -736,7 +732,7 @@ static inline void pci_write_bits16(struct pci_dev *pdev, int offset, ...@@ -736,7 +732,7 @@ static inline void pci_write_bits16(struct pci_dev *pdev, int offset,
/* write all or some bits in a dword-register*/ /* write all or some bits in a dword-register*/
static inline void pci_write_bits32(struct pci_dev *pdev, int offset, static inline void pci_write_bits32(struct pci_dev *pdev, int offset,
u32 value, u32 mask) u32 value, u32 mask)
{ {
if (mask != 0xffff) { if (mask != 0xffff) {
u32 buf; u32 buf;
...@@ -750,13 +746,13 @@ static inline void pci_write_bits32(struct pci_dev *pdev, int offset, ...@@ -750,13 +746,13 @@ static inline void pci_write_bits32(struct pci_dev *pdev, int offset,
pci_write_config_dword(pdev, offset, value); pci_write_config_dword(pdev, offset, value);
} }
#endif /* CONFIG_PCI */ #endif /* CONFIG_PCI */
extern struct mem_ctl_info * edac_mc_find(int idx); extern struct mem_ctl_info *edac_mc_find(int idx);
extern int edac_mc_add_mc(struct mem_ctl_info *mci,int mc_idx); extern int edac_mc_add_mc(struct mem_ctl_info *mci, int mc_idx);
extern struct mem_ctl_info * edac_mc_del_mc(struct device *dev); extern struct mem_ctl_info *edac_mc_del_mc(struct device *dev);
extern int edac_mc_find_csrow_by_page(struct mem_ctl_info *mci, extern int edac_mc_find_csrow_by_page(struct mem_ctl_info *mci,
unsigned long page); unsigned long page);
/* /*
* The no info errors are used when error overflows are reported. * The no info errors are used when error overflows are reported.
...@@ -769,44 +765,43 @@ extern int edac_mc_find_csrow_by_page(struct mem_ctl_info *mci, ...@@ -769,44 +765,43 @@ extern int edac_mc_find_csrow_by_page(struct mem_ctl_info *mci,
* statement clutter and extra function arguments. * statement clutter and extra function arguments.
*/ */
extern void edac_mc_handle_ce(struct mem_ctl_info *mci, extern void edac_mc_handle_ce(struct mem_ctl_info *mci,
unsigned long page_frame_number, unsigned long offset_in_page, unsigned long page_frame_number,
unsigned long syndrome, int row, int channel, unsigned long offset_in_page,
const char *msg); unsigned long syndrome, int row, int channel,
const char *msg);
extern void edac_mc_handle_ce_no_info(struct mem_ctl_info *mci, extern void edac_mc_handle_ce_no_info(struct mem_ctl_info *mci,
const char *msg); const char *msg);
extern void edac_mc_handle_ue(struct mem_ctl_info *mci, extern void edac_mc_handle_ue(struct mem_ctl_info *mci,
unsigned long page_frame_number, unsigned long offset_in_page, unsigned long page_frame_number,
int row, const char *msg); unsigned long offset_in_page, int row,
const char *msg);
extern void edac_mc_handle_ue_no_info(struct mem_ctl_info *mci, extern void edac_mc_handle_ue_no_info(struct mem_ctl_info *mci,
const char *msg); const char *msg);
extern void edac_mc_handle_fbd_ue(struct mem_ctl_info *mci, extern void edac_mc_handle_fbd_ue(struct mem_ctl_info *mci, unsigned int csrow,
unsigned int csrow, unsigned int channel0, unsigned int channel1,
unsigned int channel0, char *msg);
unsigned int channel1, extern void edac_mc_handle_fbd_ce(struct mem_ctl_info *mci, unsigned int csrow,
char *msg); unsigned int channel, char *msg);
extern void edac_mc_handle_fbd_ce(struct mem_ctl_info *mci,
unsigned int csrow,
unsigned int channel,
char *msg);
/* /*
* edac_device APIs * edac_device APIs
*/ */
extern struct mem_ctl_info *edac_mc_alloc(unsigned sz_pvt, unsigned nr_csrows, extern struct mem_ctl_info *edac_mc_alloc(unsigned sz_pvt, unsigned nr_csrows,
unsigned nr_chans); unsigned nr_chans);
extern void edac_mc_free(struct mem_ctl_info *mci); extern void edac_mc_free(struct mem_ctl_info *mci);
extern int edac_device_add_device(struct edac_device_ctl_info *edac_dev, int edac_idx); extern int edac_device_add_device(struct edac_device_ctl_info *edac_dev,
extern struct edac_device_ctl_info * edac_device_del_device(struct device *dev); int edac_idx);
extern struct edac_device_ctl_info *edac_device_del_device(struct device *dev);
extern void edac_device_handle_ue(struct edac_device_ctl_info *edac_dev, extern void edac_device_handle_ue(struct edac_device_ctl_info *edac_dev,
int inst_nr, int block_nr, const char *msg); int inst_nr, int block_nr, const char *msg);
extern void edac_device_handle_ce(struct edac_device_ctl_info *edac_dev, extern void edac_device_handle_ce(struct edac_device_ctl_info *edac_dev,
int inst_nr, int block_nr, const char *msg); int inst_nr, int block_nr, const char *msg);
/* /*
* edac_pci APIs * edac_pci APIs
*/ */
extern struct edac_pci_ctl_info * extern struct edac_pci_ctl_info *edac_pci_alloc_ctl_info(unsigned int sz_pvt, const char
edac_pci_alloc_ctl_info(unsigned int sz_pvt, const char *edac_pci_name); *edac_pci_name);
extern void edac_pci_free_ctl_info(struct edac_pci_ctl_info *pci); extern void edac_pci_free_ctl_info(struct edac_pci_ctl_info *pci);
...@@ -814,10 +809,10 @@ extern void ...@@ -814,10 +809,10 @@ extern void
edac_pci_reset_delay_period(struct edac_pci_ctl_info *pci, unsigned long value); edac_pci_reset_delay_period(struct edac_pci_ctl_info *pci, unsigned long value);
extern int edac_pci_add_device(struct edac_pci_ctl_info *pci, int edac_idx); extern int edac_pci_add_device(struct edac_pci_ctl_info *pci, int edac_idx);
extern struct edac_pci_ctl_info * edac_pci_del_device(struct device *dev); extern struct edac_pci_ctl_info *edac_pci_del_device(struct device *dev);
extern struct edac_pci_ctl_info * extern struct edac_pci_ctl_info *edac_pci_create_generic_ctl(struct device *dev, const char
edac_pci_create_generic_ctl(struct device *dev, const char *mod_name); *mod_name);
extern void edac_pci_release_generic_ctl(struct edac_pci_ctl_info *pci); extern void edac_pci_release_generic_ctl(struct edac_pci_ctl_info *pci);
extern int edac_pci_create_sysfs(struct edac_pci_ctl_info *pci); extern int edac_pci_create_sysfs(struct edac_pci_ctl_info *pci);
...@@ -826,6 +821,6 @@ extern void edac_pci_remove_sysfs(struct edac_pci_ctl_info *pci); ...@@ -826,6 +821,6 @@ extern void edac_pci_remove_sysfs(struct edac_pci_ctl_info *pci);
/* /*
* edac misc APIs * edac misc APIs
*/ */
extern char * edac_op_state_toString(int op_state); extern char *edac_op_state_toString(int op_state);
#endif /* _EDAC_CORE_H_ */ #endif /* _EDAC_CORE_H_ */
drivers/edac/edac_device.c
浏览文件 @ 079708b9
...@@ -35,7 +35,6 @@ ...@@ -35,7 +35,6 @@
static DECLARE_MUTEX(device_ctls_mutex); static DECLARE_MUTEX(device_ctls_mutex);
static struct list_head edac_device_list = LIST_HEAD_INIT(edac_device_list); static struct list_head edac_device_list = LIST_HEAD_INIT(edac_device_list);
static inline void lock_device_list(void) static inline void lock_device_list(void)
{ {
down(&device_ctls_mutex); down(&device_ctls_mutex);
...@@ -46,18 +45,17 @@ static inline void unlock_device_list(void) ...@@ -46,18 +45,17 @@ static inline void unlock_device_list(void)
up(&device_ctls_mutex); up(&device_ctls_mutex);
} }
#ifdef CONFIG_EDAC_DEBUG #ifdef CONFIG_EDAC_DEBUG
static void edac_device_dump_device(struct edac_device_ctl_info *edac_dev) static void edac_device_dump_device(struct edac_device_ctl_info *edac_dev)
{ {
debugf3("\tedac_dev = %p dev_idx=%d \n", edac_dev,edac_dev->dev_idx); debugf3("\tedac_dev = %p dev_idx=%d \n", edac_dev, edac_dev->dev_idx);
debugf4("\tedac_dev->edac_check = %p\n", edac_dev->edac_check); debugf4("\tedac_dev->edac_check = %p\n", edac_dev->edac_check);
debugf3("\tdev = %p\n", edac_dev->dev); debugf3("\tdev = %p\n", edac_dev->dev);
debugf3("\tmod_name:ctl_name = %s:%s\n", debugf3("\tmod_name:ctl_name = %s:%s\n",
edac_dev->mod_name, edac_dev->ctl_name); edac_dev->mod_name, edac_dev->ctl_name);
debugf3("\tpvt_info = %p\n\n", edac_dev->pvt_info); debugf3("\tpvt_info = %p\n\n", edac_dev->pvt_info);
} }
#endif /* CONFIG_EDAC_DEBUG */ #endif /* CONFIG_EDAC_DEBUG */
/* /*
* The alloc() and free() functions for the 'edac_device' control info * The alloc() and free() functions for the 'edac_device' control info
...@@ -71,7 +69,8 @@ struct edac_device_ctl_info *edac_device_alloc_ctl_info( ...@@ -71,7 +69,8 @@ struct edac_device_ctl_info *edac_device_alloc_ctl_info(
char *edac_block_name, char *edac_block_name,
unsigned nr_blocks, unsigned nr_blocks,
unsigned offset_value, unsigned offset_value,
struct edac_attrib_spec *attrib_spec, struct edac_attrib_spec
*attrib_spec,
unsigned nr_attribs) unsigned nr_attribs)
{ {
struct edac_device_ctl_info *dev_ctl; struct edac_device_ctl_info *dev_ctl;
...@@ -84,35 +83,35 @@ struct edac_device_ctl_info *edac_device_alloc_ctl_info( ...@@ -84,35 +83,35 @@ struct edac_device_ctl_info *edac_device_alloc_ctl_info(
void *pvt; void *pvt;
debugf1("%s() instances=%d blocks=%d\n", debugf1("%s() instances=%d blocks=%d\n",
__func__,nr_instances,nr_blocks); __func__, nr_instances, nr_blocks);
/* Figure out the offsets of the various items from the start of an /* Figure out the offsets of the various items from the start of an
* ctl_info structure. We want the alignment of each item * ctl_info structure. We want the alignment of each item
* to be at least as stringent as what the compiler would * to be at least as stringent as what the compiler would
* provide if we could simply hardcode everything into a single struct. * provide if we could simply hardcode everything into a single struct.
*/ */
dev_ctl = (struct edac_device_ctl_info *) 0; dev_ctl = (struct edac_device_ctl_info *)0;
/* Calc the 'end' offset past the ctl_info structure */ /* Calc the 'end' offset past the ctl_info structure */
dev_inst = (struct edac_device_instance *) dev_inst = (struct edac_device_instance *)
edac_align_ptr(&dev_ctl[1],sizeof(*dev_inst)); edac_align_ptr(&dev_ctl[1], sizeof(*dev_inst));
/* Calc the 'end' offset past the instance array */ /* Calc the 'end' offset past the instance array */
dev_blk = (struct edac_device_block *) dev_blk = (struct edac_device_block *)
edac_align_ptr(&dev_inst[nr_instances],sizeof(*dev_blk)); edac_align_ptr(&dev_inst[nr_instances], sizeof(*dev_blk));
/* Calc the 'end' offset past the dev_blk array */ /* Calc the 'end' offset past the dev_blk array */
count = nr_instances * nr_blocks; count = nr_instances * nr_blocks;
dev_attrib = (struct edac_attrib *) dev_attrib = (struct edac_attrib *)
edac_align_ptr(&dev_blk[count],sizeof(*dev_attrib)); edac_align_ptr(&dev_blk[count], sizeof(*dev_attrib));
/* Check for case of NO attributes specified */ /* Check for case of NO attributes specified */
if (nr_attribs > 0) if (nr_attribs > 0)
count *= nr_attribs; count *= nr_attribs;
/* Calc the 'end' offset past the attributes array */ /* Calc the 'end' offset past the attributes array */
pvt = edac_align_ptr(&dev_attrib[count],sz_private); pvt = edac_align_ptr(&dev_attrib[count], sz_private);
total_size = ((unsigned long) pvt) + sz_private; total_size = ((unsigned long)pvt) + sz_private;
/* Allocate the amount of memory for the set of control structures */ /* Allocate the amount of memory for the set of control structures */
if ((dev_ctl = kmalloc(total_size, GFP_KERNEL)) == NULL) if ((dev_ctl = kmalloc(total_size, GFP_KERNEL)) == NULL)
...@@ -122,22 +121,21 @@ struct edac_device_ctl_info *edac_device_alloc_ctl_info( ...@@ -122,22 +121,21 @@ struct edac_device_ctl_info *edac_device_alloc_ctl_info(
* rather than an imaginary chunk of memory located at address 0. * rather than an imaginary chunk of memory located at address 0.
*/ */
dev_inst = (struct edac_device_instance *) dev_inst = (struct edac_device_instance *)
(((char *) dev_ctl) + ((unsigned long) dev_inst)); (((char *)dev_ctl) + ((unsigned long)dev_inst));
dev_blk = (struct edac_device_block *) dev_blk = (struct edac_device_block *)
(((char *) dev_ctl) + ((unsigned long) dev_blk)); (((char *)dev_ctl) + ((unsigned long)dev_blk));
dev_attrib = (struct edac_attrib *) dev_attrib = (struct edac_attrib *)
(((char *) dev_ctl) + ((unsigned long) dev_attrib)); (((char *)dev_ctl) + ((unsigned long)dev_attrib));
pvt = sz_private ? pvt = sz_private ? (((char *)dev_ctl) + ((unsigned long)pvt)) : NULL;
(((char *) dev_ctl) + ((unsigned long) pvt)) : NULL;
memset(dev_ctl, 0, total_size); /* clear all fields */ memset(dev_ctl, 0, total_size); /* clear all fields */
dev_ctl->nr_instances = nr_instances; dev_ctl->nr_instances = nr_instances;
dev_ctl->instances = dev_inst; dev_ctl->instances = dev_inst;
dev_ctl->pvt_info = pvt; dev_ctl->pvt_info = pvt;
/* Name of this edac device, ensure null terminated */ /* Name of this edac device, ensure null terminated */
snprintf(dev_ctl->name,sizeof(dev_ctl->name),"%s", edac_device_name); snprintf(dev_ctl->name, sizeof(dev_ctl->name), "%s", edac_device_name);
dev_ctl->name[sizeof(dev_ctl->name)-1] = '\0'; dev_ctl->name[sizeof(dev_ctl->name) - 1] = '\0';
/* Initialize every Instance */ /* Initialize every Instance */
for (instance = 0; instance < nr_instances; instance++) { for (instance = 0; instance < nr_instances; instance++) {
...@@ -149,24 +147,22 @@ struct edac_device_ctl_info *edac_device_alloc_ctl_info( ...@@ -149,24 +147,22 @@ struct edac_device_ctl_info *edac_device_alloc_ctl_info(
/* name of this instance */ /* name of this instance */
snprintf(inst->name, sizeof(inst->name), snprintf(inst->name, sizeof(inst->name),
"%s%u", edac_device_name, instance); "%s%u", edac_device_name, instance);
inst->name[sizeof(inst->name)-1] = '\0'; inst->name[sizeof(inst->name) - 1] = '\0';
/* Initialize every block in each instance */ /* Initialize every block in each instance */
for ( block = 0; for (block = 0; block < nr_blocks; block++) {
block < nr_blocks;
block++) {
blk = &blk_p[block]; blk = &blk_p[block];
blk->instance = inst; blk->instance = inst;
blk->nr_attribs = nr_attribs; blk->nr_attribs = nr_attribs;
attrib_p = &dev_attrib[block * nr_attribs]; attrib_p = &dev_attrib[block * nr_attribs];
blk->attribs = attrib_p; blk->attribs = attrib_p;
snprintf(blk->name, sizeof(blk->name), snprintf(blk->name, sizeof(blk->name),
"%s%d", edac_block_name,block+1); "%s%d", edac_block_name, block + 1);
blk->name[sizeof(blk->name)-1] = '\0'; blk->name[sizeof(blk->name) - 1] = '\0';
debugf1("%s() instance=%d block=%d name=%s\n", debugf1("%s() instance=%d block=%d name=%s\n",
__func__, instance,block,blk->name); __func__, instance, block, blk->name);
if (attrib_spec != NULL) { if (attrib_spec != NULL) {
/* when there is an attrib_spec passed int then /* when there is an attrib_spec passed int then
...@@ -178,7 +174,7 @@ struct edac_device_ctl_info *edac_device_alloc_ctl_info( ...@@ -178,7 +174,7 @@ struct edac_device_ctl_info *edac_device_alloc_ctl_info(
/* Link each attribute to the caller's /* Link each attribute to the caller's
* spec entry, for name and type * spec entry, for name and type
*/ */
attrib->spec = &attrib_spec[attr]; attrib->spec = &attrib_spec[attr];
} }
} }
...@@ -190,6 +186,7 @@ struct edac_device_ctl_info *edac_device_alloc_ctl_info( ...@@ -190,6 +186,7 @@ struct edac_device_ctl_info *edac_device_alloc_ctl_info(
return dev_ctl; return dev_ctl;
} }
EXPORT_SYMBOL_GPL(edac_device_alloc_ctl_info); EXPORT_SYMBOL_GPL(edac_device_alloc_ctl_info);
/* /*
...@@ -197,19 +194,18 @@ EXPORT_SYMBOL_GPL(edac_device_alloc_ctl_info); ...@@ -197,19 +194,18 @@ EXPORT_SYMBOL_GPL(edac_device_alloc_ctl_info);
* frees the memory allocated by the edac_device_alloc_ctl_info() * frees the memory allocated by the edac_device_alloc_ctl_info()
* function * function
*/ */
void edac_device_free_ctl_info( struct edac_device_ctl_info *ctl_info) { void edac_device_free_ctl_info(struct edac_device_ctl_info *ctl_info)
{
kfree(ctl_info); kfree(ctl_info);
} }
EXPORT_SYMBOL_GPL(edac_device_free_ctl_info);
EXPORT_SYMBOL_GPL(edac_device_free_ctl_info);
/* /*
* find_edac_device_by_dev * find_edac_device_by_dev
* scans the edac_device list for a specific 'struct device *' * scans the edac_device list for a specific 'struct device *'
*/ */
static struct edac_device_ctl_info * static struct edac_device_ctl_info *find_edac_device_by_dev(struct device *dev)
find_edac_device_by_dev(struct device *dev)
{ {
struct edac_device_ctl_info *edac_dev; struct edac_device_ctl_info *edac_dev;
struct list_head *item; struct list_head *item;
...@@ -234,7 +230,7 @@ find_edac_device_by_dev(struct device *dev) ...@@ -234,7 +230,7 @@ find_edac_device_by_dev(struct device *dev)
* 0 on success * 0 on success
* 1 on failure. * 1 on failure.
*/ */
static int add_edac_dev_to_global_list (struct edac_device_ctl_info *edac_dev) static int add_edac_dev_to_global_list(struct edac_device_ctl_info *edac_dev)
{ {
struct list_head *item, *insert_before; struct list_head *item, *insert_before;
struct edac_device_ctl_info *rover; struct edac_device_ctl_info *rover;
...@@ -261,17 +257,18 @@ static int add_edac_dev_to_global_list (struct edac_device_ctl_info *edac_dev) ...@@ -261,17 +257,18 @@ static int add_edac_dev_to_global_list (struct edac_device_ctl_info *edac_dev)
list_add_tail_rcu(&edac_dev->link, insert_before); list_add_tail_rcu(&edac_dev->link, insert_before);
return 0; return 0;
fail0: fail0:
edac_printk(KERN_WARNING, EDAC_MC, edac_printk(KERN_WARNING, EDAC_MC,
"%s (%s) %s %s already assigned %d\n", "%s (%s) %s %s already assigned %d\n",
rover->dev->bus_id, dev_name(rover), rover->dev->bus_id, dev_name(rover),
rover->mod_name, rover->ctl_name, rover->dev_idx); rover->mod_name, rover->ctl_name, rover->dev_idx);
return 1; return 1;
fail1: fail1:
edac_printk(KERN_WARNING, EDAC_MC, edac_printk(KERN_WARNING, EDAC_MC,
"bug in low-level driver: attempt to assign\n" "bug in low-level driver: attempt to assign\n"
" duplicate dev_idx %d in %s()\n", rover->dev_idx, __func__); " duplicate dev_idx %d in %s()\n", rover->dev_idx,
__func__);
return 1; return 1;
} }
...@@ -290,8 +287,8 @@ static void complete_edac_device_list_del(struct rcu_head *head) ...@@ -290,8 +287,8 @@ static void complete_edac_device_list_del(struct rcu_head *head)
/* /*
* del_edac_device_from_global_list * del_edac_device_from_global_list
*/ */
static void del_edac_device_from_global_list( static void del_edac_device_from_global_list(struct edac_device_ctl_info
struct edac_device_ctl_info *edac_device) *edac_device)
{ {
list_del_rcu(&edac_device->link); list_del_rcu(&edac_device->link);
init_completion(&edac_device->complete); init_completion(&edac_device->complete);
...@@ -308,7 +305,7 @@ static void del_edac_device_from_global_list( ...@@ -308,7 +305,7 @@ static void del_edac_device_from_global_list(
* *
* Caller must hold device_ctls_mutex. * Caller must hold device_ctls_mutex.
*/ */
struct edac_device_ctl_info * edac_device_find(int idx) struct edac_device_ctl_info *edac_device_find(int idx)
{ {
struct list_head *item; struct list_head *item;
struct edac_device_ctl_info *edac_dev; struct edac_device_ctl_info *edac_dev;
...@@ -328,8 +325,8 @@ struct edac_device_ctl_info * edac_device_find(int idx) ...@@ -328,8 +325,8 @@ struct edac_device_ctl_info * edac_device_find(int idx)
return NULL; return NULL;
} }
EXPORT_SYMBOL(edac_device_find);
EXPORT_SYMBOL(edac_device_find);
/* /*
* edac_device_workq_function * edac_device_workq_function
...@@ -338,14 +335,13 @@ EXPORT_SYMBOL(edac_device_find); ...@@ -338,14 +335,13 @@ EXPORT_SYMBOL(edac_device_find);
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,20)) #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,20))
static void edac_device_workq_function(struct work_struct *work_req) static void edac_device_workq_function(struct work_struct *work_req)
{ {
struct delayed_work *d_work = (struct delayed_work*) work_req; struct delayed_work *d_work = (struct delayed_work *)work_req;
struct edac_device_ctl_info *edac_dev = struct edac_device_ctl_info *edac_dev = to_edac_device_ctl_work(d_work);
to_edac_device_ctl_work(d_work);
#else #else
static void edac_device_workq_function(void *ptr) static void edac_device_workq_function(void *ptr)
{ {
struct edac_device_ctl_info *edac_dev = struct edac_device_ctl_info *edac_dev =
(struct edac_device_ctl_info *) ptr; (struct edac_device_ctl_info *)ptr;
#endif #endif
//debugf0("%s() here and running\n", __func__); //debugf0("%s() here and running\n", __func__);
...@@ -353,14 +349,14 @@ static void edac_device_workq_function(void *ptr) ...@@ -353,14 +349,14 @@ static void edac_device_workq_function(void *ptr)
/* Only poll controllers that are running polled and have a check */ /* Only poll controllers that are running polled and have a check */
if ((edac_dev->op_state == OP_RUNNING_POLL) && if ((edac_dev->op_state == OP_RUNNING_POLL) &&
(edac_dev->edac_check != NULL)) { (edac_dev->edac_check != NULL)) {
edac_dev->edac_check(edac_dev); edac_dev->edac_check(edac_dev);
} }
unlock_device_list(); unlock_device_list();
/* Reschedule */ /* Reschedule */
queue_delayed_work(edac_workqueue,&edac_dev->work, edac_dev->delay); queue_delayed_work(edac_workqueue, &edac_dev->work, edac_dev->delay);
} }
/* /*
...@@ -369,7 +365,7 @@ static void edac_device_workq_function(void *ptr) ...@@ -369,7 +365,7 @@ static void edac_device_workq_function(void *ptr)
* passing in the new delay period in msec * passing in the new delay period in msec
*/ */
void edac_device_workq_setup(struct edac_device_ctl_info *edac_dev, void edac_device_workq_setup(struct edac_device_ctl_info *edac_dev,
unsigned msec) unsigned msec)
{ {
debugf0("%s()\n", __func__); debugf0("%s()\n", __func__);
...@@ -403,9 +399,8 @@ void edac_device_workq_teardown(struct edac_device_ctl_info *edac_dev) ...@@ -403,9 +399,8 @@ void edac_device_workq_teardown(struct edac_device_ctl_info *edac_dev)
* edac_device_reset_delay_period * edac_device_reset_delay_period
*/ */
void edac_device_reset_delay_period( void edac_device_reset_delay_period(struct edac_device_ctl_info *edac_dev,
struct edac_device_ctl_info *edac_dev, unsigned long value)
unsigned long value)
{ {
lock_device_list(); lock_device_list();
...@@ -450,7 +445,7 @@ int edac_device_add_device(struct edac_device_ctl_info *edac_dev, int edac_idx) ...@@ -450,7 +445,7 @@ int edac_device_add_device(struct edac_device_ctl_info *edac_dev, int edac_idx)
/* create this instance's sysfs entries */ /* create this instance's sysfs entries */
if (edac_device_create_sysfs(edac_dev)) { if (edac_device_create_sysfs(edac_dev)) {
edac_device_printk(edac_dev, KERN_WARNING, edac_device_printk(edac_dev, KERN_WARNING,
"failed to create sysfs device\n"); "failed to create sysfs device\n");
goto fail1; goto fail1;
} }
...@@ -468,27 +463,27 @@ int edac_device_add_device(struct edac_device_ctl_info *edac_dev, int edac_idx) ...@@ -468,27 +463,27 @@ int edac_device_add_device(struct edac_device_ctl_info *edac_dev, int edac_idx)
edac_dev->op_state = OP_RUNNING_INTERRUPT; edac_dev->op_state = OP_RUNNING_INTERRUPT;
} }
/* Report action taken */ /* Report action taken */
edac_device_printk(edac_dev, KERN_INFO, edac_device_printk(edac_dev, KERN_INFO,
"Giving out device to module '%s' controller '%s': DEV '%s' (%s)\n", "Giving out device to module '%s' controller '%s': DEV '%s' (%s)\n",
edac_dev->mod_name, edac_dev->mod_name,
edac_dev->ctl_name, edac_dev->ctl_name,
dev_name(edac_dev), dev_name(edac_dev),
edac_op_state_toString(edac_dev->op_state) edac_op_state_toString(edac_dev->op_state)
); );
unlock_device_list(); unlock_device_list();
return 0; return 0;
fail1: fail1:
/* Some error, so remove the entry from the lsit */ /* Some error, so remove the entry from the lsit */
del_edac_device_from_global_list(edac_dev); del_edac_device_from_global_list(edac_dev);
fail0: fail0:
unlock_device_list(); unlock_device_list();
return 1; return 1;
} }
EXPORT_SYMBOL_GPL(edac_device_add_device); EXPORT_SYMBOL_GPL(edac_device_add_device);
/** /**
...@@ -504,7 +499,7 @@ EXPORT_SYMBOL_GPL(edac_device_add_device); ...@@ -504,7 +499,7 @@ EXPORT_SYMBOL_GPL(edac_device_add_device);
* Pointer to removed edac_device structure, * Pointer to removed edac_device structure,
* OR NULL if device not found. * OR NULL if device not found.
*/ */
struct edac_device_ctl_info * edac_device_del_device(struct device *dev) struct edac_device_ctl_info *edac_device_del_device(struct device *dev)
{ {
struct edac_device_ctl_info *edac_dev; struct edac_device_ctl_info *edac_dev;
...@@ -532,16 +527,14 @@ struct edac_device_ctl_info * edac_device_del_device(struct device *dev) ...@@ -532,16 +527,14 @@ struct edac_device_ctl_info * edac_device_del_device(struct device *dev)
unlock_device_list(); unlock_device_list();
edac_printk(KERN_INFO, EDAC_MC, edac_printk(KERN_INFO, EDAC_MC,
"Removed device %d for %s %s: DEV %s\n", "Removed device %d for %s %s: DEV %s\n",
edac_dev->dev_idx, edac_dev->dev_idx,
edac_dev->mod_name, edac_dev->mod_name, edac_dev->ctl_name, dev_name(edac_dev));
edac_dev->ctl_name,
dev_name(edac_dev));
return edac_dev; return edac_dev;
} }
EXPORT_SYMBOL_GPL(edac_device_del_device);
EXPORT_SYMBOL_GPL(edac_device_del_device);
static inline int edac_device_get_log_ce(struct edac_device_ctl_info *edac_dev) static inline int edac_device_get_log_ce(struct edac_device_ctl_info *edac_dev)
{ {
...@@ -553,8 +546,8 @@ static inline int edac_device_get_log_ue(struct edac_device_ctl_info *edac_dev) ...@@ -553,8 +546,8 @@ static inline int edac_device_get_log_ue(struct edac_device_ctl_info *edac_dev)
return edac_dev->log_ue; return edac_dev->log_ue;
} }
static inline int edac_device_get_panic_on_ue( static inline int edac_device_get_panic_on_ue(struct edac_device_ctl_info
struct edac_device_ctl_info *edac_dev) *edac_dev)
{ {
return edac_dev->panic_on_ue; return edac_dev->panic_on_ue;
} }
...@@ -564,15 +557,16 @@ static inline int edac_device_get_panic_on_ue( ...@@ -564,15 +557,16 @@ static inline int edac_device_get_panic_on_ue(
* perform a common output and handling of an 'edac_dev' CE event * perform a common output and handling of an 'edac_dev' CE event
*/ */
void edac_device_handle_ce(struct edac_device_ctl_info *edac_dev, void edac_device_handle_ce(struct edac_device_ctl_info *edac_dev,
int inst_nr, int block_nr, const char *msg) int inst_nr, int block_nr, const char *msg)
{ {
struct edac_device_instance *instance; struct edac_device_instance *instance;
struct edac_device_block *block = NULL; struct edac_device_block *block = NULL;
if ((inst_nr >= edac_dev->nr_instances) || (inst_nr < 0)) { if ((inst_nr >= edac_dev->nr_instances) || (inst_nr < 0)) {
edac_device_printk(edac_dev, KERN_ERR, edac_device_printk(edac_dev, KERN_ERR,
"INTERNAL ERROR: 'instance' out of range " "INTERNAL ERROR: 'instance' out of range "
"(%d >= %d)\n", inst_nr, edac_dev->nr_instances); "(%d >= %d)\n", inst_nr,
edac_dev->nr_instances);
return; return;
} }
...@@ -580,8 +574,9 @@ void edac_device_handle_ce(struct edac_device_ctl_info *edac_dev, ...@@ -580,8 +574,9 @@ void edac_device_handle_ce(struct edac_device_ctl_info *edac_dev,
if ((block_nr >= instance->nr_blocks) || (block_nr < 0)) { if ((block_nr >= instance->nr_blocks) || (block_nr < 0)) {
edac_device_printk(edac_dev, KERN_ERR, edac_device_printk(edac_dev, KERN_ERR,
"INTERNAL ERROR: instance %d 'block' out of range " "INTERNAL ERROR: instance %d 'block' out of range "
"(%d >= %d)\n", inst_nr, block_nr, instance->nr_blocks); "(%d >= %d)\n", inst_nr, block_nr,
instance->nr_blocks);
return; return;
} }
...@@ -596,10 +591,11 @@ void edac_device_handle_ce(struct edac_device_ctl_info *edac_dev, ...@@ -596,10 +591,11 @@ void edac_device_handle_ce(struct edac_device_ctl_info *edac_dev,
if (edac_device_get_log_ce(edac_dev)) if (edac_device_get_log_ce(edac_dev))
edac_device_printk(edac_dev, KERN_WARNING, edac_device_printk(edac_dev, KERN_WARNING,
"CE ctl: %s, instance: %s, block: %s: %s\n", "CE ctl: %s, instance: %s, block: %s: %s\n",
edac_dev->ctl_name, instance->name, edac_dev->ctl_name, instance->name,
block ? block->name : "N/A", msg); block ? block->name : "N/A", msg);
} }
EXPORT_SYMBOL_GPL(edac_device_handle_ce); EXPORT_SYMBOL_GPL(edac_device_handle_ce);
/* /*
...@@ -607,15 +603,16 @@ EXPORT_SYMBOL_GPL(edac_device_handle_ce); ...@@ -607,15 +603,16 @@ EXPORT_SYMBOL_GPL(edac_device_handle_ce);
* perform a common output and handling of an 'edac_dev' UE event * perform a common output and handling of an 'edac_dev' UE event
*/ */
void edac_device_handle_ue(struct edac_device_ctl_info *edac_dev, void edac_device_handle_ue(struct edac_device_ctl_info *edac_dev,
int inst_nr, int block_nr, const char *msg) int inst_nr, int block_nr, const char *msg)
{ {
struct edac_device_instance *instance; struct edac_device_instance *instance;
struct edac_device_block *block = NULL; struct edac_device_block *block = NULL;
if ((inst_nr >= edac_dev->nr_instances) || (inst_nr < 0)) { if ((inst_nr >= edac_dev->nr_instances) || (inst_nr < 0)) {
edac_device_printk(edac_dev, KERN_ERR, edac_device_printk(edac_dev, KERN_ERR,
"INTERNAL ERROR: 'instance' out of range " "INTERNAL ERROR: 'instance' out of range "
"(%d >= %d)\n", inst_nr, edac_dev->nr_instances); "(%d >= %d)\n", inst_nr,
edac_dev->nr_instances);
return; return;
} }
...@@ -623,8 +620,9 @@ void edac_device_handle_ue(struct edac_device_ctl_info *edac_dev, ...@@ -623,8 +620,9 @@ void edac_device_handle_ue(struct edac_device_ctl_info *edac_dev,
if ((block_nr >= instance->nr_blocks) || (block_nr < 0)) { if ((block_nr >= instance->nr_blocks) || (block_nr < 0)) {
edac_device_printk(edac_dev, KERN_ERR, edac_device_printk(edac_dev, KERN_ERR,
"INTERNAL ERROR: instance %d 'block' out of range " "INTERNAL ERROR: instance %d 'block' out of range "
"(%d >= %d)\n", inst_nr, block_nr, instance->nr_blocks); "(%d >= %d)\n", inst_nr, block_nr,
instance->nr_blocks);
return; return;
} }
...@@ -639,14 +637,14 @@ void edac_device_handle_ue(struct edac_device_ctl_info *edac_dev, ...@@ -639,14 +637,14 @@ void edac_device_handle_ue(struct edac_device_ctl_info *edac_dev,
if (edac_device_get_log_ue(edac_dev)) if (edac_device_get_log_ue(edac_dev))
edac_device_printk(edac_dev, KERN_EMERG, edac_device_printk(edac_dev, KERN_EMERG,
"UE ctl: %s, instance: %s, block: %s: %s\n", "UE ctl: %s, instance: %s, block: %s: %s\n",
edac_dev->ctl_name, instance->name, edac_dev->ctl_name, instance->name,
block ? block->name : "N/A", msg); block ? block->name : "N/A", msg);
if (edac_device_get_panic_on_ue(edac_dev)) if (edac_device_get_panic_on_ue(edac_dev))
panic("EDAC %s: UE instance: %s, block %s: %s\n", panic("EDAC %s: UE instance: %s, block %s: %s\n",
edac_dev->ctl_name, instance->name, edac_dev->ctl_name, instance->name,
block ? block->name : "N/A", msg); block ? block->name : "N/A", msg);
} }
EXPORT_SYMBOL_GPL(edac_device_handle_ue);
EXPORT_SYMBOL_GPL(edac_device_handle_ue);
drivers/edac/edac_device_sysfs.c
浏览文件 @ 079708b9
此差异已折叠。
drivers/edac/edac_mc.c
浏览文件 @ 079708b9
...@@ -34,7 +34,6 @@ ...@@ -34,7 +34,6 @@
#include "edac_core.h" #include "edac_core.h"
#include "edac_module.h" #include "edac_module.h"
/* lock to memory controller's control array */ /* lock to memory controller's control array */
static DEFINE_MUTEX(mem_ctls_mutex); static DEFINE_MUTEX(mem_ctls_mutex);
static struct list_head mc_devices = LIST_HEAD_INIT(mc_devices); static struct list_head mc_devices = LIST_HEAD_INIT(mc_devices);
...@@ -54,13 +53,11 @@ static void edac_mc_dump_csrow(struct csrow_info *csrow) ...@@ -54,13 +53,11 @@ static void edac_mc_dump_csrow(struct csrow_info *csrow)
{ {
debugf4("\tcsrow = %p\n", csrow); debugf4("\tcsrow = %p\n", csrow);
debugf4("\tcsrow->csrow_idx = %d\n", csrow->csrow_idx); debugf4("\tcsrow->csrow_idx = %d\n", csrow->csrow_idx);
debugf4("\tcsrow->first_page = 0x%lx\n", debugf4("\tcsrow->first_page = 0x%lx\n", csrow->first_page);
csrow->first_page);
debugf4("\tcsrow->last_page = 0x%lx\n", csrow->last_page); debugf4("\tcsrow->last_page = 0x%lx\n", csrow->last_page);
debugf4("\tcsrow->page_mask = 0x%lx\n", csrow->page_mask); debugf4("\tcsrow->page_mask = 0x%lx\n", csrow->page_mask);
debugf4("\tcsrow->nr_pages = 0x%x\n", csrow->nr_pages); debugf4("\tcsrow->nr_pages = 0x%x\n", csrow->nr_pages);
debugf4("\tcsrow->nr_channels = %d\n", debugf4("\tcsrow->nr_channels = %d\n", csrow->nr_channels);
csrow->nr_channels);
debugf4("\tcsrow->channels = %p\n", csrow->channels); debugf4("\tcsrow->channels = %p\n", csrow->channels);
debugf4("\tcsrow->mci = %p\n\n", csrow->mci); debugf4("\tcsrow->mci = %p\n\n", csrow->mci);
} }
...@@ -75,12 +72,11 @@ static void edac_mc_dump_mci(struct mem_ctl_info *mci) ...@@ -75,12 +72,11 @@ static void edac_mc_dump_mci(struct mem_ctl_info *mci)
debugf3("\tmci->nr_csrows = %d, csrows = %p\n", debugf3("\tmci->nr_csrows = %d, csrows = %p\n",
mci->nr_csrows, mci->csrows); mci->nr_csrows, mci->csrows);
debugf3("\tdev = %p\n", mci->dev); debugf3("\tdev = %p\n", mci->dev);
debugf3("\tmod_name:ctl_name = %s:%s\n", debugf3("\tmod_name:ctl_name = %s:%s\n", mci->mod_name, mci->ctl_name);
mci->mod_name, mci->ctl_name);
debugf3("\tpvt_info = %p\n\n", mci->pvt_info); debugf3("\tpvt_info = %p\n\n", mci->pvt_info);
} }
#endif /* CONFIG_EDAC_DEBUG */ #endif /* CONFIG_EDAC_DEBUG */
/* 'ptr' points to a possibly unaligned item X such that sizeof(X) is 'size'. /* 'ptr' points to a possibly unaligned item X such that sizeof(X) is 'size'.
* Adjust 'ptr' so that its alignment is at least as stringent as what the * Adjust 'ptr' so that its alignment is at least as stringent as what the
...@@ -89,7 +85,7 @@ static void edac_mc_dump_mci(struct mem_ctl_info *mci) ...@@ -89,7 +85,7 @@ static void edac_mc_dump_mci(struct mem_ctl_info *mci)
* If 'size' is a constant, the compiler will optimize this whole function * If 'size' is a constant, the compiler will optimize this whole function
* down to either a no-op or the addition of a constant to the value of 'ptr'. * down to either a no-op or the addition of a constant to the value of 'ptr'.
*/ */
char * edac_align_ptr(void *ptr, unsigned size) char *edac_align_ptr(void *ptr, unsigned size)
{ {
unsigned align, r; unsigned align, r;
...@@ -106,14 +102,14 @@ char * edac_align_ptr(void *ptr, unsigned size) ...@@ -106,14 +102,14 @@ char * edac_align_ptr(void *ptr, unsigned size)
else if (size > sizeof(char)) else if (size > sizeof(char))
align = sizeof(short); align = sizeof(short);
else else
return (char *) ptr; return (char *)ptr;
r = size % align; r = size % align;
if (r == 0) if (r == 0)
return (char *) ptr; return (char *)ptr;
return (char *) (((unsigned long) ptr) + align - r); return (char *)(((unsigned long)ptr) + align - r);
} }
/** /**
...@@ -133,7 +129,7 @@ char * edac_align_ptr(void *ptr, unsigned size) ...@@ -133,7 +129,7 @@ char * edac_align_ptr(void *ptr, unsigned size)
* struct mem_ctl_info pointer * struct mem_ctl_info pointer
*/ */
struct mem_ctl_info *edac_mc_alloc(unsigned sz_pvt, unsigned nr_csrows, struct mem_ctl_info *edac_mc_alloc(unsigned sz_pvt, unsigned nr_csrows,
unsigned nr_chans) unsigned nr_chans)
{ {
struct mem_ctl_info *mci; struct mem_ctl_info *mci;
struct csrow_info *csi, *csrow; struct csrow_info *csi, *csrow;
...@@ -147,12 +143,12 @@ struct mem_ctl_info *edac_mc_alloc(unsigned sz_pvt, unsigned nr_csrows, ...@@ -147,12 +143,12 @@ struct mem_ctl_info *edac_mc_alloc(unsigned sz_pvt, unsigned nr_csrows,
* stringent as what the compiler would provide if we could simply * stringent as what the compiler would provide if we could simply
* hardcode everything into a single struct. * hardcode everything into a single struct.
*/ */
mci = (struct mem_ctl_info *) 0; mci = (struct mem_ctl_info *)0;
csi = (struct csrow_info *)edac_align_ptr(&mci[1], sizeof(*csi)); csi = (struct csrow_info *)edac_align_ptr(&mci[1], sizeof(*csi));
chi = (struct channel_info *) chi = (struct channel_info *)
edac_align_ptr(&csi[nr_csrows], sizeof(*chi)); edac_align_ptr(&csi[nr_csrows], sizeof(*chi));
pvt = edac_align_ptr(&chi[nr_chans * nr_csrows], sz_pvt); pvt = edac_align_ptr(&chi[nr_chans * nr_csrows], sz_pvt);
size = ((unsigned long) pvt) + sz_pvt; size = ((unsigned long)pvt) + sz_pvt;
if ((mci = kmalloc(size, GFP_KERNEL)) == NULL) if ((mci = kmalloc(size, GFP_KERNEL)) == NULL)
return NULL; return NULL;
...@@ -160,11 +156,11 @@ struct mem_ctl_info *edac_mc_alloc(unsigned sz_pvt, unsigned nr_csrows, ...@@ -160,11 +156,11 @@ struct mem_ctl_info *edac_mc_alloc(unsigned sz_pvt, unsigned nr_csrows,
/* Adjust pointers so they point within the memory we just allocated /* Adjust pointers so they point within the memory we just allocated
* rather than an imaginary chunk of memory located at address 0. * rather than an imaginary chunk of memory located at address 0.
*/ */
csi = (struct csrow_info *) (((char *) mci) + ((unsigned long) csi)); csi = (struct csrow_info *)(((char *)mci) + ((unsigned long)csi));
chi = (struct channel_info *) (((char *) mci) + ((unsigned long) chi)); chi = (struct channel_info *)(((char *)mci) + ((unsigned long)chi));
pvt = sz_pvt ? (((char *) mci) + ((unsigned long) pvt)) : NULL; pvt = sz_pvt ? (((char *)mci) + ((unsigned long)pvt)) : NULL;
memset(mci, 0, size); /* clear all fields */ memset(mci, 0, size); /* clear all fields */
mci->csrows = csi; mci->csrows = csi;
mci->pvt_info = pvt; mci->pvt_info = pvt;
mci->nr_csrows = nr_csrows; mci->nr_csrows = nr_csrows;
...@@ -188,6 +184,7 @@ struct mem_ctl_info *edac_mc_alloc(unsigned sz_pvt, unsigned nr_csrows, ...@@ -188,6 +184,7 @@ struct mem_ctl_info *edac_mc_alloc(unsigned sz_pvt, unsigned nr_csrows,
return mci; return mci;
} }
EXPORT_SYMBOL_GPL(edac_mc_alloc); EXPORT_SYMBOL_GPL(edac_mc_alloc);
/** /**
...@@ -198,6 +195,7 @@ void edac_mc_free(struct mem_ctl_info *mci) ...@@ -198,6 +195,7 @@ void edac_mc_free(struct mem_ctl_info *mci)
{ {
kfree(mci); kfree(mci);
} }
EXPORT_SYMBOL_GPL(edac_mc_free); EXPORT_SYMBOL_GPL(edac_mc_free);
static struct mem_ctl_info *find_mci_by_dev(struct device *dev) static struct mem_ctl_info *find_mci_by_dev(struct device *dev)
...@@ -224,7 +222,7 @@ static int edac_mc_assert_error_check_and_clear(void) ...@@ -224,7 +222,7 @@ static int edac_mc_assert_error_check_and_clear(void)
{ {
int old_state; int old_state;
if(edac_op_state == EDAC_OPSTATE_POLL) if (edac_op_state == EDAC_OPSTATE_POLL)
return 1; return 1;
old_state = edac_err_assert; old_state = edac_err_assert;
...@@ -240,12 +238,12 @@ static int edac_mc_assert_error_check_and_clear(void) ...@@ -240,12 +238,12 @@ static int edac_mc_assert_error_check_and_clear(void)
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,20)) #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,20))
static void edac_mc_workq_function(struct work_struct *work_req) static void edac_mc_workq_function(struct work_struct *work_req)
{ {
struct delayed_work *d_work = (struct delayed_work*) work_req; struct delayed_work *d_work = (struct delayed_work *)work_req;
struct mem_ctl_info *mci = to_edac_mem_ctl_work(d_work); struct mem_ctl_info *mci = to_edac_mem_ctl_work(d_work);
#else #else
static void edac_mc_workq_function(void *ptr) static void edac_mc_workq_function(void *ptr)
{ {
struct mem_ctl_info *mci = (struct mem_ctl_info *) ptr; struct mem_ctl_info *mci = (struct mem_ctl_info *)ptr;
#endif #endif
mutex_lock(&mem_ctls_mutex); mutex_lock(&mem_ctls_mutex);
...@@ -264,7 +262,7 @@ static void edac_mc_workq_function(void *ptr) ...@@ -264,7 +262,7 @@ static void edac_mc_workq_function(void *ptr)
/* Reschedule */ /* Reschedule */
queue_delayed_work(edac_workqueue, &mci->work, queue_delayed_work(edac_workqueue, &mci->work,
msecs_to_jiffies(edac_mc_get_poll_msec())); msecs_to_jiffies(edac_mc_get_poll_msec()));
} }
/* /*
...@@ -320,7 +318,7 @@ void edac_reset_delay_period(struct mem_ctl_info *mci, unsigned long value) ...@@ -320,7 +318,7 @@ void edac_reset_delay_period(struct mem_ctl_info *mci, unsigned long value)
* Before calling this function, caller must * Before calling this function, caller must
* assign a unique value to mci->mc_idx. * assign a unique value to mci->mc_idx.
*/ */
static int add_mc_to_global_list (struct mem_ctl_info *mci) static int add_mc_to_global_list(struct mem_ctl_info *mci)
{ {
struct list_head *item, *insert_before; struct list_head *item, *insert_before;
struct mem_ctl_info *p; struct mem_ctl_info *p;
...@@ -346,13 +344,13 @@ static int add_mc_to_global_list (struct mem_ctl_info *mci) ...@@ -346,13 +344,13 @@ static int add_mc_to_global_list (struct mem_ctl_info *mci)
atomic_inc(&edac_handlers); atomic_inc(&edac_handlers);
return 0; return 0;
fail0: fail0:
edac_printk(KERN_WARNING, EDAC_MC, edac_printk(KERN_WARNING, EDAC_MC,
"%s (%s) %s %s already assigned %d\n", p->dev->bus_id, "%s (%s) %s %s already assigned %d\n", p->dev->bus_id,
dev_name(mci), p->mod_name, p->ctl_name, p->mc_idx); dev_name(mci), p->mod_name, p->ctl_name, p->mc_idx);
return 1; return 1;
fail1: fail1:
edac_printk(KERN_WARNING, EDAC_MC, edac_printk(KERN_WARNING, EDAC_MC,
"bug in low-level driver: attempt to assign\n" "bug in low-level driver: attempt to assign\n"
" duplicate mc_idx %d in %s()\n", p->mc_idx, __func__); " duplicate mc_idx %d in %s()\n", p->mc_idx, __func__);
...@@ -385,7 +383,7 @@ static void del_mc_from_global_list(struct mem_ctl_info *mci) ...@@ -385,7 +383,7 @@ static void del_mc_from_global_list(struct mem_ctl_info *mci)
* *
* Caller must hold mem_ctls_mutex. * Caller must hold mem_ctls_mutex.
*/ */
struct mem_ctl_info * edac_mc_find(int idx) struct mem_ctl_info *edac_mc_find(int idx)
{ {
struct list_head *item; struct list_head *item;
struct mem_ctl_info *mci; struct mem_ctl_info *mci;
...@@ -403,6 +401,7 @@ struct mem_ctl_info * edac_mc_find(int idx) ...@@ -403,6 +401,7 @@ struct mem_ctl_info * edac_mc_find(int idx)
return NULL; return NULL;
} }
EXPORT_SYMBOL(edac_mc_find); EXPORT_SYMBOL(edac_mc_find);
/** /**
...@@ -433,8 +432,8 @@ int edac_mc_add_mc(struct mem_ctl_info *mci, int mc_idx) ...@@ -433,8 +432,8 @@ int edac_mc_add_mc(struct mem_ctl_info *mci, int mc_idx)
edac_mc_dump_csrow(&mci->csrows[i]); edac_mc_dump_csrow(&mci->csrows[i]);
for (j = 0; j < mci->csrows[i].nr_channels; j++) for (j = 0; j < mci->csrows[i].nr_channels; j++)
edac_mc_dump_channel( edac_mc_dump_channel(&mci->csrows[i].
&mci->csrows[i].channels[j]); channels[j]);
} }
} }
#endif #endif
...@@ -448,7 +447,7 @@ int edac_mc_add_mc(struct mem_ctl_info *mci, int mc_idx) ...@@ -448,7 +447,7 @@ int edac_mc_add_mc(struct mem_ctl_info *mci, int mc_idx)
if (edac_create_sysfs_mci_device(mci)) { if (edac_create_sysfs_mci_device(mci)) {
edac_mc_printk(mci, KERN_WARNING, edac_mc_printk(mci, KERN_WARNING,
"failed to create sysfs device\n"); "failed to create sysfs device\n");
goto fail1; goto fail1;
} }
...@@ -464,18 +463,19 @@ int edac_mc_add_mc(struct mem_ctl_info *mci, int mc_idx) ...@@ -464,18 +463,19 @@ int edac_mc_add_mc(struct mem_ctl_info *mci, int mc_idx)
/* Report action taken */ /* Report action taken */
edac_mc_printk(mci, KERN_INFO, "Giving out device to %s %s: DEV %s\n", edac_mc_printk(mci, KERN_INFO, "Giving out device to %s %s: DEV %s\n",
mci->mod_name, mci->ctl_name, dev_name(mci)); mci->mod_name, mci->ctl_name, dev_name(mci));
mutex_unlock(&mem_ctls_mutex); mutex_unlock(&mem_ctls_mutex);
return 0; return 0;
fail1: fail1:
del_mc_from_global_list(mci); del_mc_from_global_list(mci);
fail0: fail0:
mutex_unlock(&mem_ctls_mutex); mutex_unlock(&mem_ctls_mutex);
return 1; return 1;
} }
EXPORT_SYMBOL_GPL(edac_mc_add_mc); EXPORT_SYMBOL_GPL(edac_mc_add_mc);
/** /**
...@@ -485,7 +485,7 @@ EXPORT_SYMBOL_GPL(edac_mc_add_mc); ...@@ -485,7 +485,7 @@ EXPORT_SYMBOL_GPL(edac_mc_add_mc);
* *
* Return pointer to removed mci structure, or NULL if device not found. * Return pointer to removed mci structure, or NULL if device not found.
*/ */
struct mem_ctl_info * edac_mc_del_mc(struct device *dev) struct mem_ctl_info *edac_mc_del_mc(struct device *dev)
{ {
struct mem_ctl_info *mci; struct mem_ctl_info *mci;
...@@ -507,10 +507,11 @@ struct mem_ctl_info * edac_mc_del_mc(struct device *dev) ...@@ -507,10 +507,11 @@ struct mem_ctl_info * edac_mc_del_mc(struct device *dev)
del_mc_from_global_list(mci); del_mc_from_global_list(mci);
mutex_unlock(&mem_ctls_mutex); mutex_unlock(&mem_ctls_mutex);
edac_printk(KERN_INFO, EDAC_MC, edac_printk(KERN_INFO, EDAC_MC,
"Removed device %d for %s %s: DEV %s\n", mci->mc_idx, "Removed device %d for %s %s: DEV %s\n", mci->mc_idx,
mci->mod_name, mci->ctl_name, dev_name(mci)); mci->mod_name, mci->ctl_name, dev_name(mci));
return mci; return mci;
} }
EXPORT_SYMBOL_GPL(edac_mc_del_mc); EXPORT_SYMBOL_GPL(edac_mc_del_mc);
static void edac_mc_scrub_block(unsigned long page, unsigned long offset, static void edac_mc_scrub_block(unsigned long page, unsigned long offset,
...@@ -523,7 +524,7 @@ static void edac_mc_scrub_block(unsigned long page, unsigned long offset, ...@@ -523,7 +524,7 @@ static void edac_mc_scrub_block(unsigned long page, unsigned long offset,
debugf3("%s()\n", __func__); debugf3("%s()\n", __func__);
/* ECC error page was not in our memory. Ignore it. */ /* ECC error page was not in our memory. Ignore it. */
if(!pfn_valid(page)) if (!pfn_valid(page))
return; return;
/* Find the actual page structure then map it and fix */ /* Find the actual page structure then map it and fix */
...@@ -575,18 +576,20 @@ int edac_mc_find_csrow_by_page(struct mem_ctl_info *mci, unsigned long page) ...@@ -575,18 +576,20 @@ int edac_mc_find_csrow_by_page(struct mem_ctl_info *mci, unsigned long page)
if (row == -1) if (row == -1)
edac_mc_printk(mci, KERN_ERR, edac_mc_printk(mci, KERN_ERR,
"could not look up page error address %lx\n", "could not look up page error address %lx\n",
(unsigned long) page); (unsigned long)page);
return row; return row;
} }
EXPORT_SYMBOL_GPL(edac_mc_find_csrow_by_page); EXPORT_SYMBOL_GPL(edac_mc_find_csrow_by_page);
/* FIXME - setable log (warning/emerg) levels */ /* FIXME - setable log (warning/emerg) levels */
/* FIXME - integrate with evlog: http://evlog.sourceforge.net/ */ /* FIXME - integrate with evlog: http://evlog.sourceforge.net/ */
void edac_mc_handle_ce(struct mem_ctl_info *mci, void edac_mc_handle_ce(struct mem_ctl_info *mci,
unsigned long page_frame_number, unsigned long offset_in_page, unsigned long page_frame_number,
unsigned long syndrome, int row, int channel, const char *msg) unsigned long offset_in_page, unsigned long syndrome,
int row, int channel, const char *msg)
{ {
unsigned long remapped_page; unsigned long remapped_page;
...@@ -596,8 +599,8 @@ void edac_mc_handle_ce(struct mem_ctl_info *mci, ...@@ -596,8 +599,8 @@ void edac_mc_handle_ce(struct mem_ctl_info *mci,
if (row >= mci->nr_csrows || row < 0) { if (row >= mci->nr_csrows || row < 0) {
/* something is wrong */ /* something is wrong */
edac_mc_printk(mci, KERN_ERR, edac_mc_printk(mci, KERN_ERR,
"INTERNAL ERROR: row out of range " "INTERNAL ERROR: row out of range "
"(%d >= %d)\n", row, mci->nr_csrows); "(%d >= %d)\n", row, mci->nr_csrows);
edac_mc_handle_ce_no_info(mci, "INTERNAL ERROR"); edac_mc_handle_ce_no_info(mci, "INTERNAL ERROR");
return; return;
} }
...@@ -605,9 +608,9 @@ void edac_mc_handle_ce(struct mem_ctl_info *mci, ...@@ -605,9 +608,9 @@ void edac_mc_handle_ce(struct mem_ctl_info *mci,
if (channel >= mci->csrows[row].nr_channels || channel < 0) { if (channel >= mci->csrows[row].nr_channels || channel < 0) {
/* something is wrong */ /* something is wrong */
edac_mc_printk(mci, KERN_ERR, edac_mc_printk(mci, KERN_ERR,
"INTERNAL ERROR: channel out of range " "INTERNAL ERROR: channel out of range "
"(%d >= %d)\n", channel, "(%d >= %d)\n", channel,
mci->csrows[row].nr_channels); mci->csrows[row].nr_channels);
edac_mc_handle_ce_no_info(mci, "INTERNAL ERROR"); edac_mc_handle_ce_no_info(mci, "INTERNAL ERROR");
return; return;
} }
...@@ -615,11 +618,11 @@ void edac_mc_handle_ce(struct mem_ctl_info *mci, ...@@ -615,11 +618,11 @@ void edac_mc_handle_ce(struct mem_ctl_info *mci,
if (edac_mc_get_log_ce()) if (edac_mc_get_log_ce())
/* FIXME - put in DIMM location */ /* FIXME - put in DIMM location */
edac_mc_printk(mci, KERN_WARNING, edac_mc_printk(mci, KERN_WARNING,
"CE page 0x%lx, offset 0x%lx, grain %d, syndrome " "CE page 0x%lx, offset 0x%lx, grain %d, syndrome "
"0x%lx, row %d, channel %d, label \"%s\": %s\n", "0x%lx, row %d, channel %d, label \"%s\": %s\n",
page_frame_number, offset_in_page, page_frame_number, offset_in_page,
mci->csrows[row].grain, syndrome, row, channel, mci->csrows[row].grain, syndrome, row, channel,
mci->csrows[row].channels[channel].label, msg); mci->csrows[row].channels[channel].label, msg);
mci->ce_count++; mci->ce_count++;
mci->csrows[row].ce_count++; mci->csrows[row].ce_count++;
...@@ -640,25 +643,27 @@ void edac_mc_handle_ce(struct mem_ctl_info *mci, ...@@ -640,25 +643,27 @@ void edac_mc_handle_ce(struct mem_ctl_info *mci,
page_frame_number; page_frame_number;
edac_mc_scrub_block(remapped_page, offset_in_page, edac_mc_scrub_block(remapped_page, offset_in_page,
mci->csrows[row].grain); mci->csrows[row].grain);
} }
} }
EXPORT_SYMBOL_GPL(edac_mc_handle_ce); EXPORT_SYMBOL_GPL(edac_mc_handle_ce);
void edac_mc_handle_ce_no_info(struct mem_ctl_info *mci, const char *msg) void edac_mc_handle_ce_no_info(struct mem_ctl_info *mci, const char *msg)
{ {
if (edac_mc_get_log_ce()) if (edac_mc_get_log_ce())
edac_mc_printk(mci, KERN_WARNING, edac_mc_printk(mci, KERN_WARNING,
"CE - no information available: %s\n", msg); "CE - no information available: %s\n", msg);
mci->ce_noinfo_count++; mci->ce_noinfo_count++;
mci->ce_count++; mci->ce_count++;
} }
EXPORT_SYMBOL_GPL(edac_mc_handle_ce_no_info); EXPORT_SYMBOL_GPL(edac_mc_handle_ce_no_info);
void edac_mc_handle_ue(struct mem_ctl_info *mci, void edac_mc_handle_ue(struct mem_ctl_info *mci,
unsigned long page_frame_number, unsigned long offset_in_page, unsigned long page_frame_number,
int row, const char *msg) unsigned long offset_in_page, int row, const char *msg)
{ {
int len = EDAC_MC_LABEL_LEN * 4; int len = EDAC_MC_LABEL_LEN * 4;
char labels[len + 1]; char labels[len + 1];
...@@ -672,41 +677,42 @@ void edac_mc_handle_ue(struct mem_ctl_info *mci, ...@@ -672,41 +677,42 @@ void edac_mc_handle_ue(struct mem_ctl_info *mci,
if (row >= mci->nr_csrows || row < 0) { if (row >= mci->nr_csrows || row < 0) {
/* something is wrong */ /* something is wrong */
edac_mc_printk(mci, KERN_ERR, edac_mc_printk(mci, KERN_ERR,
"INTERNAL ERROR: row out of range " "INTERNAL ERROR: row out of range "
"(%d >= %d)\n", row, mci->nr_csrows); "(%d >= %d)\n", row, mci->nr_csrows);
edac_mc_handle_ue_no_info(mci, "INTERNAL ERROR"); edac_mc_handle_ue_no_info(mci, "INTERNAL ERROR");
return; return;
} }
chars = snprintf(pos, len + 1, "%s", chars = snprintf(pos, len + 1, "%s",
mci->csrows[row].channels[0].label); mci->csrows[row].channels[0].label);
len -= chars; len -= chars;
pos += chars; pos += chars;
for (chan = 1; (chan < mci->csrows[row].nr_channels) && (len > 0); for (chan = 1; (chan < mci->csrows[row].nr_channels) && (len > 0);
chan++) { chan++) {
chars = snprintf(pos, len + 1, ":%s", chars = snprintf(pos, len + 1, ":%s",
mci->csrows[row].channels[chan].label); mci->csrows[row].channels[chan].label);
len -= chars; len -= chars;
pos += chars; pos += chars;
} }
if (edac_mc_get_log_ue()) if (edac_mc_get_log_ue())
edac_mc_printk(mci, KERN_EMERG, edac_mc_printk(mci, KERN_EMERG,
"UE page 0x%lx, offset 0x%lx, grain %d, row %d, " "UE page 0x%lx, offset 0x%lx, grain %d, row %d, "
"labels \"%s\": %s\n", page_frame_number, "labels \"%s\": %s\n", page_frame_number,
offset_in_page, mci->csrows[row].grain, row, labels, offset_in_page, mci->csrows[row].grain, row,
msg); labels, msg);
if (edac_mc_get_panic_on_ue()) if (edac_mc_get_panic_on_ue())
panic("EDAC MC%d: UE page 0x%lx, offset 0x%lx, grain %d, " panic("EDAC MC%d: UE page 0x%lx, offset 0x%lx, grain %d, "
"row %d, labels \"%s\": %s\n", mci->mc_idx, "row %d, labels \"%s\": %s\n", mci->mc_idx,
page_frame_number, offset_in_page, page_frame_number, offset_in_page,
mci->csrows[row].grain, row, labels, msg); mci->csrows[row].grain, row, labels, msg);
mci->ue_count++; mci->ue_count++;
mci->csrows[row].ue_count++; mci->csrows[row].ue_count++;
} }
EXPORT_SYMBOL_GPL(edac_mc_handle_ue); EXPORT_SYMBOL_GPL(edac_mc_handle_ue);
void edac_mc_handle_ue_no_info(struct mem_ctl_info *mci, const char *msg) void edac_mc_handle_ue_no_info(struct mem_ctl_info *mci, const char *msg)
...@@ -716,22 +722,21 @@ void edac_mc_handle_ue_no_info(struct mem_ctl_info *mci, const char *msg) ...@@ -716,22 +722,21 @@ void edac_mc_handle_ue_no_info(struct mem_ctl_info *mci, const char *msg)
if (edac_mc_get_log_ue()) if (edac_mc_get_log_ue())
edac_mc_printk(mci, KERN_WARNING, edac_mc_printk(mci, KERN_WARNING,
"UE - no information available: %s\n", msg); "UE - no information available: %s\n", msg);
mci->ue_noinfo_count++; mci->ue_noinfo_count++;
mci->ue_count++; mci->ue_count++;
} }
EXPORT_SYMBOL_GPL(edac_mc_handle_ue_no_info);
EXPORT_SYMBOL_GPL(edac_mc_handle_ue_no_info);
/************************************************************* /*************************************************************
* On Fully Buffered DIMM modules, this help function is * On Fully Buffered DIMM modules, this help function is
* called to process UE events * called to process UE events
*/ */
void edac_mc_handle_fbd_ue(struct mem_ctl_info *mci, void edac_mc_handle_fbd_ue(struct mem_ctl_info *mci,
unsigned int csrow, unsigned int csrow,
unsigned int channela, unsigned int channela,
unsigned int channelb, unsigned int channelb, char *msg)
char *msg)
{ {
int len = EDAC_MC_LABEL_LEN * 4; int len = EDAC_MC_LABEL_LEN * 4;
char labels[len + 1]; char labels[len + 1];
...@@ -741,8 +746,8 @@ void edac_mc_handle_fbd_ue(struct mem_ctl_info *mci, ...@@ -741,8 +746,8 @@ void edac_mc_handle_fbd_ue(struct mem_ctl_info *mci,
if (csrow >= mci->nr_csrows) { if (csrow >= mci->nr_csrows) {
/* something is wrong */ /* something is wrong */
edac_mc_printk(mci, KERN_ERR, edac_mc_printk(mci, KERN_ERR,
"INTERNAL ERROR: row out of range (%d >= %d)\n", "INTERNAL ERROR: row out of range (%d >= %d)\n",
csrow, mci->nr_csrows); csrow, mci->nr_csrows);
edac_mc_handle_ue_no_info(mci, "INTERNAL ERROR"); edac_mc_handle_ue_no_info(mci, "INTERNAL ERROR");
return; return;
} }
...@@ -750,9 +755,9 @@ void edac_mc_handle_fbd_ue(struct mem_ctl_info *mci, ...@@ -750,9 +755,9 @@ void edac_mc_handle_fbd_ue(struct mem_ctl_info *mci,
if (channela >= mci->csrows[csrow].nr_channels) { if (channela >= mci->csrows[csrow].nr_channels) {
/* something is wrong */ /* something is wrong */
edac_mc_printk(mci, KERN_ERR, edac_mc_printk(mci, KERN_ERR,
"INTERNAL ERROR: channel-a out of range " "INTERNAL ERROR: channel-a out of range "
"(%d >= %d)\n", "(%d >= %d)\n",
channela, mci->csrows[csrow].nr_channels); channela, mci->csrows[csrow].nr_channels);
edac_mc_handle_ue_no_info(mci, "INTERNAL ERROR"); edac_mc_handle_ue_no_info(mci, "INTERNAL ERROR");
return; return;
} }
...@@ -760,9 +765,9 @@ void edac_mc_handle_fbd_ue(struct mem_ctl_info *mci, ...@@ -760,9 +765,9 @@ void edac_mc_handle_fbd_ue(struct mem_ctl_info *mci,
if (channelb >= mci->csrows[csrow].nr_channels) { if (channelb >= mci->csrows[csrow].nr_channels) {
/* something is wrong */ /* something is wrong */
edac_mc_printk(mci, KERN_ERR, edac_mc_printk(mci, KERN_ERR,
"INTERNAL ERROR: channel-b out of range " "INTERNAL ERROR: channel-b out of range "
"(%d >= %d)\n", "(%d >= %d)\n",
channelb, mci->csrows[csrow].nr_channels); channelb, mci->csrows[csrow].nr_channels);
edac_mc_handle_ue_no_info(mci, "INTERNAL ERROR"); edac_mc_handle_ue_no_info(mci, "INTERNAL ERROR");
return; return;
} }
...@@ -773,21 +778,23 @@ void edac_mc_handle_fbd_ue(struct mem_ctl_info *mci, ...@@ -773,21 +778,23 @@ void edac_mc_handle_fbd_ue(struct mem_ctl_info *mci,
/* Generate the DIMM labels from the specified channels */ /* Generate the DIMM labels from the specified channels */
chars = snprintf(pos, len + 1, "%s", chars = snprintf(pos, len + 1, "%s",
mci->csrows[csrow].channels[channela].label); mci->csrows[csrow].channels[channela].label);
len -= chars; pos += chars; len -= chars;
pos += chars;
chars = snprintf(pos, len + 1, "-%s", chars = snprintf(pos, len + 1, "-%s",
mci->csrows[csrow].channels[channelb].label); mci->csrows[csrow].channels[channelb].label);
if (edac_mc_get_log_ue()) if (edac_mc_get_log_ue())
edac_mc_printk(mci, KERN_EMERG, edac_mc_printk(mci, KERN_EMERG,
"UE row %d, channel-a= %d channel-b= %d " "UE row %d, channel-a= %d channel-b= %d "
"labels \"%s\": %s\n", csrow, channela, channelb, "labels \"%s\": %s\n", csrow, channela, channelb,
labels, msg); labels, msg);
if (edac_mc_get_panic_on_ue()) if (edac_mc_get_panic_on_ue())
panic("UE row %d, channel-a= %d channel-b= %d " panic("UE row %d, channel-a= %d channel-b= %d "
"labels \"%s\": %s\n", csrow, channela, "labels \"%s\": %s\n", csrow, channela,
channelb, labels, msg); channelb, labels, msg);
} }
EXPORT_SYMBOL(edac_mc_handle_fbd_ue); EXPORT_SYMBOL(edac_mc_handle_fbd_ue);
/************************************************************* /*************************************************************
...@@ -795,25 +802,23 @@ EXPORT_SYMBOL(edac_mc_handle_fbd_ue); ...@@ -795,25 +802,23 @@ EXPORT_SYMBOL(edac_mc_handle_fbd_ue);
* called to process CE events * called to process CE events
*/ */
void edac_mc_handle_fbd_ce(struct mem_ctl_info *mci, void edac_mc_handle_fbd_ce(struct mem_ctl_info *mci,
unsigned int csrow, unsigned int csrow, unsigned int channel, char *msg)
unsigned int channel,
char *msg)
{ {
/* Ensure boundary values */ /* Ensure boundary values */
if (csrow >= mci->nr_csrows) { if (csrow >= mci->nr_csrows) {
/* something is wrong */ /* something is wrong */
edac_mc_printk(mci, KERN_ERR, edac_mc_printk(mci, KERN_ERR,
"INTERNAL ERROR: row out of range (%d >= %d)\n", "INTERNAL ERROR: row out of range (%d >= %d)\n",
csrow, mci->nr_csrows); csrow, mci->nr_csrows);
edac_mc_handle_ce_no_info(mci, "INTERNAL ERROR"); edac_mc_handle_ce_no_info(mci, "INTERNAL ERROR");
return; return;
} }
if (channel >= mci->csrows[csrow].nr_channels) { if (channel >= mci->csrows[csrow].nr_channels) {
/* something is wrong */ /* something is wrong */
edac_mc_printk(mci, KERN_ERR, edac_mc_printk(mci, KERN_ERR,
"INTERNAL ERROR: channel out of range (%d >= %d)\n", "INTERNAL ERROR: channel out of range (%d >= %d)\n",
channel, mci->csrows[csrow].nr_channels); channel, mci->csrows[csrow].nr_channels);
edac_mc_handle_ce_no_info(mci, "INTERNAL ERROR"); edac_mc_handle_ce_no_info(mci, "INTERNAL ERROR");
return; return;
} }
...@@ -821,17 +826,16 @@ void edac_mc_handle_fbd_ce(struct mem_ctl_info *mci, ...@@ -821,17 +826,16 @@ void edac_mc_handle_fbd_ce(struct mem_ctl_info *mci,
if (edac_mc_get_log_ce()) if (edac_mc_get_log_ce())
/* FIXME - put in DIMM location */ /* FIXME - put in DIMM location */
edac_mc_printk(mci, KERN_WARNING, edac_mc_printk(mci, KERN_WARNING,
"CE row %d, channel %d, label \"%s\": %s\n", "CE row %d, channel %d, label \"%s\": %s\n",
csrow, channel, csrow, channel,
mci->csrows[csrow].channels[channel].label, mci->csrows[csrow].channels[channel].label, msg);
msg);
mci->ce_count++; mci->ce_count++;
mci->csrows[csrow].ce_count++; mci->csrows[csrow].ce_count++;
mci->csrows[csrow].channels[channel].ce_count++; mci->csrows[csrow].channels[channel].ce_count++;
} }
EXPORT_SYMBOL(edac_mc_handle_fbd_ce);
EXPORT_SYMBOL(edac_mc_handle_fbd_ce);
/* /*
* Iterate over all MC instances and check for ECC, et al, errors * Iterate over all MC instances and check for ECC, et al, errors
......
drivers/edac/edac_mc.h
浏览文件 @ 079708b9
/* /*
* Older .h file for edac, until all drivers are modified * Older .h file for edac, until all drivers are modified
* *
*/ */
#include "edac_core.h" #include "edac_core.h"
drivers/edac/edac_mc_sysfs.c
浏览文件 @ 079708b9
此差异已折叠。
drivers/edac/edac_module.c
浏览文件 @ 079708b9
...@@ -37,7 +37,7 @@ static int edac_class_valid = 0; ...@@ -37,7 +37,7 @@ static int edac_class_valid = 0;
/* /*
* edac_op_state_toString() * edac_op_state_toString()
*/ */
char * edac_op_state_toString(int opstate) char *edac_op_state_toString(int opstate)
{ {
if (opstate == OP_RUNNING_POLL) if (opstate == OP_RUNNING_POLL)
return "POLLED"; return "POLLED";
...@@ -60,7 +60,7 @@ char * edac_op_state_toString(int opstate) ...@@ -60,7 +60,7 @@ char * edac_op_state_toString(int opstate)
*/ */
struct sysdev_class *edac_get_edac_class(void) struct sysdev_class *edac_get_edac_class(void)
{ {
struct sysdev_class *classptr=NULL; struct sysdev_class *classptr = NULL;
if (edac_class_valid) if (edac_class_valid)
classptr = &edac_class; classptr = &edac_class;
...@@ -133,7 +133,6 @@ static void edac_workqueue_teardown(void) ...@@ -133,7 +133,6 @@ static void edac_workqueue_teardown(void)
} }
} }
/* /*
* edac_init * edac_init
* module initialization entry point * module initialization entry point
...@@ -148,8 +147,8 @@ static int __init edac_init(void) ...@@ -148,8 +147,8 @@ static int __init edac_init(void)
* Harvest and clear any boot/initialization PCI parity errors * Harvest and clear any boot/initialization PCI parity errors
* *
* FIXME: This only clears errors logged by devices present at time of * FIXME: This only clears errors logged by devices present at time of
* module initialization. We should also do an initial clear * module initialization. We should also do an initial clear
* of each newly hotplugged device. * of each newly hotplugged device.
*/ */
edac_pci_clear_parity_errors(); edac_pci_clear_parity_errors();
...@@ -158,7 +157,7 @@ static int __init edac_init(void) ...@@ -158,7 +157,7 @@ static int __init edac_init(void)
*/ */
if (edac_register_sysfs_edac_name()) { if (edac_register_sysfs_edac_name()) {
edac_printk(KERN_ERR, EDAC_MC, edac_printk(KERN_ERR, EDAC_MC,
"Error initializing 'edac' kobject\n"); "Error initializing 'edac' kobject\n");
err = -ENODEV; err = -ENODEV;
goto error; goto error;
} }
...@@ -167,7 +166,7 @@ static int __init edac_init(void) ...@@ -167,7 +166,7 @@ static int __init edac_init(void)
*/ */
if (edac_sysfs_memctrl_setup()) { if (edac_sysfs_memctrl_setup()) {
edac_printk(KERN_ERR, EDAC_MC, edac_printk(KERN_ERR, EDAC_MC,
"Error initializing sysfs code\n"); "Error initializing sysfs code\n");
err = -ENODEV; err = -ENODEV;
goto error_sysfs; goto error_sysfs;
} }
...@@ -182,11 +181,11 @@ static int __init edac_init(void) ...@@ -182,11 +181,11 @@ static int __init edac_init(void)
return 0; return 0;
/* Error teardown stack */ /* Error teardown stack */
error_mem: error_mem:
edac_sysfs_memctrl_teardown(); edac_sysfs_memctrl_teardown();
error_sysfs: error_sysfs:
edac_unregister_sysfs_edac_name(); edac_unregister_sysfs_edac_name();
error: error:
return err; return err;
} }
...@@ -198,7 +197,7 @@ static void __exit edac_exit(void) ...@@ -198,7 +197,7 @@ static void __exit edac_exit(void)
{ {
debugf0("%s()\n", __func__); debugf0("%s()\n", __func__);
/* tear down the various subsystems*/ /* tear down the various subsystems */
edac_workqueue_teardown(); edac_workqueue_teardown();
edac_sysfs_memctrl_teardown(); edac_sysfs_memctrl_teardown();
edac_unregister_sysfs_edac_name(); edac_unregister_sysfs_edac_name();
...@@ -220,4 +219,3 @@ MODULE_DESCRIPTION("Core library routines for EDAC reporting"); ...@@ -220,4 +219,3 @@ MODULE_DESCRIPTION("Core library routines for EDAC reporting");
module_param(edac_debug_level, int, 0644); module_param(edac_debug_level, int, 0644);
MODULE_PARM_DESC(edac_debug_level, "Debug level"); MODULE_PARM_DESC(edac_debug_level, "Debug level");
#endif #endif
drivers/edac/edac_module.h
浏览文件 @ 079708b9
...@@ -40,12 +40,10 @@ extern struct sysdev_class *edac_get_edac_class(void); ...@@ -40,12 +40,10 @@ extern struct sysdev_class *edac_get_edac_class(void);
/* edac core workqueue: single CPU mode */ /* edac core workqueue: single CPU mode */
extern struct workqueue_struct *edac_workqueue; extern struct workqueue_struct *edac_workqueue;
extern void edac_device_workq_setup(struct edac_device_ctl_info *edac_dev, extern void edac_device_workq_setup(struct edac_device_ctl_info *edac_dev,
unsigned msec); unsigned msec);
extern void edac_device_workq_teardown(struct edac_device_ctl_info *edac_dev); extern void edac_device_workq_teardown(struct edac_device_ctl_info *edac_dev);
extern void edac_device_reset_delay_period( extern void edac_device_reset_delay_period(struct edac_device_ctl_info
struct edac_device_ctl_info *edac_dev, *edac_dev, unsigned long value);
unsigned long value);
/* /*
* EDAC PCI functions * EDAC PCI functions
...@@ -57,7 +55,7 @@ extern int edac_sysfs_pci_setup(void); ...@@ -57,7 +55,7 @@ extern int edac_sysfs_pci_setup(void);
extern void edac_sysfs_pci_teardown(void); extern void edac_sysfs_pci_teardown(void);
extern int edac_pci_get_check_errors(void); extern int edac_pci_get_check_errors(void);
extern int edac_pci_get_poll_msec(void); extern int edac_pci_get_poll_msec(void);
#else /* CONFIG_PCI */ #else /* CONFIG_PCI */
/* pre-process these away */ /* pre-process these away */
#define edac_pci_do_parity_check() #define edac_pci_do_parity_check()
#define edac_pci_clear_parity_errors() #define edac_pci_clear_parity_errors()
...@@ -65,8 +63,6 @@ extern int edac_pci_get_poll_msec(void); ...@@ -65,8 +63,6 @@ extern int edac_pci_get_poll_msec(void);
#define edac_sysfs_pci_teardown() #define edac_sysfs_pci_teardown()
#define edac_pci_get_check_errors() #define edac_pci_get_check_errors()
#define edac_pci_get_poll_msec() #define edac_pci_get_poll_msec()
#endif /* CONFIG_PCI */ #endif /* CONFIG_PCI */
#endif /* __EDAC_MODULE_H__ */
#endif /* __EDAC_MODULE_H__ */
drivers/edac/edac_pci.c
浏览文件 @ 079708b9
...@@ -46,9 +46,8 @@ static inline void edac_unlock_pci_list(void) ...@@ -46,9 +46,8 @@ static inline void edac_unlock_pci_list(void)
* structure. The chip driver will allocate one of these for each * structure. The chip driver will allocate one of these for each
* edac_pci it is going to control/register with the EDAC CORE. * edac_pci it is going to control/register with the EDAC CORE.
*/ */
struct edac_pci_ctl_info * edac_pci_alloc_ctl_info( struct edac_pci_ctl_info *edac_pci_alloc_ctl_info(unsigned int sz_pvt,
unsigned int sz_pvt, const char *edac_pci_name)
const char *edac_pci_name)
{ {
struct edac_pci_ctl_info *pci; struct edac_pci_ctl_info *pci;
void *pvt; void *pvt;
...@@ -67,10 +66,11 @@ struct edac_pci_ctl_info * edac_pci_alloc_ctl_info( ...@@ -67,10 +66,11 @@ struct edac_pci_ctl_info * edac_pci_alloc_ctl_info(
pci->op_state = OP_ALLOC; pci->op_state = OP_ALLOC;
snprintf(pci->name, strlen(edac_pci_name)+1, "%s", edac_pci_name); snprintf(pci->name, strlen(edac_pci_name) + 1, "%s", edac_pci_name);
return pci; return pci;
} }
EXPORT_SYMBOL_GPL(edac_pci_alloc_ctl_info); EXPORT_SYMBOL_GPL(edac_pci_alloc_ctl_info);
/* /*
...@@ -81,13 +81,14 @@ void edac_pci_free_ctl_info(struct edac_pci_ctl_info *pci) ...@@ -81,13 +81,14 @@ void edac_pci_free_ctl_info(struct edac_pci_ctl_info *pci)
{ {
kfree(pci); kfree(pci);
} }
EXPORT_SYMBOL_GPL(edac_pci_free_ctl_info); EXPORT_SYMBOL_GPL(edac_pci_free_ctl_info);
/* /*
* find_edac_pci_by_dev() * find_edac_pci_by_dev()
* scans the edac_pci list for a specific 'struct device *' * scans the edac_pci list for a specific 'struct device *'
*/ */
static struct edac_pci_ctl_info * find_edac_pci_by_dev(struct device *dev) static struct edac_pci_ctl_info *find_edac_pci_by_dev(struct device *dev)
{ {
struct edac_pci_ctl_info *pci; struct edac_pci_ctl_info *pci;
struct list_head *item; struct list_head *item;
...@@ -139,17 +140,18 @@ static int add_edac_pci_to_global_list(struct edac_pci_ctl_info *pci) ...@@ -139,17 +140,18 @@ static int add_edac_pci_to_global_list(struct edac_pci_ctl_info *pci)
list_add_tail_rcu(&pci->link, insert_before); list_add_tail_rcu(&pci->link, insert_before);
return 0; return 0;
fail0: fail0:
edac_printk(KERN_WARNING, EDAC_PCI, edac_printk(KERN_WARNING, EDAC_PCI,
"%s (%s) %s %s already assigned %d\n", "%s (%s) %s %s already assigned %d\n",
rover->dev->bus_id, dev_name(rover), rover->dev->bus_id, dev_name(rover),
rover->mod_name, rover->ctl_name, rover->pci_idx); rover->mod_name, rover->ctl_name, rover->pci_idx);
return 1; return 1;
fail1: fail1:
edac_printk(KERN_WARNING, EDAC_PCI, edac_printk(KERN_WARNING, EDAC_PCI,
"but in low-level driver: attempt to assign\n" "but in low-level driver: attempt to assign\n"
"\tduplicate pci_idx %d in %s()\n", rover->pci_idx, __func__); "\tduplicate pci_idx %d in %s()\n", rover->pci_idx,
__func__);
return 1; return 1;
} }
...@@ -185,7 +187,7 @@ static void del_edac_pci_from_global_list(struct edac_pci_ctl_info *pci) ...@@ -185,7 +187,7 @@ static void del_edac_pci_from_global_list(struct edac_pci_ctl_info *pci)
* *
* Caller must hold pci_ctls_mutex. * Caller must hold pci_ctls_mutex.
*/ */
struct edac_pci_ctl_info * edac_pci_find(int idx) struct edac_pci_ctl_info *edac_pci_find(int idx)
{ {
struct list_head *item; struct list_head *item;
struct edac_pci_ctl_info *pci; struct edac_pci_ctl_info *pci;
...@@ -198,13 +200,14 @@ struct edac_pci_ctl_info * edac_pci_find(int idx) ...@@ -198,13 +200,14 @@ struct edac_pci_ctl_info * edac_pci_find(int idx)
if (pci->pci_idx == idx) if (pci->pci_idx == idx)
return pci; return pci;
/* not on list, so terminate early */ /* not on list, so terminate early */
break; break;
} }
} }
return NULL; return NULL;
} }
EXPORT_SYMBOL_GPL(edac_pci_find); EXPORT_SYMBOL_GPL(edac_pci_find);
/* /*
...@@ -225,15 +228,14 @@ static void edac_pci_workq_function(void *ptr) ...@@ -225,15 +228,14 @@ static void edac_pci_workq_function(void *ptr)
edac_lock_pci_list(); edac_lock_pci_list();
if ((pci->op_state == OP_RUNNING_POLL) && if ((pci->op_state == OP_RUNNING_POLL) &&
(pci->edac_check != NULL) && (pci->edac_check != NULL) && (edac_pci_get_check_errors()))
(edac_pci_get_check_errors()))
pci->edac_check(pci); pci->edac_check(pci);
edac_unlock_pci_list(); edac_unlock_pci_list();
/* Reschedule */ /* Reschedule */
queue_delayed_work(edac_workqueue, &pci->work, queue_delayed_work(edac_workqueue, &pci->work,
msecs_to_jiffies(edac_pci_get_poll_msec())); msecs_to_jiffies(edac_pci_get_poll_msec()));
} }
/* /*
...@@ -242,7 +244,7 @@ static void edac_pci_workq_function(void *ptr) ...@@ -242,7 +244,7 @@ static void edac_pci_workq_function(void *ptr)
* passing in the new delay period in msec * passing in the new delay period in msec
*/ */
static void edac_pci_workq_setup(struct edac_pci_ctl_info *pci, static void edac_pci_workq_setup(struct edac_pci_ctl_info *pci,
unsigned int msec) unsigned int msec)
{ {
debugf0("%s()\n", __func__); debugf0("%s()\n", __func__);
...@@ -252,7 +254,7 @@ static void edac_pci_workq_setup(struct edac_pci_ctl_info *pci, ...@@ -252,7 +254,7 @@ static void edac_pci_workq_setup(struct edac_pci_ctl_info *pci,
INIT_WORK(&pci->work, edac_pci_workq_function, pci); INIT_WORK(&pci->work, edac_pci_workq_function, pci);
#endif #endif
queue_delayed_work(edac_workqueue, &pci->work, queue_delayed_work(edac_workqueue, &pci->work,
msecs_to_jiffies(edac_pci_get_poll_msec())); msecs_to_jiffies(edac_pci_get_poll_msec()));
} }
/* /*
...@@ -272,7 +274,7 @@ static void edac_pci_workq_teardown(struct edac_pci_ctl_info *pci) ...@@ -272,7 +274,7 @@ static void edac_pci_workq_teardown(struct edac_pci_ctl_info *pci)
* edac_pci_reset_delay_period * edac_pci_reset_delay_period
*/ */
void edac_pci_reset_delay_period(struct edac_pci_ctl_info *pci, void edac_pci_reset_delay_period(struct edac_pci_ctl_info *pci,
unsigned long value) unsigned long value)
{ {
edac_lock_pci_list(); edac_lock_pci_list();
...@@ -282,6 +284,7 @@ void edac_pci_reset_delay_period(struct edac_pci_ctl_info *pci, ...@@ -282,6 +284,7 @@ void edac_pci_reset_delay_period(struct edac_pci_ctl_info *pci,
edac_unlock_pci_list(); edac_unlock_pci_list();
} }
EXPORT_SYMBOL_GPL(edac_pci_reset_delay_period); EXPORT_SYMBOL_GPL(edac_pci_reset_delay_period);
/* /*
...@@ -324,22 +327,22 @@ int edac_pci_add_device(struct edac_pci_ctl_info *pci, int edac_idx) ...@@ -324,22 +327,22 @@ int edac_pci_add_device(struct edac_pci_ctl_info *pci, int edac_idx)
} }
edac_pci_printk(pci, KERN_INFO, edac_pci_printk(pci, KERN_INFO,
"Giving out device to module '%s' controller '%s':" "Giving out device to module '%s' controller '%s':"
" DEV '%s' (%s)\n", " DEV '%s' (%s)\n",
pci->mod_name, pci->mod_name,
pci->ctl_name, pci->ctl_name,
dev_name(pci), dev_name(pci), edac_op_state_toString(pci->op_state));
edac_op_state_toString(pci->op_state));
edac_unlock_pci_list(); edac_unlock_pci_list();
return 0; return 0;
fail1: fail1:
del_edac_pci_from_global_list(pci); del_edac_pci_from_global_list(pci);
fail0: fail0:
edac_unlock_pci_list(); edac_unlock_pci_list();
return 1; return 1;
} }
EXPORT_SYMBOL_GPL(edac_pci_add_device); EXPORT_SYMBOL_GPL(edac_pci_add_device);
/* /*
...@@ -355,7 +358,7 @@ EXPORT_SYMBOL_GPL(edac_pci_add_device); ...@@ -355,7 +358,7 @@ EXPORT_SYMBOL_GPL(edac_pci_add_device);
* Pointer to removed edac_pci structure, * Pointer to removed edac_pci structure,
* or NULL if device not found * or NULL if device not found
*/ */
struct edac_pci_ctl_info * edac_pci_del_device(struct device *dev) struct edac_pci_ctl_info *edac_pci_del_device(struct device *dev)
{ {
struct edac_pci_ctl_info *pci; struct edac_pci_ctl_info *pci;
...@@ -379,14 +382,12 @@ struct edac_pci_ctl_info * edac_pci_del_device(struct device *dev) ...@@ -379,14 +382,12 @@ struct edac_pci_ctl_info * edac_pci_del_device(struct device *dev)
edac_unlock_pci_list(); edac_unlock_pci_list();
edac_printk(KERN_INFO, EDAC_PCI, edac_printk(KERN_INFO, EDAC_PCI,
"Removed device %d for %s %s: DEV %s\n", "Removed device %d for %s %s: DEV %s\n",
pci->pci_idx, pci->pci_idx, pci->mod_name, pci->ctl_name, dev_name(pci));
pci->mod_name,
pci->ctl_name,
dev_name(pci));
return pci; return pci;
} }
EXPORT_SYMBOL_GPL(edac_pci_del_device); EXPORT_SYMBOL_GPL(edac_pci_del_device);
void edac_pci_generic_check(struct edac_pci_ctl_info *pci) void edac_pci_generic_check(struct edac_pci_ctl_info *pci)
...@@ -401,8 +402,8 @@ struct edac_pci_gen_data { ...@@ -401,8 +402,8 @@ struct edac_pci_gen_data {
int edac_idx; int edac_idx;
}; };
struct edac_pci_ctl_info * struct edac_pci_ctl_info *edac_pci_create_generic_ctl(struct device *dev,
edac_pci_create_generic_ctl(struct device *dev, const char *mod_name) const char *mod_name)
{ {
struct edac_pci_ctl_info *pci; struct edac_pci_ctl_info *pci;
struct edac_pci_gen_data *pdata; struct edac_pci_gen_data *pdata;
...@@ -430,6 +431,7 @@ edac_pci_create_generic_ctl(struct device *dev, const char *mod_name) ...@@ -430,6 +431,7 @@ edac_pci_create_generic_ctl(struct device *dev, const char *mod_name)
return pci; return pci;
} }
EXPORT_SYMBOL_GPL(edac_pci_create_generic_ctl); EXPORT_SYMBOL_GPL(edac_pci_create_generic_ctl);
void edac_pci_release_generic_ctl(struct edac_pci_ctl_info *pci) void edac_pci_release_generic_ctl(struct edac_pci_ctl_info *pci)
...@@ -437,4 +439,5 @@ void edac_pci_release_generic_ctl(struct edac_pci_ctl_info *pci) ...@@ -437,4 +439,5 @@ void edac_pci_release_generic_ctl(struct edac_pci_ctl_info *pci)
edac_pci_del_device(pci->dev); edac_pci_del_device(pci->dev);
edac_pci_free_ctl_info(pci); edac_pci_free_ctl_info(pci);
} }
EXPORT_SYMBOL_GPL(edac_pci_release_generic_ctl); EXPORT_SYMBOL_GPL(edac_pci_release_generic_ctl);
drivers/edac/edac_pci_sysfs.c
浏览文件 @ 079708b9
...@@ -13,7 +13,6 @@ ...@@ -13,7 +13,6 @@
#include "edac_core.h" #include "edac_core.h"
#include "edac_module.h" #include "edac_module.h"
#ifdef CONFIG_PCI #ifdef CONFIG_PCI
#define EDAC_PCI_SYMLINK "device" #define EDAC_PCI_SYMLINK "device"
...@@ -26,7 +25,7 @@ static atomic_t pci_parity_count = ATOMIC_INIT(0); ...@@ -26,7 +25,7 @@ static atomic_t pci_parity_count = ATOMIC_INIT(0);
static atomic_t pci_nonparity_count = ATOMIC_INIT(0); static atomic_t pci_nonparity_count = ATOMIC_INIT(0);
static int edac_pci_poll_msec = 1000; static int edac_pci_poll_msec = 1000;
static struct kobject edac_pci_kobj; /* /sys/devices/system/edac/pci */ static struct kobject edac_pci_kobj; /* /sys/devices/system/edac/pci */
static struct completion edac_pci_kobj_complete; static struct completion edac_pci_kobj_complete;
static atomic_t edac_pci_sysfs_refcount = ATOMIC_INIT(0); static atomic_t edac_pci_sysfs_refcount = ATOMIC_INIT(0);
...@@ -58,13 +57,13 @@ int edac_pci_get_poll_msec(void) ...@@ -58,13 +57,13 @@ int edac_pci_get_poll_msec(void)
/**************************** EDAC PCI sysfs instance *******************/ /**************************** EDAC PCI sysfs instance *******************/
static ssize_t instance_pe_count_show(struct edac_pci_ctl_info *pci, char *data) static ssize_t instance_pe_count_show(struct edac_pci_ctl_info *pci, char *data)
{ {
return sprintf(data,"%u\n", atomic_read(&pci->counters.pe_count)); return sprintf(data, "%u\n", atomic_read(&pci->counters.pe_count));
} }
static ssize_t instance_npe_count_show(struct edac_pci_ctl_info *pci, static ssize_t instance_npe_count_show(struct edac_pci_ctl_info *pci,
char *data) char *data)
{ {
return sprintf(data,"%u\n", atomic_read(&pci->counters.npe_count)); return sprintf(data, "%u\n", atomic_read(&pci->counters.npe_count));
} }
#define to_instance(k) container_of(k, struct edac_pci_ctl_info, kobj) #define to_instance(k) container_of(k, struct edac_pci_ctl_info, kobj)
...@@ -83,36 +82,34 @@ static void edac_pci_instance_release(struct kobject *kobj) ...@@ -83,36 +82,34 @@ static void edac_pci_instance_release(struct kobject *kobj)
/* instance specific attribute structure */ /* instance specific attribute structure */
struct instance_attribute { struct instance_attribute {
struct attribute attr; struct attribute attr;
ssize_t (*show)(struct edac_pci_ctl_info *, char *); ssize_t(*show) (struct edac_pci_ctl_info *, char *);
ssize_t (*store)(struct edac_pci_ctl_info *, const char *, size_t); ssize_t(*store) (struct edac_pci_ctl_info *, const char *, size_t);
}; };
/* Function to 'show' fields from the edac_pci 'instance' structure */ /* Function to 'show' fields from the edac_pci 'instance' structure */
static ssize_t edac_pci_instance_show(struct kobject *kobj, static ssize_t edac_pci_instance_show(struct kobject *kobj,
struct attribute *attr, struct attribute *attr, char *buffer)
char *buffer)
{ {
struct edac_pci_ctl_info *pci = to_instance(kobj); struct edac_pci_ctl_info *pci = to_instance(kobj);
struct instance_attribute *instance_attr = to_instance_attr(attr); struct instance_attribute *instance_attr = to_instance_attr(attr);
if (instance_attr->show) if (instance_attr->show)
return instance_attr->show(pci, buffer); return instance_attr->show(pci, buffer);
return -EIO; return -EIO;
} }
/* Function to 'store' fields into the edac_pci 'instance' structure */ /* Function to 'store' fields into the edac_pci 'instance' structure */
static ssize_t edac_pci_instance_store(struct kobject *kobj, static ssize_t edac_pci_instance_store(struct kobject *kobj,
struct attribute *attr, struct attribute *attr,
const char *buffer, size_t count) const char *buffer, size_t count)
{ {
struct edac_pci_ctl_info *pci = to_instance(kobj); struct edac_pci_ctl_info *pci = to_instance(kobj);
struct instance_attribute *instance_attr = to_instance_attr(attr); struct instance_attribute *instance_attr = to_instance_attr(attr);
if (instance_attr->store) if (instance_attr->store)
return instance_attr->store(pci, buffer, count); return instance_attr->store(pci, buffer, count);
return -EIO; return -EIO;
} }
static struct sysfs_ops pci_instance_ops = { static struct sysfs_ops pci_instance_ops = {
...@@ -158,7 +155,7 @@ static int edac_pci_create_instance_kobj(struct edac_pci_ctl_info *pci, int idx) ...@@ -158,7 +155,7 @@ static int edac_pci_create_instance_kobj(struct edac_pci_ctl_info *pci, int idx)
err = kobject_register(&pci->kobj); err = kobject_register(&pci->kobj);
if (err != 0) { if (err != 0) {
debugf2("%s() failed to register instance pci%d\n", debugf2("%s() failed to register instance pci%d\n",
__func__, idx); __func__, idx);
return err; return err;
} }
...@@ -182,7 +179,7 @@ edac_pci_delete_instance_kobj(struct edac_pci_ctl_info *pci, int idx) ...@@ -182,7 +179,7 @@ edac_pci_delete_instance_kobj(struct edac_pci_ctl_info *pci, int idx)
static ssize_t edac_pci_int_show(void *ptr, char *buffer) static ssize_t edac_pci_int_show(void *ptr, char *buffer)
{ {
int *value = ptr; int *value = ptr;
return sprintf(buffer,"%d\n",*value); return sprintf(buffer, "%d\n", *value);
} }
static ssize_t edac_pci_int_store(void *ptr, const char *buffer, size_t count) static ssize_t edac_pci_int_store(void *ptr, const char *buffer, size_t count)
...@@ -190,7 +187,7 @@ static ssize_t edac_pci_int_store(void *ptr, const char *buffer, size_t count) ...@@ -190,7 +187,7 @@ static ssize_t edac_pci_int_store(void *ptr, const char *buffer, size_t count)
int *value = ptr; int *value = ptr;
if (isdigit(*buffer)) if (isdigit(*buffer))
*value = simple_strtoul(buffer,NULL,0); *value = simple_strtoul(buffer, NULL, 0);
return count; return count;
} }
...@@ -198,16 +195,16 @@ static ssize_t edac_pci_int_store(void *ptr, const char *buffer, size_t count) ...@@ -198,16 +195,16 @@ static ssize_t edac_pci_int_store(void *ptr, const char *buffer, size_t count)
struct edac_pci_dev_attribute { struct edac_pci_dev_attribute {
struct attribute attr; struct attribute attr;
void *value; void *value;
ssize_t (*show)(void *,char *); ssize_t(*show) (void *, char *);
ssize_t (*store)(void *, const char *,size_t); ssize_t(*store) (void *, const char *, size_t);
}; };
/* Set of show/store abstract level functions for PCI Parity object */ /* Set of show/store abstract level functions for PCI Parity object */
static ssize_t edac_pci_dev_show(struct kobject *kobj, struct attribute *attr, static ssize_t edac_pci_dev_show(struct kobject *kobj, struct attribute *attr,
char *buffer) char *buffer)
{ {
struct edac_pci_dev_attribute *edac_pci_dev; struct edac_pci_dev_attribute *edac_pci_dev;
edac_pci_dev= (struct edac_pci_dev_attribute*)attr; edac_pci_dev = (struct edac_pci_dev_attribute *)attr;
if (edac_pci_dev->show) if (edac_pci_dev->show)
return edac_pci_dev->show(edac_pci_dev->value, buffer); return edac_pci_dev->show(edac_pci_dev->value, buffer);
...@@ -215,10 +212,11 @@ static ssize_t edac_pci_dev_show(struct kobject *kobj, struct attribute *attr, ...@@ -215,10 +212,11 @@ static ssize_t edac_pci_dev_show(struct kobject *kobj, struct attribute *attr,
} }
static ssize_t edac_pci_dev_store(struct kobject *kobj, static ssize_t edac_pci_dev_store(struct kobject *kobj,
struct attribute *attr, const char *buffer, size_t count) struct attribute *attr, const char *buffer,
size_t count)
{ {
struct edac_pci_dev_attribute *edac_pci_dev; struct edac_pci_dev_attribute *edac_pci_dev;
edac_pci_dev= (struct edac_pci_dev_attribute*)attr; edac_pci_dev = (struct edac_pci_dev_attribute *)attr;
if (edac_pci_dev->show) if (edac_pci_dev->show)
return edac_pci_dev->store(edac_pci_dev->value, buffer, count); return edac_pci_dev->store(edac_pci_dev->value, buffer, count);
...@@ -226,8 +224,8 @@ static ssize_t edac_pci_dev_store(struct kobject *kobj, ...@@ -226,8 +224,8 @@ static ssize_t edac_pci_dev_store(struct kobject *kobj,
} }
static struct sysfs_ops edac_pci_sysfs_ops = { static struct sysfs_ops edac_pci_sysfs_ops = {
.show = edac_pci_dev_show, .show = edac_pci_dev_show,
.store = edac_pci_dev_store .store = edac_pci_dev_store
}; };
#define EDAC_PCI_ATTR(_name,_mode,_show,_store) \ #define EDAC_PCI_ATTR(_name,_mode,_show,_store) \
...@@ -247,14 +245,14 @@ static struct edac_pci_dev_attribute edac_pci_attr_##_name = { \ ...@@ -247,14 +245,14 @@ static struct edac_pci_dev_attribute edac_pci_attr_##_name = { \
}; };
/* PCI Parity control files */ /* PCI Parity control files */
EDAC_PCI_ATTR(check_pci_errors, S_IRUGO|S_IWUSR, edac_pci_int_show, EDAC_PCI_ATTR(check_pci_errors, S_IRUGO | S_IWUSR, edac_pci_int_show,
edac_pci_int_store); edac_pci_int_store);
EDAC_PCI_ATTR(edac_pci_log_pe, S_IRUGO|S_IWUSR, edac_pci_int_show, EDAC_PCI_ATTR(edac_pci_log_pe, S_IRUGO | S_IWUSR, edac_pci_int_show,
edac_pci_int_store); edac_pci_int_store);
EDAC_PCI_ATTR(edac_pci_log_npe, S_IRUGO|S_IWUSR, edac_pci_int_show, EDAC_PCI_ATTR(edac_pci_log_npe, S_IRUGO | S_IWUSR, edac_pci_int_show,
edac_pci_int_store); edac_pci_int_store);
EDAC_PCI_ATTR(edac_pci_panic_on_pe, S_IRUGO|S_IWUSR, edac_pci_int_show, EDAC_PCI_ATTR(edac_pci_panic_on_pe, S_IRUGO | S_IWUSR, edac_pci_int_show,
edac_pci_int_store); edac_pci_int_store);
EDAC_PCI_ATTR(pci_parity_count, S_IRUGO, edac_pci_int_show, NULL); EDAC_PCI_ATTR(pci_parity_count, S_IRUGO, edac_pci_int_show, NULL);
EDAC_PCI_ATTR(pci_nonparity_count, S_IRUGO, edac_pci_int_show, NULL); EDAC_PCI_ATTR(pci_nonparity_count, S_IRUGO, edac_pci_int_show, NULL);
...@@ -283,7 +281,7 @@ static void edac_pci_release(struct kobject *kobj) ...@@ -283,7 +281,7 @@ static void edac_pci_release(struct kobject *kobj)
static struct kobj_type ktype_edac_pci = { static struct kobj_type ktype_edac_pci = {
.release = edac_pci_release, .release = edac_pci_release,
.sysfs_ops = &edac_pci_sysfs_ops, .sysfs_ops = &edac_pci_sysfs_ops,
.default_attrs = (struct attribute **) edac_pci_attr, .default_attrs = (struct attribute **)edac_pci_attr,
}; };
/** /**
...@@ -310,7 +308,7 @@ int edac_pci_register_main_kobj(void) ...@@ -310,7 +308,7 @@ int edac_pci_register_main_kobj(void)
edac_pci_kobj.parent = &edac_class->kset.kobj; edac_pci_kobj.parent = &edac_class->kset.kobj;
err = kobject_set_name(&edac_pci_kobj, "pci"); err = kobject_set_name(&edac_pci_kobj, "pci");
if(err) if (err)
return err; return err;
/* Instanstiate the pci object */ /* Instanstiate the pci object */
...@@ -359,15 +357,12 @@ int edac_pci_create_sysfs(struct edac_pci_ctl_info *pci) ...@@ -359,15 +357,12 @@ int edac_pci_create_sysfs(struct edac_pci_ctl_info *pci)
edac_pci_unregister_main_kobj(); edac_pci_unregister_main_kobj();
} }
debugf0("%s() idx=%d\n", __func__, pci->pci_idx); debugf0("%s() idx=%d\n", __func__, pci->pci_idx);
err = sysfs_create_link(edac_kobj, err = sysfs_create_link(edac_kobj, &pci->dev->kobj, EDAC_PCI_SYMLINK);
&pci->dev->kobj,
EDAC_PCI_SYMLINK);
if (err) { if (err) {
debugf0("%s() sysfs_create_link() returned err= %d\n", debugf0("%s() sysfs_create_link() returned err= %d\n",
__func__, err); __func__, err);
return err; return err;
} }
...@@ -410,7 +405,7 @@ static u16 get_pci_parity_status(struct pci_dev *dev, int secondary) ...@@ -410,7 +405,7 @@ static u16 get_pci_parity_status(struct pci_dev *dev, int secondary)
} }
status &= PCI_STATUS_DETECTED_PARITY | PCI_STATUS_SIG_SYSTEM_ERROR | status &= PCI_STATUS_DETECTED_PARITY | PCI_STATUS_SIG_SYSTEM_ERROR |
PCI_STATUS_PARITY; PCI_STATUS_PARITY;
if (status) if (status)
/* reset only the bits we are interested in */ /* reset only the bits we are interested in */
...@@ -419,7 +414,7 @@ static u16 get_pci_parity_status(struct pci_dev *dev, int secondary) ...@@ -419,7 +414,7 @@ static u16 get_pci_parity_status(struct pci_dev *dev, int secondary)
return status; return status;
} }
typedef void (*pci_parity_check_fn_t) (struct pci_dev *dev); typedef void (*pci_parity_check_fn_t) (struct pci_dev * dev);
/* Clear any PCI parity errors logged by this device. */ /* Clear any PCI parity errors logged by this device. */
static void edac_pci_dev_parity_clear(struct pci_dev *dev) static void edac_pci_dev_parity_clear(struct pci_dev *dev)
...@@ -442,35 +437,35 @@ static void edac_pci_dev_parity_clear(struct pci_dev *dev) ...@@ -442,35 +437,35 @@ static void edac_pci_dev_parity_clear(struct pci_dev *dev)
static void edac_pci_dev_parity_test(struct pci_dev *dev) static void edac_pci_dev_parity_test(struct pci_dev *dev)
{ {
u16 status; u16 status;
u8 header_type; u8 header_type;
/* read the STATUS register on this device /* read the STATUS register on this device
*/ */
status = get_pci_parity_status(dev, 0); status = get_pci_parity_status(dev, 0);
debugf2("PCI STATUS= 0x%04x %s\n", status, dev->dev.bus_id ); debugf2("PCI STATUS= 0x%04x %s\n", status, dev->dev.bus_id);
/* check the status reg for errors */ /* check the status reg for errors */
if (status) { if (status) {
if (status & (PCI_STATUS_SIG_SYSTEM_ERROR)) { if (status & (PCI_STATUS_SIG_SYSTEM_ERROR)) {
edac_printk(KERN_CRIT, EDAC_PCI, edac_printk(KERN_CRIT, EDAC_PCI,
"Signaled System Error on %s\n", "Signaled System Error on %s\n",
pci_name(dev)); pci_name(dev));
atomic_inc(&pci_nonparity_count); atomic_inc(&pci_nonparity_count);
} }
if (status & (PCI_STATUS_PARITY)) { if (status & (PCI_STATUS_PARITY)) {
edac_printk(KERN_CRIT, EDAC_PCI, edac_printk(KERN_CRIT, EDAC_PCI,
"Master Data Parity Error on %s\n", "Master Data Parity Error on %s\n",
pci_name(dev)); pci_name(dev));
atomic_inc(&pci_parity_count); atomic_inc(&pci_parity_count);
} }
if (status & (PCI_STATUS_DETECTED_PARITY)) { if (status & (PCI_STATUS_DETECTED_PARITY)) {
edac_printk(KERN_CRIT, EDAC_PCI, edac_printk(KERN_CRIT, EDAC_PCI,
"Detected Parity Error on %s\n", "Detected Parity Error on %s\n",
pci_name(dev)); pci_name(dev));
atomic_inc(&pci_parity_count); atomic_inc(&pci_parity_count);
} }
...@@ -479,36 +474,35 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev) ...@@ -479,36 +474,35 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
/* read the device TYPE, looking for bridges */ /* read the device TYPE, looking for bridges */
pci_read_config_byte(dev, PCI_HEADER_TYPE, &header_type); pci_read_config_byte(dev, PCI_HEADER_TYPE, &header_type);
debugf2("PCI HEADER TYPE= 0x%02x %s\n", header_type, dev->dev.bus_id ); debugf2("PCI HEADER TYPE= 0x%02x %s\n", header_type, dev->dev.bus_id);
if ((header_type & 0x7F) == PCI_HEADER_TYPE_BRIDGE) { if ((header_type & 0x7F) == PCI_HEADER_TYPE_BRIDGE) {
/* On bridges, need to examine secondary status register */ /* On bridges, need to examine secondary status register */
status = get_pci_parity_status(dev, 1); status = get_pci_parity_status(dev, 1);
debugf2("PCI SEC_STATUS= 0x%04x %s\n", debugf2("PCI SEC_STATUS= 0x%04x %s\n", status, dev->dev.bus_id);
status, dev->dev.bus_id );
/* check the secondary status reg for errors */ /* check the secondary status reg for errors */
if (status) { if (status) {
if (status & (PCI_STATUS_SIG_SYSTEM_ERROR)) { if (status & (PCI_STATUS_SIG_SYSTEM_ERROR)) {
edac_printk(KERN_CRIT, EDAC_PCI, "Bridge " edac_printk(KERN_CRIT, EDAC_PCI, "Bridge "
"Signaled System Error on %s\n", "Signaled System Error on %s\n",
pci_name(dev)); pci_name(dev));
atomic_inc(&pci_nonparity_count); atomic_inc(&pci_nonparity_count);
} }
if (status & (PCI_STATUS_PARITY)) { if (status & (PCI_STATUS_PARITY)) {
edac_printk(KERN_CRIT, EDAC_PCI, "Bridge " edac_printk(KERN_CRIT, EDAC_PCI, "Bridge "
"Master Data Parity Error on " "Master Data Parity Error on "
"%s\n", pci_name(dev)); "%s\n", pci_name(dev));
atomic_inc(&pci_parity_count); atomic_inc(&pci_parity_count);
} }
if (status & (PCI_STATUS_DETECTED_PARITY)) { if (status & (PCI_STATUS_DETECTED_PARITY)) {
edac_printk(KERN_CRIT, EDAC_PCI, "Bridge " edac_printk(KERN_CRIT, EDAC_PCI, "Bridge "
"Detected Parity Error on %s\n", "Detected Parity Error on %s\n",
pci_name(dev)); pci_name(dev));
atomic_inc(&pci_parity_count); atomic_inc(&pci_parity_count);
} }
...@@ -529,7 +523,7 @@ static inline void edac_pci_dev_parity_iterator(pci_parity_check_fn_t fn) ...@@ -529,7 +523,7 @@ static inline void edac_pci_dev_parity_iterator(pci_parity_check_fn_t fn)
* and while we are looking at it have its reference count * and while we are looking at it have its reference count
* bumped until we are done with it * bumped until we are done with it
*/ */
while((dev = pci_get_device(PCI_ANY_ID, PCI_ANY_ID, dev)) != NULL) { while ((dev = pci_get_device(PCI_ANY_ID, PCI_ANY_ID, dev)) != NULL) {
fn(dev); fn(dev);
} }
} }
...@@ -590,6 +584,7 @@ void edac_pci_handle_pe(struct edac_pci_ctl_info *pci, const char *msg) ...@@ -590,6 +584,7 @@ void edac_pci_handle_pe(struct edac_pci_ctl_info *pci, const char *msg)
*/ */
edac_pci_do_parity_check(); edac_pci_do_parity_check();
} }
EXPORT_SYMBOL_GPL(edac_pci_handle_pe); EXPORT_SYMBOL_GPL(edac_pci_handle_pe);
void edac_pci_handle_npe(struct edac_pci_ctl_info *pci, const char *msg) void edac_pci_handle_npe(struct edac_pci_ctl_info *pci, const char *msg)
...@@ -609,6 +604,7 @@ void edac_pci_handle_npe(struct edac_pci_ctl_info *pci, const char *msg) ...@@ -609,6 +604,7 @@ void edac_pci_handle_npe(struct edac_pci_ctl_info *pci, const char *msg)
*/ */
edac_pci_do_parity_check(); edac_pci_do_parity_check();
} }
EXPORT_SYMBOL_GPL(edac_pci_handle_npe); EXPORT_SYMBOL_GPL(edac_pci_handle_npe);
/* /*
...@@ -616,9 +612,9 @@ EXPORT_SYMBOL_GPL(edac_pci_handle_npe); ...@@ -616,9 +612,9 @@ EXPORT_SYMBOL_GPL(edac_pci_handle_npe);
*/ */
module_param(check_pci_errors, int, 0644); module_param(check_pci_errors, int, 0644);
MODULE_PARM_DESC(check_pci_errors, MODULE_PARM_DESC(check_pci_errors,
"Check for PCI bus parity errors: 0=off 1=on"); "Check for PCI bus parity errors: 0=off 1=on");
module_param(edac_pci_panic_on_pe, int, 0644); module_param(edac_pci_panic_on_pe, int, 0644);
MODULE_PARM_DESC(edac_pci_panic_on_pe, MODULE_PARM_DESC(edac_pci_panic_on_pe,
"Panic on PCI Bus Parity error: 0=off 1=on"); "Panic on PCI Bus Parity error: 0=off 1=on");
#endif /* CONFIG_PCI */ #endif /* CONFIG_PCI */
drivers/edac/edac_stub.c
浏览文件 @ 079708b9
...@@ -30,6 +30,7 @@ inline int edac_handler_set(void) ...@@ -30,6 +30,7 @@ inline int edac_handler_set(void)
return atomic_read(&edac_handlers); return atomic_read(&edac_handlers);
} }
EXPORT_SYMBOL(edac_handler_set); EXPORT_SYMBOL(edac_handler_set);
/* /*
...@@ -39,4 +40,5 @@ inline void edac_atomic_assert_error(void) ...@@ -39,4 +40,5 @@ inline void edac_atomic_assert_error(void)
{ {
edac_err_assert++; edac_err_assert++;
} }
EXPORT_SYMBOL(edac_atomic_assert_error); EXPORT_SYMBOL(edac_atomic_assert_error);
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或