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

Commit dd53bce4 authored by Borislav Petkov's avatar Borislav Petkov Committed by Borislav Petkov
Browse files

EDAC, MCE: Adjust IC decoders to F14h 



Add support for IC MCEs for F14h CPUs. K8 and F10h are almost identical
so use one function for both.

Signed-off-by: default avatarBorislav Petkov <borislav.petkov@amd.com>
parent 888ab8e6

drivers/edac/mce_amd.c

+70 −48
Original line number Original line Diff line number Diff line
@@ -219,60 +219,79 @@ static void amd_decode_dc_mce(struct mce *m) 
	pr_emerg(HW_ERR "Corrupted DC MCE info?\n");

	pr_emerg(HW_ERR "Corrupted DC MCE info?\n");

}

}





static void amd_decode_ic_mce(struct mce *m)

static bool k8_ic_mce(u16 ec)

{

{

	u32 ec  = m->status & 0xffff;

	u32 xec = (m->status >> 16) & 0xf;



	pr_emerg(HW_ERR "Instruction Cache Error");



	if (xec == 1 && TLB_ERROR(ec))

		pr_cont(": %s TLB multimatch.\n", LL_MSG(ec));

	else if (xec == 0) {

		if (TLB_ERROR(ec))

			pr_cont(": %s TLB Parity error.\n", LL_MSG(ec));

		else if (BUS_ERROR(ec)) {

			if (boot_cpu_data.x86 == 0xf &&

			    (m->status & BIT(58)))

				pr_cont(" during system linefill.\n");

			else

				pr_cont(" during attempted NB data read.\n");

		} else if (MEM_ERROR(ec)) {

	u8 ll	 = ec & 0x3;

	u8 ll	 = ec & 0x3;

			u8 rrrr = (ec >> 4) & 0xf;

	u8 r4	 = (ec >> 4) & 0xf;

	bool ret = true;



	if (!MEM_ERROR(ec))

		return false;





	if (ll == 0x2)

	if (ll == 0x2)

		pr_cont("during a linefill from L2.\n");

		pr_cont("during a linefill from L2.\n");

	else if (ll == 0x1) {

	else if (ll == 0x1) {



		switch (r4) {

				switch (rrrr) {

		case R4_IRD:

				case 0x5:

			pr_cont("Parity error during data load.\n");

					pr_cont(": Parity error during "

					       "data load.\n");

			break;

			break;





				case 0x7:

		case R4_EVICT:

					pr_cont(": Copyback Parity/Victim"

			pr_cont("Copyback Parity/Victim error.\n");

						" error.\n");

			break;

			break;





				case 0x8:

		case R4_SNOOP:

					pr_cont(": Tag Snoop error.\n");

			pr_cont("Tag Snoop error.\n");

			break;

			break;





		default:

		default:

					goto wrong_ic_mce;

			ret = false;

			break;

			break;

		}

		}

			}

	} else

	} else

			goto wrong_ic_mce;

		ret = false;

	} else

		goto wrong_ic_mce;





	return;

	return ret;

}





wrong_ic_mce:

static bool f14h_ic_mce(u16 ec)

{

	u8 ll    = ec & 0x3;

	u8 tt    = (ec >> 2) & 0x3;

	u8 r4  = (ec >> 4) & 0xf;

	bool ret = true;



	if (MEM_ERROR(ec)) {

		if (tt != 0 || ll != 1)

			ret = false;



		if (r4 == R4_IRD)

			pr_cont("Data/tag array parity error for a tag hit.\n");

		else if (r4 == R4_SNOOP)

			pr_cont("Tag error during snoop/victimization.\n");

		else

			ret = false;

	}

	return ret;

}



static void amd_decode_ic_mce(struct mce *m)

{

	u16 ec = m->status & 0xffff;

	u8 xec = (m->status >> 16) & 0xf;



	pr_emerg(HW_ERR "Instruction Cache Error: ");



	if (TLB_ERROR(ec))

		pr_cont("%s TLB %s.\n", LL_MSG(ec),

			(xec ? "multimatch" : "parity error"));

	else if (BUS_ERROR(ec)) {

		bool k8 = (boot_cpu_data.x86 == 0xf && (m->status & BIT(58)));



		pr_cont("during %s.\n", (k8 ? "system linefill" : "NB data read"));

	} else if (fam_ops->ic_mce(ec))

		;

	else

		pr_emerg(HW_ERR "Corrupted IC MCE info?\n");

		pr_emerg(HW_ERR "Corrupted IC MCE info?\n");

}

}
@@ -481,14 +500,17 @@ static int __init mce_amd_init(void) 
	switch (boot_cpu_data.x86) {

	switch (boot_cpu_data.x86) {

	case 0xf:

	case 0xf:

		fam_ops->dc_mce = k8_dc_mce;

		fam_ops->dc_mce = k8_dc_mce;

		fam_ops->ic_mce = k8_ic_mce;

		break;

		break;





	case 0x10:

	case 0x10:

		fam_ops->dc_mce = f10h_dc_mce;

		fam_ops->dc_mce = f10h_dc_mce;

		fam_ops->ic_mce = k8_ic_mce;

		break;

		break;





	case 0x14:

	case 0x14:

		fam_ops->dc_mce = f14h_dc_mce;

		fam_ops->dc_mce = f14h_dc_mce;

		fam_ops->ic_mce = f14h_ic_mce;

		break;

		break;





	default:

	default:

drivers/edac/mce_amd.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -101,6 +101,7 @@ struct err_regs { 
 */

 */

struct amd_decoder_ops {

struct amd_decoder_ops {

	bool (*dc_mce)(u16);

	bool (*dc_mce)(u16);

	bool (*ic_mce)(u16);

};

};





void amd_report_gart_errors(bool);

void amd_report_gart_errors(bool);