Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

edac: mpc85xx mask ecc syndrome correctly

With a 64-bit wide data bus only the lowest 8-bits of the ECC syndrome are
relevant. With a 32-bit wide data bus only the lowest 16-bits are
relevant on most architectures.

Without this change, the ECC syndrome displayed can be mildly confusing,
eg:

EDAC MPC85xx MC1: syndrome: 0x25252525

When in reality the ECC syndrome is 0x25.

A variety of Freescale manuals say a variety of different things about how
to decode the CAPTURE_ECC (syndrome) register. I don't have a system with
a 32-bit bus to test on, but I believe the change is correct. It'd be
good to get an ACK from someone at Freescale about this change though.

Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
Signed-off-by: Doug Thompson <dougthompson@xmission.com>
Cc: Kumar Gala <galak@gate.crashing.org>
Cc: Dave Jiang <djiang@mvista.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

authored by

Peter Tyser and committed by
Linus Torvalds
21768639 8467005d

+14 -1
+11 -1
drivers/edac/mpc85xx_edac.c
··· 672 672 { 673 673 struct mpc85xx_mc_pdata *pdata = mci->pvt_info; 674 674 struct csrow_info *csrow; 675 + u32 bus_width; 675 676 u32 err_detect; 676 677 u32 syndrome; 677 678 u32 err_addr; ··· 693 692 } 694 693 695 694 syndrome = in_be32(pdata->mc_vbase + MPC85XX_MC_CAPTURE_ECC); 695 + 696 + /* Mask off appropriate bits of syndrome based on bus width */ 697 + bus_width = (in_be32(pdata->mc_vbase + MPC85XX_MC_DDR_SDRAM_CFG) & 698 + DSC_DBW_MASK) ? 32 : 64; 699 + if (bus_width == 64) 700 + syndrome &= 0xff; 701 + else 702 + syndrome &= 0xffff; 703 + 696 704 err_addr = in_be32(pdata->mc_vbase + MPC85XX_MC_CAPTURE_ADDRESS); 697 705 pfn = err_addr >> PAGE_SHIFT; 698 706 ··· 717 707 mpc85xx_mc_printk(mci, KERN_ERR, "Capture Data Low: %#8.8x\n", 718 708 in_be32(pdata->mc_vbase + 719 709 MPC85XX_MC_CAPTURE_DATA_LO)); 720 - mpc85xx_mc_printk(mci, KERN_ERR, "syndrome: %#8.8x\n", syndrome); 710 + mpc85xx_mc_printk(mci, KERN_ERR, "syndrome: %#2.2x\n", syndrome); 721 711 mpc85xx_mc_printk(mci, KERN_ERR, "err addr: %#8.8x\n", err_addr); 722 712 mpc85xx_mc_printk(mci, KERN_ERR, "PFN: %#8.8x\n", pfn); 723 713
+3
drivers/edac/mpc85xx_edac.h
··· 48 48 #define DSC_MEM_EN 0x80000000 49 49 #define DSC_ECC_EN 0x20000000 50 50 #define DSC_RD_EN 0x10000000 51 + #define DSC_DBW_MASK 0x00180000 52 + #define DSC_DBW_32 0x00080000 53 + #define DSC_DBW_64 0x00000000 51 54 52 55 #define DSC_SDTYPE_MASK 0x07000000 53 56