diff options
Diffstat (limited to 'drivers/edac')
-rw-r--r-- | drivers/edac/edac_core.h | 6 | ||||
-rw-r--r-- | drivers/edac/edac_device.c | 10 | ||||
-rw-r--r-- | drivers/edac/i7core_edac.c | 10 | ||||
-rw-r--r-- | drivers/edac/sb_edac.c | 6 |
4 files changed, 16 insertions, 16 deletions
diff --git a/drivers/edac/edac_core.h b/drivers/edac/edac_core.h index e48ab3108ad8..841bb2d7ce61 100644 --- a/drivers/edac/edac_core.h +++ b/drivers/edac/edac_core.h | |||
@@ -107,13 +107,13 @@ extern int edac_debug_level; | |||
107 | * | 107 | * |
108 | * CPU caches (L1 and L2) | 108 | * CPU caches (L1 and L2) |
109 | * DMA engines | 109 | * DMA engines |
110 | * Core CPU swithces | 110 | * Core CPU switches |
111 | * Fabric switch units | 111 | * Fabric switch units |
112 | * PCIe interface controllers | 112 | * PCIe interface controllers |
113 | * other EDAC/ECC type devices that can be monitored for | 113 | * other EDAC/ECC type devices that can be monitored for |
114 | * errors, etc. | 114 | * errors, etc. |
115 | * | 115 | * |
116 | * It allows for a 2 level set of hiearchry. For example: | 116 | * It allows for a 2 level set of hierarchy. For example: |
117 | * | 117 | * |
118 | * cache could be composed of L1, L2 and L3 levels of cache. | 118 | * cache could be composed of L1, L2 and L3 levels of cache. |
119 | * Each CPU core would have its own L1 cache, while sharing | 119 | * Each CPU core would have its own L1 cache, while sharing |
@@ -460,7 +460,7 @@ extern int edac_mc_find_csrow_by_page(struct mem_ctl_info *mci, | |||
460 | /* | 460 | /* |
461 | * The no info errors are used when error overflows are reported. | 461 | * The no info errors are used when error overflows are reported. |
462 | * There are a limited number of error logging registers that can | 462 | * There are a limited number of error logging registers that can |
463 | * be exausted. When all registers are exhausted and an additional | 463 | * be exhausted. When all registers are exhausted and an additional |
464 | * error occurs then an error overflow register records that an | 464 | * error occurs then an error overflow register records that an |
465 | * error occurred and the type of error, but doesn't have any | 465 | * error occurred and the type of error, but doesn't have any |
466 | * further information. The ce/ue versions make for cleaner | 466 | * further information. The ce/ue versions make for cleaner |
diff --git a/drivers/edac/edac_device.c b/drivers/edac/edac_device.c index 4b154593343a..da4a1f11939f 100644 --- a/drivers/edac/edac_device.c +++ b/drivers/edac/edac_device.c | |||
@@ -56,7 +56,7 @@ static void edac_device_dump_device(struct edac_device_ctl_info *edac_dev) | |||
56 | * | 56 | * |
57 | * The control structure is allocated in complete chunk | 57 | * The control structure is allocated in complete chunk |
58 | * from the OS. It is in turn sub allocated to the | 58 | * from the OS. It is in turn sub allocated to the |
59 | * various objects that compose the struture | 59 | * various objects that compose the structure |
60 | * | 60 | * |
61 | * The structure has a 'nr_instance' array within itself. | 61 | * The structure has a 'nr_instance' array within itself. |
62 | * Each instance represents a major component | 62 | * Each instance represents a major component |
@@ -118,7 +118,7 @@ struct edac_device_ctl_info *edac_device_alloc_ctl_info( | |||
118 | /* Calc the 'end' offset past the attributes array */ | 118 | /* Calc the 'end' offset past the attributes array */ |
119 | pvt = edac_align_ptr(&dev_attrib[count], sz_private); | 119 | pvt = edac_align_ptr(&dev_attrib[count], sz_private); |
120 | } else { | 120 | } else { |
121 | /* no attribute array specificed */ | 121 | /* no attribute array specified */ |
122 | pvt = edac_align_ptr(dev_attrib, sz_private); | 122 | pvt = edac_align_ptr(dev_attrib, sz_private); |
123 | } | 123 | } |
124 | 124 | ||
@@ -367,7 +367,7 @@ static void del_edac_device_from_global_list(struct edac_device_ctl_info | |||
367 | * structure, that needs to be polled for possible error events. | 367 | * structure, that needs to be polled for possible error events. |
368 | * | 368 | * |
369 | * This operation is to acquire the list mutex lock | 369 | * This operation is to acquire the list mutex lock |
370 | * (thus preventing insertation or deletion) | 370 | * (thus preventing insertion or deletion) |
371 | * and then call the device's poll function IFF this device is | 371 | * and then call the device's poll function IFF this device is |
372 | * running polled and there is a poll function defined. | 372 | * running polled and there is a poll function defined. |
373 | */ | 373 | */ |
@@ -394,7 +394,7 @@ static void edac_device_workq_function(struct work_struct *work_req) | |||
394 | 394 | ||
395 | /* Reschedule the workq for the next time period to start again | 395 | /* Reschedule the workq for the next time period to start again |
396 | * if the number of msec is for 1 sec, then adjust to the next | 396 | * if the number of msec is for 1 sec, then adjust to the next |
397 | * whole one second to save timers fireing all over the period | 397 | * whole one second to save timers firing all over the period |
398 | * between integral seconds | 398 | * between integral seconds |
399 | */ | 399 | */ |
400 | if (edac_dev->poll_msec == 1000) | 400 | if (edac_dev->poll_msec == 1000) |
@@ -563,7 +563,7 @@ EXPORT_SYMBOL_GPL(edac_device_add_device); | |||
563 | * Remove sysfs entries for specified edac_device structure and | 563 | * Remove sysfs entries for specified edac_device structure and |
564 | * then remove edac_device structure from global list | 564 | * then remove edac_device structure from global list |
565 | * | 565 | * |
566 | * @pdev: | 566 | * @dev: |
567 | * Pointer to 'struct device' representing edac_device | 567 | * Pointer to 'struct device' representing edac_device |
568 | * structure to remove. | 568 | * structure to remove. |
569 | * | 569 | * |
diff --git a/drivers/edac/i7core_edac.c b/drivers/edac/i7core_edac.c index 85226ccf5290..7f1dfcc4e597 100644 --- a/drivers/edac/i7core_edac.c +++ b/drivers/edac/i7core_edac.c | |||
@@ -90,7 +90,7 @@ MODULE_PARM_DESC(use_pci_fixup, "Enable PCI fixup to seek for hidden devices"); | |||
90 | #define MC_MAX_DOD 0x64 | 90 | #define MC_MAX_DOD 0x64 |
91 | 91 | ||
92 | /* | 92 | /* |
93 | * OFFSETS for Device 3 Function 4, as inicated on Xeon 5500 datasheet: | 93 | * OFFSETS for Device 3 Function 4, as indicated on Xeon 5500 datasheet: |
94 | * http://www.arrownac.com/manufacturers/intel/s/nehalem/5500-datasheet-v2.pdf | 94 | * http://www.arrownac.com/manufacturers/intel/s/nehalem/5500-datasheet-v2.pdf |
95 | */ | 95 | */ |
96 | 96 | ||
@@ -101,7 +101,7 @@ MODULE_PARM_DESC(use_pci_fixup, "Enable PCI fixup to seek for hidden devices"); | |||
101 | #define DIMM1_COR_ERR(r) (((r) >> 16) & 0x7fff) | 101 | #define DIMM1_COR_ERR(r) (((r) >> 16) & 0x7fff) |
102 | #define DIMM0_COR_ERR(r) ((r) & 0x7fff) | 102 | #define DIMM0_COR_ERR(r) ((r) & 0x7fff) |
103 | 103 | ||
104 | /* OFFSETS for Device 3 Function 2, as inicated on Xeon 5500 datasheet */ | 104 | /* OFFSETS for Device 3 Function 2, as indicated on Xeon 5500 datasheet */ |
105 | #define MC_SSRCONTROL 0x48 | 105 | #define MC_SSRCONTROL 0x48 |
106 | #define SSR_MODE_DISABLE 0x00 | 106 | #define SSR_MODE_DISABLE 0x00 |
107 | #define SSR_MODE_ENABLE 0x01 | 107 | #define SSR_MODE_ENABLE 0x01 |
@@ -398,7 +398,7 @@ static DEFINE_PCI_DEVICE_TABLE(i7core_pci_tbl) = { | |||
398 | }; | 398 | }; |
399 | 399 | ||
400 | /**************************************************************************** | 400 | /**************************************************************************** |
401 | Anciliary status routines | 401 | Ancillary status routines |
402 | ****************************************************************************/ | 402 | ****************************************************************************/ |
403 | 403 | ||
404 | /* MC_CONTROL bits */ | 404 | /* MC_CONTROL bits */ |
@@ -1361,7 +1361,7 @@ static int i7core_get_onedevice(struct pci_dev **prev, | |||
1361 | dev_descr->dev_id, *prev); | 1361 | dev_descr->dev_id, *prev); |
1362 | 1362 | ||
1363 | /* | 1363 | /* |
1364 | * On Xeon 55xx, the Intel Quckpath Arch Generic Non-core regs | 1364 | * On Xeon 55xx, the Intel QuickPath Arch Generic Non-core regs |
1365 | * is at addr 8086:2c40, instead of 8086:2c41. So, we need | 1365 | * is at addr 8086:2c40, instead of 8086:2c41. So, we need |
1366 | * to probe for the alternate address in case of failure | 1366 | * to probe for the alternate address in case of failure |
1367 | */ | 1367 | */ |
@@ -2132,7 +2132,7 @@ static int set_sdram_scrub_rate(struct mem_ctl_info *mci, u32 new_bw) | |||
2132 | 2132 | ||
2133 | /* | 2133 | /* |
2134 | * get_sdram_scrub_rate This routine convert current scrub rate value | 2134 | * get_sdram_scrub_rate This routine convert current scrub rate value |
2135 | * into byte/sec bandwidth accourding to | 2135 | * into byte/sec bandwidth according to |
2136 | * SCRUBINTERVAL formula found in datasheet. | 2136 | * SCRUBINTERVAL formula found in datasheet. |
2137 | */ | 2137 | */ |
2138 | static int get_sdram_scrub_rate(struct mem_ctl_info *mci) | 2138 | static int get_sdram_scrub_rate(struct mem_ctl_info *mci) |
diff --git a/drivers/edac/sb_edac.c b/drivers/edac/sb_edac.c index a203536d90dd..123204f8e23b 100644 --- a/drivers/edac/sb_edac.c +++ b/drivers/edac/sb_edac.c | |||
@@ -58,7 +58,7 @@ static int probed; | |||
58 | 58 | ||
59 | /* | 59 | /* |
60 | * FIXME: For now, let's order by device function, as it makes | 60 | * FIXME: For now, let's order by device function, as it makes |
61 | * easier for driver's development proccess. This table should be | 61 | * easier for driver's development process. This table should be |
62 | * moved to pci_id.h when submitted upstream | 62 | * moved to pci_id.h when submitted upstream |
63 | */ | 63 | */ |
64 | #define PCI_DEVICE_ID_INTEL_SBRIDGE_SAD0 0x3cf4 /* 12.6 */ | 64 | #define PCI_DEVICE_ID_INTEL_SBRIDGE_SAD0 0x3cf4 /* 12.6 */ |
@@ -375,7 +375,7 @@ static DEFINE_PCI_DEVICE_TABLE(sbridge_pci_tbl) = { | |||
375 | 375 | ||
376 | 376 | ||
377 | /**************************************************************************** | 377 | /**************************************************************************** |
378 | Anciliary status routines | 378 | Ancillary status routines |
379 | ****************************************************************************/ | 379 | ****************************************************************************/ |
380 | 380 | ||
381 | static inline int numrank(u32 mtr) | 381 | static inline int numrank(u32 mtr) |
@@ -1430,7 +1430,7 @@ static void sbridge_mce_output_error(struct mem_ctl_info *mci, | |||
1430 | type = "FATAL"; | 1430 | type = "FATAL"; |
1431 | 1431 | ||
1432 | /* | 1432 | /* |
1433 | * According with Table 15-9 of the Intel Archictecture spec vol 3A, | 1433 | * According with Table 15-9 of the Intel Architecture spec vol 3A, |
1434 | * memory errors should fit in this mask: | 1434 | * memory errors should fit in this mask: |
1435 | * 000f 0000 1mmm cccc (binary) | 1435 | * 000f 0000 1mmm cccc (binary) |
1436 | * where: | 1436 | * where: |