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 4/9] x86, RAS: Move MCE injection code into ras/
Date: Wed, 19 Oct 2011 16:51:01 +0200 [thread overview]
Message-ID: <1319035866-29570-5-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>
This is the code collecting all AMD MCE injection methods.
No functionality change.
Signed-off-by: Borislav Petkov <borislav.petkov@amd.com>
---
arch/x86/kernel/cpu/ras/Kconfig | 9 +++++++--
arch/x86/kernel/cpu/ras/amd/Makefile | 3 +++
.../x86/kernel/cpu/ras/amd/mce-inject.c | 0
drivers/edac/Kconfig | 10 ----------
drivers/edac/Makefile | 2 --
5 files changed, 10 insertions(+), 14 deletions(-)
rename drivers/edac/mce_amd_inj.c => arch/x86/kernel/cpu/ras/amd/mce-inject.c (100%)
diff --git a/arch/x86/kernel/cpu/ras/Kconfig b/arch/x86/kernel/cpu/ras/Kconfig
index 440d6a1..39dd0af 100644
--- a/arch/x86/kernel/cpu/ras/Kconfig
+++ b/arch/x86/kernel/cpu/ras/Kconfig
@@ -22,7 +22,12 @@ config X86_AMD_DECODE_MCE
which occur really early upon boot, before the module infrastructure
has been initialized.
+config X86_AMD_MCE_INJECT
+ tristate "Simple MCE injection interface over /sysfs"
+ depends on X86_AMD_DECODE_MCE
+ 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/kernel/cpu/ras/amd/Makefile b/arch/x86/kernel/cpu/ras/amd/Makefile
index a18207b..3a01e3a 100644
--- a/arch/x86/kernel/cpu/ras/amd/Makefile
+++ b/arch/x86/kernel/cpu/ras/amd/Makefile
@@ -2,3 +2,6 @@ obj-$(CONFIG_X86_AMD_ERROR_THRESHOLDING) += thresholding.o
amd_mce_decode-y := mce-decode.o
obj-$(CONFIG_X86_AMD_DECODE_MCE) += amd_mce_decode.o
+
+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/kernel/cpu/ras/amd/mce-inject.c
similarity index 100%
rename from drivers/edac/mce_amd_inj.c
rename to arch/x86/kernel/cpu/ras/amd/mce-inject.c
diff --git a/drivers/edac/Kconfig b/drivers/edac/Kconfig
index 8de46e7..9c9b319 100644
--- a/drivers/edac/Kconfig
+++ b/drivers/edac/Kconfig
@@ -39,16 +39,6 @@ config EDAC_DEBUG
there're four debug levels (x=0,1,2,3 from low to high).
Usually you should select 'N'.
-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
diff --git a/drivers/edac/Makefile b/drivers/edac/Makefile
index a6f10c2..5444512 100644
--- a/drivers/edac/Makefile
+++ b/drivers/edac/Makefile
@@ -17,8 +17,6 @@ ifdef CONFIG_PCI
edac_core-y += edac_pci.o edac_pci_sysfs.o
endif
-obj-$(CONFIG_EDAC_MCE_INJ) += mce_amd_inj.o
-
obj-$(CONFIG_EDAC_AMD76X) += amd76x_edac.o
obj-$(CONFIG_EDAC_CPC925) += cpc925_edac.o
obj-$(CONFIG_EDAC_I5000) += i5000_edac.o
--
1.7.4.rc2
next prev 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 ` Borislav Petkov [this message]
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 ` [PATCH 8/9] x86, RAS: Add attributes needed for HW injection Borislav Petkov
2011-10-19 21:03 ` 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-5-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).