diff options
Diffstat (limited to 'drivers/edac/e752x_edac.c')
-rw-r--r-- | drivers/edac/e752x_edac.c | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/drivers/edac/e752x_edac.c b/drivers/edac/e752x_edac.c index 7cde7f1aafb7..39c8997b2162 100644 --- a/drivers/edac/e752x_edac.c +++ b/drivers/edac/e752x_edac.c | |||
@@ -309,7 +309,7 @@ static unsigned long ctl_page_to_phys(struct mem_ctl_info *mci, | |||
309 | u32 remap; | 309 | u32 remap; |
310 | struct e752x_pvt *pvt = (struct e752x_pvt *)mci->pvt_info; | 310 | struct e752x_pvt *pvt = (struct e752x_pvt *)mci->pvt_info; |
311 | 311 | ||
312 | debugf3("%s()\n", __func__); | 312 | debugf3("\n"); |
313 | 313 | ||
314 | if (page < pvt->tolm) | 314 | if (page < pvt->tolm) |
315 | return page; | 315 | return page; |
@@ -335,7 +335,7 @@ static void do_process_ce(struct mem_ctl_info *mci, u16 error_one, | |||
335 | int i; | 335 | int i; |
336 | struct e752x_pvt *pvt = (struct e752x_pvt *)mci->pvt_info; | 336 | struct e752x_pvt *pvt = (struct e752x_pvt *)mci->pvt_info; |
337 | 337 | ||
338 | debugf3("%s()\n", __func__); | 338 | debugf3("\n"); |
339 | 339 | ||
340 | /* convert the addr to 4k page */ | 340 | /* convert the addr to 4k page */ |
341 | page = sec1_add >> (PAGE_SHIFT - 4); | 341 | page = sec1_add >> (PAGE_SHIFT - 4); |
@@ -394,7 +394,7 @@ static void do_process_ue(struct mem_ctl_info *mci, u16 error_one, | |||
394 | int row; | 394 | int row; |
395 | struct e752x_pvt *pvt = (struct e752x_pvt *)mci->pvt_info; | 395 | struct e752x_pvt *pvt = (struct e752x_pvt *)mci->pvt_info; |
396 | 396 | ||
397 | debugf3("%s()\n", __func__); | 397 | debugf3("\n"); |
398 | 398 | ||
399 | if (error_one & 0x0202) { | 399 | if (error_one & 0x0202) { |
400 | error_2b = ded_add; | 400 | error_2b = ded_add; |
@@ -453,7 +453,7 @@ static inline void process_ue_no_info_wr(struct mem_ctl_info *mci, | |||
453 | if (!handle_error) | 453 | if (!handle_error) |
454 | return; | 454 | return; |
455 | 455 | ||
456 | debugf3("%s()\n", __func__); | 456 | debugf3("\n"); |
457 | edac_mc_handle_error(HW_EVENT_ERR_UNCORRECTED, mci, 0, 0, 0, | 457 | edac_mc_handle_error(HW_EVENT_ERR_UNCORRECTED, mci, 0, 0, 0, |
458 | -1, -1, -1, | 458 | -1, -1, -1, |
459 | "e752x UE log memory write", "", NULL); | 459 | "e752x UE log memory write", "", NULL); |
@@ -982,7 +982,7 @@ static void e752x_check(struct mem_ctl_info *mci) | |||
982 | { | 982 | { |
983 | struct e752x_error_info info; | 983 | struct e752x_error_info info; |
984 | 984 | ||
985 | debugf3("%s()\n", __func__); | 985 | debugf3("\n"); |
986 | e752x_get_error_info(mci, &info); | 986 | e752x_get_error_info(mci, &info); |
987 | e752x_process_error_info(mci, &info, 1); | 987 | e752x_process_error_info(mci, &info, 1); |
988 | } | 988 | } |
@@ -1102,7 +1102,7 @@ static void e752x_init_csrows(struct mem_ctl_info *mci, struct pci_dev *pdev, | |||
1102 | pci_read_config_byte(pdev, E752X_DRB + index, &value); | 1102 | pci_read_config_byte(pdev, E752X_DRB + index, &value); |
1103 | /* convert a 128 or 64 MiB DRB to a page size. */ | 1103 | /* convert a 128 or 64 MiB DRB to a page size. */ |
1104 | cumul_size = value << (25 + drc_drbg - PAGE_SHIFT); | 1104 | cumul_size = value << (25 + drc_drbg - PAGE_SHIFT); |
1105 | debugf3("%s(): (%d) cumul_size 0x%x\n", __func__, index, | 1105 | debugf3("(%d) cumul_size 0x%x\n", index, |
1106 | cumul_size); | 1106 | cumul_size); |
1107 | if (cumul_size == last_cumul_size) | 1107 | if (cumul_size == last_cumul_size) |
1108 | continue; /* not populated */ | 1108 | continue; /* not populated */ |
@@ -1270,7 +1270,7 @@ static int e752x_probe1(struct pci_dev *pdev, int dev_idx) | |||
1270 | int drc_chan; /* Number of channels 0=1chan,1=2chan */ | 1270 | int drc_chan; /* Number of channels 0=1chan,1=2chan */ |
1271 | struct e752x_error_info discard; | 1271 | struct e752x_error_info discard; |
1272 | 1272 | ||
1273 | debugf0("%s(): mci\n", __func__); | 1273 | debugf0("mci\n"); |
1274 | debugf0("Starting Probe1\n"); | 1274 | debugf0("Starting Probe1\n"); |
1275 | 1275 | ||
1276 | /* check to see if device 0 function 1 is enabled; if it isn't, we | 1276 | /* check to see if device 0 function 1 is enabled; if it isn't, we |
@@ -1301,7 +1301,7 @@ static int e752x_probe1(struct pci_dev *pdev, int dev_idx) | |||
1301 | if (mci == NULL) | 1301 | if (mci == NULL) |
1302 | return -ENOMEM; | 1302 | return -ENOMEM; |
1303 | 1303 | ||
1304 | debugf3("%s(): init mci\n", __func__); | 1304 | debugf3("init mci\n"); |
1305 | mci->mtype_cap = MEM_FLAG_RDDR; | 1305 | mci->mtype_cap = MEM_FLAG_RDDR; |
1306 | /* 3100 IMCH supports SECDEC only */ | 1306 | /* 3100 IMCH supports SECDEC only */ |
1307 | mci->edac_ctl_cap = (dev_idx == I3100) ? EDAC_FLAG_SECDED : | 1307 | mci->edac_ctl_cap = (dev_idx == I3100) ? EDAC_FLAG_SECDED : |
@@ -1311,7 +1311,7 @@ static int e752x_probe1(struct pci_dev *pdev, int dev_idx) | |||
1311 | mci->mod_ver = E752X_REVISION; | 1311 | mci->mod_ver = E752X_REVISION; |
1312 | mci->pdev = &pdev->dev; | 1312 | mci->pdev = &pdev->dev; |
1313 | 1313 | ||
1314 | debugf3("%s(): init pvt\n", __func__); | 1314 | debugf3("init pvt\n"); |
1315 | pvt = (struct e752x_pvt *)mci->pvt_info; | 1315 | pvt = (struct e752x_pvt *)mci->pvt_info; |
1316 | pvt->dev_info = &e752x_devs[dev_idx]; | 1316 | pvt->dev_info = &e752x_devs[dev_idx]; |
1317 | pvt->mc_symmetric = ((ddrcsr & 0x10) != 0); | 1317 | pvt->mc_symmetric = ((ddrcsr & 0x10) != 0); |
@@ -1321,7 +1321,7 @@ static int e752x_probe1(struct pci_dev *pdev, int dev_idx) | |||
1321 | return -ENODEV; | 1321 | return -ENODEV; |
1322 | } | 1322 | } |
1323 | 1323 | ||
1324 | debugf3("%s(): more mci init\n", __func__); | 1324 | debugf3("more mci init\n"); |
1325 | mci->ctl_name = pvt->dev_info->ctl_name; | 1325 | mci->ctl_name = pvt->dev_info->ctl_name; |
1326 | mci->dev_name = pci_name(pdev); | 1326 | mci->dev_name = pci_name(pdev); |
1327 | mci->edac_check = e752x_check; | 1327 | mci->edac_check = e752x_check; |
@@ -1343,7 +1343,7 @@ static int e752x_probe1(struct pci_dev *pdev, int dev_idx) | |||
1343 | mci->edac_cap = EDAC_FLAG_SECDED; /* the only mode supported */ | 1343 | mci->edac_cap = EDAC_FLAG_SECDED; /* the only mode supported */ |
1344 | else | 1344 | else |
1345 | mci->edac_cap |= EDAC_FLAG_NONE; | 1345 | mci->edac_cap |= EDAC_FLAG_NONE; |
1346 | debugf3("%s(): tolm, remapbase, remaplimit\n", __func__); | 1346 | debugf3("tolm, remapbase, remaplimit\n"); |
1347 | 1347 | ||
1348 | /* load the top of low memory, remap base, and remap limit vars */ | 1348 | /* load the top of low memory, remap base, and remap limit vars */ |
1349 | pci_read_config_word(pdev, E752X_TOLM, &pci_data); | 1349 | pci_read_config_word(pdev, E752X_TOLM, &pci_data); |
@@ -1360,7 +1360,7 @@ static int e752x_probe1(struct pci_dev *pdev, int dev_idx) | |||
1360 | * type of memory controller. The ID is therefore hardcoded to 0. | 1360 | * type of memory controller. The ID is therefore hardcoded to 0. |
1361 | */ | 1361 | */ |
1362 | if (edac_mc_add_mc(mci)) { | 1362 | if (edac_mc_add_mc(mci)) { |
1363 | debugf3("%s(): failed edac_mc_add_mc()\n", __func__); | 1363 | debugf3("failed edac_mc_add_mc()\n"); |
1364 | goto fail; | 1364 | goto fail; |
1365 | } | 1365 | } |
1366 | 1366 | ||
@@ -1378,7 +1378,7 @@ static int e752x_probe1(struct pci_dev *pdev, int dev_idx) | |||
1378 | } | 1378 | } |
1379 | 1379 | ||
1380 | /* get this far and it's successful */ | 1380 | /* get this far and it's successful */ |
1381 | debugf3("%s(): success\n", __func__); | 1381 | debugf3("success\n"); |
1382 | return 0; | 1382 | return 0; |
1383 | 1383 | ||
1384 | fail: | 1384 | fail: |
@@ -1394,7 +1394,7 @@ fail: | |||
1394 | static int __devinit e752x_init_one(struct pci_dev *pdev, | 1394 | static int __devinit e752x_init_one(struct pci_dev *pdev, |
1395 | const struct pci_device_id *ent) | 1395 | const struct pci_device_id *ent) |
1396 | { | 1396 | { |
1397 | debugf0("%s()\n", __func__); | 1397 | debugf0("\n"); |
1398 | 1398 | ||
1399 | /* wake up and enable device */ | 1399 | /* wake up and enable device */ |
1400 | if (pci_enable_device(pdev) < 0) | 1400 | if (pci_enable_device(pdev) < 0) |
@@ -1408,7 +1408,7 @@ static void __devexit e752x_remove_one(struct pci_dev *pdev) | |||
1408 | struct mem_ctl_info *mci; | 1408 | struct mem_ctl_info *mci; |
1409 | struct e752x_pvt *pvt; | 1409 | struct e752x_pvt *pvt; |
1410 | 1410 | ||
1411 | debugf0("%s()\n", __func__); | 1411 | debugf0("\n"); |
1412 | 1412 | ||
1413 | if (e752x_pci) | 1413 | if (e752x_pci) |
1414 | edac_pci_release_generic_ctl(e752x_pci); | 1414 | edac_pci_release_generic_ctl(e752x_pci); |
@@ -1454,7 +1454,7 @@ static int __init e752x_init(void) | |||
1454 | { | 1454 | { |
1455 | int pci_rc; | 1455 | int pci_rc; |
1456 | 1456 | ||
1457 | debugf3("%s()\n", __func__); | 1457 | debugf3("\n"); |
1458 | 1458 | ||
1459 | /* Ensure that the OPSTATE is set correctly for POLL or NMI */ | 1459 | /* Ensure that the OPSTATE is set correctly for POLL or NMI */ |
1460 | opstate_init(); | 1460 | opstate_init(); |
@@ -1465,7 +1465,7 @@ static int __init e752x_init(void) | |||
1465 | 1465 | ||
1466 | static void __exit e752x_exit(void) | 1466 | static void __exit e752x_exit(void) |
1467 | { | 1467 | { |
1468 | debugf3("%s()\n", __func__); | 1468 | debugf3("\n"); |
1469 | pci_unregister_driver(&e752x_driver); | 1469 | pci_unregister_driver(&e752x_driver); |
1470 | } | 1470 | } |
1471 | 1471 | ||