The patch titled
EDAC: CPC925 MC check fixup
has been removed from the -mm tree. Its filename was
edac-add-cpc925-memory-controller-driver-mc-check-fixup.patch
This patch was dropped because it was folded into edac-add-cpc925-memory-controller-driver.patch
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: EDAC: CPC925 MC check fixup
From: Harry Ciao <qingtao.cao@xxxxxxxxxxxxx>
Fix an obvious bug in CPC925 Memory Controller's check routine -
edac_mc_handle_ue() should have been called for UECC errors and
edac_mc_handle_ce() for CECC errors.
Signed-off-by: Harry Ciao <qingtao.cao@xxxxxxxxxxxxx>
Cc: Doug Thompson <norsk5@xxxxxxxxx>
Cc: Michael Ellerman <michael@xxxxxxxxxxxxxx>
Cc: Benjamin Herrenschmidt <benh@xxxxxxxxxxxxxxxxxxx>
Cc: Kumar Gala <galak@xxxxxxxxxxxxxxxxx>
Cc: Paul Mackerras <paulus@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/edac/cpc925_edac.c | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff -puN drivers/edac/cpc925_edac.c~edac-add-cpc925-memory-controller-driver-mc-check-fixup drivers/edac/cpc925_edac.c
--- a/drivers/edac/cpc925_edac.c~edac-add-cpc925-memory-controller-driver-mc-check-fixup
+++ a/drivers/edac/cpc925_edac.c
@@ -544,17 +544,16 @@ static void cpc925_mc_check(struct mem_c
/* Revert column/row addresses into page frame number, etc */
cpc925_mc_get_pfn(mci, mear, &pfn, &offset, &csrow);
- if (apiexcp & UECC_EXCP_DETECTED) {
- cpc925_mc_printk(mci, KERN_INFO, "DRAM UECC Fault\n");
+ if (apiexcp & CECC_EXCP_DETECTED) {
+ cpc925_mc_printk(mci, KERN_INFO, "DRAM CECC Fault\n");
channel = cpc925_mc_find_channel(mci, syndrome);
edac_mc_handle_ce(mci, pfn, offset, syndrome,
csrow, channel, mci->ctl_name);
}
- if (apiexcp & CECC_EXCP_DETECTED) {
- cpc925_mc_printk(mci, KERN_INFO, "DRAM CECC Fault\n");
- edac_mc_handle_ue(mci, pfn, offset,
- csrow, mci->ctl_name);
+ if (apiexcp & UECC_EXCP_DETECTED) {
+ cpc925_mc_printk(mci, KERN_INFO, "DRAM UECC Fault\n");
+ edac_mc_handle_ue(mci, pfn, offset, csrow, mci->ctl_name);
}
cpc925_mc_printk(mci, KERN_INFO, "Dump registers:\n");
_
Patches currently in -mm which might be from qingtao.cao@xxxxxxxxxxxxx are
edac-add-cpc925-memory-controller-driver.patch
edac-add-cpc925-memory-controller-driver-mc-check-fixup.patch
edac-add-edac_device_alloc_index.patch
edac-add-edac_device_alloc_index-cleanup.patch
edac-cpc925-mc-platform-device-setup.patch
edac-cpc925-mc-platform-device-setup-v3.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
