Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6c36dfe9 authored by Borislav Petkov's avatar Borislav Petkov Committed by Ingo Molnar
Browse files

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: default avatarBorislav 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: default avatarIngo Molnar <mingo@kernel.org>
parent a79da384

arch/x86/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -212,6 +212,8 @@ drivers-$(CONFIG_PM) += arch/x86/power/ 


drivers-$(CONFIG_FB) += arch/x86/video/



drivers-$(CONFIG_RAS) += arch/x86/ras/



####

# boot loader support. Several targets are kept for legacy purposes

arch/x86/ras/Kconfig

0 → 100644
+11 −0
Original line number Diff line number Diff line 
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!

arch/x86/ras/Makefile

0 → 100644
+2 −0
Original line number Diff line number Diff line 
obj-$(CONFIG_AMD_MCE_INJ)		+= mce_amd_inj.o

drivers/edac/mce_amd_inj.c→arch/x86/ras/mce_amd_inj.c

+3 −3
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ 
 * This file may be distributed under the terms of the GNU General Public

 * 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.

 */
@@ -19,7 +19,7 @@ 
#include <linux/uaccess.h>

#include <asm/mce.h>



#include "mce_amd.h"

#include "../kernel/cpu/mcheck/mce-internal.h"



/*

 * Collect all the MCi_XXX settings
@@ -195,7 +195,7 @@ static void do_inject(void) 
		i_mce.status |= MCI_STATUS_MISCV;



	if (inj_type == SW_INJ) {

		amd_decode_mce(NULL, 0, &i_mce);

		mce_inject_log(&i_mce);

		return;

	}

drivers/edac/Kconfig

+0 −10
Original line number Diff line number Diff line
@@ -61,16 +61,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"

	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

	tristate "Main Memory EDAC (Error Detection And Correction) reporting"

	select RAS