x86/ras: Move AMD MCE injector to arch/x86/ras/
This is an x86-specific module and would benefit from being closer to the arch code. Move it there. Update copyright while at it. Signed-off-by: Borislav Petkov <bp@suse.de> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Tony Luck <tony.luck@intel.com> Link: http://lkml.kernel.org/r/1439396985-12812-14-git-send-email-bp@alien8.de Signed-off-by: Ingo Molnar <mingo@kernel.org>
This commit is contained in:
parent
a79da38494
commit
6c36dfe949
|
@ -212,6 +212,8 @@ drivers-$(CONFIG_PM) += arch/x86/power/
|
||||||
|
|
||||||
drivers-$(CONFIG_FB) += arch/x86/video/
|
drivers-$(CONFIG_FB) += arch/x86/video/
|
||||||
|
|
||||||
|
drivers-$(CONFIG_RAS) += arch/x86/ras/
|
||||||
|
|
||||||
####
|
####
|
||||||
# boot loader support. Several targets are kept for legacy purposes
|
# boot loader support. Several targets are kept for legacy purposes
|
||||||
|
|
||||||
|
|
|
@ -0,0 +1,11 @@
|
||||||
|
config AMD_MCE_INJ
|
||||||
|
tristate "Simple MCE injection interface for AMD processors"
|
||||||
|
depends on RAS && EDAC_DECODE_MCE && DEBUG_FS
|
||||||
|
default n
|
||||||
|
help
|
||||||
|
This is a simple debugfs interface to inject MCEs and test different
|
||||||
|
aspects of the MCE handling code.
|
||||||
|
|
||||||
|
WARNING: Do not even assume this interface is staying stable!
|
||||||
|
|
||||||
|
|
|
@ -0,0 +1,2 @@
|
||||||
|
obj-$(CONFIG_AMD_MCE_INJ) += mce_amd_inj.o
|
||||||
|
|
|
@ -6,7 +6,7 @@
|
||||||
* This file may be distributed under the terms of the GNU General Public
|
* This file may be distributed under the terms of the GNU General Public
|
||||||
* License version 2.
|
* License version 2.
|
||||||
*
|
*
|
||||||
* Copyright (c) 2010-14: Borislav Petkov <bp@alien8.de>
|
* Copyright (c) 2010-15: Borislav Petkov <bp@alien8.de>
|
||||||
* Advanced Micro Devices Inc.
|
* Advanced Micro Devices Inc.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
@ -19,7 +19,7 @@
|
||||||
#include <linux/uaccess.h>
|
#include <linux/uaccess.h>
|
||||||
#include <asm/mce.h>
|
#include <asm/mce.h>
|
||||||
|
|
||||||
#include "mce_amd.h"
|
#include "../kernel/cpu/mcheck/mce-internal.h"
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Collect all the MCi_XXX settings
|
* Collect all the MCi_XXX settings
|
||||||
|
@ -195,7 +195,7 @@ static void do_inject(void)
|
||||||
i_mce.status |= MCI_STATUS_MISCV;
|
i_mce.status |= MCI_STATUS_MISCV;
|
||||||
|
|
||||||
if (inj_type == SW_INJ) {
|
if (inj_type == SW_INJ) {
|
||||||
amd_decode_mce(NULL, 0, &i_mce);
|
mce_inject_log(&i_mce);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
|
@ -61,16 +61,6 @@ config EDAC_DECODE_MCE
|
||||||
which occur really early upon boot, before the module infrastructure
|
which occur really early upon boot, before the module infrastructure
|
||||||
has been initialized.
|
has been initialized.
|
||||||
|
|
||||||
config EDAC_MCE_INJ
|
|
||||||
tristate "Simple MCE injection interface"
|
|
||||||
depends on EDAC_DECODE_MCE && DEBUG_FS
|
|
||||||
default n
|
|
||||||
help
|
|
||||||
This is a simple debugfs interface to inject MCEs and test different
|
|
||||||
aspects of the MCE handling code.
|
|
||||||
|
|
||||||
WARNING: Do not even assume this interface is staying stable!
|
|
||||||
|
|
||||||
config EDAC_MM_EDAC
|
config EDAC_MM_EDAC
|
||||||
tristate "Main Memory EDAC (Error Detection And Correction) reporting"
|
tristate "Main Memory EDAC (Error Detection And Correction) reporting"
|
||||||
select RAS
|
select RAS
|
||||||
|
|
|
@ -17,7 +17,6 @@ edac_core-y += edac_pci.o edac_pci_sysfs.o
|
||||||
endif
|
endif
|
||||||
|
|
||||||
obj-$(CONFIG_EDAC_GHES) += ghes_edac.o
|
obj-$(CONFIG_EDAC_GHES) += ghes_edac.o
|
||||||
obj-$(CONFIG_EDAC_MCE_INJ) += mce_amd_inj.o
|
|
||||||
|
|
||||||
edac_mce_amd-y := mce_amd.o
|
edac_mce_amd-y := mce_amd.o
|
||||||
obj-$(CONFIG_EDAC_DECODE_MCE) += edac_mce_amd.o
|
obj-$(CONFIG_EDAC_DECODE_MCE) += edac_mce_amd.o
|
||||||
|
|
|
@ -29,4 +29,7 @@ menuconfig RAS
|
||||||
data corruption.
|
data corruption.
|
||||||
|
|
||||||
if RAS
|
if RAS
|
||||||
|
|
||||||
|
source arch/x86/ras/Kconfig
|
||||||
|
|
||||||
endif
|
endif
|
||||||
|
|
Loading…
Reference in New Issue