The patch titled edac: mpc85xx fix bad page calculation has been added to the -mm tree. Its filename is edac-mpc85xx-fix-bad-page-calculation.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://userweb.kernel.org/~akpm/stuff/added-to-mm.txt to find out what to do about this The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: edac: mpc85xx fix bad page calculation From: Peter Tyser <ptyser@xxxxxxxxxxx> Commit b4846251727a38a7f248e41308c060995371dd05 ("edac: mpc85xx add mpc83xx support") accidentally broke how a chip select's first and last page addresses are calculated. The page addresses are being shifted too far right by PAGE_SHIFT. This results in errors such as: EDAC MPC85xx MC1: Err addr: 0x003075c0 EDAC MPC85xx MC1: PFN: 0x00000307 EDAC MPC85xx MC1: PFN out of range! EDAC MC1: INTERNAL ERROR: row out of range (4 >= 4) EDAC MC1: CE - no information available: INTERNAL ERROR The vaule of PAGE_SHIFT is already being taken into consideration during the calculation of the 'start' and 'end' variables, thus it is not necessary to account for it again when setting a chip select's first and last page address. Signed-off-by: Peter Tyser <ptyser@xxxxxxxxxxx> Signed-off-by: Doug Thompson <dougthompson@xxxxxxxxxxxx> Cc: Ira W. Snyder <iws@xxxxxxxxxxxxxxxx> Cc: Kumar Gala <galak@xxxxxxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/edac/mpc85xx_edac.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff -puN drivers/edac/mpc85xx_edac.c~edac-mpc85xx-fix-bad-page-calculation drivers/edac/mpc85xx_edac.c --- a/drivers/edac/mpc85xx_edac.c~edac-mpc85xx-fix-bad-page-calculation +++ a/drivers/edac/mpc85xx_edac.c @@ -804,8 +804,8 @@ static void __devinit mpc85xx_init_csrow end <<= (24 - PAGE_SHIFT); end |= (1 << (24 - PAGE_SHIFT)) - 1; - csrow->first_page = start >> PAGE_SHIFT; - csrow->last_page = end >> PAGE_SHIFT; + csrow->first_page = start; + csrow->last_page = end; csrow->nr_pages = end + 1 - start; csrow->grain = 8; csrow->mtype = mtype; _ Patches currently in -mm which might be from ptyser@xxxxxxxxxxx are edac-mpc85xx-fix-bad-page-calculation.patch edac-mpc85xx-fix-build-regression-by-removing-unused-debug-code.patch linux-next.patch edac-mpc85xx-mask-ecc-syndrome-correctly.patch edac-mpc85xx-improve-sdram-error-reporting.patch edac-mpc85xx-use-resource_size-instead-of-raw-math.patch edac-e752x-fsb-ecc.patch edac-e752x-add-dram-scrubbing-support.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