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

Commit 84db003f authored by Mike Chan's avatar Mike Chan Committed by Linus Torvalds
Browse files

[PATCH] EDAC: Fix in e752x mc driver 



This fix/change returns the offset into the page for the ce/ue error, instead
of just 0.  The e752x dram controller reads 34:6 of the linear address with
the error.

Signed-off-by: default avatarMike Chan <mikechan@google.com>
Signed-off-by: default avatardoug thompson <norsk5@xmission.com>
Acked-by: default avatarAlan Cox <alan@redhat.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 9962fd01

drivers/edac/e752x_edac.c

+11 −6
Original line number Diff line number Diff line
@@ -285,8 +285,9 @@ static void do_process_ce(struct mem_ctl_info *mci, u16 error_one, 
	if (!pvt->map_type)

		row = 7 - row;



	edac_mc_handle_ce(mci, page, 0, sec1_syndrome, row, channel,

		"e752x CE");

	/* e752x mc reads 34:6 of the DRAM linear address */

	edac_mc_handle_ce(mci, page, offset_in_page(sec1_add << 4),

			sec1_syndrome, row, channel, "e752x CE");

}



static inline void process_ce(struct mem_ctl_info *mci, u16 error_one,
@@ -319,8 +320,10 @@ static void do_process_ue(struct mem_ctl_info *mci, u16 error_one, 
			((block_page >> 1) & 3) :

			edac_mc_find_csrow_by_page(mci, block_page);



		edac_mc_handle_ue(mci, block_page, 0, row,

			"e752x UE from Read");

		/* e752x mc reads 34:6 of the DRAM linear address */

		edac_mc_handle_ue(mci, block_page,

					offset_in_page(error_2b << 4),

					row, "e752x UE from Read");

	}

	if (error_one & 0x0404) {

		error_2b = scrb_add;
@@ -333,8 +336,10 @@ static void do_process_ue(struct mem_ctl_info *mci, u16 error_one, 
			((block_page >> 1) & 3) :

			edac_mc_find_csrow_by_page(mci, block_page);



		edac_mc_handle_ue(mci, block_page, 0, row,

				"e752x UE from Scruber");

		/* e752x mc reads 34:6 of the DRAM linear address */

		edac_mc_handle_ue(mci, block_page,

					offset_in_page(error_2b << 4),

					row, "e752x UE from Scruber");

	}

}