Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 21768639be419d00275ac4e58b863361d0c24ee4

Authored by Peter Tyser
Committed by Linus Torvalds
1 parent 8467005da3
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

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>

Showing 2 changed files with 14 additions and 1 deletions Side-by-side Diff

drivers/edac/mpc85xx_edac.c
Diff comments   View file @ 2176863
... ... @@ -672,6 +672,7 @@
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;
... ... @@ -692,6 +693,15 @@
692 693 }
693 694  
694 695 syndrome = in_be32(pdata->mc_vbase + MPC85XX_MC_CAPTURE_ECC);
  696 +
  697 + /* Mask off appropriate bits of syndrome based on bus width */
  698 + bus_width = (in_be32(pdata->mc_vbase + MPC85XX_MC_DDR_SDRAM_CFG) &
  699 + DSC_DBW_MASK) ? 32 : 64;
  700 + if (bus_width == 64)
  701 + syndrome &= 0xff;
  702 + else
  703 + syndrome &= 0xffff;
  704 +
695 705 err_addr = in_be32(pdata->mc_vbase + MPC85XX_MC_CAPTURE_ADDRESS);
696 706 pfn = err_addr >> PAGE_SHIFT;
697 707  
... ... @@ -707,7 +717,7 @@
707 717 mpc85xx_mc_printk(mci, KERN_ERR, "Capture Data Low: %#8.8x\n",
708 718 in_be32(pdata->mc_vbase +
709 719 MPC85XX_MC_CAPTURE_DATA_LO));
710   - mpc85xx_mc_printk(mci, KERN_ERR, "syndrome: %#8.8x\n", syndrome);
  720 + mpc85xx_mc_printk(mci, KERN_ERR, "syndrome: %#2.2x\n", syndrome);
711 721 mpc85xx_mc_printk(mci, KERN_ERR, "err addr: %#8.8x\n", err_addr);
712 722 mpc85xx_mc_printk(mci, KERN_ERR, "PFN: %#8.8x\n", pfn);
713 723  
drivers/edac/mpc85xx_edac.h
Diff comments   View file @ 2176863
... ... @@ -48,6 +48,9 @@
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