aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDave Jiang <djiang@mvista.com>2007-07-19 04:50:10 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-07-19 13:04:55 -0400
commit456a2f9552e7849475f4aea1a9aa4c0e54b3ddda (patch)
treedf1a120c837fe4c4635c55d81e249ee6d06f4436
parentcddbfcacf02dc2d5b074fc2717358a7529a190db (diff)
drivers/edac: drivers to use new PCI operation
Move x86 drivers to new pci controller setup 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>
-rw-r--r--drivers/edac/amd76x_edac.c16
-rw-r--r--drivers/edac/e7xxx_edac.c16
-rw-r--r--drivers/edac/i3000_edac.c15
-rw-r--r--drivers/edac/i5000_edac.c17
-rw-r--r--drivers/edac/i82443bxgx_edac.c16
-rw-r--r--drivers/edac/i82860_edac.c15
-rw-r--r--drivers/edac/i82875p_edac.c16
-rw-r--r--drivers/edac/r82600_edac.c16
8 files changed, 127 insertions, 0 deletions
diff --git a/drivers/edac/amd76x_edac.c b/drivers/edac/amd76x_edac.c
index eaa22519209..cc392eebee5 100644
--- a/drivers/edac/amd76x_edac.c
+++ b/drivers/edac/amd76x_edac.c
@@ -91,6 +91,8 @@ static const struct amd76x_dev_info amd76x_devs[] = {
91 .ctl_name = "AMD762"}, 91 .ctl_name = "AMD762"},
92}; 92};
93 93
94static struct edac_pci_ctl_info *amd76x_pci;
95
94/** 96/**
95 * amd76x_get_error_info - fetch error information 97 * amd76x_get_error_info - fetch error information
96 * @mci: Memory controller 98 * @mci: Memory controller
@@ -266,6 +268,17 @@ static int amd76x_probe1(struct pci_dev *pdev, int dev_idx)
266 goto fail; 268 goto fail;
267 } 269 }
268 270
271 /* allocating generic PCI control info */
272 amd76x_pci = edac_pci_create_generic_ctl(&pdev->dev, EDAC_MOD_STR);
273 if (!amd76x_pci) {
274 printk(KERN_WARNING
275 "%s(): Unable to create PCI control\n",
276 __func__);
277 printk(KERN_WARNING
278 "%s(): PCI error report via EDAC not setup\n",
279 __func__);
280 }
281
269 /* get this far and it's successful */ 282 /* get this far and it's successful */
270 debugf3("%s(): success\n", __func__); 283 debugf3("%s(): success\n", __func__);
271 return 0; 284 return 0;
@@ -299,6 +312,9 @@ static void __devexit amd76x_remove_one(struct pci_dev *pdev)
299 312
300 debugf0("%s()\n", __func__); 313 debugf0("%s()\n", __func__);
301 314
315 if (amd76x_pci)
316 edac_pci_release_generic_ctl(amd76x_pci);
317
302 if ((mci = edac_mc_del_mc(&pdev->dev)) == NULL) 318 if ((mci = edac_mc_del_mc(&pdev->dev)) == NULL)
303 return; 319 return;
304 320
diff --git a/drivers/edac/e7xxx_edac.c b/drivers/edac/e7xxx_edac.c
index 2b20610991c..453ba346b6c 100644
--- a/drivers/edac/e7xxx_edac.c
+++ b/drivers/edac/e7xxx_edac.c
@@ -144,6 +144,8 @@ struct e7xxx_error_info {
144 u32 dram_uelog_add; 144 u32 dram_uelog_add;
145}; 145};
146 146
147static struct edac_pci_ctl_info *e7xxx_pci;
148
147static const struct e7xxx_dev_info e7xxx_devs[] = { 149static const struct e7xxx_dev_info e7xxx_devs[] = {
148 [E7500] = { 150 [E7500] = {
149 .err_dev = PCI_DEVICE_ID_INTEL_7500_1_ERR, 151 .err_dev = PCI_DEVICE_ID_INTEL_7500_1_ERR,
@@ -481,6 +483,17 @@ static int e7xxx_probe1(struct pci_dev *pdev, int dev_idx)
481 goto fail1; 483 goto fail1;
482 } 484 }
483 485
486 /* allocating generic PCI control info */
487 e7xxx_pci = edac_pci_create_generic_ctl(&pdev->dev, EDAC_MOD_STR);
488 if (!e7xxx_pci) {
489 printk(KERN_WARNING
490 "%s(): Unable to create PCI control\n",
491 __func__);
492 printk(KERN_WARNING
493 "%s(): PCI error report via EDAC not setup\n",
494 __func__);
495 }
496
484 /* get this far and it's successful */ 497 /* get this far and it's successful */
485 debugf3("%s(): success\n", __func__); 498 debugf3("%s(): success\n", __func__);
486 return 0; 499 return 0;
@@ -512,6 +525,9 @@ static void __devexit e7xxx_remove_one(struct pci_dev *pdev)
512 525
513 debugf0("%s()\n", __func__); 526 debugf0("%s()\n", __func__);
514 527
528 if (e7xxx_pci)
529 edac_pci_release_generic_ctl(e7xxx_pci);
530
515 if ((mci = edac_mc_del_mc(&pdev->dev)) == NULL) 531 if ((mci = edac_mc_del_mc(&pdev->dev)) == NULL)
516 return; 532 return;
517 533
diff --git a/drivers/edac/i3000_edac.c b/drivers/edac/i3000_edac.c
index c8418fcea25..fa4c4d48756 100644
--- a/drivers/edac/i3000_edac.c
+++ b/drivers/edac/i3000_edac.c
@@ -153,6 +153,7 @@ static const struct i3000_dev_info i3000_devs[] = {
153 153
154static struct pci_dev *mci_pdev = NULL; 154static struct pci_dev *mci_pdev = NULL;
155static int i3000_registered = 1; 155static int i3000_registered = 1;
156static struct edac_pci_ctl_info *i3000_pci;
156 157
157static void i3000_get_error_info(struct mem_ctl_info *mci, 158static void i3000_get_error_info(struct mem_ctl_info *mci,
158 struct i3000_error_info *info) 159 struct i3000_error_info *info)
@@ -373,6 +374,17 @@ static int i3000_probe1(struct pci_dev *pdev, int dev_idx)
373 goto fail; 374 goto fail;
374 } 375 }
375 376
377 /* allocating generic PCI control info */
378 i3000_pci = edac_pci_create_generic_ctl(&pdev->dev, EDAC_MOD_STR);
379 if (!i3000_pci) {
380 printk(KERN_WARNING
381 "%s(): Unable to create PCI control\n",
382 __func__);
383 printk(KERN_WARNING
384 "%s(): PCI error report via EDAC not setup\n",
385 __func__);
386 }
387
376 /* get this far and it's successful */ 388 /* get this far and it's successful */
377 debugf3("MC: %s(): success\n", __func__); 389 debugf3("MC: %s(): success\n", __func__);
378 return 0; 390 return 0;
@@ -408,6 +420,9 @@ static void __devexit i3000_remove_one(struct pci_dev *pdev)
408 420
409 debugf0("%s()\n", __func__); 421 debugf0("%s()\n", __func__);
410 422
423 if (i3000_pci)
424 edac_pci_release_generic_ctl(i3000_pci);
425
411 if ((mci = edac_mc_del_mc(&pdev->dev)) == NULL) 426 if ((mci = edac_mc_del_mc(&pdev->dev)) == NULL)
412 return; 427 return;
413 428
diff --git a/drivers/edac/i5000_edac.c b/drivers/edac/i5000_edac.c
index aa05c45efc0..4b4ec978df2 100644
--- a/drivers/edac/i5000_edac.c
+++ b/drivers/edac/i5000_edac.c
@@ -28,6 +28,7 @@
28 * Alter this version for the I5000 module when modifications are made 28 * Alter this version for the I5000 module when modifications are made
29 */ 29 */
30#define I5000_REVISION " Ver: 2.0.12 " __DATE__ 30#define I5000_REVISION " Ver: 2.0.12 " __DATE__
31#define EDAC_MOD_STR "i5000_edac"
31 32
32#define i5000_printk(level, fmt, arg...) \ 33#define i5000_printk(level, fmt, arg...) \
33 edac_printk(level, "i5000", fmt, ##arg) 34 edac_printk(level, "i5000", fmt, ##arg)
@@ -381,6 +382,8 @@ struct i5000_error_info {
381 382
382}; 383};
383 384
385static struct edac_pci_ctl_info *i5000_pci;
386
384/****************************************************************************** 387/******************************************************************************
385 * i5000_get_error_info Retrieve the hardware error information from 388 * i5000_get_error_info Retrieve the hardware error information from
386 * the hardware and cache it in the 'info' 389 * the hardware and cache it in the 'info'
@@ -1375,6 +1378,17 @@ static int i5000_probe1(struct pci_dev *pdev, int dev_idx)
1375 1378
1376 i5000_clear_error(mci); 1379 i5000_clear_error(mci);
1377 1380
1381 /* allocating generic PCI control info */
1382 i5000_pci = edac_pci_create_generic_ctl(&pdev->dev, EDAC_MOD_STR);
1383 if (!i5000_pci) {
1384 printk(KERN_WARNING
1385 "%s(): Unable to create PCI control\n",
1386 __func__);
1387 printk(KERN_WARNING
1388 "%s(): PCI error report via EDAC not setup\n",
1389 __func__);
1390 }
1391
1378 return 0; 1392 return 0;
1379 1393
1380 /* Error exit unwinding stack */ 1394 /* Error exit unwinding stack */
@@ -1420,6 +1434,9 @@ static void __devexit i5000_remove_one(struct pci_dev *pdev)
1420 1434
1421 debugf0(__FILE__ ": %s()\n", __func__); 1435 debugf0(__FILE__ ": %s()\n", __func__);
1422 1436
1437 if (i5000_pci)
1438 edac_pci_release_generic_ctl(i5000_pci);
1439
1423 if ((mci = edac_mc_del_mc(&pdev->dev)) == NULL) 1440 if ((mci = edac_mc_del_mc(&pdev->dev)) == NULL)
1424 return; 1441 return;
1425 1442
diff --git a/drivers/edac/i82443bxgx_edac.c b/drivers/edac/i82443bxgx_edac.c
index c0070aba87b..d190104081c 100644
--- a/drivers/edac/i82443bxgx_edac.c
+++ b/drivers/edac/i82443bxgx_edac.c
@@ -111,6 +111,8 @@ struct i82443bxgx_edacmc_error_info {
111 u32 eap; 111 u32 eap;
112}; 112};
113 113
114static struct edac_pci_ctl_info *i82443bxgx_pci;
115
114static void i82443bxgx_edacmc_get_error_info(struct mem_ctl_info *mci, 116static void i82443bxgx_edacmc_get_error_info(struct mem_ctl_info *mci,
115 struct i82443bxgx_edacmc_error_info 117 struct i82443bxgx_edacmc_error_info
116 *info) 118 *info)
@@ -316,6 +318,17 @@ static int i82443bxgx_edacmc_probe1(struct pci_dev *pdev, int dev_idx)
316 goto fail; 318 goto fail;
317 } 319 }
318 320
321 /* allocating generic PCI control info */
322 i82443bxgx_pci = edac_pci_create_generic_ctl(&pdev->dev, EDAC_MOD_STR);
323 if (!i82443bxgx_pci) {
324 printk(KERN_WARNING
325 "%s(): Unable to create PCI control\n",
326 __func__);
327 printk(KERN_WARNING
328 "%s(): PCI error report via EDAC not setup\n",
329 __func__);
330 }
331
319 debugf3("MC: " __FILE__ ": %s(): success\n", __func__); 332 debugf3("MC: " __FILE__ ": %s(): success\n", __func__);
320 return 0; 333 return 0;
321 334
@@ -342,6 +355,9 @@ static void __devexit i82443bxgx_edacmc_remove_one(struct pci_dev *pdev)
342 355
343 debugf0(__FILE__ ": %s()\n", __func__); 356 debugf0(__FILE__ ": %s()\n", __func__);
344 357
358 if (i82443bxgx_pci)
359 edac_pci_release_generic_ctl(i82443bxgx_pci);
360
345 if ((mci = edac_mc_del_mc(&pdev->dev)) == NULL) 361 if ((mci = edac_mc_del_mc(&pdev->dev)) == NULL)
346 return; 362 return;
347 363
diff --git a/drivers/edac/i82860_edac.c b/drivers/edac/i82860_edac.c
index bd7bbb733f7..db8a864f16f 100644
--- a/drivers/edac/i82860_edac.c
+++ b/drivers/edac/i82860_edac.c
@@ -60,6 +60,7 @@ static const struct i82860_dev_info i82860_devs[] = {
60static struct pci_dev *mci_pdev = NULL; /* init dev: in case that AGP code 60static struct pci_dev *mci_pdev = NULL; /* init dev: in case that AGP code
61 * has already registered driver 61 * has already registered driver
62 */ 62 */
63static struct edac_pci_ctl_info *i82860_pci;
63 64
64static void i82860_get_error_info(struct mem_ctl_info *mci, 65static void i82860_get_error_info(struct mem_ctl_info *mci,
65 struct i82860_error_info *info) 66 struct i82860_error_info *info)
@@ -213,6 +214,17 @@ static int i82860_probe1(struct pci_dev *pdev, int dev_idx)
213 goto fail; 214 goto fail;
214 } 215 }
215 216
217 /* allocating generic PCI control info */
218 i82860_pci = edac_pci_create_generic_ctl(&pdev->dev, EDAC_MOD_STR);
219 if (!i82860_pci) {
220 printk(KERN_WARNING
221 "%s(): Unable to create PCI control\n",
222 __func__);
223 printk(KERN_WARNING
224 "%s(): PCI error report via EDAC not setup\n",
225 __func__);
226 }
227
216 /* get this far and it's successful */ 228 /* get this far and it's successful */
217 debugf3("%s(): success\n", __func__); 229 debugf3("%s(): success\n", __func__);
218 230
@@ -249,6 +261,9 @@ static void __devexit i82860_remove_one(struct pci_dev *pdev)
249 261
250 debugf0("%s()\n", __func__); 262 debugf0("%s()\n", __func__);
251 263
264 if (i82860_pci)
265 edac_pci_release_generic_ctl(i82860_pci);
266
252 if ((mci = edac_mc_del_mc(&pdev->dev)) == NULL) 267 if ((mci = edac_mc_del_mc(&pdev->dev)) == NULL)
253 return; 268 return;
254 269
diff --git a/drivers/edac/i82875p_edac.c b/drivers/edac/i82875p_edac.c
index 889ccf6ad85..214112b5e52 100644
--- a/drivers/edac/i82875p_edac.c
+++ b/drivers/edac/i82875p_edac.c
@@ -183,6 +183,8 @@ static struct pci_dev *mci_pdev = NULL; /* init dev: in case that AGP code has
183 183
184static int i82875p_registered = 1; 184static int i82875p_registered = 1;
185 185
186static struct edac_pci_ctl_info *i82875p_pci;
187
186static void i82875p_get_error_info(struct mem_ctl_info *mci, 188static void i82875p_get_error_info(struct mem_ctl_info *mci,
187 struct i82875p_error_info *info) 189 struct i82875p_error_info *info)
188{ 190{
@@ -424,6 +426,17 @@ static int i82875p_probe1(struct pci_dev *pdev, int dev_idx)
424 goto fail1; 426 goto fail1;
425 } 427 }
426 428
429 /* allocating generic PCI control info */
430 i82875p_pci = edac_pci_create_generic_ctl(&pdev->dev, EDAC_MOD_STR);
431 if (!i82875p_pci) {
432 printk(KERN_WARNING
433 "%s(): Unable to create PCI control\n",
434 __func__);
435 printk(KERN_WARNING
436 "%s(): PCI error report via EDAC not setup\n",
437 __func__);
438 }
439
427 /* get this far and it's successful */ 440 /* get this far and it's successful */
428 debugf3("%s(): success\n", __func__); 441 debugf3("%s(): success\n", __func__);
429 return 0; 442 return 0;
@@ -467,6 +480,9 @@ static void __devexit i82875p_remove_one(struct pci_dev *pdev)
467 480
468 debugf0("%s()\n", __func__); 481 debugf0("%s()\n", __func__);
469 482
483 if (i82875p_pci)
484 edac_pci_release_generic_ctl(i82875p_pci);
485
470 if ((mci = edac_mc_del_mc(&pdev->dev)) == NULL) 486 if ((mci = edac_mc_del_mc(&pdev->dev)) == NULL)
471 return; 487 return;
472 488
diff --git a/drivers/edac/r82600_edac.c b/drivers/edac/r82600_edac.c
index 18206ce28d1..8097f2faaa8 100644
--- a/drivers/edac/r82600_edac.c
+++ b/drivers/edac/r82600_edac.c
@@ -133,6 +133,8 @@ struct r82600_error_info {
133 133
134static unsigned int disable_hardware_scrub = 0; 134static unsigned int disable_hardware_scrub = 0;
135 135
136static struct edac_pci_ctl_info *r82600_pci;
137
136static void r82600_get_error_info(struct mem_ctl_info *mci, 138static void r82600_get_error_info(struct mem_ctl_info *mci,
137 struct r82600_error_info *info) 139 struct r82600_error_info *info)
138{ 140{
@@ -326,6 +328,17 @@ static int r82600_probe1(struct pci_dev *pdev, int dev_idx)
326 pci_write_bits32(pdev, R82600_EAP, BIT(31), BIT(31)); 328 pci_write_bits32(pdev, R82600_EAP, BIT(31), BIT(31));
327 } 329 }
328 330
331 /* allocating generic PCI control info */
332 r82600_pci = edac_pci_create_generic_ctl(&pdev->dev, EDAC_MOD_STR);
333 if (!r82600_pci) {
334 printk(KERN_WARNING
335 "%s(): Unable to create PCI control\n",
336 __func__);
337 printk(KERN_WARNING
338 "%s(): PCI error report via EDAC not setup\n",
339 __func__);
340 }
341
329 debugf3("%s(): success\n", __func__); 342 debugf3("%s(): success\n", __func__);
330 return 0; 343 return 0;
331 344
@@ -350,6 +363,9 @@ static void __devexit r82600_remove_one(struct pci_dev *pdev)
350 363
351 debugf0("%s()\n", __func__); 364 debugf0("%s()\n", __func__);
352 365
366 if (r82600_pci)
367 edac_pci_release_generic_ctl(r82600_pci);
368
353 if ((mci = edac_mc_del_mc(&pdev->dev)) == NULL) 369 if ((mci = edac_mc_del_mc(&pdev->dev)) == NULL)
354 return; 370 return;
355 371