drivers/edac: Lindent e752x
Run e752x_edac.c file through Lindent for cleanup Signed-off-by: Dave Jiang <djiang@mvista.com> Signed-off-by: Douglas Thompson <dougthompson@xmission.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Dave Jiang
Linus Torvalds
parent
466b71d584
commit
203333cbba
|
|
@ -206,25 +206,22 @@ static const struct e752x_dev_info e752x_devs[] = {
|
|||
[E7520] = {
|
||||
.err_dev = PCI_DEVICE_ID_INTEL_7520_1_ERR,
|
||||
.ctl_dev = PCI_DEVICE_ID_INTEL_7520_0,
|
||||
.ctl_name = "E7520"
|
||||
},
|
||||
.ctl_name = "E7520"},
|
||||
[E7525] = {
|
||||
.err_dev = PCI_DEVICE_ID_INTEL_7525_1_ERR,
|
||||
.ctl_dev = PCI_DEVICE_ID_INTEL_7525_0,
|
||||
.ctl_name = "E7525"
|
||||
},
|
||||
.ctl_name = "E7525"},
|
||||
[E7320] = {
|
||||
.err_dev = PCI_DEVICE_ID_INTEL_7320_1_ERR,
|
||||
.ctl_dev = PCI_DEVICE_ID_INTEL_7320_0,
|
||||
.ctl_name = "E7320"
|
||||
},
|
||||
.ctl_name = "E7320"},
|
||||
};
|
||||
|
||||
static unsigned long ctl_page_to_phys(struct mem_ctl_info *mci,
|
||||
unsigned long page)
|
||||
{
|
||||
u32 remap;
|
||||
struct e752x_pvt *pvt = (struct e752x_pvt *) mci->pvt_info;
|
||||
struct e752x_pvt *pvt = (struct e752x_pvt *)mci->pvt_info;
|
||||
|
||||
debugf3("%s()\n", __func__);
|
||||
|
||||
|
|
@ -250,7 +247,7 @@ static void do_process_ce(struct mem_ctl_info *mci, u16 error_one,
|
|||
int row;
|
||||
int channel;
|
||||
int i;
|
||||
struct e752x_pvt *pvt = (struct e752x_pvt *) mci->pvt_info;
|
||||
struct e752x_pvt *pvt = (struct e752x_pvt *)mci->pvt_info;
|
||||
|
||||
debugf3("%s()\n", __func__);
|
||||
|
||||
|
|
@ -264,7 +261,8 @@ static void do_process_ce(struct mem_ctl_info *mci, u16 error_one,
|
|||
e752x_printk(KERN_WARNING,
|
||||
"Test row %d Table %d %d %d %d %d %d %d %d\n", row,
|
||||
pvt->map[0], pvt->map[1], pvt->map[2], pvt->map[3],
|
||||
pvt->map[4], pvt->map[5], pvt->map[6], pvt->map[7]);
|
||||
pvt->map[4], pvt->map[5], pvt->map[6],
|
||||
pvt->map[7]);
|
||||
|
||||
/* test for channel remapping */
|
||||
for (i = 0; i < 8; i++) {
|
||||
|
|
@ -278,7 +276,8 @@ static void do_process_ce(struct mem_ctl_info *mci, u16 error_one,
|
|||
row = i;
|
||||
else
|
||||
e752x_mc_printk(mci, KERN_WARNING,
|
||||
"row %d not found in remap table\n", row);
|
||||
"row %d not found in remap table\n",
|
||||
row);
|
||||
} else
|
||||
row = edac_mc_find_csrow_by_page(mci, page);
|
||||
|
||||
|
|
@ -308,7 +307,7 @@ static void do_process_ue(struct mem_ctl_info *mci, u16 error_one,
|
|||
{
|
||||
u32 error_2b, block_page;
|
||||
int row;
|
||||
struct e752x_pvt *pvt = (struct e752x_pvt *) mci->pvt_info;
|
||||
struct e752x_pvt *pvt = (struct e752x_pvt *)mci->pvt_info;
|
||||
|
||||
debugf3("%s()\n", __func__);
|
||||
|
||||
|
|
@ -347,7 +346,8 @@ static void do_process_ue(struct mem_ctl_info *mci, u16 error_one,
|
|||
}
|
||||
|
||||
static inline void process_ue(struct mem_ctl_info *mci, u16 error_one,
|
||||
u32 ded_add, u32 scrb_add, int *error_found, int handle_error)
|
||||
u32 ded_add, u32 scrb_add, int *error_found,
|
||||
int handle_error)
|
||||
{
|
||||
*error_found = 1;
|
||||
|
||||
|
|
@ -372,20 +372,20 @@ static void do_process_ded_retry(struct mem_ctl_info *mci, u16 error,
|
|||
{
|
||||
u32 error_1b, page;
|
||||
int row;
|
||||
struct e752x_pvt *pvt = (struct e752x_pvt *) mci->pvt_info;
|
||||
struct e752x_pvt *pvt = (struct e752x_pvt *)mci->pvt_info;
|
||||
|
||||
error_1b = retry_add;
|
||||
page = error_1b >> (PAGE_SHIFT - 4); /* convert the addr to 4k page */
|
||||
row = pvt->mc_symmetric ?
|
||||
((page >> 1) & 3) : /* chip select are bits 14 & 13 */
|
||||
row = pvt->mc_symmetric ? ((page >> 1) & 3) : /* chip select are bits 14 & 13 */
|
||||
edac_mc_find_csrow_by_page(mci, page);
|
||||
e752x_mc_printk(mci, KERN_WARNING,
|
||||
"CE page 0x%lx, row %d : Memory read retry\n",
|
||||
(long unsigned int) page, row);
|
||||
(long unsigned int)page, row);
|
||||
}
|
||||
|
||||
static inline void process_ded_retry(struct mem_ctl_info *mci, u16 error,
|
||||
u32 retry_add, int *error_found, int handle_error)
|
||||
u32 retry_add, int *error_found,
|
||||
int handle_error)
|
||||
{
|
||||
*error_found = 1;
|
||||
|
||||
|
|
@ -525,27 +525,26 @@ static void e752x_check_hub_interface(struct e752x_error_info *info,
|
|||
|
||||
stat8 = info->hi_ferr;
|
||||
|
||||
if(stat8 & 0x7f) { /* Error, so process */
|
||||
stat8 &= 0x7f;
|
||||
|
||||
if(stat8 & 0x2b)
|
||||
hub_error(1, stat8 & 0x2b, error_found, handle_error);
|
||||
|
||||
if(stat8 & 0x54)
|
||||
hub_error(0, stat8 & 0x54, error_found, handle_error);
|
||||
}
|
||||
|
||||
//pci_read_config_byte(dev,E752X_HI_NERR,&stat8);
|
||||
|
||||
stat8 = info->hi_nerr;
|
||||
|
||||
if(stat8 & 0x7f) { /* Error, so process */
|
||||
if (stat8 & 0x7f) { /* Error, so process */
|
||||
stat8 &= 0x7f;
|
||||
|
||||
if (stat8 & 0x2b)
|
||||
hub_error(1, stat8 & 0x2b, error_found, handle_error);
|
||||
|
||||
if(stat8 & 0x54)
|
||||
if (stat8 & 0x54)
|
||||
hub_error(0, stat8 & 0x54, error_found, handle_error);
|
||||
}
|
||||
//pci_read_config_byte(dev,E752X_HI_NERR,&stat8);
|
||||
|
||||
stat8 = info->hi_nerr;
|
||||
|
||||
if (stat8 & 0x7f) { /* Error, so process */
|
||||
stat8 &= 0x7f;
|
||||
|
||||
if (stat8 & 0x2b)
|
||||
hub_error(1, stat8 & 0x2b, error_found, handle_error);
|
||||
|
||||
if (stat8 & 0x54)
|
||||
hub_error(0, stat8 & 0x54, error_found, handle_error);
|
||||
}
|
||||
}
|
||||
|
|
@ -564,20 +563,20 @@ static void e752x_check_sysbus(struct e752x_error_info *info,
|
|||
error32 = (stat32 >> 16) & 0x3ff;
|
||||
stat32 = stat32 & 0x3ff;
|
||||
|
||||
if(stat32 & 0x087)
|
||||
if (stat32 & 0x087)
|
||||
sysbus_error(1, stat32 & 0x087, error_found, handle_error);
|
||||
|
||||
if(stat32 & 0x378)
|
||||
if (stat32 & 0x378)
|
||||
sysbus_error(0, stat32 & 0x378, error_found, handle_error);
|
||||
|
||||
if(error32 & 0x087)
|
||||
if (error32 & 0x087)
|
||||
sysbus_error(1, error32 & 0x087, error_found, handle_error);
|
||||
|
||||
if(error32 & 0x378)
|
||||
if (error32 & 0x378)
|
||||
sysbus_error(0, error32 & 0x378, error_found, handle_error);
|
||||
}
|
||||
|
||||
static void e752x_check_membuf (struct e752x_error_info *info,
|
||||
static void e752x_check_membuf(struct e752x_error_info *info,
|
||||
int *error_found, int handle_error)
|
||||
{
|
||||
u8 stat8;
|
||||
|
|
@ -597,7 +596,7 @@ static void e752x_check_membuf (struct e752x_error_info *info,
|
|||
}
|
||||
}
|
||||
|
||||
static void e752x_check_dram (struct mem_ctl_info *mci,
|
||||
static void e752x_check_dram(struct mem_ctl_info *mci,
|
||||
struct e752x_error_info *info, int *error_found,
|
||||
int handle_error)
|
||||
{
|
||||
|
|
@ -607,55 +606,52 @@ static void e752x_check_dram (struct mem_ctl_info *mci,
|
|||
error_next = info->dram_nerr;
|
||||
|
||||
/* decode and report errors */
|
||||
if(error_one & 0x0101) /* check first error correctable */
|
||||
if (error_one & 0x0101) /* check first error correctable */
|
||||
process_ce(mci, error_one, info->dram_sec1_add,
|
||||
info->dram_sec1_syndrome, error_found,
|
||||
handle_error);
|
||||
info->dram_sec1_syndrome, error_found, handle_error);
|
||||
|
||||
if(error_next & 0x0101) /* check next error correctable */
|
||||
if (error_next & 0x0101) /* check next error correctable */
|
||||
process_ce(mci, error_next, info->dram_sec2_add,
|
||||
info->dram_sec2_syndrome, error_found,
|
||||
handle_error);
|
||||
info->dram_sec2_syndrome, error_found, handle_error);
|
||||
|
||||
if(error_one & 0x4040)
|
||||
if (error_one & 0x4040)
|
||||
process_ue_no_info_wr(mci, error_found, handle_error);
|
||||
|
||||
if(error_next & 0x4040)
|
||||
if (error_next & 0x4040)
|
||||
process_ue_no_info_wr(mci, error_found, handle_error);
|
||||
|
||||
if(error_one & 0x2020)
|
||||
if (error_one & 0x2020)
|
||||
process_ded_retry(mci, error_one, info->dram_retr_add,
|
||||
error_found, handle_error);
|
||||
|
||||
if(error_next & 0x2020)
|
||||
if (error_next & 0x2020)
|
||||
process_ded_retry(mci, error_next, info->dram_retr_add,
|
||||
error_found, handle_error);
|
||||
|
||||
if(error_one & 0x0808)
|
||||
process_threshold_ce(mci, error_one, error_found,
|
||||
handle_error);
|
||||
if (error_one & 0x0808)
|
||||
process_threshold_ce(mci, error_one, error_found, handle_error);
|
||||
|
||||
if(error_next & 0x0808)
|
||||
if (error_next & 0x0808)
|
||||
process_threshold_ce(mci, error_next, error_found,
|
||||
handle_error);
|
||||
|
||||
if(error_one & 0x0606)
|
||||
if (error_one & 0x0606)
|
||||
process_ue(mci, error_one, info->dram_ded_add,
|
||||
info->dram_scrb_add, error_found, handle_error);
|
||||
|
||||
if(error_next & 0x0606)
|
||||
if (error_next & 0x0606)
|
||||
process_ue(mci, error_next, info->dram_ded_add,
|
||||
info->dram_scrb_add, error_found, handle_error);
|
||||
}
|
||||
|
||||
static void e752x_get_error_info (struct mem_ctl_info *mci,
|
||||
static void e752x_get_error_info(struct mem_ctl_info *mci,
|
||||
struct e752x_error_info *info)
|
||||
{
|
||||
struct pci_dev *dev;
|
||||
struct e752x_pvt *pvt;
|
||||
|
||||
memset(info, 0, sizeof(*info));
|
||||
pvt = (struct e752x_pvt *) mci->pvt_info;
|
||||
pvt = (struct e752x_pvt *)mci->pvt_info;
|
||||
dev = pvt->dev_d0f1;
|
||||
pci_read_config_dword(dev, E752X_FERR_GLOBAL, &info->ferr_global);
|
||||
|
||||
|
|
@ -664,8 +660,7 @@ static void e752x_get_error_info (struct mem_ctl_info *mci,
|
|||
pci_read_config_word(dev, E752X_SYSBUS_FERR,
|
||||
&info->sysbus_ferr);
|
||||
pci_read_config_byte(dev, E752X_BUF_FERR, &info->buf_ferr);
|
||||
pci_read_config_word(dev, E752X_DRAM_FERR,
|
||||
&info->dram_ferr);
|
||||
pci_read_config_word(dev, E752X_DRAM_FERR, &info->dram_ferr);
|
||||
pci_read_config_dword(dev, E752X_DRAM_SEC1_ADD,
|
||||
&info->dram_sec1_add);
|
||||
pci_read_config_word(dev, E752X_DRAM_SEC1_SYNDROME,
|
||||
|
|
@ -704,8 +699,7 @@ static void e752x_get_error_info (struct mem_ctl_info *mci,
|
|||
pci_read_config_word(dev, E752X_SYSBUS_NERR,
|
||||
&info->sysbus_nerr);
|
||||
pci_read_config_byte(dev, E752X_BUF_NERR, &info->buf_nerr);
|
||||
pci_read_config_word(dev, E752X_DRAM_NERR,
|
||||
&info->dram_nerr);
|
||||
pci_read_config_word(dev, E752X_DRAM_NERR, &info->dram_nerr);
|
||||
pci_read_config_dword(dev, E752X_DRAM_SEC2_ADD,
|
||||
&info->dram_sec2_add);
|
||||
pci_read_config_word(dev, E752X_DRAM_SEC2_SYNDROME,
|
||||
|
|
@ -732,8 +726,9 @@ static void e752x_get_error_info (struct mem_ctl_info *mci,
|
|||
}
|
||||
}
|
||||
|
||||
static int e752x_process_error_info (struct mem_ctl_info *mci,
|
||||
struct e752x_error_info *info, int handle_errors)
|
||||
static int e752x_process_error_info(struct mem_ctl_info *mci,
|
||||
struct e752x_error_info *info,
|
||||
int handle_errors)
|
||||
{
|
||||
u32 error32, stat32;
|
||||
int error_found;
|
||||
|
|
@ -791,9 +786,9 @@ static void e752x_init_csrows(struct mem_ctl_info *mci, struct pci_dev *pdev,
|
|||
u32 dra, drc, cumul_size;
|
||||
|
||||
dra = 0;
|
||||
for (index=0; index < 4; index++) {
|
||||
for (index = 0; index < 4; index++) {
|
||||
u8 dra_reg;
|
||||
pci_read_config_byte(pdev, E752X_DRA+index, &dra_reg);
|
||||
pci_read_config_byte(pdev, E752X_DRA + index, &dra_reg);
|
||||
dra |= dra_reg << (index * 8);
|
||||
}
|
||||
pci_read_config_dword(pdev, E752X_DRC, &drc);
|
||||
|
|
@ -870,8 +865,7 @@ static void e752x_init_mem_map_table(struct pci_dev *pdev,
|
|||
*/
|
||||
pci_read_config_byte(pdev, E752X_DRB + index + 1,
|
||||
&value);
|
||||
pvt->map[index + 1] = (value == last) ?
|
||||
0xff : /* the dimm is single sided,
|
||||
pvt->map[index + 1] = (value == last) ? 0xff : /* the dimm is single sided,
|
||||
so flag as empty */
|
||||
row; /* this is a double sided dimm
|
||||
to save the next row # */
|
||||
|
|
@ -892,8 +886,7 @@ static int e752x_get_devs(struct pci_dev *pdev, int dev_idx,
|
|||
struct pci_dev *dev;
|
||||
|
||||
pvt->bridge_ck = pci_get_device(PCI_VENDOR_ID_INTEL,
|
||||
pvt->dev_info->err_dev,
|
||||
pvt->bridge_ck);
|
||||
pvt->dev_info->err_dev, pvt->bridge_ck);
|
||||
|
||||
if (pvt->bridge_ck == NULL)
|
||||
pvt->bridge_ck = pci_scan_single_device(pdev->bus,
|
||||
|
|
@ -917,7 +910,7 @@ static int e752x_get_devs(struct pci_dev *pdev, int dev_idx,
|
|||
|
||||
return 0;
|
||||
|
||||
fail:
|
||||
fail:
|
||||
pci_dev_put(pvt->bridge_ck);
|
||||
return 1;
|
||||
}
|
||||
|
|
@ -952,7 +945,7 @@ static int e752x_probe1(struct pci_dev *pdev, int dev_idx)
|
|||
debugf0("Starting Probe1\n");
|
||||
|
||||
/* make sure error reporting method is sane */
|
||||
switch(edac_op_state) {
|
||||
switch (edac_op_state) {
|
||||
case EDAC_OPSTATE_POLL:
|
||||
case EDAC_OPSTATE_NMI:
|
||||
break;
|
||||
|
|
@ -995,7 +988,7 @@ static int e752x_probe1(struct pci_dev *pdev, int dev_idx)
|
|||
mci->dev = &pdev->dev;
|
||||
|
||||
debugf3("%s(): init pvt\n", __func__);
|
||||
pvt = (struct e752x_pvt *) mci->pvt_info;
|
||||
pvt = (struct e752x_pvt *)mci->pvt_info;
|
||||
pvt->dev_info = &e752x_devs[dev_idx];
|
||||
pvt->mc_symmetric = ((ddrcsr & 0x10) != 0);
|
||||
|
||||
|
|
@ -1034,7 +1027,7 @@ static int e752x_probe1(struct pci_dev *pdev, int dev_idx)
|
|||
/* Here we assume that we will never see multiple instances of this
|
||||
* type of memory controller. The ID is therefore hardcoded to 0.
|
||||
*/
|
||||
if (edac_mc_add_mc(mci,0)) {
|
||||
if (edac_mc_add_mc(mci, 0)) {
|
||||
debugf3("%s(): failed edac_mc_add_mc()\n", __func__);
|
||||
goto fail;
|
||||
}
|
||||
|
|
@ -1046,18 +1039,16 @@ static int e752x_probe1(struct pci_dev *pdev, int dev_idx)
|
|||
e752x_pci = edac_pci_create_generic_ctl(&pdev->dev, EDAC_MOD_STR);
|
||||
if (!e752x_pci) {
|
||||
printk(KERN_WARNING
|
||||
"%s(): Unable to create PCI control\n",
|
||||
__func__);
|
||||
"%s(): Unable to create PCI control\n", __func__);
|
||||
printk(KERN_WARNING
|
||||
"%s(): PCI error report via EDAC not setup\n",
|
||||
__func__);
|
||||
"%s(): PCI error report via EDAC not setup\n", __func__);
|
||||
}
|
||||
|
||||
/* get this far and it's successful */
|
||||
debugf3("%s(): success\n", __func__);
|
||||
return 0;
|
||||
|
||||
fail:
|
||||
fail:
|
||||
pci_dev_put(pvt->dev_d0f0);
|
||||
pci_dev_put(pvt->dev_d0f1);
|
||||
pci_dev_put(pvt->bridge_ck);
|
||||
|
|
@ -1073,7 +1064,7 @@ static int __devinit e752x_init_one(struct pci_dev *pdev,
|
|||
debugf0("%s()\n", __func__);
|
||||
|
||||
/* wake up and enable device */
|
||||
if(pci_enable_device(pdev) < 0)
|
||||
if (pci_enable_device(pdev) < 0)
|
||||
return -EIO;
|
||||
|
||||
return e752x_probe1(pdev, ent->driver_data);
|
||||
|
|
@ -1092,7 +1083,7 @@ static void __devexit e752x_remove_one(struct pci_dev *pdev)
|
|||
if ((mci = edac_mc_del_mc(&pdev->dev)) == NULL)
|
||||
return;
|
||||
|
||||
pvt = (struct e752x_pvt *) mci->pvt_info;
|
||||
pvt = (struct e752x_pvt *)mci->pvt_info;
|
||||
pci_dev_put(pvt->dev_d0f0);
|
||||
pci_dev_put(pvt->dev_d0f1);
|
||||
pci_dev_put(pvt->bridge_ck);
|
||||
|
|
@ -1102,16 +1093,13 @@ static void __devexit e752x_remove_one(struct pci_dev *pdev)
|
|||
static const struct pci_device_id e752x_pci_tbl[] __devinitdata = {
|
||||
{
|
||||
PCI_VEND_DEV(INTEL, 7520_0), PCI_ANY_ID, PCI_ANY_ID, 0, 0,
|
||||
E7520
|
||||
},
|
||||
E7520},
|
||||
{
|
||||
PCI_VEND_DEV(INTEL, 7525_0), PCI_ANY_ID, PCI_ANY_ID, 0, 0,
|
||||
E7525
|
||||
},
|
||||
E7525},
|
||||
{
|
||||
PCI_VEND_DEV(INTEL, 7320_0), PCI_ANY_ID, PCI_ANY_ID, 0, 0,
|
||||
E7320
|
||||
},
|
||||
E7320},
|
||||
{
|
||||
0,
|
||||
} /* 0 terminated list. */
|
||||
|
|
@ -1150,6 +1138,6 @@ MODULE_DESCRIPTION("MC support for Intel e752x memory controllers");
|
|||
|
||||
module_param(force_function_unhide, int, 0444);
|
||||
MODULE_PARM_DESC(force_function_unhide, "if BIOS sets Dev0:Fun1 up as hidden:"
|
||||
" 1=force unhide and hope BIOS doesn't fight driver for Dev0:Fun1 access");
|
||||
" 1=force unhide and hope BIOS doesn't fight driver for Dev0:Fun1 access");
|
||||
module_param(edac_op_state, int, 0444);
|
||||
MODULE_PARM_DESC(edac_op_state, "EDAC Error Reporting state: 0=Poll,1=NMI");
|
||||
|
|
|
|||
Loading…
Reference in New Issue