From: Borislav Petkov <bp@amd64.org>
To: Tony Luck <tony.luck@intel.com>
Cc: EDAC devel <linux-edac@vger.kernel.org>, X86-ML <x86@kernel.org>,
LKML <linux-kernel@vger.kernel.org>,
Borislav Petkov <borislav.petkov@amd.com>
Subject: [PATCH 5/6] x86, RAS: Add attributes needed for HW injection
Date: Mon, 8 Oct 2012 19:11:32 +0200 [thread overview]
Message-ID: <1349716293-16723-6-git-send-email-bp@amd64.org> (raw)
In-Reply-To: <1349716293-16723-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/ras/amd/mce-inject.c | 55 +++++++++++++++++++++++++++++++++++++++++++
1 file changed, 55 insertions(+)
diff --git a/arch/x86/ras/amd/mce-inject.c b/arch/x86/ras/amd/mce-inject.c
index c0c811579ce9..b55d69fbd6e3 100644
--- a/arch/x86/ras/amd/mce-inject.c
+++ b/arch/x86/ras/amd/mce-inject.c
@@ -79,6 +79,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_EXCEPTION);
+
+ 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_EXCEPTION;
+ break;
+
+ case 1:
+ m->inject_flags |= MCJ_EXCEPTION;
+ break;
+
+ default:
+ pr_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 >= nr_cpu_ids || !cpu_online(val)) {
+ pr_err("%s: Invalid 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.
*/
@@ -119,6 +172,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.8.0.rc0.18.gf84667d
next prev parent reply other threads:[~2012-10-08 17:12 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-10-08 17:11 [PATCH 0/6] AMD MCE injection improvs Borislav Petkov
2012-10-08 17:11 ` [PATCH 1/6] x86, RAS: Add a barebones RAS subtree Borislav Petkov
2012-10-08 23:53 ` Tony Luck
2012-10-09 13:20 ` Borislav Petkov
2012-10-08 17:11 ` [PATCH 2/6] x86, RAS: Move AMD MCE injection code into ras/ Borislav Petkov
2012-10-08 17:11 ` [PATCH 3/6] x86, RAS: Convert mce-inject module to debugfs Borislav Petkov
2012-10-08 17:11 ` [PATCH 4/6] x86, RAS: Add function enabling direct writes to MCE MSRs Borislav Petkov
2012-10-08 17:11 ` Borislav Petkov [this message]
2012-10-08 17:11 ` [PATCH 6/6] x86, RAS: Add an injector function Borislav Petkov
2012-10-08 23:58 ` [PATCH 0/6] AMD MCE injection improvs Tony Luck
2012-10-09 6:18 ` 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=1349716293-16723-6-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=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
Powered by JetHome