linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Borislav Petkov <bp@amd64.org>
To: EDAC devel <linux-edac@vger.kernel.org>
Cc: Tony Luck <tony.luck@intel.com>, Ingo Molnar <mingo@elte.hu>,
	X86-ML <x86@kernel.org>, LKML <linux-kernel@vger.kernel.org>,
	Borislav Petkov <borislav.petkov@amd.com>
Subject: [PATCH 8/9] x86, RAS: Add attributes needed for HW injection
Date: Wed, 19 Oct 2011 16:51:05 +0200	[thread overview]
Message-ID: <1319035866-29570-9-git-send-email-bp@amd64.org> (raw)
In-Reply-To: <1319035866-29570-1-git-send-email-bp@amd64.org>

From: Borislav Petkov <borislav.petkov@amd.com>

hw_inject denotes whether we want to do a hardware or a software
injection and, in the case of hardware injection, we want to do that on
a particular cpu, thus the 'cpu' attribute.

Signed-off-by: Borislav Petkov <borislav.petkov@amd.com>
---
 arch/x86/kernel/cpu/ras/amd/mce-inject.c |   55 ++++++++++++++++++++++++++++++
 1 files changed, 55 insertions(+), 0 deletions(-)

diff --git a/arch/x86/kernel/cpu/ras/amd/mce-inject.c b/arch/x86/kernel/cpu/ras/amd/mce-inject.c
index 1b797bd..8646080 100644
--- a/arch/x86/kernel/cpu/ras/amd/mce-inject.c
+++ b/arch/x86/kernel/cpu/ras/amd/mce-inject.c
@@ -77,6 +77,59 @@ static int toggle_hw_mce_inject(unsigned int cpu, bool enable)
 }
 
 /*
+ * HW or SW injection
+ */
+static int hw_inj_get(void *data, u64 *val)
+{
+	struct mce *m = (struct mce *)data;
+
+	*val = !!(m->inject_flags & MCJ_HW_MSR_INJECT);
+
+	return 0;
+}
+
+static int hw_inj_set(void *data, u64 val)
+{
+	struct mce *m = (struct mce *)data;
+
+	switch (val) {
+	case 0:
+		m->inject_flags &= (u8)~MCJ_HW_MSR_INJECT;
+		break;
+
+	case 1:
+		m->inject_flags |= MCJ_HW_MSR_INJECT;
+		break;
+
+	default:
+		printk(KERN_ERR "%s: Only 0 or 1 allowed!\n", __func__);
+		return -EINVAL;
+	}
+	return 0;
+}
+
+DEFINE_SIMPLE_ATTRIBUTE(hw_inj_fops, hw_inj_get, hw_inj_set, "%llu\n");
+
+/*
+ * On which CPU to inject?
+ */
+MCE_INJECT_GET(extcpu);
+
+static int inj_extcpu_set(void *data, u64 val)
+{
+	struct mce *m = (struct mce *)data;
+
+	if (val >= num_online_cpus()) {
+		printk(KERN_ERR "%s: Non-existent CPU: %llu\n", __func__, val);
+		return -EINVAL;
+	}
+	m->extcpu = val;
+	return 0;
+}
+
+DEFINE_SIMPLE_ATTRIBUTE(extcpu_fops, inj_extcpu_get, inj_extcpu_set, "%llu\n");
+
+/*
  * This denotes into which bank we're injecting and triggers
  * the injection, at the same time.
  */
@@ -116,6 +169,8 @@ struct dfs_node {
 	{ .name = "misc",	.fops = &misc_fops },
 	{ .name = "addr",	.fops = &addr_fops },
 	{ .name = "bank",	.fops = &bank_fops },
+	{ .name = "hw_inject",	.fops = &hw_inj_fops },
+	{ .name = "cpu",	.fops = &extcpu_fops },
 };
 
 static int __init init_mce_inject(void)
-- 
1.7.4.rc2


  parent reply	other threads:[~2011-10-19 14:52 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-10-19 14:50 [RFC -v2] x86 RAS: Reorganize functionality Borislav Petkov
2011-10-19 14:50 ` [PATCH 1/9] x86, mce: Enable MCA support by default Borislav Petkov
2011-10-19 14:50 ` [PATCH 2/9] x86, RAS: Start reorganizing RAS features support Borislav Petkov
2011-10-19 17:13   ` Luck, Tony
2011-10-19 17:22     ` Mauro Carvalho Chehab
2011-10-19 18:11       ` Borislav Petkov
2011-10-19 19:14         ` Mauro Carvalho Chehab
2011-10-20 15:12           ` Borislav Petkov
2011-10-19 14:51 ` [PATCH 3/9] x86, RAS: Move MCE decoding code into ras/ Borislav Petkov
2011-10-19 14:51 ` [PATCH 4/9] x86, RAS: Move MCE injection " Borislav Petkov
2011-10-19 14:51 ` [PATCH 5/9] x86, MCE: Add a HW injection flag Borislav Petkov
2011-10-19 14:51 ` [PATCH 6/9] x86, RAS: Convert mce-inject module to debugfs Borislav Petkov
2011-10-19 14:51 ` [PATCH 7/9] x86, RAS: Add function enabling direct writes to MCE MSRs Borislav Petkov
2011-10-19 14:51 ` Borislav Petkov [this message]
2011-10-19 21:03   ` [PATCH 8/9] x86, RAS: Add attributes needed for HW injection David Rientjes
2011-10-19 21:09     ` Borislav Petkov
2011-10-19 21:19       ` David Rientjes
2011-10-20 15:06         ` Borislav Petkov
2011-10-19 14:51 ` [PATCH 9/9] x86, RAS: Add an injector function Borislav Petkov
2011-10-19 17:08 ` [RFC -v2] x86 RAS: Reorganize functionality Luck, Tony
2011-10-19 17:13   ` Borislav Petkov

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1319035866-29570-9-git-send-email-bp@amd64.org \
    --to=bp@amd64.org \
    --cc=borislav.petkov@amd.com \
    --cc=linux-edac@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mingo@elte.hu \
    --cc=tony.luck@intel.com \
    --cc=x86@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).