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

Commit 94baaee4 authored by Borislav Petkov's avatar Borislav Petkov
Browse files

amd64_edac: beef up DRAM error injection 



When injecting DRAM ECC errors (F3xBC_x8), EccVector[15:0] is a bitmask
of which bits should be error injected when written to and holds the
payload of 16-bit DRAM word when read, respectively.

Add /sysfs members to show the DRAM ECC section/word/vector.

Fail wrong injection values entered over /sysfs instead of truncating
them.

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

drivers/edac/amd64_edac.h

+2 −4
Original line number Original line Diff line number Diff line
@@ -372,13 +372,11 @@ enum { 




#define SET_NB_DRAM_INJECTION_WRITE(word, bits)  \

#define SET_NB_DRAM_INJECTION_WRITE(word, bits)  \

					(BIT(((word) & 0xF) + 20) | \

					(BIT(((word) & 0xF) + 20) | \

					BIT(17) |  \

					BIT(17) | bits)

					((bits) & 0xF))





#define SET_NB_DRAM_INJECTION_READ(word, bits)  \

#define SET_NB_DRAM_INJECTION_READ(word, bits)  \

					(BIT(((word) & 0xF) + 20) | \

					(BIT(((word) & 0xF) + 20) | \

					BIT(16) |  \

					BIT(16) |  bits)

					((bits) & 0xF))





#define K8_NBCAP			0xE8

#define K8_NBCAP			0xE8

#define K8_NBCAP_CORES			(BIT(12)|BIT(13))

#define K8_NBCAP_CORES			(BIT(12)|BIT(13))

drivers/edac/amd64_edac_inj.c

+43 −6
Original line number Original line Diff line number Diff line 
#include "amd64_edac.h"

#include "amd64_edac.h"





static ssize_t amd64_inject_section_show(struct mem_ctl_info *mci, char *buf)

{

	struct amd64_pvt *pvt = mci->pvt_info;

	return sprintf(buf, "0x%x\n", pvt->injection.section);

}



/*

/*

 * store error injection section value which refers to one of 4 16-byte sections

 * store error injection section value which refers to one of 4 16-byte sections

 * within a 64-byte cacheline

 * within a 64-byte cacheline
@@ -15,12 +21,26 @@ static ssize_t amd64_inject_section_store(struct mem_ctl_info *mci, 




	ret = strict_strtoul(data, 10, &value);

	ret = strict_strtoul(data, 10, &value);

	if (ret != -EINVAL) {

	if (ret != -EINVAL) {



		if (value > 3) {

			amd64_printk(KERN_WARNING,

				     "%s: invalid section 0x%lx\n",

				     __func__, value);

			return -EINVAL;

		}



		pvt->injection.section = (u32) value;

		pvt->injection.section = (u32) value;

		return count;

		return count;

	}

	}

	return ret;

	return ret;

}

}





static ssize_t amd64_inject_word_show(struct mem_ctl_info *mci, char *buf)

{

	struct amd64_pvt *pvt = mci->pvt_info;

	return sprintf(buf, "0x%x\n", pvt->injection.word);

}



/*

/*

 * store error injection word value which refers to one of 9 16-bit word of the

 * store error injection word value which refers to one of 9 16-bit word of the

 * 16-byte (128-bit + ECC bits) section

 * 16-byte (128-bit + ECC bits) section
@@ -37,14 +57,25 @@ static ssize_t amd64_inject_word_store(struct mem_ctl_info *mci, 
	ret = strict_strtoul(data, 10, &value);

	ret = strict_strtoul(data, 10, &value);

	if (ret != -EINVAL) {

	if (ret != -EINVAL) {





		value = (value <= 8) ? value : 0;

		if (value > 8) {

		pvt->injection.word = (u32) value;

			amd64_printk(KERN_WARNING,

				     "%s: invalid word 0x%lx\n",

				     __func__, value);

			return -EINVAL;

		}





		pvt->injection.word = (u32) value;

		return count;

		return count;

	}

	}

	return ret;

	return ret;

}

}





static ssize_t amd64_inject_ecc_vector_show(struct mem_ctl_info *mci, char *buf)

{

	struct amd64_pvt *pvt = mci->pvt_info;

	return sprintf(buf, "0x%x\n", pvt->injection.bit_map);

}



/*

/*

 * store 16 bit error injection vector which enables injecting errors to the

 * store 16 bit error injection vector which enables injecting errors to the

 * corresponding bit within the error injection word above. When used during a

 * corresponding bit within the error injection word above. When used during a
@@ -60,8 +91,14 @@ static ssize_t amd64_inject_ecc_vector_store(struct mem_ctl_info *mci, 
	ret = strict_strtoul(data, 16, &value);

	ret = strict_strtoul(data, 16, &value);

	if (ret != -EINVAL) {

	if (ret != -EINVAL) {





		pvt->injection.bit_map = (u32) value & 0xFFFF;

		if (value & 0xFFFF0000) {

			amd64_printk(KERN_WARNING,

				     "%s: invalid EccVector: 0x%lx\n",

				     __func__, value);

			return -EINVAL;

		}





		pvt->injection.bit_map = (u32) value;

		return count;

		return count;

	}

	}

	return ret;

	return ret;
@@ -147,7 +184,7 @@ struct mcidev_sysfs_attribute amd64_inj_attrs[] = { 
			.name = "inject_section",

			.name = "inject_section",

			.mode = (S_IRUGO | S_IWUSR)

			.mode = (S_IRUGO | S_IWUSR)

		},

		},

		.show = NULL,

		.show = amd64_inject_section_show,

		.store = amd64_inject_section_store,

		.store = amd64_inject_section_store,

	},

	},

	{

	{
@@ -155,7 +192,7 @@ struct mcidev_sysfs_attribute amd64_inj_attrs[] = { 
			.name = "inject_word",

			.name = "inject_word",

			.mode = (S_IRUGO | S_IWUSR)

			.mode = (S_IRUGO | S_IWUSR)

		},

		},

		.show = NULL,

		.show = amd64_inject_word_show,

		.store = amd64_inject_word_store,

		.store = amd64_inject_word_store,

	},

	},

	{

	{
@@ -163,7 +200,7 @@ struct mcidev_sysfs_attribute amd64_inj_attrs[] = { 
			.name = "inject_ecc_vector",

			.name = "inject_ecc_vector",

			.mode = (S_IRUGO | S_IWUSR)

			.mode = (S_IRUGO | S_IWUSR)

		},

		},

		.show = NULL,

		.show = amd64_inject_ecc_vector_show,

		.store = amd64_inject_ecc_vector_store,

		.store = amd64_inject_ecc_vector_store,

	},

	},

	{

	{