Commit 2c532791 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'ras_core_for_v5.13' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull x86 RAS update from Borislav Petkov:
 "Provide the ability to specify the IPID (IP block associated with the
  MCE, AMD-specific) when injecting an MCE"

* tag 'ras_core_for_v5.13' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/mce/inject: Add IPID for injection too
parents 41acc109 2ffdc2c3

arch/x86/kernel/cpu/mce/inject.c

+6 −0
Original line number Diff line number Diff line
@@ -74,6 +74,7 @@ MCE_INJECT_SET(status); 
MCE_INJECT_SET(misc);

MCE_INJECT_SET(addr);

MCE_INJECT_SET(synd);

MCE_INJECT_SET(ipid);



#define MCE_INJECT_GET(reg)						\

static int inj_##reg##_get(void *data, u64 *val)			\
@@ -88,11 +89,13 @@ MCE_INJECT_GET(status); 
MCE_INJECT_GET(misc);

MCE_INJECT_GET(addr);

MCE_INJECT_GET(synd);

MCE_INJECT_GET(ipid);



DEFINE_SIMPLE_ATTRIBUTE(status_fops, inj_status_get, inj_status_set, "%llx\n");

DEFINE_SIMPLE_ATTRIBUTE(misc_fops, inj_misc_get, inj_misc_set, "%llx\n");

DEFINE_SIMPLE_ATTRIBUTE(addr_fops, inj_addr_get, inj_addr_set, "%llx\n");

DEFINE_SIMPLE_ATTRIBUTE(synd_fops, inj_synd_get, inj_synd_set, "%llx\n");

DEFINE_SIMPLE_ATTRIBUTE(ipid_fops, inj_ipid_get, inj_ipid_set, "%llx\n");



static void setup_inj_struct(struct mce *m)

{
@@ -629,6 +632,8 @@ static const char readme_msg[] = 
"\t    is present in hardware. \n"

"\t  - \"th\": Trigger APIC interrupt for Threshold errors. Causes threshold \n"

"\t    APIC interrupt handler to handle the error. \n"

"\n"

"ipid:\t IPID (AMD-specific)\n"

"\n";



static ssize_t
@@ -652,6 +657,7 @@ static struct dfs_node { 
	{ .name = "misc",	.fops = &misc_fops,   .perm = S_IRUSR | S_IWUSR },

	{ .name = "addr",	.fops = &addr_fops,   .perm = S_IRUSR | S_IWUSR },

	{ .name = "synd",	.fops = &synd_fops,   .perm = S_IRUSR | S_IWUSR },

	{ .name = "ipid",	.fops = &ipid_fops,   .perm = S_IRUSR | S_IWUSR },

	{ .name = "bank",	.fops = &bank_fops,   .perm = S_IRUSR | S_IWUSR },

	{ .name = "flags",	.fops = &flags_fops,  .perm = S_IRUSR | S_IWUSR },

	{ .name = "cpu",	.fops = &extcpu_fops, .perm = S_IRUSR | S_IWUSR },