Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e78fac22 authored by Jérémy Lefaure's avatar Jérémy Lefaure Committed by Greg Kroah-Hartman
Browse files

EDAC, i5000, i5400: Fix use of MTR_DRAM_WIDTH macro 




[ Upstream commit e61555c29c28a4a3b6ba6207f4a0883ee236004d ]

The MTR_DRAM_WIDTH macro returns the data width. It is sometimes used
as if it returned a boolean true if the width if 8. Fix the tests where
MTR_DRAM_WIDTH is misused.

Signed-off-by: default avatarJérémy Lefaure <jeremy.lefaure@lse.epita.fr>
Cc: linux-edac <linux-edac@vger.kernel.org>
Link: http://lkml.kernel.org/r/20170309011809.8340-1-jeremy.lefaure@lse.epita.fr


Signed-off-by: default avatarBorislav Petkov <bp@suse.de>
Signed-off-by: default avatarSasha Levin <alexander.levin@verizon.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 8364904c

drivers/edac/i5000_edac.c

+1 −1
Original line number Diff line number Diff line
@@ -1293,7 +1293,7 @@ static int i5000_init_csrows(struct mem_ctl_info *mci) 
			dimm->mtype = MEM_FB_DDR2;



			/* ask what device type on this row */

			if (MTR_DRAM_WIDTH(mtr))

			if (MTR_DRAM_WIDTH(mtr) == 8)

				dimm->dtype = DEV_X8;

			else

				dimm->dtype = DEV_X4;

drivers/edac/i5400_edac.c

+3 −2
Original line number Diff line number Diff line
@@ -1207,13 +1207,14 @@ static int i5400_init_dimms(struct mem_ctl_info *mci) 


			dimm->nr_pages = size_mb << 8;

			dimm->grain = 8;

			dimm->dtype = MTR_DRAM_WIDTH(mtr) ? DEV_X8 : DEV_X4;

			dimm->dtype = MTR_DRAM_WIDTH(mtr) == 8 ?

				      DEV_X8 : DEV_X4;

			dimm->mtype = MEM_FB_DDR2;

			/*

			 * The eccc mechanism is SDDC (aka SECC), with

			 * is similar to Chipkill.

			 */

			dimm->edac_mode = MTR_DRAM_WIDTH(mtr) ?

			dimm->edac_mode = MTR_DRAM_WIDTH(mtr) == 8 ?

					  EDAC_S8ECD8ED : EDAC_S4ECD4ED;

			ndimms++;

		}