trace, RAS: Add basic RAS trace event

To avoid confuision and conflict of usage for RAS related trace event,
add an unified RAS trace event stub.

Start a RAS subsystem menu which will be fleshed out in time, when more
features get added to it.

Signed-off-by: Chen, Gong <gong.chen@linux.intel.com>
Link: http://lkml.kernel.org/r/1402475691-30045-2-git-send-email-gong.chen@linux.intel.com
Signed-off-by: Borislav Petkov <bp@suse.de>
Signed-off-by: Tony Luck <tony.luck@intel.com>

diff --git a/drivers/Kconfig b/drivers/Kconfig
index 0e87a34b6472e65c62c1d4b4bdd3d6ac49dc3624..4e6e66c3c8d6550df5a0d86f7fb7d436c8d280f1 100644 (file)
--- a/drivers/Kconfig
+++ b/drivers/Kconfig
@@ -176,4 +176,6 @@ source "drivers/powercap/Kconfig"
 
 source "drivers/mcb/Kconfig"
 
+source "drivers/ras/Kconfig"
+
 endmenu

diff --git a/drivers/Makefile b/drivers/Makefile
index f98b50d8251d3849dfb871ca1fef595f0677bbc0..65c32b1cea3d643b9065e55b4afb87e68e2e1142 100644 (file)
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -158,3 +158,4 @@ obj-$(CONFIG_NTB)           += ntb/
 obj-$(CONFIG_FMC)              += fmc/
 obj-$(CONFIG_POWERCAP)         += powercap/
 obj-$(CONFIG_MCB)              += mcb/
+obj-$(CONFIG_RAS)              += ras/

diff --git a/drivers/edac/Kconfig b/drivers/edac/Kconfig
index 878f09005fad99a57e7f04e648d9828f87c0dc5c..d3c0465ba456c870d0ec8438fc10cfaf6b829962 100644 (file)
--- a/drivers/edac/Kconfig
+++ b/drivers/edac/Kconfig
@@ -72,6 +72,7 @@ config EDAC_MCE_INJ
 
 config EDAC_MM_EDAC
        tristate "Main Memory EDAC (Error Detection And Correction) reporting"
+       select RAS
        help
          Some systems are able to detect and correct errors in main
          memory.  EDAC can report statistics on memory error

diff --git a/drivers/edac/edac_mc.c b/drivers/edac/edac_mc.c
index 2c694b5297cc3a9dc5840f8d348bc66330d12d1c..9f134823fa75848d69e1f7c1f4edd07ae141e08d 100644 (file)
--- a/drivers/edac/edac_mc.c
+++ b/drivers/edac/edac_mc.c
@@ -33,9 +33,6 @@
 #include <asm/edac.h>
 #include "edac_core.h"
 #include "edac_module.h"
-
-#define CREATE_TRACE_POINTS
-#define TRACE_INCLUDE_PATH ../../include/ras
 #include <ras/ras_event.h>
 
 /* lock to memory controller's control array */

diff --git a/drivers/ras/Kconfig b/drivers/ras/Kconfig
new file mode 100644 (file)
index 0000000..f9da613
--- /dev/null
+++ b/drivers/ras/Kconfig
@@ -0,0 +1,2 @@
+config RAS
+       bool

diff --git a/drivers/ras/Makefile b/drivers/ras/Makefile
new file mode 100644 (file)
index 0000000..223e806
--- /dev/null
+++ b/drivers/ras/Makefile
@@ -0,0 +1 @@
+obj-$(CONFIG_RAS) += ras.o

diff --git a/drivers/ras/ras.c b/drivers/ras/ras.c
new file mode 100644 (file)
index 0000000..b0c6ed1
--- /dev/null
+++ b/drivers/ras/ras.c
@@ -0,0 +1,12 @@
+/*
+ * Copyright (C) 2014 Intel Corporation
+ *
+ * Authors:
+ *     Chen, Gong <gong.chen@linux.intel.com>
+ */
+
+#define CREATE_TRACE_POINTS
+#define TRACE_INCLUDE_PATH ../../include/ras
+#include <ras/ras_event.h>
+
+EXPORT_TRACEPOINT_SYMBOL_GPL(mc_event);