From: Borislav Petkov <bp@amd64.org>
To: Tony Luck <tony.luck@intel.com>
Cc: X86-ML <x86@kernel.org>, EDAC devel <linux-edac@vger.kernel.org>,
LKML <linux-kernel@vger.kernel.org>,
Borislav Petkov <borislav.petkov@amd.com>
Subject: [PATCH -v2 2/6] x86, RAS: Move AMD MCE injection code into ras/
Date: Tue, 16 Oct 2012 16:52:51 +0200 [thread overview]
Message-ID: <1350399175-14477-3-git-send-email-bp@amd64.org> (raw)
In-Reply-To: <1350399175-14477-1-git-send-email-bp@amd64.org>
From: Borislav Petkov <borislav.petkov@amd.com>
This is the code collecting all AMD MCE injection methods.
No functionality change.
Signed-off-by: Borislav Petkov <borislav.petkov@amd.com>
---
arch/x86/Kconfig | 2 ++
arch/x86/ras/Kconfig | 11 +++++++++++
arch/x86/ras/Makefile | 1 +
arch/x86/ras/amd/Makefile | 3 +++
drivers/edac/mce_amd_inj.c => arch/x86/ras/amd/mce-inject.c | 2 +-
drivers/edac/Kconfig | 10 ----------
6 files changed, 18 insertions(+), 11 deletions(-)
create mode 100644 arch/x86/ras/Kconfig
create mode 100644 arch/x86/ras/amd/Makefile
rename drivers/edac/mce_amd_inj.c => arch/x86/ras/amd/mce-inject.c (99%)
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index e882fc64ffb3..f2f704af9f86 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -666,6 +666,8 @@ config X86_RAS
A collection of Reliability, Availability and Serviceability software
features which enable hardware error logging and reporting.
+source "arch/x86/ras/Kconfig"
+
source "arch/x86/Kconfig.cpu"
config HPET_TIMER
diff --git a/arch/x86/ras/Kconfig b/arch/x86/ras/Kconfig
new file mode 100644
index 000000000000..9362f54bfe0f
--- /dev/null
+++ b/arch/x86/ras/Kconfig
@@ -0,0 +1,11 @@
+menu "AMD RAS features"
+ depends on X86_RAS && CPU_SUP_AMD
+
+config X86_AMD_MCE_INJECT
+ tristate "Simple MCE injection interface over /sysfs"
+ default n
+ help
+ This is a simple interface to inject MCEs over /sysfs and test
+ the MCE decoding code.
+
+endmenu
diff --git a/arch/x86/ras/Makefile b/arch/x86/ras/Makefile
index e69de29bb2d1..dd7a321e4b5e 100644
--- a/arch/x86/ras/Makefile
+++ b/arch/x86/ras/Makefile
@@ -0,0 +1 @@
+obj-$(CONFIG_X86_MCE) += amd/
diff --git a/arch/x86/ras/amd/Makefile b/arch/x86/ras/amd/Makefile
new file mode 100644
index 000000000000..74f2a1e676b4
--- /dev/null
+++ b/arch/x86/ras/amd/Makefile
@@ -0,0 +1,3 @@
+amd_mce_inject-y := mce-inject.o
+obj-$(CONFIG_X86_AMD_MCE_INJECT) += amd_mce_inject.o
+
diff --git a/drivers/edac/mce_amd_inj.c b/arch/x86/ras/amd/mce-inject.c
similarity index 99%
rename from drivers/edac/mce_amd_inj.c
rename to arch/x86/ras/amd/mce-inject.c
index 66b5151c1080..90aa317b09a6 100644
--- a/drivers/edac/mce_amd_inj.c
+++ b/arch/x86/ras/amd/mce-inject.c
@@ -16,7 +16,7 @@
#include <linux/module.h>
#include <asm/mce.h>
-#include "mce_amd.h"
+#include "../../../drivers/edac/mce_amd.h"
struct edac_mce_attr {
struct attribute attr;
diff --git a/drivers/edac/Kconfig b/drivers/edac/Kconfig
index 409b92b8d346..96c1f6f4b6a1 100644
--- a/drivers/edac/Kconfig
+++ b/drivers/edac/Kconfig
@@ -59,16 +59,6 @@ config EDAC_DECODE_MCE
which occur really early upon boot, before the module infrastructure
has been initialized.
-config EDAC_MCE_INJ
- tristate "Simple MCE injection interface over /sysfs"
- depends on EDAC_DECODE_MCE
- default n
- help
- This is a simple interface to inject MCEs over /sysfs and test
- the MCE decoding code in EDAC.
-
- This is currently AMD-only.
-
config EDAC_MM_EDAC
tristate "Main Memory EDAC (Error Detection And Correction) reporting"
help
--
1.8.0.rc2.4.g42e55a5
next prev parent reply other threads:[~2012-10-16 14:53 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-10-16 14:52 [PATCH -v2 0/6] AMD MCE injection improvs Borislav Petkov
2012-10-16 14:52 ` [PATCH -v2 1/6] x86, RAS: Add a barebones RAS subtree Borislav Petkov
2012-10-16 14:52 ` Borislav Petkov [this message]
2012-10-16 14:52 ` [PATCH -v2 3/6] x86, RAS: Convert mce-inject module to debugfs Borislav Petkov
2012-10-16 15:41 ` Joe Perches
2012-10-16 16:39 ` Borislav Petkov
2012-10-17 19:06 ` Andi Kleen
2012-10-17 20:02 ` Borislav Petkov
2012-10-16 14:52 ` [PATCH -v2 4/6] x86, RAS: Add function enabling direct writes to MCE MSRs Borislav Petkov
2012-10-16 17:59 ` Joe Perches
2012-10-16 14:52 ` [PATCH -v2 5/6] x86, RAS: Add attributes needed for HW injection Borislav Petkov
2012-10-16 14:52 ` [PATCH -v2 6/6] x86, RAS: Add an injector function 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=1350399175-14477-3-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