diff --git a/SOURCES/0001-ras-mc-ctl-Improve-error-summary-to-show-label-and-m.patch b/SOURCES/0001-ras-mc-ctl-Improve-error-summary-to-show-label-and-m.patch
new file mode 100644
index 0000000..60c0bbd
--- /dev/null
+++ b/SOURCES/0001-ras-mc-ctl-Improve-error-summary-to-show-label-and-m.patch
@@ -0,0 +1,38 @@
+From 5e8fb95e2f6dd3f427e0ae5d7d066aeb6d61fd0f Mon Sep 17 00:00:00 2001
+From: Mauro Carvalho Chehab <mchehab@redhat.com>
+Date: Wed, 29 May 2013 21:53:58 -0300
+Subject: [PATCH 01/32] ras-mc-ctl: Improve error summary to show label and mc
+
+Both information are useful for the users, even on summary.
+
+Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
+---
+ util/ras-mc-ctl.in |    6 +++---
+ 1 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/util/ras-mc-ctl.in b/util/ras-mc-ctl.in
+index 32c4edb..5b1ca4d 100755
+--- a/util/ras-mc-ctl.in
++++ b/util/ras-mc-ctl.in
+@@ -827,15 +827,15 @@ sub summary
+ 
+     my $dbh = DBI->connect("dbi:SQLite:dbname=$dbname", "", "", {});
+ 
+-    my $query = "select top_layer,middle_layer,lower_layer, count(*) from mc_event group by top_layer,middle_layer,lower_layer";
++    my $query = "select label, mc, top_layer,middle_layer,lower_layer, count(*) from mc_event group by label,mc,top_layer,middle_layer,lower_layer";
+     my $query_handle = $dbh->prepare($query);
+     $query_handle->execute();
+ 
+-    $query_handle->bind_columns(\my($top, $mid, $low, $count));
++    $query_handle->bind_columns(\my($label, $mc, $top, $mid, $low, $count));
+ 
+     print "Memory controller events summary:\n";
+     while($query_handle->fetch()) {
+-        print "location: $top:$mid:$low errors: $count\n";
++        print "DIMM Label(s): '$label' location: $mc:$top:$mid:$low errors: $count\n";
+     }
+ 
+     $query_handle->finish;
+-- 
+1.7.1
+
diff --git a/SOURCES/0002-ras-record-make-the-code-more-generic.patch b/SOURCES/0002-ras-record-make-the-code-more-generic.patch
new file mode 100644
index 0000000..243aa28
--- /dev/null
+++ b/SOURCES/0002-ras-record-make-the-code-more-generic.patch
@@ -0,0 +1,240 @@
+From 002238dff53b284c9455554f146176ee8de2de4a Mon Sep 17 00:00:00 2001
+From: Mauro Carvalho Chehab <mchehab@redhat.com>
+Date: Fri, 31 May 2013 12:41:01 -0300
+Subject: [PATCH 02/32] ras-record: make the code more generic
+
+Now that we're ready to add more tables to the database, make
+the code that creates and inserts data into the table more
+generic.
+
+Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
+---
+ ras-record.c |  173 +++++++++++++++++++++++++++++++++++++---------------------
+ 1 files changed, 110 insertions(+), 63 deletions(-)
+
+diff --git a/ras-record.c b/ras-record.c
+index 8995c9e..3af0791 100644
+--- a/ras-record.c
++++ b/ras-record.c
+@@ -28,80 +28,128 @@
+ #include "ras-mc-handler.h"
+ #include "ras-logger.h"
+ 
++/* #define DEBUG_SQL 1 */
++
+ #define SQLITE_RAS_DB RASSTATEDIR "/" RAS_DB_FNAME
+ 
+-const char *mc_event_db = " mc_event ";
+-const char *mc_event_db_create_fields = "("
+-		"id INTEGER PRIMARY KEY"
+-		", timestamp TEXT"
+-		", err_count INTEGER"
+-		", err_type TEXT"
+-		", err_msg TEXT"		/* 5 */
+-		", label TEXT"
+-		", mc INTEGER"
+-		", top_layer INTEGER"
+-		", middle_layer INTEGER"
+-		", lower_layer INTEGER"		/* 10 */
+-		", address INTEGER"
+-		", grain INTEGER"
+-		", syndrome INTEGER"
+-		", driver_detail TEXT"		/* 14 */
+-	")";
+-
+-const char *mc_event_db_fields = "("
+-		"id"
+-		", timestamp"
+-		", err_count"
+-		", err_type"
+-		", err_msg"			/* 5 */
+-		", label"
+-		", mc"
+-		", top_layer"
+-		", middle_layer"
+-		", lower_layer"			/* 10 */
+-		", address"
+-		", grain"
+-		", syndrome"
+-		", driver_detail"		/* 14 */
+-	")";
+-
+-#define NUM_MC_EVENT_DB_VALUES	14
+-
+-const char *createdb = "CREATE TABLE IF NOT EXISTS";
++
++#define ARRAY_SIZE(x) (sizeof(x)/sizeof(*(x)))
++
++struct db_fields {
++	char *name;
++	char *type;
++};
++
++struct db_table_descriptor {
++	char			*name;
++	const struct db_fields	*fields;
++	size_t			num_fields;
++};
++
++static const struct db_fields mc_event_fields[] = {
++		{ .name="id",			.type="INTEGER PRIMARY KEY" },
++		{ .name="timestamp",		.type="TEXT" },
++		{ .name="err_count",		.type="INTEGER" },
++		{ .name="err_type",		.type="TEXT" },
++		{ .name="err_msg",		.type="TEXT" },
++		{ .name="label",		.type="TEXT" },
++		{ .name="mc",			.type="INTEGER" },
++		{ .name="top_layer",		.type="INTEGER" },
++		{ .name="middle_layer",		.type="INTEGER" },
++		{ .name="lower_layer",		.type="INTEGER" },
++		{ .name="address",		.type="INTEGER" },
++		{ .name="grain",		.type="INTEGER" },
++		{ .name="syndrome",		.type="INTEGER" },
++		{ .name="driver_detail",	.type="TEXT" },
++};
++
++static const struct db_table_descriptor mc_event_tab = {
++	.name = "mc_event",
++	.fields = mc_event_fields,
++	.num_fields = ARRAY_SIZE(mc_event_fields),
++};
++
+ const char *insertdb = "INSERT INTO";
+ const char *valuesdb = " VALUES ";
+ 
+-static int ras_mc_prepare_stmt(struct sqlite3_priv *priv)
++static int ras_mc_prepare_stmt(struct sqlite3_priv *priv,
++			       sqlite3_stmt **stmt,
++			       const struct db_table_descriptor *db_tab)
++
+ {
+ 	int i, rc;
+-	char sql[1024];
++	char sql[1024], *p = sql, *end = sql + sizeof(sql);
++	const struct db_fields *field;
++
++	p += snprintf(p, end - p, "INSERT INTO %s (",
++		      db_tab->name);
++
++	for (i = 0; i < db_tab->num_fields; i++) {
++		field = &db_tab->fields[i];
++		p += snprintf(p, end - p, "%s", field->name);
++
++		if (i < db_tab->num_fields - 1)
++			p += snprintf(p, end - p, ", ");
++	}
+ 
+-	strcpy(sql, insertdb);
+-	strcat(sql, mc_event_db);
+-	strcat(sql, mc_event_db_fields);
+-	strcat(sql, valuesdb);
++	p += snprintf(p, end - p, ") VALUES ( NULL, ");
+ 
+-	strcat(sql, "(NULL, ");	/* Auto-increment field */
+-	for (i = 1; i < NUM_MC_EVENT_DB_VALUES; i++) {
+-		if (i < NUM_MC_EVENT_DB_VALUES - 1)
++	for (i = 1; i < db_tab->num_fields; i++) {
++		if (i <  db_tab->num_fields - 1)
+ 			strcat(sql, "?, ");
+ 		else
+ 			strcat(sql, "?)");
+ 	}
+ 
+-	rc = sqlite3_prepare_v2(priv->db, sql, -1, &priv->stmt, NULL);
++#ifdef DEBUG_SQL
++	log(TERM, LOG_INFO, "SQL: %s\n", sql);
++#endif
++
++	rc = sqlite3_prepare_v2(priv->db, sql, -1, stmt, NULL);
+ 	if (rc != SQLITE_OK)
+-		log(TERM, LOG_ERR, "Failed to prepare insert db on %s: error = %s\n",
+-		       SQLITE_RAS_DB, sqlite3_errmsg(priv->db));
++		log(TERM, LOG_ERR,
++		    "Failed to prepare insert db at table %s (db %s): error = %s\n",
++		    db_tab->name, SQLITE_RAS_DB, sqlite3_errmsg(priv->db));
+ 
+ 	return rc;
+ }
+ 
++static int ras_mc_create_table(struct sqlite3_priv *priv,
++			       const struct db_table_descriptor *db_tab)
++{
++	const struct db_fields *field;
++	char sql[1024], *p = sql, *end = sql + sizeof(sql);
++	int i,rc;
++
++	p += snprintf(p, end - p, "CREATE TABLE IF NOT EXISTS %s (",
++		      db_tab->name);
++
++	for (i = 0; i < db_tab->num_fields; i++) {
++		field = &db_tab->fields[i];
++		p += snprintf(p, end - p, "%s %s", field->name, field->type);
++
++		if (i < db_tab->num_fields - 1)
++			p += snprintf(p, end - p, ", ");
++	}
++	p += snprintf(p, end - p, ")");
++
++#ifdef DEBUG_SQL
++	log(TERM, LOG_INFO, "SQL: %s\n", sql);
++#endif
++
++	rc = sqlite3_exec(priv->db, sql, NULL, NULL, NULL);
++	if (rc != SQLITE_OK) {
++		log(TERM, LOG_ERR,
++		    "Failed to create table %s on %s: error = %d\n",
++		    db_tab->name, SQLITE_RAS_DB, rc);
++	}
++	return rc;
++}
++
+ int ras_mc_event_opendb(unsigned cpu, struct ras_events *ras)
+ {
+ 	int rc;
+ 	sqlite3 *db;
+-	char sql[1024];
+ 	struct sqlite3_priv *priv;
+ 
+ 	printf("Calling %s()\n", __FUNCTION__);
+@@ -137,27 +185,26 @@ int ras_mc_event_opendb(unsigned cpu, struct ras_events *ras)
+ 		free(priv);
+ 		return -1;
+ 	}
++	priv->db = db;
+ 
+-	strcpy(sql, createdb);
+-	strcat(sql, mc_event_db);
+-	strcat(sql, mc_event_db_create_fields);
+-	rc = sqlite3_exec(db, sql, NULL, NULL, NULL);
++	rc = ras_mc_create_table(priv, &mc_event_tab);
+ 	if (rc != SQLITE_OK) {
+-		log(TERM, LOG_ERR,
+-		    "cpu %u: Failed to create db on %s: error = %d\n",
+-		    cpu, SQLITE_RAS_DB, rc);
++		sqlite3_close(db);
+ 		free(priv);
+ 		return -1;
+ 	}
+ 
+-	priv->db = db;
+-	ras->db_priv = priv;
+-
+-	rc = ras_mc_prepare_stmt(priv);
+-	if (rc == SQLITE_OK)
++	rc = ras_mc_prepare_stmt(priv, &priv->stmt, &mc_event_tab);
++	if (rc == SQLITE_OK) {
+ 		log(TERM, LOG_INFO,
+ 		    "cpu %u: Recording events at %s\n",
+ 		    cpu, SQLITE_RAS_DB);
++		ras->db_priv = priv;
++	} else {
++		sqlite3_close(db);
++		free(priv);
++		return -1;
++	}
+ 
+ 	return 0;
+ }
+-- 
+1.7.1
+
diff --git a/SOURCES/0003-ras-record-rename-stmt-to-stmt_mc_event.patch b/SOURCES/0003-ras-record-rename-stmt-to-stmt_mc_event.patch
new file mode 100644
index 0000000..f72a1a0
--- /dev/null
+++ b/SOURCES/0003-ras-record-rename-stmt-to-stmt_mc_event.patch
@@ -0,0 +1,97 @@
+From 016802f4093e80971a52c590c661a04924cb9aa3 Mon Sep 17 00:00:00 2001
+From: Mauro Carvalho Chehab <mchehab@redhat.com>
+Date: Fri, 31 May 2013 13:10:16 -0300
+Subject: [PATCH 03/32] ras-record: rename stmt to stmt_mc_event
+
+This stmt is used only for mc_event. So, rename it, as we'll be
+adding other stmts for the other tables.
+
+Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
+---
+ ras-record.c |   46 ++++++++++++++++++++++++----------------------
+ ras-record.h |    2 +-
+ 2 files changed, 25 insertions(+), 23 deletions(-)
+
+diff --git a/ras-record.c b/ras-record.c
+index 3af0791..efcd78f 100644
+--- a/ras-record.c
++++ b/ras-record.c
+@@ -194,7 +194,7 @@ int ras_mc_event_opendb(unsigned cpu, struct ras_events *ras)
+ 		return -1;
+ 	}
+ 
+-	rc = ras_mc_prepare_stmt(priv, &priv->stmt, &mc_event_tab);
++	rc = ras_mc_prepare_stmt(priv, &priv->stmt_mc_event, &mc_event_tab);
+ 	if (rc == SQLITE_OK) {
+ 		log(TERM, LOG_INFO,
+ 		    "cpu %u: Recording events at %s\n",
+@@ -214,30 +214,32 @@ int ras_store_mc_event(struct ras_events *ras, struct ras_mc_event *ev)
+ 	int rc;
+ 	struct sqlite3_priv *priv = ras->db_priv;
+ 
+-	if (!priv || !priv->stmt)
++	if (!priv || !priv->stmt_mc_event)
+ 		return 0;
+-	log(TERM, LOG_INFO, "mc_event store: %p\n", priv->stmt);
+-
+-	sqlite3_bind_text(priv->stmt,  1, ev->timestamp, -1, NULL);
+-	sqlite3_bind_int (priv->stmt,  2, ev->error_count);
+-	sqlite3_bind_text(priv->stmt,  3, ev->error_type, -1, NULL);
+-	sqlite3_bind_text(priv->stmt,  4, ev->msg, -1, NULL);
+-	sqlite3_bind_text(priv->stmt,  5, ev->label, -1, NULL);
+-	sqlite3_bind_int (priv->stmt,  6, ev->mc_index);
+-	sqlite3_bind_int (priv->stmt,  7, ev->top_layer);
+-	sqlite3_bind_int (priv->stmt,  8, ev->middle_layer);
+-	sqlite3_bind_int (priv->stmt,  9, ev->lower_layer);
+-	sqlite3_bind_int (priv->stmt, 10, ev->address);
+-	sqlite3_bind_int (priv->stmt, 11, ev->grain);
+-	sqlite3_bind_int (priv->stmt, 12, ev->syndrome);
+-	sqlite3_bind_text(priv->stmt, 13, ev->driver_detail, -1, NULL);
+-	rc = sqlite3_step(priv->stmt);
++	log(TERM, LOG_INFO, "mc_event store: %p\n", priv->stmt_mc_event);
++
++	sqlite3_bind_text(priv->stmt_mc_event,  1, ev->timestamp, -1, NULL);
++	sqlite3_bind_int (priv->stmt_mc_event,  2, ev->error_count);
++	sqlite3_bind_text(priv->stmt_mc_event,  3, ev->error_type, -1, NULL);
++	sqlite3_bind_text(priv->stmt_mc_event,  4, ev->msg, -1, NULL);
++	sqlite3_bind_text(priv->stmt_mc_event,  5, ev->label, -1, NULL);
++	sqlite3_bind_int (priv->stmt_mc_event,  6, ev->mc_index);
++	sqlite3_bind_int (priv->stmt_mc_event,  7, ev->top_layer);
++	sqlite3_bind_int (priv->stmt_mc_event,  8, ev->middle_layer);
++	sqlite3_bind_int (priv->stmt_mc_event,  9, ev->lower_layer);
++	sqlite3_bind_int (priv->stmt_mc_event, 10, ev->address);
++	sqlite3_bind_int (priv->stmt_mc_event, 11, ev->grain);
++	sqlite3_bind_int (priv->stmt_mc_event, 12, ev->syndrome);
++	sqlite3_bind_text(priv->stmt_mc_event, 13, ev->driver_detail, -1, NULL);
++	rc = sqlite3_step(priv->stmt_mc_event);
+ 	if (rc != SQLITE_OK && rc != SQLITE_DONE)
+-		log(TERM, LOG_ERR, "Failed to do mc_event step on sqlite: error = %d\n", rc);
+-	rc = sqlite3_reset(priv->stmt);
++		log(TERM, LOG_ERR,
++		    "Failed to do mc_event step on sqlite: error = %d\n", rc);
++	rc = sqlite3_reset(priv->stmt_mc_event);
+ 	if (rc != SQLITE_OK && rc != SQLITE_DONE)
+-		log(TERM, LOG_ERR, "Failed reset mc_event on sqlite: error = %d\n",
+-		       rc);
++		log(TERM, LOG_ERR,
++		    "Failed reset mc_event on sqlite: error = %d\n",
++		    rc);
+ 	log(TERM, LOG_INFO, "register inserted at db\n");
+ 
+ 	return rc;
+diff --git a/ras-record.h b/ras-record.h
+index 20c327f..9791185 100644
+--- a/ras-record.h
++++ b/ras-record.h
+@@ -46,7 +46,7 @@ struct ras_aer_event {
+ 
+ struct sqlite3_priv {
+ 	sqlite3		*db;
+-	sqlite3_stmt	*stmt;
++	sqlite3_stmt	*stmt_mc_event;
+ };
+ 
+ int ras_mc_event_opendb(unsigned cpu, struct ras_events *ras);
+-- 
+1.7.1
+
diff --git a/SOURCES/0004-ras-record-reorder-functions.patch b/SOURCES/0004-ras-record-reorder-functions.patch
new file mode 100644
index 0000000..4e6f58b
--- /dev/null
+++ b/SOURCES/0004-ras-record-reorder-functions.patch
@@ -0,0 +1,114 @@
+From 4474f696c9207ceb21d55a0047ab6871879afe5a Mon Sep 17 00:00:00 2001
+From: Mauro Carvalho Chehab <mchehab@redhat.com>
+Date: Fri, 31 May 2013 13:51:55 -0300
+Subject: [PATCH 04/32] ras-record: reorder functions
+
+No functional changes
+
+Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
+---
+ ras-record.c |   77 +++++++++++++++++++++++++++++----------------------------
+ 1 files changed, 39 insertions(+), 38 deletions(-)
+
+diff --git a/ras-record.c b/ras-record.c
+index efcd78f..298977e 100644
+--- a/ras-record.c
++++ b/ras-record.c
+@@ -46,6 +46,10 @@ struct db_table_descriptor {
+ 	size_t			num_fields;
+ };
+ 
++/*
++ * Table and functions to handle ras:mc_event
++ */
++
+ static const struct db_fields mc_event_fields[] = {
+ 		{ .name="id",			.type="INTEGER PRIMARY KEY" },
+ 		{ .name="timestamp",		.type="TEXT" },
+@@ -69,8 +73,41 @@ static const struct db_table_descriptor mc_event_tab = {
+ 	.num_fields = ARRAY_SIZE(mc_event_fields),
+ };
+ 
+-const char *insertdb = "INSERT INTO";
+-const char *valuesdb = " VALUES ";
++int ras_store_mc_event(struct ras_events *ras, struct ras_mc_event *ev)
++{
++	int rc;
++	struct sqlite3_priv *priv = ras->db_priv;
++
++	if (!priv || !priv->stmt_mc_event)
++		return 0;
++	log(TERM, LOG_INFO, "mc_event store: %p\n", priv->stmt_mc_event);
++
++	sqlite3_bind_text(priv->stmt_mc_event,  1, ev->timestamp, -1, NULL);
++	sqlite3_bind_int (priv->stmt_mc_event,  2, ev->error_count);
++	sqlite3_bind_text(priv->stmt_mc_event,  3, ev->error_type, -1, NULL);
++	sqlite3_bind_text(priv->stmt_mc_event,  4, ev->msg, -1, NULL);
++	sqlite3_bind_text(priv->stmt_mc_event,  5, ev->label, -1, NULL);
++	sqlite3_bind_int (priv->stmt_mc_event,  6, ev->mc_index);
++	sqlite3_bind_int (priv->stmt_mc_event,  7, ev->top_layer);
++	sqlite3_bind_int (priv->stmt_mc_event,  8, ev->middle_layer);
++	sqlite3_bind_int (priv->stmt_mc_event,  9, ev->lower_layer);
++	sqlite3_bind_int (priv->stmt_mc_event, 10, ev->address);
++	sqlite3_bind_int (priv->stmt_mc_event, 11, ev->grain);
++	sqlite3_bind_int (priv->stmt_mc_event, 12, ev->syndrome);
++	sqlite3_bind_text(priv->stmt_mc_event, 13, ev->driver_detail, -1, NULL);
++	rc = sqlite3_step(priv->stmt_mc_event);
++	if (rc != SQLITE_OK && rc != SQLITE_DONE)
++		log(TERM, LOG_ERR,
++		    "Failed to do mc_event step on sqlite: error = %d\n", rc);
++	rc = sqlite3_reset(priv->stmt_mc_event);
++	if (rc != SQLITE_OK && rc != SQLITE_DONE)
++		log(TERM, LOG_ERR,
++		    "Failed reset mc_event on sqlite: error = %d\n",
++		    rc);
++	log(TERM, LOG_INFO, "register inserted at db\n");
++
++	return rc;
++}
+ 
+ static int ras_mc_prepare_stmt(struct sqlite3_priv *priv,
+ 			       sqlite3_stmt **stmt,
+@@ -208,39 +245,3 @@ int ras_mc_event_opendb(unsigned cpu, struct ras_events *ras)
+ 
+ 	return 0;
+ }
+-
+-int ras_store_mc_event(struct ras_events *ras, struct ras_mc_event *ev)
+-{
+-	int rc;
+-	struct sqlite3_priv *priv = ras->db_priv;
+-
+-	if (!priv || !priv->stmt_mc_event)
+-		return 0;
+-	log(TERM, LOG_INFO, "mc_event store: %p\n", priv->stmt_mc_event);
+-
+-	sqlite3_bind_text(priv->stmt_mc_event,  1, ev->timestamp, -1, NULL);
+-	sqlite3_bind_int (priv->stmt_mc_event,  2, ev->error_count);
+-	sqlite3_bind_text(priv->stmt_mc_event,  3, ev->error_type, -1, NULL);
+-	sqlite3_bind_text(priv->stmt_mc_event,  4, ev->msg, -1, NULL);
+-	sqlite3_bind_text(priv->stmt_mc_event,  5, ev->label, -1, NULL);
+-	sqlite3_bind_int (priv->stmt_mc_event,  6, ev->mc_index);
+-	sqlite3_bind_int (priv->stmt_mc_event,  7, ev->top_layer);
+-	sqlite3_bind_int (priv->stmt_mc_event,  8, ev->middle_layer);
+-	sqlite3_bind_int (priv->stmt_mc_event,  9, ev->lower_layer);
+-	sqlite3_bind_int (priv->stmt_mc_event, 10, ev->address);
+-	sqlite3_bind_int (priv->stmt_mc_event, 11, ev->grain);
+-	sqlite3_bind_int (priv->stmt_mc_event, 12, ev->syndrome);
+-	sqlite3_bind_text(priv->stmt_mc_event, 13, ev->driver_detail, -1, NULL);
+-	rc = sqlite3_step(priv->stmt_mc_event);
+-	if (rc != SQLITE_OK && rc != SQLITE_DONE)
+-		log(TERM, LOG_ERR,
+-		    "Failed to do mc_event step on sqlite: error = %d\n", rc);
+-	rc = sqlite3_reset(priv->stmt_mc_event);
+-	if (rc != SQLITE_OK && rc != SQLITE_DONE)
+-		log(TERM, LOG_ERR,
+-		    "Failed reset mc_event on sqlite: error = %d\n",
+-		    rc);
+-	log(TERM, LOG_INFO, "register inserted at db\n");
+-
+-	return rc;
+-}
+-- 
+1.7.1
+
diff --git a/SOURCES/0005-ras-record-Make-the-code-easier-to-add-support-for-o.patch b/SOURCES/0005-ras-record-Make-the-code-easier-to-add-support-for-o.patch
new file mode 100644
index 0000000..ec8c437
--- /dev/null
+++ b/SOURCES/0005-ras-record-Make-the-code-easier-to-add-support-for-o.patch
@@ -0,0 +1,60 @@
+From 93217061a4b1dc7f287f2715aadc621d2c00425d Mon Sep 17 00:00:00 2001
+From: Mauro Carvalho Chehab <mchehab@redhat.com>
+Date: Fri, 31 May 2013 13:53:18 -0300
+Subject: [PATCH 05/32] ras-record: Make the code easier to add support for other tables
+
+Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
+---
+ ras-record.c |   25 ++++++++-----------------
+ 1 files changed, 8 insertions(+), 17 deletions(-)
+
+diff --git a/ras-record.c b/ras-record.c
+index 298977e..36b3373 100644
+--- a/ras-record.c
++++ b/ras-record.c
+@@ -143,10 +143,14 @@ static int ras_mc_prepare_stmt(struct sqlite3_priv *priv,
+ #endif
+ 
+ 	rc = sqlite3_prepare_v2(priv->db, sql, -1, stmt, NULL);
+-	if (rc != SQLITE_OK)
++	if (rc != SQLITE_OK) {
+ 		log(TERM, LOG_ERR,
+ 		    "Failed to prepare insert db at table %s (db %s): error = %s\n",
+ 		    db_tab->name, SQLITE_RAS_DB, sqlite3_errmsg(priv->db));
++		stmt = NULL;
++	} else {
++		log(TERM, LOG_INFO, "Recording %s events\n", db_tab->name);
++	}
+ 
+ 	return rc;
+ }
+@@ -225,23 +229,10 @@ int ras_mc_event_opendb(unsigned cpu, struct ras_events *ras)
+ 	priv->db = db;
+ 
+ 	rc = ras_mc_create_table(priv, &mc_event_tab);
+-	if (rc != SQLITE_OK) {
+-		sqlite3_close(db);
+-		free(priv);
+-		return -1;
+-	}
++	if (rc == SQLITE_OK)
++		rc = ras_mc_prepare_stmt(priv, &priv->stmt_mc_event, &mc_event_tab);
+ 
+-	rc = ras_mc_prepare_stmt(priv, &priv->stmt_mc_event, &mc_event_tab);
+-	if (rc == SQLITE_OK) {
+-		log(TERM, LOG_INFO,
+-		    "cpu %u: Recording events at %s\n",
+-		    cpu, SQLITE_RAS_DB);
+-		ras->db_priv = priv;
+-	} else {
+-		sqlite3_close(db);
+-		free(priv);
+-		return -1;
+-	}
+ 
++	ras->db_priv = priv;
+ 	return 0;
+ }
+-- 
+1.7.1
+
diff --git a/SOURCES/0006-Add-support-to-record-AER-events.patch b/SOURCES/0006-Add-support-to-record-AER-events.patch
new file mode 100644
index 0000000..5d5ab87
--- /dev/null
+++ b/SOURCES/0006-Add-support-to-record-AER-events.patch
@@ -0,0 +1,141 @@
+From 11004aaa98865dd7c0ee28b4af8d6ba6b6f11507 Mon Sep 17 00:00:00 2001
+From: Mauro Carvalho Chehab <mchehab@redhat.com>
+Date: Fri, 31 May 2013 13:54:11 -0300
+Subject: [PATCH 06/32] Add support to record AER events
+
+Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
+---
+ ras-aer-handler.c |    4 ++-
+ ras-record.c      |   60 ++++++++++++++++++++++++++++++++++++++++++++++++++++-
+ ras-record.h      |    6 +++++
+ 3 files changed, 68 insertions(+), 2 deletions(-)
+
+diff --git a/ras-aer-handler.c b/ras-aer-handler.c
+index ec63e2a..e5abaca 100644
+--- a/ras-aer-handler.c
++++ b/ras-aer-handler.c
+@@ -111,7 +111,9 @@ int ras_aer_event_handler(struct trace_seq *s,
+ 	trace_seq_puts(s, ev.error_type);
+ 
+ 	/* Insert data into the SGBD */
+-//	ras_store_aer_event(ras, &ev);
++#ifdef HAVE_SQLITE3
++	ras_store_aer_event(ras, &ev);
++#endif
+ 
+ 	return 0;
+ }
+diff --git a/ras-record.c b/ras-record.c
+index 36b3373..cb302ce 100644
+--- a/ras-record.c
++++ b/ras-record.c
+@@ -26,6 +26,7 @@
+ #include <unistd.h>
+ #include "ras-events.h"
+ #include "ras-mc-handler.h"
++#include "ras-aer-handler.h"
+ #include "ras-logger.h"
+ 
+ /* #define DEBUG_SQL 1 */
+@@ -109,6 +110,56 @@ int ras_store_mc_event(struct ras_events *ras, struct ras_mc_event *ev)
+ 	return rc;
+ }
+ 
++/*
++ * Table and functions to handle ras:aer
++ */
++
++#ifdef HAVE_AER
++static const struct db_fields aer_event_fields[] = {
++		{ .name="id",			.type="INTEGER PRIMARY KEY" },
++		{ .name="timestamp",		.type="TEXT" },
++		{ .name="err_type",		.type="TEXT" },
++		{ .name="err_msg",		.type="TEXT" },
++};
++
++static const struct db_table_descriptor aer_event_tab = {
++	.name = "aer_event",
++	.fields = aer_event_fields,
++	.num_fields = ARRAY_SIZE(aer_event_fields),
++};
++
++int ras_store_aer_event(struct ras_events *ras, struct ras_aer_event *ev)
++{
++	int rc;
++	struct sqlite3_priv *priv = ras->db_priv;
++
++	if (!priv || !priv->stmt_aer_event)
++		return 0;
++	log(TERM, LOG_INFO, "mc_event store: %p\n", priv->stmt_aer_event);
++
++	sqlite3_bind_text(priv->stmt_aer_event,  1, ev->timestamp, -1, NULL);
++	sqlite3_bind_text(priv->stmt_aer_event,  3, ev->error_type, -1, NULL);
++	sqlite3_bind_text(priv->stmt_aer_event,  4, ev->msg, -1, NULL);
++
++	rc = sqlite3_step(priv->stmt_aer_event);
++	if (rc != SQLITE_OK && rc != SQLITE_DONE)
++		log(TERM, LOG_ERR,
++		    "Failed to do aer_event step on sqlite: error = %d\n", rc);
++	rc = sqlite3_reset(priv->stmt_aer_event);
++	if (rc != SQLITE_OK && rc != SQLITE_DONE)
++		log(TERM, LOG_ERR,
++		    "Failed reset aer_event on sqlite: error = %d\n",
++		    rc);
++	log(TERM, LOG_INFO, "register inserted at db\n");
++
++	return rc;
++}
++#endif
++
++/*
++ * Generic code
++ */
++
+ static int ras_mc_prepare_stmt(struct sqlite3_priv *priv,
+ 			       sqlite3_stmt **stmt,
+ 			       const struct db_table_descriptor *db_tab)
+@@ -230,8 +281,15 @@ int ras_mc_event_opendb(unsigned cpu, struct ras_events *ras)
+ 
+ 	rc = ras_mc_create_table(priv, &mc_event_tab);
+ 	if (rc == SQLITE_OK)
+-		rc = ras_mc_prepare_stmt(priv, &priv->stmt_mc_event, &mc_event_tab);
++		rc = ras_mc_prepare_stmt(priv, &priv->stmt_mc_event,
++					 &mc_event_tab);
+ 
++#ifdef HAVE_AER
++	rc = ras_mc_create_table(priv, &aer_event_tab);
++	if (rc == SQLITE_OK)
++		rc = ras_mc_prepare_stmt(priv, &priv->stmt_aer_event,
++					 &aer_event_tab);
++#endif
+ 
+ 	ras->db_priv = priv;
+ 	return 0;
+diff --git a/ras-record.h b/ras-record.h
+index 9791185..5008906 100644
+--- a/ras-record.h
++++ b/ras-record.h
+@@ -47,14 +47,20 @@ struct ras_aer_event {
+ struct sqlite3_priv {
+ 	sqlite3		*db;
+ 	sqlite3_stmt	*stmt_mc_event;
++#ifdef HAVE_AER
++	sqlite3_stmt	*stmt_aer_event;
++#endif
+ };
+ 
+ int ras_mc_event_opendb(unsigned cpu, struct ras_events *ras);
+ int ras_store_mc_event(struct ras_events *ras, struct ras_mc_event *ev);
++int ras_store_aer_event(struct ras_events *ras, struct ras_aer_event *ev);
+ 
+ #else
+ static inline int ras_mc_event_opendb(unsigned cpu, struct ras_events *ras) { return 0; };
+ static inline int ras_store_mc_event(struct ras_events *ras, struct ras_mc_event *ev) { return 0; };
++static inline int ras_store_aer_event(struct ras_events *ras, struct ras_aer_event *ev) { return 0; };
++
+ #endif
+ 
+ #endif
+-- 
+1.7.1
+
diff --git a/SOURCES/0007-Add-support-to-store-MCE-events-at-the-database.patch b/SOURCES/0007-Add-support-to-store-MCE-events-at-the-database.patch
new file mode 100644
index 0000000..8caf335
--- /dev/null
+++ b/SOURCES/0007-Add-support-to-store-MCE-events-at-the-database.patch
@@ -0,0 +1,202 @@
+From 0a31d938cf29e065e96de1206a7d35042962e02a Mon Sep 17 00:00:00 2001
+From: Mauro Carvalho Chehab <mchehab@redhat.com>
+Date: Fri, 31 May 2013 14:18:24 -0300
+Subject: [PATCH 07/32] Add support to store MCE events at the database
+
+Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
+---
+ ras-mce-handler.c |    5 +++
+ ras-record.c      |  104 +++++++++++++++++++++++++++++++++++++++++++++++++++-
+ ras-record.h      |    9 +++++
+ 3 files changed, 116 insertions(+), 2 deletions(-)
+
+diff --git a/ras-mce-handler.c b/ras-mce-handler.c
+index 614a0eb..59e8d05 100644
+--- a/ras-mce-handler.c
++++ b/ras-mce-handler.c
+@@ -396,5 +396,10 @@ int ras_mce_event_handler(struct trace_seq *s,
+ 		return rc;
+ 
+ 	report_mce_event(ras, record, s, &e);
++
++#ifdef HAVE_SQLITE3
++	ras_store_mce_record(ras, &e);
++#endif
++
+ 	return 0;
+ }
+diff --git a/ras-record.c b/ras-record.c
+index cb302ce..daa3cb1 100644
+--- a/ras-record.c
++++ b/ras-record.c
+@@ -27,6 +27,7 @@
+ #include "ras-events.h"
+ #include "ras-mc-handler.h"
+ #include "ras-aer-handler.h"
++#include "ras-mce-handler.h"
+ #include "ras-logger.h"
+ 
+ /* #define DEBUG_SQL 1 */
+@@ -135,7 +136,7 @@ int ras_store_aer_event(struct ras_events *ras, struct ras_aer_event *ev)
+ 
+ 	if (!priv || !priv->stmt_aer_event)
+ 		return 0;
+-	log(TERM, LOG_INFO, "mc_event store: %p\n", priv->stmt_aer_event);
++	log(TERM, LOG_INFO, "aer_event store: %p\n", priv->stmt_aer_event);
+ 
+ 	sqlite3_bind_text(priv->stmt_aer_event,  1, ev->timestamp, -1, NULL);
+ 	sqlite3_bind_text(priv->stmt_aer_event,  3, ev->error_type, -1, NULL);
+@@ -156,6 +157,98 @@ int ras_store_aer_event(struct ras_events *ras, struct ras_aer_event *ev)
+ }
+ #endif
+ 
++
++/*
++ * Table and functions to handle mce:mce_record
++ */
++
++#ifdef HAVE_MCE
++static const struct db_fields mce_record_fields[] = {
++		{ .name="id",			.type="INTEGER PRIMARY KEY" },
++		{ .name="timestamp",		.type="TEXT" },
++
++		/* MCE registers */
++		{ .name="mcgcap",		.type="INTEGER" },
++		{ .name="mcgstatus",		.type="INTEGER" },
++		{ .name="status",		.type="INTEGER" },
++		{ .name="addr",			.type="INTEGER" }, // 5
++		{ .name="misc",			.type="INTEGER" },
++		{ .name="ip",			.type="INTEGER" },
++		{ .name="tsc",			.type="INTEGER" },
++		{ .name="walltime",		.type="INTEGER" },
++		{ .name="cpu",			.type="INTEGER" }, // 10
++		{ .name="cpuid",		.type="INTEGER" },
++		{ .name="apicid",		.type="INTEGER" },
++		{ .name="socketid",		.type="INTEGER" },
++		{ .name="cs",			.type="INTEGER" },
++		{ .name="bank",			.type="INTEGER" }, //15
++		{ .name="cpuvendor",		.type="INTEGER" },
++
++		/* Parsed data - will likely change */
++		{ .name="bank_name",		.type="TEXT" },
++		{ .name="error_msg",		.type="TEXT" },
++		{ .name="mcgstatus_msg",	.type="TEXT" },
++		{ .name="mcistatus_msg",	.type="TEXT" }, // 20
++		{ .name="user_action",		.type="TEXT" },
++		{ .name="mc_location",		.type="TEXT" },
++};
++
++static const struct db_table_descriptor mce_record_tab = {
++	.name = "mce_record",
++	.fields = mce_record_fields,
++	.num_fields = ARRAY_SIZE(mce_record_fields),
++};
++
++int ras_store_mce_record(struct ras_events *ras, struct mce_event *ev)
++{
++	int rc;
++	struct sqlite3_priv *priv = ras->db_priv;
++
++	if (!priv || !priv->stmt_mce_record)
++		return 0;
++	log(TERM, LOG_INFO, "mce_record store: %p\n", priv->stmt_mce_record);
++
++	sqlite3_bind_text(priv->stmt_mce_record,  1, ev->timestamp, -1, NULL);
++	sqlite3_bind_int (priv->stmt_mce_record,  2, ev->mcgcap);
++	sqlite3_bind_int (priv->stmt_mce_record,  3, ev->mcgstatus);
++	sqlite3_bind_int (priv->stmt_mce_record,  4, ev->status);
++	sqlite3_bind_int (priv->stmt_mce_record,  5, ev->addr);
++	sqlite3_bind_int (priv->stmt_mce_record,  6, ev->misc);
++	sqlite3_bind_int (priv->stmt_mce_record,  7, ev->ip);
++	sqlite3_bind_int (priv->stmt_mce_record,  8, ev->tsc);
++	sqlite3_bind_int (priv->stmt_mce_record,  9, ev->walltime);
++	sqlite3_bind_int (priv->stmt_mce_record, 10, ev->cpu);
++	sqlite3_bind_int (priv->stmt_mce_record, 11, ev->cpuid);
++	sqlite3_bind_int (priv->stmt_mce_record, 12, ev->apicid);
++	sqlite3_bind_int (priv->stmt_mce_record, 13, ev->socketid);
++	sqlite3_bind_int (priv->stmt_mce_record, 14, ev->cs);
++	sqlite3_bind_int (priv->stmt_mce_record, 15, ev->bank);
++	sqlite3_bind_int (priv->stmt_mce_record, 16, ev->cpuvendor);
++
++	sqlite3_bind_text(priv->stmt_mce_record, 17, ev->bank_name, -1, NULL);
++	sqlite3_bind_text(priv->stmt_mce_record, 18, ev->error_msg, -1, NULL);
++	sqlite3_bind_text(priv->stmt_mce_record, 19, ev->mcgstatus_msg, -1, NULL);
++	sqlite3_bind_text(priv->stmt_mce_record, 20, ev->mcistatus_msg, -1, NULL);
++	sqlite3_bind_text(priv->stmt_mce_record, 21, ev->mcastatus_msg, -1, NULL);
++	sqlite3_bind_text(priv->stmt_mce_record, 22, ev->user_action, -1, NULL);
++	sqlite3_bind_text(priv->stmt_mce_record, 23, ev->mc_location, -1, NULL);
++
++	rc = sqlite3_step(priv->stmt_mce_record);
++	if (rc != SQLITE_OK && rc != SQLITE_DONE)
++		log(TERM, LOG_ERR,
++		    "Failed to do mce_record step on sqlite: error = %d\n", rc);
++	rc = sqlite3_reset(priv->stmt_mce_record);
++	if (rc != SQLITE_OK && rc != SQLITE_DONE)
++		log(TERM, LOG_ERR,
++		    "Failed reset mce_record on sqlite: error = %d\n",
++		    rc);
++	log(TERM, LOG_INFO, "register inserted at db\n");
++
++	return rc;
++}
++#endif
++
++
+ /*
+  * Generic code
+  */
+@@ -291,6 +384,13 @@ int ras_mc_event_opendb(unsigned cpu, struct ras_events *ras)
+ 					 &aer_event_tab);
+ #endif
+ 
+-	ras->db_priv = priv;
++#ifdef HAVE_MCE
++	rc = ras_mc_create_table(priv, &mce_record_tab);
++	if (rc == SQLITE_OK)
++		rc = ras_mc_prepare_stmt(priv, &priv->stmt_mce_record,
++					 &mce_record_tab);
++#endif
++
++		ras->db_priv = priv;
+ 	return 0;
+ }
+diff --git a/ras-record.h b/ras-record.h
+index 5008906..6f146a8 100644
+--- a/ras-record.h
++++ b/ras-record.h
+@@ -40,6 +40,10 @@ struct ras_aer_event {
+ 	const char *msg;
+ };
+ 
++struct ras_mc_event;
++struct ras_aer_event;
++struct mce_event;
++
+ #ifdef HAVE_SQLITE3
+ 
+ #include <sqlite3.h>
+@@ -50,16 +54,21 @@ struct sqlite3_priv {
+ #ifdef HAVE_AER
+ 	sqlite3_stmt	*stmt_aer_event;
+ #endif
++#ifdef HAVE_MCE
++	sqlite3_stmt	*stmt_mce_record;
++#endif
+ };
+ 
+ int ras_mc_event_opendb(unsigned cpu, struct ras_events *ras);
+ int ras_store_mc_event(struct ras_events *ras, struct ras_mc_event *ev);
+ int ras_store_aer_event(struct ras_events *ras, struct ras_aer_event *ev);
++int ras_store_mce_record(struct ras_events *ras, struct mce_event *ev);
+ 
+ #else
+ static inline int ras_mc_event_opendb(unsigned cpu, struct ras_events *ras) { return 0; };
+ static inline int ras_store_mc_event(struct ras_events *ras, struct ras_mc_event *ev) { return 0; };
+ static inline int ras_store_aer_event(struct ras_events *ras, struct ras_aer_event *ev) { return 0; };
++static inline int ras_store_mce_record(struct ras_events *ras, struct mce_event *ev) { return 0; };
+ 
+ #endif
+ 
+-- 
+1.7.1
+
diff --git a/SOURCES/0008-ras-mc-ctl-add-summary-for-MCE-and-PCIe-AER-errors.patch b/SOURCES/0008-ras-mc-ctl-add-summary-for-MCE-and-PCIe-AER-errors.patch
new file mode 100644
index 0000000..18d1dad
--- /dev/null
+++ b/SOURCES/0008-ras-mc-ctl-add-summary-for-MCE-and-PCIe-AER-errors.patch
@@ -0,0 +1,85 @@
+From 2925cc92d73065dab3bbf7de83404d6e0e141dc6 Mon Sep 17 00:00:00 2001
+From: Mauro Carvalho Chehab <mchehab@redhat.com>
+Date: Fri, 31 May 2013 14:57:54 -0300
+Subject: [PATCH 08/32] ras-mc-ctl: add summary for MCE and PCIe AER errors
+
+Report the summary also for MCE and PCIe errors.
+
+Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
+---
+ util/ras-mc-ctl.in |   50 ++++++++++++++++++++++++++++++++++++++++++++------
+ 1 files changed, 44 insertions(+), 6 deletions(-)
+
+diff --git a/util/ras-mc-ctl.in b/util/ras-mc-ctl.in
+index 5b1ca4d..118af7b 100755
+--- a/util/ras-mc-ctl.in
++++ b/util/ras-mc-ctl.in
+@@ -824,21 +824,59 @@ sub find_prog
+ sub summary
+ {
+     require DBI;
++    my ($query, $query_handle, $out);
++    my ($err_type, $label, $mc, $top, $mid, $low, $count, $msg);
+ 
+     my $dbh = DBI->connect("dbi:SQLite:dbname=$dbname", "", "", {});
+ 
+-    my $query = "select label, mc, top_layer,middle_layer,lower_layer, count(*) from mc_event group by label,mc,top_layer,middle_layer,lower_layer";
+-    my $query_handle = $dbh->prepare($query);
++    # Memory controller mc_event errors
++    $query = "select err_type, label, mc, top_layer,middle_layer,lower_layer, count(*) from mc_event group by err_type, label, mc, top_layer, middle_layer, lower_layer";
++    $query_handle = $dbh->prepare($query);
+     $query_handle->execute();
++    $query_handle->bind_columns(\($err_type, $label, $mc, $top, $mid, $low, $count));
++    $out = "";
++    while($query_handle->fetch()) {
++        $out .= "\t$err_type on DIMM Label(s): '$label' location: $mc:$top:$mid:$low errors: $count\n";
++    }
++    if ($out ne "") {
++        print "Memory controller events summary:\n$out\n";
++    } else {
++        print "No Memory errors.\n\n";
++    }
++    $query_handle->finish;
+ 
+-    $query_handle->bind_columns(\my($label, $mc, $top, $mid, $low, $count));
+-
+-    print "Memory controller events summary:\n";
++    # PCIe AER aer_event errors
++    $query = "select err_type, err_msg, count(*) from aer_event group by err_type, err_msg";
++    $query_handle = $dbh->prepare($query);
++    $query_handle->execute();
++    $query_handle->bind_columns(\($err_type, $msg, $count));
++    $out = "";
+     while($query_handle->fetch()) {
+-        print "DIMM Label(s): '$label' location: $mc:$top:$mid:$low errors: $count\n";
++        $out .= "\t$count $err_type errors: $msg\n";
+     }
++    if ($out ne "") {
++        print "PCIe AER events summary:\n$out\n";
++    } else {
++        print "No PCIe AER errors.\n\n";
++    }
++    $query_handle->finish;
+ 
++    # MCE mce_record errors
++    $query = "select error_msg, count(*) from mce_record group by error_msg";
++    $query_handle = $dbh->prepare($query);
++    $query_handle->execute();
++    $query_handle->bind_columns(\($msg, $count));
++    $out = "";
++    while($query_handle->fetch()) {
++        $out .= "\t$count $msg errors\n";
++    }
++    if ($out ne "") {
++        print "MCE records summary:\n$out";
++    } else {
++        print "No MCE errors.\n";
++    }
+     $query_handle->finish;
++
+     undef($dbh);
+ }
+ 
+-- 
+1.7.1
+
diff --git a/SOURCES/0009-ras-mc-ctl-report-errors-also-for-PCIe-AER-and-MCE.patch b/SOURCES/0009-ras-mc-ctl-report-errors-also-for-PCIe-AER-and-MCE.patch
new file mode 100644
index 0000000..fda9b46
--- /dev/null
+++ b/SOURCES/0009-ras-mc-ctl-report-errors-also-for-PCIe-AER-and-MCE.patch
@@ -0,0 +1,108 @@
+From 4b64649eb5740027f58377f6c29d1554d9792b97 Mon Sep 17 00:00:00 2001
+From: Mauro Carvalho Chehab <mchehab@redhat.com>
+Date: Fri, 31 May 2013 16:16:44 -0300
+Subject: [PATCH 09/32] ras-mc-ctl: report errors also for PCIe AER and MCE
+
+Show also PCIe AER and MCE when used with --errors parameter.
+
+Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
+---
+ util/ras-mc-ctl.in |   73 +++++++++++++++++++++++++++++++++++++++++++++++-----
+ 1 files changed, 66 insertions(+), 7 deletions(-)
+
+diff --git a/util/ras-mc-ctl.in b/util/ras-mc-ctl.in
+index 118af7b..30d3078 100755
+--- a/util/ras-mc-ctl.in
++++ b/util/ras-mc-ctl.in
+@@ -883,22 +883,81 @@ sub summary
+ sub errors
+ {
+     require DBI;
++    my ($query, $query_handle, $id, $time, $count, $type, $msg, $label, $mc, $top, $mid, $low, $addr, $grain, $syndrome, $detail, $out);
++    my ($mcgcap,$mcgstatus, $status, $misc, $ip, $tsc, $walltime, $cpu, $cpuid, $apicid, $socketid, $cs, $bank, $cpuvendor, $bank_name, $mcgstatus_msg, $mcistatus_msg, $user_action, $mc_location);
+ 
+     my $dbh = DBI->connect("dbi:SQLite:dbname=$dbname", "", "", {});
+ 
+-    my $query = "select id, timestamp, err_count, err_type, err_msg, label, mc, top_layer,middle_layer,lower_layer, address, grain, syndrome, driver_detail from mc_event order by id";
+-
+-    my $query_handle = $dbh->prepare($query);
++    # Memory controller mc_event errors
++    $query = "select id, timestamp, err_count, err_type, err_msg, label, mc, top_layer,middle_layer,lower_layer, address, grain, syndrome, driver_detail from mc_event order by id";
++    $query_handle = $dbh->prepare($query);
+     $query_handle->execute();
++    $query_handle->bind_columns(\($id, $time, $count, $type, $msg, $label, $mc, $top, $mid, $low, $addr, $grain, $syndrome, $detail));
++    $out = "";
++    while($query_handle->fetch()) {
++        $out .= "$id $time $count $type error(s): $msg at $label location: $mc:$top:$mid:$low, addr $addr, grain $grain, syndrome $syndrome $detail\n";
++    }
++    if ($out ne "") {
++        print "PCIe AER events:\n$out\n";
++    } else {
++        print "No PCIe AER errors.\n\n";
++    }
++    $query_handle->finish;
+ 
+-    $query_handle->bind_columns(\my($id, $time, $count, $type, $msg, $label, $mc, $top, $mid, $low, $addr, $grain, $syndrome, $detail));
+-
+-    print "Memory controller events:\n";
++    # PCIe AER aer_event errors
++    $query = "select id, timestamp, err_type, err_msg from aer_event order by id";
++    $query_handle = $dbh->prepare($query);
++    $query_handle->execute();
++    $query_handle->bind_columns(\($id, $time, $type, $msg));
++    $out = "";
+     while($query_handle->fetch()) {
+-        print "$id $time $count $type error(s): $msg at $label location: $mc:$top:$mid:$low, addr $addr, grain $grain, syndrome $syndrome $detail\n";
++        $out .= "$id $time $type error: $msg\n";
+     }
++    if ($out ne "") {
++        print "MCE events:\n$out\n";
++    } else {
++        print "No MCE errors.\n\n";
++    }
++    $query_handle->finish;
+ 
++    # MCE mce_record errors
++    $query = "select id, timestamp, mcgcap, mcgstatus, status, addr, misc, ip, tsc, walltime, cpu, cpuid, apicid, socketid, cs, bank, cpuvendor, bank_name, error_msg, mcgstatus_msg, mcistatus_msg, user_action, mc_location from mce_record order by id";
++    $query_handle = $dbh->prepare($query);
++    $query_handle->execute();
++    $query_handle->bind_columns(\($id, $time, $mcgcap,$mcgstatus, $status, $addr, $misc, $ip, $tsc, $walltime, $cpu, $cpuid, $apicid, $socketid, $cs, $bank, $cpuvendor, $bank_name, $msg, $mcgstatus_msg, $mcistatus_msg, $user_action, $mc_location));
++    $out = "";
++    while($query_handle->fetch()) {
++        $out .= "$id $time error: $msg";
++	$out .= ", CPU $cpuvendor" if ($cpuvendor);
++	$out .= ", bank $bank_name" if ($bank_name);
++	$out .= ", mcg $mcgstatus_msg" if ($mcgstatus_msg);
++	$out .= ", mci $mcistatus_msg" if ($mcistatus_msg);
++	$out .= ", $mc_location" if ($mc_location);
++	$out .= ", $user_action" if ($user_action);
++	$out .= sprintf ", mcgcap=0x%08x", $mcgcap if ($mcgcap);
++	$out .= sprintf ", mcgstatus=0x%08x", $mcgstatus if ($mcgstatus);
++	$out .= sprintf ", status=0x%08x", $status if ($status);
++	$out .= sprintf ", addr=0x%08x", $addr if ($addr);
++	$out .= sprintf ", misc=0x%08x", $misc if ($misc);
++	$out .= sprintf ", ip=0x%08x", $ip if ($ip);
++	$out .= sprintf ", tsc=0x%08x", $tsc if ($tsc);
++	$out .= sprintf ", walltime=0x%08x", $walltime if ($walltime);
++	$out .= sprintf ", cpu=0x%08x", $cpu if ($cpu);
++	$out .= sprintf ", cpuid=0x%08x", $cpuid if ($cpuid);
++	$out .= sprintf ", apicid=0x%08x", $apicid if ($apicid);
++	$out .= sprintf ", socketid=0x%08x", $socketid if ($socketid);
++	$out .= sprintf ", cs=0x%08x", $cs if ($cs);
++	$out .= sprintf ", bank=0x%08x", $bank if ($bank);
++
++	$out .= "\n";
++    }
++    if ($out ne "") {
++        print "Memory controller events:\n$out\n";
++    } else {
++        print "No Memory errors.\n\n";
++    }
+     $query_handle->finish;
++
+     undef($dbh);
+ }
+ 
+-- 
+1.7.1
+
diff --git a/SOURCES/0010-ras-mc-ctl-Fix-the-name-of-the-error-table-data.patch b/SOURCES/0010-ras-mc-ctl-Fix-the-name-of-the-error-table-data.patch
new file mode 100644
index 0000000..5500798
--- /dev/null
+++ b/SOURCES/0010-ras-mc-ctl-Fix-the-name-of-the-error-table-data.patch
@@ -0,0 +1,53 @@
+From dc811f88b1bd5ac33faa1606c3a3ce4d3bc0b7ed Mon Sep 17 00:00:00 2001
+From: Mauro Carvalho Chehab <mchehab@redhat.com>
+Date: Fri, 31 May 2013 16:40:40 -0300
+Subject: [PATCH 10/32] ras-mc-ctl: Fix the name of the error table data
+
+Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
+---
+ util/ras-mc-ctl.in |   12 ++++++------
+ 1 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/util/ras-mc-ctl.in b/util/ras-mc-ctl.in
+index 30d3078..48d9b00 100755
+--- a/util/ras-mc-ctl.in
++++ b/util/ras-mc-ctl.in
+@@ -898,9 +898,9 @@ sub errors
+         $out .= "$id $time $count $type error(s): $msg at $label location: $mc:$top:$mid:$low, addr $addr, grain $grain, syndrome $syndrome $detail\n";
+     }
+     if ($out ne "") {
+-        print "PCIe AER events:\n$out\n";
++        print "Memory controller events:\n$out\n";
+     } else {
+-        print "No PCIe AER errors.\n\n";
++        print "No Memory errors.\n\n";
+     }
+     $query_handle->finish;
+ 
+@@ -914,9 +914,9 @@ sub errors
+         $out .= "$id $time $type error: $msg\n";
+     }
+     if ($out ne "") {
+-        print "MCE events:\n$out\n";
++        print "PCIe AER events:\n$out\n";
+     } else {
+-        print "No MCE errors.\n\n";
++        print "No PCIe AER errors.\n\n";
+     }
+     $query_handle->finish;
+ 
+@@ -952,9 +952,9 @@ sub errors
+ 	$out .= "\n";
+     }
+     if ($out ne "") {
+-        print "Memory controller events:\n$out\n";
++        print "MCE events:\n$out\n";
+     } else {
+-        print "No Memory errors.\n\n";
++        print "No MCE errors.\n\n";
+     }
+     $query_handle->finish;
+ 
+-- 
+1.7.1
+
diff --git a/SOURCES/0013-ras-mc-ctl-Improve-parser.patch b/SOURCES/0013-ras-mc-ctl-Improve-parser.patch
new file mode 100644
index 0000000..7900f18
--- /dev/null
+++ b/SOURCES/0013-ras-mc-ctl-Improve-parser.patch
@@ -0,0 +1,36 @@
+From 099af4056912faa28bf1385fffa77e7bbb468b93 Mon Sep 17 00:00:00 2001
+From: Mauro Carvalho Chehab <m.chehab@samsung.com>
+Date: Thu, 15 Aug 2013 12:43:02 -0300
+Subject: [PATCH 13/32] ras-mc-ctl: Improve parser
+
+Accept either . or : as layers separator at config files.
+
+Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
+---
+ util/ras-mc-ctl.in |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/util/ras-mc-ctl.in b/util/ras-mc-ctl.in
+index 48d9b00..f5a8ce5 100755
+--- a/util/ras-mc-ctl.in
++++ b/util/ras-mc-ctl.in
+@@ -481,14 +481,14 @@ sub parse_dimm_labels_file
+ 
+             next unless (my ($label, $info) = ($str =~ /^(.*)\s*:\s*(.*)$/i));
+ 
+-            unless ($info =~ /\d+(?:\.\d+)*/) {
++            unless ($info =~ /\d+(?:[\.\:]\d+)*/) {
+                 log_error ("$file: $line: Invalid syntax, ignoring: \"$_\"\n");
+                 next;
+             }
+ 
+             for my $target (split (/[, ]+/, $info)) {
+                 my $n;
+-                my ($mc, $top, $mid, $low, $extra) = ($target =~ /(\d+)(?:\.(\d+)){0,1}(?:\.(\d+)){0,1}(?:\.(\d+)){0,1}(?:\.(\d+)){0,1}/);
++                my ($mc, $top, $mid, $low, $extra) = ($target =~ /(\d+)(?:[\.\:](\d+)){0,1}(?:[\.\:](\d+)){0,1}(?:[\.\:](\d+)){0,1}(?:[\.\:](\d+)){0,1}/);
+ 
+                 if (defined($extra)) {
+                         die ("Error: Only up to 3 layers are currently supported on label db \"$file\"\n");
+-- 
+1.7.1
+
diff --git a/SOURCES/0014-ras-mc-ctl-Fix-label-register-with-2-layers.patch b/SOURCES/0014-ras-mc-ctl-Fix-label-register-with-2-layers.patch
new file mode 100644
index 0000000..6274324
--- /dev/null
+++ b/SOURCES/0014-ras-mc-ctl-Fix-label-register-with-2-layers.patch
@@ -0,0 +1,77 @@
+From 0d53728f9cbdca5a1bd32c51a121dd1162f50e95 Mon Sep 17 00:00:00 2001
+From: Mauro Carvalho Chehab <m.chehab@samsung.com>
+Date: Thu, 15 Aug 2013 12:45:18 -0300
+Subject: [PATCH 14/32] ras-mc-ctl: Fix label register with 2 layers
+
+When there aren't 3 layers, label print/register weren't working.
+
+Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
+---
+ util/ras-mc-ctl.in |   19 +++++++++++++------
+ 1 files changed, 13 insertions(+), 6 deletions(-)
+
+diff --git a/util/ras-mc-ctl.in b/util/ras-mc-ctl.in
+index f5a8ce5..a7137be 100755
+--- a/util/ras-mc-ctl.in
++++ b/util/ras-mc-ctl.in
+@@ -508,7 +508,6 @@ sub parse_dimm_labels_file
+                     }
+                     map { $lh->{$vendor}{lc $_}{$mc}{$top}{$mid}{$low} = $label }
+                             @models;
+-                        $n = 3;
+                 }
+                 if (!$num) {
+                         $num = $n;
+@@ -542,9 +541,13 @@ sub parse_dimm_labels
+ 
+ sub read_dimm_label
+ {
+-    my ($mc, $top, $mid, $low) = @_;
++    my ($num_layers, $mc, $top, $mid, $low) = @_;
+     my $sysfs = "/sys/devices/system/edac/mc";
+-    my $pos = "$mc:$top:$mid:$low";
++    my $pos;
++
++    $pos = "$mc:$top:$mid:$low" if ($num_layers == 3);
++    $pos = "$mc:$top:$mid" if ($num_layers == 2);
++    $pos = "$mc:$top" if ($num_layers == 1);
+ 
+     if (!defined($dimm_node{$pos})) {
+         my $label = "$pos missing";
+@@ -574,10 +577,14 @@ sub read_dimm_label
+ 
+ sub get_dimm_label_node
+ {
+-    my ($mc, $top, $mid, $low) = @_;
++    my ($num_layers, $mc, $top, $mid, $low) = @_;
+     my $sysfs = "/sys/devices/system/edac/mc";
+     my $pos = "$mc:$top:$mid:$low";
+ 
++    $pos = "$mc:$top:$mid:$low" if ($num_layers == 3);
++    $pos = "$mc:$top:$mid" if ($num_layers == 2);
++    $pos = "$mc:$top" if ($num_layers == 1);
++
+     return "" if (!defined($dimm_node{$pos}));
+ 
+     my $dimm = $dimm_node{$pos};
+@@ -611,7 +618,7 @@ sub print_dimm_labels
+             for my $mid (sort keys %{$$lref{$vendor}{$model}{$mc}{$top}}) {
+                 for my $low (sort keys %{$$lref{$vendor}{$model}{$mc}{$top}{$mid}}) {
+                     my $label = $$lref{$vendor}{$model}{$mc}{$top}{$mid}{$low};
+-                    my ($rlabel,$loc) = read_dimm_label ($mc, $top, $mid, $low);
++                    my ($rlabel,$loc) = read_dimm_label ($$num_layers{$vendor}{$model}, $mc, $top, $mid, $low);
+ 
+                     printf $fh $format, $loc, $label, $rlabel;
+                 }
+@@ -645,7 +652,7 @@ sub register_dimm_labels
+             for my $mid (sort keys %{$$lref{$vendor}{$model}{$mc}{$top}}) {
+                 for my $low (sort keys %{$$lref{$vendor}{$model}{$mc}{$top}{$mid}}) {
+ 
+-                    my $file = get_dimm_label_node($mc, $top, $mid, $low);
++                    my $file = get_dimm_label_node($$num_layers{$vendor}{$model}, $mc, $top, $mid, $low);
+ 
+                     # Ignore sysfs files that don't exist. Might just be
+                     #  unpopulated bank.
+-- 
+1.7.1
+
diff --git a/SOURCES/0015-Add-an-example-of-labels-file.patch b/SOURCES/0015-Add-an-example-of-labels-file.patch
new file mode 100644
index 0000000..f7e64b7
--- /dev/null
+++ b/SOURCES/0015-Add-an-example-of-labels-file.patch
@@ -0,0 +1,44 @@
+From 74d84ba18f4f1d7097b47ce1c2e41e332d197dfb Mon Sep 17 00:00:00 2001
+From: Mauro Carvalho Chehab <m.chehab@samsung.com>
+Date: Thu, 15 Aug 2013 12:58:02 -0300
+Subject: [PATCH 15/32] Add an example of labels file
+
+This is an example of a labels file for a Dell Power Edge T620.
+
+For now, only DIMMs A1 and B1 are tested here.
+
+Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
+---
+ labels/dell |   20 ++++++++++++++++++++
+ 1 files changed, 20 insertions(+), 0 deletions(-)
+ create mode 100644 labels/dell
+
+diff --git a/labels/dell b/labels/dell
+new file mode 100644
+index 0000000..e1a09a7
+--- /dev/null
++++ b/labels/dell
+@@ -0,0 +1,20 @@
++# RASDAEMON Motherboard DIMM labels Database file.
++#
++#  Vendor-name and model-name are found from the program 'dmidecode'
++#  labels are found from the silk screen on the motherboard.
++#
++#Vendor: <vendor-name>
++#  Model: <model-name>
++#    <label>:  <mc>.<top>.<mid>.<low>
++#
++
++Vendor: Dell Inc.
++
++  Model: 0F5XM3
++    DIMM_A1: 0.0.0;	DIMM_A2:  0.0.1;	DIMM_A3:  0.0.2;	DIMM_A4:  0.0.3;
++    DIMM_A5: 0.1.0;	DIMM_A6:  0.1.1;	DIMM_A7:  0.1.2;	DIMM_A8:  0.1.3;
++    DIMM_A9: 0.2.0;	DIMM_A10: 0.2.1;	DIMM_A11: 0.2.2;	DIMM_A12: 0.2.3;
++
++    DIMM_B1: 1.0.0;	DIMM_B2:  1.0.1;	DIMM_B3:  1.0.2;	DIMM_B4:  1.0.3;
++    DIMM_B5: 1.1.0;	DIMM_B6:  1.1.1;	DIMM_B7:  1.1.2;	DIMM_B8:  1.1.3;
++    DIMM_B9: 1.2.0;	DIMM_B10: 1.2.1;	DIMM_B11: 1.2.2;	DIMM_B12: 1.2.3;
+-- 
+1.7.1
+
diff --git a/SOURCES/0017-ras-mc-ctl-Fix-the-DIMM-layout-display.patch b/SOURCES/0017-ras-mc-ctl-Fix-the-DIMM-layout-display.patch
new file mode 100644
index 0000000..b9a57d3
--- /dev/null
+++ b/SOURCES/0017-ras-mc-ctl-Fix-the-DIMM-layout-display.patch
@@ -0,0 +1,76 @@
+From b8bb2ed4a751516d32373e478e5c9ea9f16b524d Mon Sep 17 00:00:00 2001
+From: Mauro Carvalho Chehab <m.chehab@samsung.com>
+Date: Thu, 15 Aug 2013 17:13:43 -0300
+Subject: [PATCH 17/32] ras-mc-ctl: Fix the DIMM layout display
+
+The items weren't being presented at the right order. Fix it.
+
+Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
+---
+ util/ras-mc-ctl.in |   26 ++++++++++++++++++++------
+ 1 files changed, 20 insertions(+), 6 deletions(-)
+
+diff --git a/util/ras-mc-ctl.in b/util/ras-mc-ctl.in
+index a7137be..196a643 100755
+--- a/util/ras-mc-ctl.in
++++ b/util/ras-mc-ctl.in
+@@ -673,15 +673,15 @@ sub register_dimm_labels
+     return 1;
+ }
+ 
+-sub dimm_display_layer($@);
++sub dimm_display_layer_rev($@);
+ 
+-sub dimm_display_layer($@)
++sub dimm_display_layer_rev($@)
+ {
+     my $layer = shift;
+     my @pos = @_;
+ 
+-    $layer--;
+-    if ($layer < 0) {
++    $layer++;
++    if ($layer >= scalar(@pos) - 1) {
+         my $str_loc = join(':', @pos);
+         my $size = $dimm_size{$str_loc};
+         if (!$size) {
+@@ -695,12 +695,26 @@ sub dimm_display_layer($@)
+     my $s;
+     for (my $i = 0; $i <= $max_pos[$layer]; $i++) {
+         $pos[$layer] = $i;
+-        $s .= dimm_display_layer($layer, @pos);
++        $s .= dimm_display_layer_rev($layer, @pos);
+     }
+ 
+     return $s;
+ }
+ 
++sub dimm_display_layer(@)
++{
++    my @pos = @_;
++
++    my $s;
++    for (my $i = 0; $i <= $max_pos[0]; $i++) {
++        $pos[0] = $i;
++        $s .= dimm_display_layer_rev(0, @pos);
++    }
++
++    return $s;
++}
++
++
+ sub dimm_display_layer_header($$)
+ {
+     my $n_items = 1;
+@@ -753,7 +767,7 @@ sub dimm_display_mem()
+         my $p1 = length($s) - 1;
+ 
+         $pos[scalar(@pos) - 1] = $d;
+-        $s .= dimm_display_layer(scalar(@pos) - 1, @pos);
++        $s .= dimm_display_layer(@pos);
+         $len += length($s);
+ 
+         $sep = "-" x $p1;
+-- 
+1.7.1
+
diff --git a/SOURCES/0019-ras-mc-ctl-remove-completely-use-of-modprobe.patch b/SOURCES/0019-ras-mc-ctl-remove-completely-use-of-modprobe.patch
new file mode 100644
index 0000000..c65a242
--- /dev/null
+++ b/SOURCES/0019-ras-mc-ctl-remove-completely-use-of-modprobe.patch
@@ -0,0 +1,29 @@
+From 2afbcd81173822014d6d73e98e9093a140bb1421 Mon Sep 17 00:00:00 2001
+From: Aristeu Rozanski <arozansk@redhat.com>
+Date: Fri, 6 Dec 2013 09:45:14 -0500
+Subject: [PATCH 19/32] ras-mc-ctl: remove completely use of modprobe
+
+While verifying SELinux policies, this popped up. ras-mc-ctl inherited a
+modprobe lookup that ends up never being used. This patch gets rid of
+it.
+
+Signed-off-by: Aristeu Rozanski <arozansk@redhat.com>
+---
+ util/ras-mc-ctl.in |    1 -
+ 1 files changed, 0 insertions(+), 1 deletions(-)
+
+diff --git a/util/ras-mc-ctl.in b/util/ras-mc-ctl.in
+index 196a643..ef0d9bc 100755
+--- a/util/ras-mc-ctl.in
++++ b/util/ras-mc-ctl.in
+@@ -39,7 +39,6 @@ my $dbname      = "@RASSTATEDIR@/@RAS_DB_FNAME@";
+ my $prefix      = "@prefix@";
+ my $sysconfdir  = "@sysconfdir@";
+ my $dmidecode   = find_prog ("dmidecode");
+-my $modprobe    = find_prog ("modprobe")  or exit (1);
+ 
+ my %conf        = ();
+ my %bus         = ();
+-- 
+1.7.1
+
diff --git a/SOURCES/0022-mce-amd-k8.c-fix-a-warning.patch b/SOURCES/0022-mce-amd-k8.c-fix-a-warning.patch
new file mode 100644
index 0000000..7ac6e58
--- /dev/null
+++ b/SOURCES/0022-mce-amd-k8.c-fix-a-warning.patch
@@ -0,0 +1,42 @@
+From 78465e5047b226011c1a4c916c79c63fb6e68f71 Mon Sep 17 00:00:00 2001
+From: Mauro Carvalho Chehab <m.chehab@samsung.com>
+Date: Fri, 14 Feb 2014 05:11:26 +0900
+Subject: [PATCH 22/32] mce-amd-k8.c: fix a warning
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+mce-amd-k8.c: In function ‘bank_name’:
+mce-amd-k8.c:250:22: warning: argument to ‘sizeof’ in ‘snprintf’ call is the same expression as the destination; did you mean to provide an explicit length? [-Wsizeof-pointer-memaccess]
+  snprintf(buf, sizeof(buf), "%s (bank=%d)", s, e->bank);
+                      ^
+
+Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
+---
+ mce-amd-k8.c |    3 +--
+ 1 files changed, 1 insertions(+), 2 deletions(-)
+
+diff --git a/mce-amd-k8.c b/mce-amd-k8.c
+index 5e21b55..8179f74 100644
+--- a/mce-amd-k8.c
++++ b/mce-amd-k8.c
+@@ -236,7 +236,6 @@ static void decode_k8_threashold(struct mce_event *e)
+ 
+ static void bank_name(struct mce_event *e)
+ {
+-	char *buf = e->bank_name;
+ 	const char *s;
+ 
+ 	if (e->bank < ARRAY_SIZE(k8bank))
+@@ -247,7 +246,7 @@ static void bank_name(struct mce_event *e)
+ 	else
+ 		return;		/* Use the generic parser for bank */
+ 
+-	snprintf(buf, sizeof(buf), "%s (bank=%d)", s, e->bank);
++	mce_snprintf(e->bank_name, "%s (bank=%d)", s, e->bank);
+ }
+ 
+ int parse_amd_k8_event(struct ras_events *ras, struct mce_event *e)
+-- 
+1.7.1
+
diff --git a/SOURCES/0023-add-abrt-suppport-for-rasdaemon.patch b/SOURCES/0023-add-abrt-suppport-for-rasdaemon.patch
new file mode 100644
index 0000000..e5ea589
--- /dev/null
+++ b/SOURCES/0023-add-abrt-suppport-for-rasdaemon.patch
@@ -0,0 +1,641 @@
+From c6ed1e1af9356cdce1eaa652061dd6e4eb32d283 Mon Sep 17 00:00:00 2001
+From: Junliang Li <lijunliang.dna@gmail.com>
+Date: Thu, 13 Feb 2014 10:39:53 +0800
+Subject: [PATCH 23/32] add abrt suppport for rasdaemon
+
+Adds abrt as another error mechanism for the rasdaemon.
+This patch does:
+
+1) read ras event (mc,mce and aer)
+
+2) setup a abrt-server unix socket
+
+3) write messages follow ABRT server protocol, set event
+   info into backtrace zone.
+
+4) commit report.
+
+For now, it depends on ABRT to limit flood reports.
+
+Signed-off-by: Junliang Li <lijunliang.dna@gmail.com>
+Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
+---
+ Makefile.am       |    5 +-
+ configure.ac      |    9 +
+ ras-aer-handler.c |    6 +
+ ras-events.h      |    3 +
+ ras-mc-handler.c  |    7 +
+ ras-mce-handler.c |    6 +
+ ras-report.c      |  429 +++++++++++++++++++++++++++++++++++++++++++++++++++++
+ ras-report.h      |   39 +++++
+ 8 files changed, 503 insertions(+), 1 deletions(-)
+ create mode 100644 ras-report.c
+ create mode 100644 ras-report.h
+
+diff --git a/Makefile.am b/Makefile.am
+index 473ce98..c1668b4 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -17,10 +17,13 @@ if WITH_MCE
+ 			mce-intel-dunnington.c mce-intel-tulsa.c \
+ 			mce-intel-sb.c mce-intel-ivb.c
+ endif
++if WITH_ABRT_REPORT
++   rasdaemon_SOURCES += ras-report.c
++endif
+ rasdaemon_LDADD = -lpthread $(SQLITE3_LIBS) libtrace/libtrace.a
+ 
+ include_HEADERS = config.h  ras-events.h  ras-logger.h  ras-mc-handler.h \
+-		  ras-aer-handler.h ras-mce-handler.h ras-record.h bitfield.h
++		  ras-aer-handler.h ras-mce-handler.h ras-record.h bitfield.h ras-report.h
+ 
+ # This rule can't be called with more than one Makefile job (like make -j8)
+ # I can't figure out a way to fix that
+diff --git a/configure.ac b/configure.ac
+index 4fe6ef2..0ea962e 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -53,6 +53,15 @@ AS_IF([test "x$enable_mce" = "xyes"], [
+ ])
+ AM_CONDITIONAL([WITH_MCE], [test x$enable_mce = xyes])
+ 
++AC_ARG_ENABLE([abrt_report],
++    AS_HELP_STRING([--enable-abrt-report], [enable report event to ABRT (currently experimental)]))
++
++AS_IF([test "x$enable_abrt_report" = "xyes"], [
++  AC_DEFINE(HAVE_ABRT_REPORT,1,"have report event to ABRT")
++  AC_SUBST([WITH_ABRT_REPORT])
++])
++AM_CONDITIONAL([WITH_ABRT_REPORT], [test x$enable_abrt_report = xyes])
++
+ test "$sysconfdir" = '${prefix}/etc' && sysconfdir=/etc
+ 
+ CFLAGS="$CFLAGS -Wall -Wmissing-prototypes -Wstrict-prototypes"
+diff --git a/ras-aer-handler.c b/ras-aer-handler.c
+index e5abaca..50526af 100644
+--- a/ras-aer-handler.c
++++ b/ras-aer-handler.c
+@@ -24,6 +24,7 @@
+ #include "ras-record.h"
+ #include "ras-logger.h"
+ #include "bitfield.h"
++#include "ras-report.h"
+ 
+ static const char *aer_errors[32] = {
+ 	/* Correctable errors */
+@@ -115,5 +116,10 @@ int ras_aer_event_handler(struct trace_seq *s,
+ 	ras_store_aer_event(ras, &ev);
+ #endif
+ 
++#ifdef HAVE_ABRT_REPORT
++	/* Report event to ABRT */
++	ras_report_aer_event(ras, &ev);
++#endif
++
+ 	return 0;
+ }
+diff --git a/ras-events.h b/ras-events.h
+index 554a95e..64e045a 100644
+--- a/ras-events.h
++++ b/ras-events.h
+@@ -47,6 +47,9 @@ struct ras_events {
+ 
+ 	/* For the mce handler */
+ 	struct mce_priv	*mce_priv;
++
++	/* For ABRT socket*/
++	int socketfd;
+ };
+ 
+ struct pthread_data {
+diff --git a/ras-mc-handler.c b/ras-mc-handler.c
+index 5c24f65..ffb3805 100644
+--- a/ras-mc-handler.c
++++ b/ras-mc-handler.c
+@@ -23,6 +23,7 @@
+ #include "ras-mc-handler.h"
+ #include "ras-record.h"
+ #include "ras-logger.h"
++#include "ras-report.h"
+ 
+ int ras_mc_event_handler(struct trace_seq *s,
+ 			 struct pevent_record *record,
+@@ -189,6 +190,12 @@ int ras_mc_event_handler(struct trace_seq *s,
+ 	/* Insert data into the SGBD */
+ 
+ 	ras_store_mc_event(ras, &ev);
++
++#ifdef HAVE_ABRT_REPORT
++	/* Report event to ABRT */
++	ras_report_mc_event(ras, &ev);
++#endif
++
+ 	return 0;
+ 
+ parse_error:
+diff --git a/ras-mce-handler.c b/ras-mce-handler.c
+index 59e8d05..1431049 100644
+--- a/ras-mce-handler.c
++++ b/ras-mce-handler.c
+@@ -26,6 +26,7 @@
+ #include "ras-mce-handler.h"
+ #include "ras-record.h"
+ #include "ras-logger.h"
++#include "ras-report.h"
+ 
+ /*
+  * The code below were adapted from Andi Kleen/Intel/SuSe mcelog code,
+@@ -401,5 +402,10 @@ int ras_mce_event_handler(struct trace_seq *s,
+ 	ras_store_mce_record(ras, &e);
+ #endif
+ 
++#ifdef HAVE_ABRT_REPORT
++	/* Report event to ABRT */
++	ras_report_mce_event(ras, &e);
++#endif
++
+ 	return 0;
+ }
+diff --git a/ras-report.c b/ras-report.c
+new file mode 100644
+index 0000000..d3e4a79
+--- /dev/null
++++ b/ras-report.c
+@@ -0,0 +1,429 @@
++#include <stdio.h>
++#include <string.h>
++#include <unistd.h>
++#include <sys/types.h>
++#include <sys/utsname.h>
++#include <sys/socket.h>
++#include <sys/un.h>
++
++#include "ras-report.h"
++
++static int setup_report_socket(void){
++	int sockfd = -1;
++	int rc = -1;
++	struct sockaddr_un addr;
++
++	sockfd = socket(AF_UNIX, SOCK_STREAM, 0);
++	if (sockfd < 0){
++		return -1;
++	}
++
++	memset(&addr, 0, sizeof(struct sockaddr_un));
++	addr.sun_family = AF_UNIX;
++	strncpy(addr.sun_path, ABRT_SOCKET, strlen(ABRT_SOCKET));
++
++	rc = connect(sockfd, (struct sockaddr *)&addr, sizeof(struct sockaddr_un));
++	if (rc < 0){
++		return -1;
++	}
++
++	return sockfd;
++}
++
++static int commit_report_basic(int sockfd){
++	char buf[INPUT_BUFFER_SIZE];
++	struct utsname un;
++	int rc = -1;
++
++	if(sockfd < 0){
++		return rc;
++	}
++
++	memset(buf, 0, INPUT_BUFFER_SIZE);
++	memset(&un, 0, sizeof(struct utsname));
++
++	rc = uname(&un);
++	if(rc < 0){
++		return rc;
++	}
++
++	/*
++	 * ABRT server protocol
++	 */
++	sprintf(buf, "PUT / HTTP/1.1\r\n\r\n");
++	rc = write(sockfd, buf, strlen(buf) + 1);
++	if(rc < strlen(buf) + 1){
++		return -1;
++	}
++
++	sprintf(buf, "PID=%d", (int)getpid());
++	rc = write(sockfd, buf, strlen(buf) + 1);
++	if(rc < strlen(buf) + 1){
++		return -1;
++	}
++
++	sprintf(buf, "EXECUTABLE=/boot/vmlinuz-%s", un.release);
++	rc = write(sockfd, buf, strlen(buf) + 1);
++	if(rc < strlen(buf) + 1){
++		return -1;
++	}
++
++	sprintf(buf, "BASENAME=%s", "rasdaemon");
++	rc = write(sockfd, buf, strlen(buf) + 1);
++	if(rc < strlen(buf) + 1){
++		return -1;
++	}
++
++	return 0;
++}
++
++/*
++ *  add "DONE" string to finish message.
++ */
++static int commit_report_done(int sockfd){
++	int rc = -1;
++
++	if(sockfd < 0){
++		return -1;
++	}
++
++	rc = write(sockfd, "DONE\0", strlen("DONE\0"));
++	if(rc < strlen("DONE\0")){
++		return -1;
++	}
++
++	return 0;
++}
++
++static int set_mc_event_backtrace(char *buf, struct ras_mc_event *ev){
++	char bt_buf[MAX_BACKTRACE_SIZE];
++
++	if(!buf || !ev)
++		return -1;
++
++	sprintf(bt_buf, "BACKTRACE= "	\
++						"timestamp=%s\n"	\
++						"error_count=%d\n"	\
++						"error_type=%s\n"	\
++						"msg=%s\n"	\
++						"label=%s\n"	\
++						"mc_index=%c\n"	\
++						"top_layer=%c\n"	\
++						"middle_layer=%c\n"	\
++						"lower_layer=%c\n"	\
++						"address=%llu\n"	\
++						"grain=%llu\n"	\
++						"syndrome=%llu\n"	\
++						"driver_detail=%s\n",	\
++						ev->timestamp,	\
++						ev->error_count,	\
++						ev->error_type,	\
++						ev->msg,	\
++						ev->label,	\
++						ev->mc_index,	\
++						ev->top_layer,	\
++						ev->middle_layer,	\
++						ev->lower_layer,	\
++						ev->address,	\
++						ev->grain,	\
++						ev->syndrome,	\
++						ev->driver_detail);
++
++	strcat(buf, bt_buf);
++
++	return 0;
++}
++
++static int set_mce_event_backtrace(char *buf, struct mce_event *ev){
++	char bt_buf[MAX_BACKTRACE_SIZE];
++
++	if(!buf || !ev)
++		return -1;
++
++	sprintf(bt_buf, "BACKTRACE="	\
++						"timestamp=%s\n"	\
++						"bank_name=%s\n"	\
++						"error_msg=%s\n"	\
++						"mcgstatus_msg=%s\n"	\
++						"mcistatus_msg=%s\n"	\
++						"mcastatus_msg=%s\n"	\
++						"user_action=%s\n"	\
++						"mc_location=%s\n"	\
++						"mcgcap=%lu\n"	\
++						"mcgstatus=%lu\n"	\
++						"status=%lu\n"	\
++						"addr=%lu\n"	\
++						"misc=%lu\n"	\
++						"ip=%lu\n"	\
++						"tsc=%lu\n"	\
++						"walltime=%lu\n"	\
++						"cpu=%u\n"	\
++						"cpuid=%u\n"	\
++						"apicid=%u\n"	\
++						"socketid=%u\n"	\
++						"cs=%d\n"	\
++						"bank=%d\n"	\
++						"cpuvendor=%d\n",	\
++						ev->timestamp,	\
++						ev->bank_name,	\
++						ev->error_msg,	\
++						ev->mcgstatus_msg,	\
++						ev->mcistatus_msg,	\
++						ev->mcastatus_msg,	\
++						ev->user_action,	\
++						ev->mc_location,	\
++						ev->mcgcap,	\
++						ev->mcgstatus,	\
++						ev->status,	\
++						ev->addr,	\
++						ev->misc,	\
++						ev->ip,	\
++						ev->tsc,	\
++						ev->walltime,	\
++						ev->cpu,	\
++						ev->cpuid,	\
++						ev->apicid,	\
++						ev->socketid,	\
++						ev->cs,	\
++						ev->bank,	\
++						ev->cpuvendor);
++
++	strcat(buf, bt_buf);
++
++	return 0;
++}
++
++static int set_aer_event_backtrace(char *buf, struct ras_aer_event *ev){
++	char bt_buf[MAX_BACKTRACE_SIZE];
++
++	if(!buf || !ev)
++		return -1;
++
++	sprintf(bt_buf, "BACKTRACE="	\
++						"timestamp=%s\n"	\
++						"error_type=%s\n"	\
++						"dev_name=%s\n"	\
++						"msg=%s\n",	\
++						ev->timestamp,	\
++						ev->error_type,	\
++						ev->dev_name,	\
++						ev->msg);
++
++	strcat(buf, bt_buf);
++
++	return 0;
++}
++
++static int commit_report_backtrace(int sockfd, int type, void *ev){
++	char buf[MAX_BACKTRACE_SIZE];
++	char *pbuf = buf;
++	int rc = -1;
++	int buf_len = 0;
++
++	if(sockfd < 0 || !ev){
++		return -1;
++	}
++
++	memset(buf, 0, MAX_BACKTRACE_SIZE);
++
++	switch(type){
++	case MC_EVENT:
++		rc = set_mc_event_backtrace(buf, (struct ras_mc_event *)ev);
++		break;
++	case AER_EVENT:
++		rc = set_aer_event_backtrace(buf, (struct ras_aer_event *)ev);
++		break;
++	case MCE_EVENT:
++		rc = set_mce_event_backtrace(buf, (struct mce_event *)ev);
++		break;
++	default:
++		return -1;
++	}
++
++	if(rc < 0){
++		return -1;
++	}
++
++	buf_len = strlen(buf);
++
++	for(;buf_len > INPUT_BUFFER_SIZE - 1; buf_len -= (INPUT_BUFFER_SIZE - 1)){
++		rc = write(sockfd, pbuf, INPUT_BUFFER_SIZE - 1);
++		if(rc < INPUT_BUFFER_SIZE - 1){
++			return -1;
++		}
++
++		pbuf = pbuf + INPUT_BUFFER_SIZE - 1;
++	}
++
++	rc = write(sockfd, pbuf, buf_len + 1);
++	if(rc < buf_len){
++		return -1;
++	}
++
++	return 0;
++}
++
++int ras_report_mc_event(struct ras_events *ras, struct ras_mc_event *ev){
++	char buf[MAX_MESSAGE_SIZE];
++	int sockfd = -1;
++	int done = 0;
++	int rc = -1;
++
++	memset(buf, 0, sizeof(buf));
++
++	sockfd = setup_report_socket();
++	if(sockfd < 0){
++		return -1;
++	}
++
++	rc = commit_report_basic(sockfd);
++	if(rc < 0){
++		goto mc_fail;
++	}
++
++	rc = commit_report_backtrace(sockfd, MC_EVENT, ev);
++	if(rc < 0){
++		goto mc_fail;
++	}
++
++	sprintf(buf, "ANALYZER=%s", "rasdaemon-mc");
++	rc = write(sockfd, buf, strlen(buf) + 1);
++	if(rc < strlen(buf) + 1){
++		goto mc_fail;
++	}
++
++	sprintf(buf, "REASON=%s", "EDAC driver report problem");
++	rc = write(sockfd, buf, strlen(buf) + 1);
++	if(rc < strlen(buf) + 1){
++		goto mc_fail;
++	}
++
++	rc = commit_report_done(sockfd);
++	if(rc < 0){
++		goto mc_fail;
++	}
++
++	done = 1;
++
++mc_fail:
++
++	if(sockfd > 0){
++		close(sockfd);
++	}
++
++	if(done){
++		return 0;
++	}else{
++		return -1;
++	}
++}
++
++int ras_report_aer_event(struct ras_events *ras, struct ras_aer_event *ev){
++	char buf[MAX_MESSAGE_SIZE];
++	int sockfd = 0;
++	int done = 0;
++	int rc = -1;
++
++	memset(buf, 0, sizeof(buf));
++
++	sockfd = setup_report_socket();
++	if(sockfd < 0){
++		return -1;
++	}
++
++	rc = commit_report_basic(sockfd);
++	if(rc < 0){
++		goto aer_fail;
++	}
++
++	rc = commit_report_backtrace(sockfd, AER_EVENT, ev);
++	if(rc < 0){
++		goto aer_fail;
++	}
++
++	sprintf(buf, "ANALYZER=%s", "rasdaemon-aer");
++	rc = write(sockfd, buf, strlen(buf) + 1);
++	if(rc < strlen(buf) + 1){
++		goto aer_fail;
++	}
++
++	sprintf(buf, "REASON=%s", "PCIe AER driver report problem");
++	rc = write(sockfd, buf, strlen(buf) + 1);
++	if(rc < strlen(buf) + 1){
++		goto aer_fail;
++	}
++
++	rc = commit_report_done(sockfd);
++	if(rc < 0){
++		goto aer_fail;
++	}
++
++	done = 1;
++
++aer_fail:
++
++	if(sockfd > 0){
++		close(sockfd);
++	}
++
++	if(done){
++		return 0;
++	}else{
++		return -1;
++	}
++}
++
++int ras_report_mce_event(struct ras_events *ras, struct mce_event *ev){
++	char buf[MAX_MESSAGE_SIZE];
++	int sockfd = 0;
++	int done = 0;
++	int rc = -1;
++
++	memset(buf, 0, sizeof(buf));
++
++	sockfd = setup_report_socket();
++	if(sockfd < 0){
++		return -1;
++	}
++
++	rc = commit_report_basic(sockfd);
++	if(rc < 0){
++		goto mce_fail;
++	}
++
++	rc = commit_report_backtrace(sockfd, MCE_EVENT, ev);
++	if(rc < 0){
++		goto mce_fail;
++	}
++
++	sprintf(buf, "ANALYZER=%s", "rasdaemon-mce");
++	rc = write(sockfd, buf, strlen(buf) + 1);
++	if(rc < strlen(buf) + 1){
++		goto mce_fail;
++	}
++
++	sprintf(buf, "REASON=%s", "Machine Check driver report problem");
++	rc = write(sockfd, buf, strlen(buf) + 1);
++	if(rc < strlen(buf) + 1){
++		goto mce_fail;
++	}
++
++	rc = commit_report_done(sockfd);
++	if(rc < 0){
++		goto mce_fail;
++	}
++
++	done = 1;
++
++mce_fail:
++
++	if(sockfd > 0){
++		close(sockfd);
++	}
++
++	if(done){
++		return 0;
++	}else{
++		return -1;
++	}
++}
+diff --git a/ras-report.h b/ras-report.h
+new file mode 100644
+index 0000000..7920cdf
+--- /dev/null
++++ b/ras-report.h
+@@ -0,0 +1,39 @@
++#ifndef __RAS_REPORT_H
++#define __RAS_REPORT_H
++
++#include "ras-record.h"
++#include "ras-events.h"
++#include "ras-mc-handler.h"
++#include "ras-mce-handler.h"
++#include "ras-aer-handler.h"
++
++/* Maximal length of backtrace. */
++#define MAX_BACKTRACE_SIZE (1024*1024)
++/* Amount of data received from one client for a message before reporting error. */
++#define MAX_MESSAGE_SIZE (4*MAX_BACKTRACE_SIZE)
++/* Maximal number of characters read from socket at once. */
++#define INPUT_BUFFER_SIZE (8*1024)
++/* ABRT socket file */
++#define ABRT_SOCKET "/var/run/abrt/abrt.socket"
++
++enum {
++	MC_EVENT,
++	MCE_EVENT,
++	AER_EVENT
++};
++
++#ifdef HAVE_ABRT_REPORT
++
++int ras_report_mc_event(struct ras_events *ras, struct ras_mc_event *ev);
++int ras_report_aer_event(struct ras_events *ras, struct ras_aer_event *ev);
++int ras_report_mce_event(struct ras_events *ras, struct mce_event *ev);
++
++#else
++
++static inline int ras_report_mc_event(struct ras_events *ras, struct ras_mc_event *ev) { return 0; };
++static inline int ras_report_aer_event(struct ras_events *ras, struct ras_aer_event *ev) { return 0; };
++static inline int ras_report_mce_event(struct ras_events *ras, struct mce_event *ev) { return 0; };
++
++#endif
++
++#endif
+-- 
+1.7.1
+
diff --git a/SOURCES/0026-rasdaemon-Add-record-option-to-rasdaemon-man-page.patch b/SOURCES/0026-rasdaemon-Add-record-option-to-rasdaemon-man-page.patch
new file mode 100644
index 0000000..711819b
--- /dev/null
+++ b/SOURCES/0026-rasdaemon-Add-record-option-to-rasdaemon-man-page.patch
@@ -0,0 +1,50 @@
+From d1b81490639f2608ecaf8fa50c24ac78c053fc2b Mon Sep 17 00:00:00 2001
+From: Betty Dall <betty.dall@hp.com>
+Date: Wed, 19 Mar 2014 14:59:47 -0600
+Subject: [PATCH 26/32] rasdaemon: Add record option to rasdaemon man page
+
+Add the already existing rasdaemon option 'record' to the rasdaemon man
+page. This option records events via sqlite3.
+
+Signed-off-by: Betty Dall <betty.dall@hp.com>
+Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
+---
+ man/rasdaemon.1.in |   14 +++++++++++---
+ 1 files changed, 11 insertions(+), 3 deletions(-)
+
+diff --git a/man/rasdaemon.1.in b/man/rasdaemon.1.in
+index 5349fa3..7a8b60f 100644
+--- a/man/rasdaemon.1.in
++++ b/man/rasdaemon.1.in
+@@ -29,8 +29,10 @@ rasdaemon \- RAS daemon to log the RAS events.
+ 
+ .SH DESCRIPTION
+ 
+-The \fBrasdaemon\fR program is a daemon with monitors the RAS trace events
+-from /sys/kernel/debug/tracing, reporting them via syslog/journald.
++The \fBrasdaemon\fR program is a daemon which monitors the platform
++Reliablity, Availability and Serviceability (RAS) reports from the
++Linux kernel trace events. These trace events are logged in
++/sys/kernel/debug/tracing, reporting them via syslog/journald.
+ 
+ .SH OPTIONS
+ .TP
+@@ -51,8 +53,14 @@ Executes in foreground, printing the events at console. Useful for testing it,
+ and to be used by systemd or Unix System V respan.
+ If not specified, the program runs in daemon mode.
+ .TP
++.BI "--record"
++Record RAS events via Sqlite3. The Sqlite3 database has the benefit of
++keeping a persistent record of the RAS events. This feature is used with
++the ras-mc-ctl utility. Note that rasdaemon may be compiled without this
++feature.
++.TP
+ .BI "--version"
+-Prints the program version and exit.
++Print the program version and exit.
+ 
+ .SH SEE ALSO
+ \fBras-mc-ctl\fR(8)
+-- 
+1.7.1
+
diff --git a/SOURCES/0027-ras-mc-ctl-Print-useful-message-when-run-without-ras.patch b/SOURCES/0027-ras-mc-ctl-Print-useful-message-when-run-without-ras.patch
new file mode 100644
index 0000000..73be031
--- /dev/null
+++ b/SOURCES/0027-ras-mc-ctl-Print-useful-message-when-run-without-ras.patch
@@ -0,0 +1,45 @@
+From caa44c3946ddc900896830297c28b90ce5b9034b Mon Sep 17 00:00:00 2001
+From: Betty Dall <betty.dall@hp.com>
+Date: Wed, 19 Mar 2014 15:54:56 -0600
+Subject: [PATCH 27/32] ras-mc-ctl: Print useful message when run without rasdaemon -r
+
+The utility script ras-mc-ctl requires that rasdaemon --record be run
+to create the me_event table in the SQLite database. The current behaviour
+is this:
+[root@sa1 util]# ras-mc-ctl --errors
+DBD::SQLite::db prepare failed: no such table: mc_event at
+/usr/local/sbin/ras-mc-ctl line 914.
+Can't call method "execute" on an undefined value at
+/usr/local/sbin/ras-mc-ctl line 915.
+
+With this change, the user sees:
+[root@sa1 util]# ras-mc-ctl --errors
+DBD::SQLite::db prepare failed: no such table: mc_event at
+/usr/local/sbin/ras-mc-ctl line 914.
+ras-mc-ctl: Error: mc_event table missing from
+/usr/local/var/lib/rasdaemon/ras-mc_event.db. Run 'rasdaemon --record'.
+
+Signed-off-by: Betty Dall <betty.dall@hp.com>
+Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
+---
+ util/ras-mc-ctl.in |    4 ++++
+ 1 files changed, 4 insertions(+), 0 deletions(-)
+
+diff --git a/util/ras-mc-ctl.in b/util/ras-mc-ctl.in
+index 196a643..e9f9c59 100755
+--- a/util/ras-mc-ctl.in
++++ b/util/ras-mc-ctl.in
+@@ -912,6 +912,10 @@ sub errors
+     # Memory controller mc_event errors
+     $query = "select id, timestamp, err_count, err_type, err_msg, label, mc, top_layer,middle_layer,lower_layer, address, grain, syndrome, driver_detail from mc_event order by id";
+     $query_handle = $dbh->prepare($query);
++    if (!$query_handle) {
++        log_error ("mc_event table missing from $dbname. Run 'rasdaemon --record'.\n");
++        exit -1
++    }
+     $query_handle->execute();
+     $query_handle->bind_columns(\($id, $time, $count, $type, $msg, $label, $mc, $top, $mid, $low, $addr, $grain, $syndrome, $detail));
+     $out = "";
+-- 
+1.7.1
+
diff --git a/SOURCES/0028-Make-paths-in-the-systemd-services-configurable.patch b/SOURCES/0028-Make-paths-in-the-systemd-services-configurable.patch
new file mode 100644
index 0000000..f751929
--- /dev/null
+++ b/SOURCES/0028-Make-paths-in-the-systemd-services-configurable.patch
@@ -0,0 +1,114 @@
+From 4bfa45f56e1500f1cfc8de3fd8d1228b11011e95 Mon Sep 17 00:00:00 2001
+From: Jakub Filak <jfilak@redhat.com>
+Date: Fri, 21 Feb 2014 15:54:09 +0100
+Subject: [PATCH 28/32] Make paths in the systemd services configurable
+
+The path to a binary depends on configuration, therefore it is better to
+not use hard coded strings.
+
+Signed-off-by: Jakub Filak <jfilak@redhat.com>
+Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
+---
+ Makefile.am                |   15 ++++++++++++++-
+ misc/ras-mc-ctl.service    |   10 ----------
+ misc/ras-mc-ctl.service.in |   10 ++++++++++
+ misc/rasdaemon.service     |   10 ----------
+ misc/rasdaemon.service.in  |   10 ++++++++++
+ 5 files changed, 34 insertions(+), 21 deletions(-)
+ delete mode 100644 misc/ras-mc-ctl.service
+ create mode 100644 misc/ras-mc-ctl.service.in
+ delete mode 100644 misc/rasdaemon.service
+ create mode 100644 misc/rasdaemon.service.in
+
+diff --git a/Makefile.am b/Makefile.am
+index c1668b4..0fa615f 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1,6 +1,19 @@
+ ACLOCAL_AMFLAGS=-I m4
+ SUBDIRS = libtrace util man
+-EXTRA_DIST = misc/rasdaemon.service misc/ras-mc-ctl.service
++SYSTEMD_SERVICES_IN = misc/rasdaemon.service.in misc/ras-mc-ctl.service.in
++SYSTEMD_SERVICES = $(SYSTEMD_SERVICES_IN:.service.in=.service)
++EXTRA_DIST = $(SYSTEMD_SERVICES_IN)
++
++# This rule is needed because \@sbindir\@ is expanded to \${exec_prefix\}/sbin
++# during ./configure phase, therefore it is not possible to add .service.in
++# files to AC_CONFIG_FILES in configure.ac
++SUFFIXES = .service.in .service
++.service.in.service:
++	sed -e s,\@sbindir\@,$(sbindir),g $< > $@
++
++# This rule is needed because the service files must be generated on target
++# system after ./configure phase
++all-local: $(SYSTEMD_SERVICES)
+ 
+ sbin_PROGRAMS = rasdaemon
+ rasdaemon_SOURCES = rasdaemon.c ras-events.c ras-mc-handler.c \
+diff --git a/misc/ras-mc-ctl.service b/misc/ras-mc-ctl.service
+deleted file mode 100644
+index 8a09508..0000000
+--- a/misc/ras-mc-ctl.service
++++ /dev/null
+@@ -1,10 +0,0 @@
+-[Unit]
+-Description=Initialize EDAC v3.0.0 Drivers For Machine Hardware
+-
+-[Service]
+-Type=oneshot
+-ExecStart=/usr/sbin/ras-mc-ctl --register-labels
+-RemainAfterExit=yes
+-
+-[Install]
+-WantedBy=multi-user.target
+diff --git a/misc/ras-mc-ctl.service.in b/misc/ras-mc-ctl.service.in
+new file mode 100644
+index 0000000..8cb3651
+--- /dev/null
++++ b/misc/ras-mc-ctl.service.in
+@@ -0,0 +1,10 @@
++[Unit]
++Description=Initialize EDAC v3.0.0 Drivers For Machine Hardware
++
++[Service]
++Type=oneshot
++ExecStart=@sbindir@/ras-mc-ctl --register-labels
++RemainAfterExit=yes
++
++[Install]
++WantedBy=multi-user.target
+diff --git a/misc/rasdaemon.service b/misc/rasdaemon.service
+deleted file mode 100644
+index 36cdef5..0000000
+--- a/misc/rasdaemon.service
++++ /dev/null
+@@ -1,10 +0,0 @@
+-[Unit]
+-Description=RAS daemon to log the RAS events
+-After=syslog.target
+-
+-[Service]
+-ExecStart=/usr/local/sbin/rasdaemon -f
+-Restart=on-abort
+-
+-[Install]
+-WantedBy=multi-user.target
+diff --git a/misc/rasdaemon.service.in b/misc/rasdaemon.service.in
+new file mode 100644
+index 0000000..5e1f375
+--- /dev/null
++++ b/misc/rasdaemon.service.in
+@@ -0,0 +1,10 @@
++[Unit]
++Description=RAS daemon to log the RAS events
++After=syslog.target
++
++[Service]
++ExecStart=@sbindir@/rasdaemon -f
++Restart=on-abort
++
++[Install]
++WantedBy=multi-user.target
+-- 
+1.7.1
+
diff --git a/SOURCES/0031-Correct-ABRT-report-data.patch b/SOURCES/0031-Correct-ABRT-report-data.patch
new file mode 100644
index 0000000..fabb7ac
--- /dev/null
+++ b/SOURCES/0031-Correct-ABRT-report-data.patch
@@ -0,0 +1,118 @@
+From d7453479e96693ebb5e17b285adf915b67095aad Mon Sep 17 00:00:00 2001
+From: Jakub Filak <jfilak@redhat.com>
+Date: Wed, 2 Apr 2014 15:03:44 +0200
+Subject: [PATCH 31/32] Correct ABRT report data
+
+Remove '\0' byte from 'PUT' message because this was superfluous.
+
+Replaced 'BASENAME' item with 'TYPE' item because the first one is no
+longer supported by abrtd and the second one is required. Basically the
+later is a substitute for the first one.
+
+Removed the closing message which is not supported by abrtd. abrtd
+considers that message as a part of the problem report.
+
+Removed a superfluous space from 'Backtrace'.
+
+Signed-off-by: Jakub Filak <jfilak@redhat.com>
+Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
+---
+ ras-report.c |   41 ++++-------------------------------------
+ 1 files changed, 4 insertions(+), 37 deletions(-)
+
+diff --git a/ras-report.c b/ras-report.c
+index d3e4a79..0a05732 100644
+--- a/ras-report.c
++++ b/ras-report.c
+@@ -51,8 +51,8 @@ static int commit_report_basic(int sockfd){
+ 	 * ABRT server protocol
+ 	 */
+ 	sprintf(buf, "PUT / HTTP/1.1\r\n\r\n");
+-	rc = write(sockfd, buf, strlen(buf) + 1);
+-	if(rc < strlen(buf) + 1){
++	rc = write(sockfd, buf, strlen(buf));
++	if(rc < strlen(buf)){
+ 		return -1;
+ 	}
+ 
+@@ -68,7 +68,7 @@ static int commit_report_basic(int sockfd){
+ 		return -1;
+ 	}
+ 
+-	sprintf(buf, "BASENAME=%s", "rasdaemon");
++	sprintf(buf, "TYPE=%s", "ras");
+ 	rc = write(sockfd, buf, strlen(buf) + 1);
+ 	if(rc < strlen(buf) + 1){
+ 		return -1;
+@@ -77,31 +77,13 @@ static int commit_report_basic(int sockfd){
+ 	return 0;
+ }
+ 
+-/*
+- *  add "DONE" string to finish message.
+- */
+-static int commit_report_done(int sockfd){
+-	int rc = -1;
+-
+-	if(sockfd < 0){
+-		return -1;
+-	}
+-
+-	rc = write(sockfd, "DONE\0", strlen("DONE\0"));
+-	if(rc < strlen("DONE\0")){
+-		return -1;
+-	}
+-
+-	return 0;
+-}
+-
+ static int set_mc_event_backtrace(char *buf, struct ras_mc_event *ev){
+ 	char bt_buf[MAX_BACKTRACE_SIZE];
+ 
+ 	if(!buf || !ev)
+ 		return -1;
+ 
+-	sprintf(bt_buf, "BACKTRACE= "	\
++	sprintf(bt_buf, "BACKTRACE="	\
+ 						"timestamp=%s\n"	\
+ 						"error_count=%d\n"	\
+ 						"error_type=%s\n"	\
+@@ -298,11 +280,6 @@ int ras_report_mc_event(struct ras_events *ras, struct ras_mc_event *ev){
+ 		goto mc_fail;
+ 	}
+ 
+-	rc = commit_report_done(sockfd);
+-	if(rc < 0){
+-		goto mc_fail;
+-	}
+-
+ 	done = 1;
+ 
+ mc_fail:
+@@ -353,11 +330,6 @@ int ras_report_aer_event(struct ras_events *ras, struct ras_aer_event *ev){
+ 		goto aer_fail;
+ 	}
+ 
+-	rc = commit_report_done(sockfd);
+-	if(rc < 0){
+-		goto aer_fail;
+-	}
+-
+ 	done = 1;
+ 
+ aer_fail:
+@@ -408,11 +380,6 @@ int ras_report_mce_event(struct ras_events *ras, struct mce_event *ev){
+ 		goto mce_fail;
+ 	}
+ 
+-	rc = commit_report_done(sockfd);
+-	if(rc < 0){
+-		goto mce_fail;
+-	}
+-
+ 	done = 1;
+ 
+ mce_fail:
+-- 
+1.7.1
+
diff --git a/SOURCES/0032-rasdaemon-handle-failures-of-snprintf.patch b/SOURCES/0032-rasdaemon-handle-failures-of-snprintf.patch
new file mode 100644
index 0000000..d78e521
--- /dev/null
+++ b/SOURCES/0032-rasdaemon-handle-failures-of-snprintf.patch
@@ -0,0 +1,43 @@
+From 59f6c44864f914a189cb924dd8fea14cc314bf3f Mon Sep 17 00:00:00 2001
+From: Aristeu Rozanski <arozansk@redhat.com>
+Date: Mon, 23 Jun 2014 15:43:41 -0400
+Subject: [PATCH 1/2] rasdaemon: handle failures of snprintf()
+
+Florian Weimer found that in bitfield_msg() the return value of
+snprintf() is used to calculate length ignoring that it can return a
+negative number. This patch makes bitfield_msg() to stop writing in such
+case.
+
+Reference: https://bugzilla.redhat.com/show_bug.cgi?id=1035741
+
+Reported-by: Florian Weimer <fweimer@redhat.com>
+Signed-off-by: Aristeu Rozanski <arozansk@redhat.com>
+---
+ bitfield.c |    4 ++++
+ 1 files changed, 4 insertions(+), 0 deletions(-)
+
+diff --git a/bitfield.c b/bitfield.c
+index b2895b4..1690f15 100644
+--- a/bitfield.c
++++ b/bitfield.c
+@@ -41,6 +41,8 @@ unsigned bitfield_msg(char *buf, size_t len, const char **bitarray,
+ 		if (status & (1 <<  (i + bit_offset))) {
+ 			if (p != buf) {
+ 				n = snprintf(p, len, ", ");
++				if (n < 0)
++					break;
+ 				len -= n;
+ 				p += n;
+ 			}
+@@ -48,6 +50,8 @@ unsigned bitfield_msg(char *buf, size_t len, const char **bitarray,
+ 				n = snprintf(p, len, "BIT%d", i + bit_offset);
+ 			else
+ 				n = snprintf(p, len, "%s", bitarray[i]);
++			if (n < 0)
++				break;
+ 			len -= n;
+ 			p += n;
+ 		}
+-- 
+1.7.1
+
diff --git a/SOURCES/0033-rasdaemon-correct-range-while-parsing-top-middle-and.patch b/SOURCES/0033-rasdaemon-correct-range-while-parsing-top-middle-and.patch
new file mode 100644
index 0000000..eadb858
--- /dev/null
+++ b/SOURCES/0033-rasdaemon-correct-range-while-parsing-top-middle-and.patch
@@ -0,0 +1,46 @@
+From 5ba31285710e85c7d3688e536cd54180321964e4 Mon Sep 17 00:00:00 2001
+From: Aristeu Rozanski <arozansk@redhat.com>
+Date: Mon, 23 Jun 2014 16:31:50 -0400
+Subject: [PATCH 2/2] rasdaemon: correct range while parsing top, middle and lower layers
+
+{top,middle,lower}_layer are signed char, therefore will never be 255.
+
+Reference: https://bugzilla.redhat.com/show_bug.cgi?id=1035746
+
+Reported-by: Florian Weimer <fweimer@redhat.com>
+Signed-off-by: Aristeu Rozanski <arozansk@redhat.com>
+---
+ ras-mc-handler.c |   14 +++-----------
+ 1 file changed, 3 insertions(+), 11 deletions(-)
+
+--- upstream.orig/ras-mc-handler.c	2014-06-26 16:09:30.000000000 -0400
++++ upstream/ras-mc-handler.c	2014-06-26 16:09:32.000000000 -0400
+@@ -120,25 +120,17 @@ if (pevent_get_field_val(s,  event, "mc_
+ 	if (pevent_get_field_val(s,  event, "top_layer", record, &val, 1) < 0)
+ 		goto parse_error;
+ 	parsed_fields++;
++	ev.top_layer = (signed char) val;
+ 
+-	ev.top_layer = (int) val;
+ 	if (pevent_get_field_val(s,  event, "middle_layer", record, &val, 1) < 0)
+ 		goto parse_error;
+ 	parsed_fields++;
++	ev.middle_layer = (signed char) val;
+ 
+-	ev.middle_layer = (int) val;
+ 	if (pevent_get_field_val(s,  event, "lower_layer", record, &val, 1) < 0)
+ 		goto parse_error;
+ 	parsed_fields++;
+-
+-	ev.lower_layer = (int) val;
+-
+-	if (ev.top_layer == 255)
+-		ev.top_layer = -1;
+-	if (ev.middle_layer == 255)
+-		ev.middle_layer = -1;
+-	if (ev.lower_layer == 255)
+-		ev.lower_layer = -1;
++	ev.lower_layer = (signed char) val;
+ 
+ 	if (ev.top_layer >= 0 || ev.middle_layer >= 0 || ev.lower_layer >= 0) {
+ 		if (ev.lower_layer >= 0)
diff --git a/SOURCES/0034-rasdaemon-enable-recording-by-default.patch b/SOURCES/0034-rasdaemon-enable-recording-by-default.patch
new file mode 100644
index 0000000..6a4c6b7
--- /dev/null
+++ b/SOURCES/0034-rasdaemon-enable-recording-by-default.patch
@@ -0,0 +1,17 @@
+---
+ misc/rasdaemon.service.in |    4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+--- upstream.orig/misc/rasdaemon.service.in	2014-06-04 14:25:13.000000000 -0400
++++ upstream/misc/rasdaemon.service.in	2014-07-08 14:37:26.421395520 -0400
+@@ -3,7 +3,9 @@ Description=RAS daemon to log the RAS ev
+ After=syslog.target
+ 
+ [Service]
+-ExecStart=@sbindir@/rasdaemon -f
++ExecStart=@sbindir@/rasdaemon -f -r
++ExecStartPost=@sbindir@/rasdaemon --enable
++ExecStop=@sbindir@/rasdaemon --disable
+ Restart=on-abort
+ 
+ [Install]
diff --git a/SOURCES/0035-eMCA-support.patch b/SOURCES/0035-eMCA-support.patch
new file mode 100644
index 0000000..8d952ef
--- /dev/null
+++ b/SOURCES/0035-eMCA-support.patch
@@ -0,0 +1,807 @@
+commit 38d48ed48f9d0baa20786d98abe2b4085fca7d5d
+Author: Luck, Tony <tony.luck@intel.com>
+Date:   Mon Aug 4 13:29:01 2014 -0700
+
+    rasdaemon: Add support for extlog trace events
+    
+    Linux kernel 3.17 includes a new trace event to pick up extended
+    error logs produced by BIOS in the Common Platform Error Record
+    format described in appendix N of the UEFI standard. This patch
+    adds support to collect that information and log it both in
+    readable ASCII and into the sqlite3 database that rasdaemon
+    uses to store all error information.  In addition ras-mc-ctl
+    is updated to query that database for both detailed and summary
+    reports.
+    
+    Big thanks to Aristeu for pretty much all the sqlite3 pieces,
+    plus testing and fixing miscellaneous issues elsewhere.
+    
+    Signed-off-by: Tony Luck <tony.luck@intel.com>
+    Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
+
+diff --git a/Makefile.am b/Makefile.am
+index 0fa615f..117c970 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -30,13 +30,17 @@ if WITH_MCE
+ 			mce-intel-dunnington.c mce-intel-tulsa.c \
+ 			mce-intel-sb.c mce-intel-ivb.c
+ endif
++if WITH_EXTLOG
++   rasdaemon_SOURCES += ras-extlog-handler.c
++endif
+ if WITH_ABRT_REPORT
+    rasdaemon_SOURCES += ras-report.c
+ endif
+ rasdaemon_LDADD = -lpthread $(SQLITE3_LIBS) libtrace/libtrace.a
+ 
+ include_HEADERS = config.h  ras-events.h  ras-logger.h  ras-mc-handler.h \
+-		  ras-aer-handler.h ras-mce-handler.h ras-record.h bitfield.h ras-report.h
++		  ras-aer-handler.h ras-mce-handler.h ras-record.h bitfield.h ras-report.h \
++		  ras-extlog-handler.h
+ 
+ # This rule can't be called with more than one Makefile job (like make -j8)
+ # I can't figure out a way to fix that
+diff --git a/configure.ac b/configure.ac
+index 64a5b13..9495491 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -53,6 +53,15 @@ AS_IF([test "x$enable_mce" = "xyes"], [
+ ])
+ AM_CONDITIONAL([WITH_MCE], [test x$enable_mce = xyes])
+ 
++AC_ARG_ENABLE([extlog],
++    AS_HELP_STRING([--enable-extlog], [enable EXTLOG events (currently experimental)]))
++
++AS_IF([test "x$enable_extlog" = "xyes"], [
++  AC_DEFINE(HAVE_EXTLOG,1,"have EXTLOG events collect")
++  AC_SUBST([WITH_EXTLOG])
++])
++AM_CONDITIONAL([WITH_EXTLOG], [test x$enable_extlog = xyes])
++
+ AC_ARG_ENABLE([abrt_report],
+     AS_HELP_STRING([--enable-abrt-report], [enable report event to ABRT (currently experimental)]))
+ 
+diff --git a/ras-aer-handler.c b/ras-aer-handler.c
+index 50526af..bb7c0b9 100644
+--- a/ras-aer-handler.c
++++ b/ras-aer-handler.c
+@@ -70,7 +70,7 @@ int ras_aer_event_handler(struct trace_seq *s,
+ 	 */
+ 
+ 	if (ras->use_uptime)
+-		now = record->ts/1000000000L + ras->uptime_diff;
++		now = record->ts/user_hz + ras->uptime_diff;
+ 	else
+ 		now = time(NULL);
+ 
+diff --git a/ras-events.c b/ras-events.c
+index ecbbd3a..0be7c3f 100644
+--- a/ras-events.c
++++ b/ras-events.c
+@@ -30,6 +30,7 @@
+ #include "ras-mc-handler.h"
+ #include "ras-aer-handler.h"
+ #include "ras-mce-handler.h"
++#include "ras-extlog-handler.h"
+ #include "ras-record.h"
+ #include "ras-logger.h"
+ 
+@@ -203,6 +204,10 @@ int toggle_ras_mc_event(int enable)
+ 	rc |= __toggle_ras_mc_event(ras, "mce", "mce_record", enable);
+ #endif
+ 
++#ifdef HAVE_EXTLOG
++	rc |= __toggle_ras_mc_event(ras, "ras", "extlog_mem_event", enable);
++#endif
++
+ free_ras:
+ 	free(ras);
+ 	return rc;
+@@ -688,6 +693,19 @@ int handle_ras_events(int record_events)
+ 		    "mce", "mce_record");
+ 	}
+ #endif
++
++#ifdef HAVE_EXTLOG
++	rc = add_event_handler(ras, pevent, page_size, "ras", "extlog_mem_event",
++			       ras_extlog_mem_event_handler);
++	if (!rc) {
++		/* tell kernel we are listening, so don't printk to console */
++		(void)open("/sys/kernel/debug/ras/daemon_active", 0);
++		num_events++;
++	} else
++		log(ALL, LOG_ERR, "Can't get traces from %s:%s\n",
++		    "ras", "aer_event");
++#endif
++
+ 	if (!num_events) {
+ 		log(ALL, LOG_INFO,
+ 		    "Failed to trace all supported RAS events. Aborting.\n");
+diff --git a/ras-extlog-handler.c b/ras-extlog-handler.c
+new file mode 100644
+index 0000000..5fd3580
+--- /dev/null
++++ b/ras-extlog-handler.c
+@@ -0,0 +1,246 @@
++/*
++ * Copyright (C) 2014 Tony Luck <tony.luck@intel.com>
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 2 of the License, or
++ * (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
++*/
++#include <ctype.h>
++#include <errno.h>
++#include <stdio.h>
++#include <stdlib.h>
++#include <string.h>
++#include <unistd.h>
++#include <stdint.h>
++#include "libtrace/kbuffer.h"
++#include "ras-extlog-handler.h"
++#include "ras-record.h"
++#include "ras-logger.h"
++#include "ras-report.h"
++
++static char *err_type(int etype)
++{
++	switch (etype) {
++	case 0: return "unknown";
++	case 1: return "no error";
++	case 2: return "single-bit ECC";
++	case 3: return "multi-bit ECC";
++	case 4: return "single-symbol chipkill ECC";
++	case 5: return "multi-symbol chipkill ECC";
++	case 6: return "master abort";
++	case 7: return "target abort";
++	case 8: return "parity error";
++	case 9: return "watchdog timeout";
++	case 10: return "invalid address";
++	case 11: return "mirror Broken";
++	case 12: return "memory sparing";
++	case 13: return "scrub corrected error";
++	case 14: return "scrub uncorrected error";
++	case 15: return "physical memory map-out event";
++	}
++	return "unknown-type";
++}
++
++static char *err_severity(int severity)
++{
++	switch (severity) {
++	case 0: return "recoverable";
++	case 1: return "fatal";
++	case 2: return "corrected";
++	case 3: return "informational";
++	}
++	return "unknown-severity";
++}
++
++static unsigned long long err_mask(int lsb)
++{
++	if (lsb == 0xff)
++		return ~0ull;
++	return ~((1ull << lsb) - 1);
++}
++
++#define CPER_MEM_VALID_NODE			0x0008
++#define CPER_MEM_VALID_CARD			0x0010
++#define CPER_MEM_VALID_MODULE			0x0020
++#define CPER_MEM_VALID_BANK			0x0040
++#define CPER_MEM_VALID_DEVICE			0x0080
++#define CPER_MEM_VALID_ROW			0x0100
++#define CPER_MEM_VALID_COLUMN			0x0200
++#define CPER_MEM_VALID_BIT_POSITION		0x0400
++#define CPER_MEM_VALID_REQUESTOR_ID		0x0800
++#define CPER_MEM_VALID_RESPONDER_ID		0x1000
++#define CPER_MEM_VALID_TARGET_ID		0x2000
++#define CPER_MEM_VALID_RANK_NUMBER		0x8000
++#define CPER_MEM_VALID_CARD_HANDLE		0x10000
++#define CPER_MEM_VALID_MODULE_HANDLE		0x20000
++
++struct cper_mem_err_compact {
++	unsigned long long	validation_bits;
++	unsigned short		node;
++	unsigned short		card;
++	unsigned short		module;
++	unsigned short		bank;
++	unsigned short		device;
++	unsigned short		row;
++	unsigned short		column;
++	unsigned short		bit_pos;
++	unsigned long long	requestor_id;
++	unsigned long long	responder_id;
++	unsigned long long	target_id;
++	unsigned short		rank;
++	unsigned short		mem_array_handle;
++	unsigned short		mem_dev_handle;
++};
++
++static char *err_cper_data(const char *c)
++{
++	const struct cper_mem_err_compact *cpd = (struct cper_mem_err_compact *)c;
++	static char buf[256];
++	char *p = buf;
++
++	if (cpd->validation_bits == 0)
++		return "";
++	p += sprintf(p, " (");
++	if (cpd->validation_bits & CPER_MEM_VALID_NODE)
++		p += sprintf(p, "node: %d ", cpd->node);
++	if (cpd->validation_bits & CPER_MEM_VALID_CARD)
++		p += sprintf(p, "card: %d ", cpd->card);
++	if (cpd->validation_bits & CPER_MEM_VALID_MODULE)
++		p += sprintf(p, "module: %d ", cpd->module);
++	if (cpd->validation_bits & CPER_MEM_VALID_BANK)
++		p += sprintf(p, "bank: %d ", cpd->bank);
++	if (cpd->validation_bits & CPER_MEM_VALID_DEVICE)
++		p += sprintf(p, "device: %d ", cpd->device);
++	if (cpd->validation_bits & CPER_MEM_VALID_ROW)
++		p += sprintf(p, "row: %d ", cpd->row);
++	if (cpd->validation_bits & CPER_MEM_VALID_COLUMN)
++		p += sprintf(p, "column: %d ", cpd->column);
++	if (cpd->validation_bits & CPER_MEM_VALID_BIT_POSITION)
++		p += sprintf(p, "bit_pos: %d ", cpd->bit_pos);
++	if (cpd->validation_bits & CPER_MEM_VALID_REQUESTOR_ID)
++		p += sprintf(p, "req_id: 0x%llx ", cpd->requestor_id);
++	if (cpd->validation_bits & CPER_MEM_VALID_RESPONDER_ID)
++		p += sprintf(p, "resp_id: 0x%llx ", cpd->responder_id);
++	if (cpd->validation_bits & CPER_MEM_VALID_TARGET_ID)
++		p += sprintf(p, "tgt_id: 0x%llx ", cpd->target_id);
++	if (cpd->validation_bits & CPER_MEM_VALID_RANK_NUMBER)
++		p += sprintf(p, "rank: %d ", cpd->rank);
++	if (cpd->validation_bits & CPER_MEM_VALID_CARD_HANDLE)
++		p += sprintf(p, "card_handle: %d ", cpd->mem_array_handle);
++	if (cpd->validation_bits & CPER_MEM_VALID_MODULE_HANDLE)
++		p += sprintf(p, "module_handle: %d ", cpd->mem_dev_handle);
++	p += sprintf(p-1, ")");
++
++	return buf;
++}
++
++static char *uuid_le(const char *uu)
++{
++	static char uuid[sizeof("xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx")];
++	char *p = uuid;
++	int i;
++	static const unsigned char le[16] = {3,2,1,0,5,4,7,6,8,9,10,11,12,13,14,15};
++
++	for (i = 0; i < 16; i++) {
++		p += sprintf(p, "%.2x", uu[le[i]]);
++		switch (i) {
++		case 3:
++		case 5:
++		case 7:
++		case 9:
++			*p++ = '-';
++			break;
++		}
++	}
++
++	*p = 0;
++
++	return uuid;
++}
++
++
++static void report_extlog_mem_event(struct ras_events *ras,
++				    struct pevent_record *record,
++				    struct trace_seq *s,
++				    struct ras_extlog_event *ev)
++{
++	trace_seq_printf(s, "%d %s error: %s physical addr: 0x%llx mask: 0x%llx%s %s %s",
++		ev->error_seq, err_severity(ev->severity),
++		err_type(ev->etype), ev->address,
++		err_mask(ev->pa_mask_lsb),
++		err_cper_data(ev->cper_data),
++		ev->fru_text,
++		uuid_le(ev->fru_id));
++}
++
++int ras_extlog_mem_event_handler(struct trace_seq *s,
++			  struct pevent_record *record,
++			  struct event_format *event, void *context)
++{
++	int len;
++	unsigned long long val;
++	struct ras_events *ras = context;
++	time_t now;
++	struct tm *tm;
++	struct ras_extlog_event ev;
++
++	/*
++	 * Newer kernels (3.10-rc1 or upper) provide an uptime clock.
++	 * On previous kernels, the way to properly generate an event would
++	 * be to inject a fake one, measure its timestamp and diff it against
++	 * gettimeofday. We won't do it here. Instead, let's use uptime,
++	 * falling-back to the event report's time, if "uptime" clock is
++	 * not available (legacy kernels).
++	 */
++
++	if (ras->use_uptime)
++		now = record->ts/user_hz + ras->uptime_diff;
++	else
++		now = time(NULL);
++
++	tm = localtime(&now);
++	if (tm)
++		strftime(ev.timestamp, sizeof(ev.timestamp),
++			 "%Y-%m-%d %H:%M:%S %z", tm);
++	trace_seq_printf(s, "%s ", ev.timestamp);
++
++	if (pevent_get_field_val(s,  event, "etype", record, &val, 1) < 0)
++		return -1;
++	ev.etype = val;
++	if (pevent_get_field_val(s,  event, "err_seq", record, &val, 1) < 0)
++		return -1;
++	ev.error_seq = val;
++	if (pevent_get_field_val(s,  event, "sev", record, &val, 1) < 0)
++		return -1;
++	ev.severity = val;
++	if (pevent_get_field_val(s,  event, "pa", record, &val, 1) < 0)
++		return -1;
++	ev.address = val;
++	if (pevent_get_field_val(s,  event, "pa_mask_lsb", record, &val, 1) < 0)
++		return -1;
++	ev.pa_mask_lsb = val;
++
++	ev.cper_data = pevent_get_field_raw(s, event, "data",
++					   record, &len, 1);
++	ev.cper_data_length = len;
++	ev.fru_text = pevent_get_field_raw(s, event, "fru_text",
++					   record, &len, 1);
++	ev.fru_id = pevent_get_field_raw(s, event, "fru_id",
++					   record, &len, 1);
++
++	report_extlog_mem_event(ras, record, s, &ev);
++
++	ras_store_extlog_mem_record(ras, &ev);
++
++	return 0;
++}
+diff --git a/ras-extlog-handler.h b/ras-extlog-handler.h
+new file mode 100644
+index 0000000..54e8cec
+--- /dev/null
++++ b/ras-extlog-handler.h
+@@ -0,0 +1,31 @@
++/*
++ * Copyright (C) 2014 Tony Luck <tony.luck@intel.com>
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 2 of the License, or
++ * (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
++*/
++
++#ifndef __RAS_EXTLOG_HANDLER_H
++#define __RAS_EXTLOG_HANDLER_H
++
++#include <stdint.h>
++
++#include "ras-events.h"
++#include "libtrace/event-parse.h"
++
++extern int ras_extlog_mem_event_handler(struct trace_seq *s,
++			  struct pevent_record *record,
++			  struct event_format *event, void *context);
++
++#endif
+diff --git a/ras-mc-handler.c b/ras-mc-handler.c
+index ffb3805..704a41c 100644
+--- a/ras-mc-handler.c
++++ b/ras-mc-handler.c
+@@ -47,7 +47,7 @@ int ras_mc_event_handler(struct trace_seq *s,
+ 	 */
+ 
+ 	if (ras->use_uptime)
+-		now = record->ts/1000000000L + ras->uptime_diff;
++		now = record->ts/user_hz + ras->uptime_diff;
+ 	else
+ 		now = time(NULL);
+ 
+diff --git a/ras-mce-handler.c b/ras-mce-handler.c
+index 1431049..a1d0b5d 100644
+--- a/ras-mce-handler.c
++++ b/ras-mce-handler.c
+@@ -237,7 +237,7 @@ static void report_mce_event(struct ras_events *ras,
+ 	 */
+ 
+ 	if (ras->use_uptime)
+-		now = record->ts/1000000000L + ras->uptime_diff;
++		now = record->ts/user_hz + ras->uptime_diff;
+ 	else
+ 		now = time(NULL);
+ 
+diff --git a/ras-record.c b/ras-record.c
+index e5150ad..3dc4493 100644
+--- a/ras-record.c
++++ b/ras-record.c
+@@ -157,6 +157,57 @@ int ras_store_aer_event(struct ras_events *ras, struct ras_aer_event *ev)
+ }
+ #endif
+ 
++#ifdef HAVE_EXTLOG
++static const struct db_fields extlog_event_fields[] = {
++		{ .name="id",			.type="INTEGER PRIMARY KEY" },
++		{ .name="timestamp",		.type="TEXT" },
++		{ .name="etype",		.type="INTEGER" },
++		{ .name="error_count",		.type="INTEGER" },
++		{ .name="severity",		.type="INTEGER" },
++		{ .name="address",		.type="INTEGER" },
++		{ .name="fru_id",		.type="BLOB" },
++		{ .name="fru_text",		.type="TEXT" },
++		{ .name="cper_data",		.type="BLOB" },
++};
++
++static const struct db_table_descriptor extlog_event_tab = {
++	.name = "extlog_event",
++	.fields = extlog_event_fields,
++	.num_fields = ARRAY_SIZE(extlog_event_fields),
++};
++
++int ras_store_extlog_mem_record(struct ras_events *ras, struct ras_extlog_event *ev)
++{
++	int rc;
++	struct sqlite3_priv *priv = ras->db_priv;
++
++	if (!priv || !priv->stmt_extlog_record)
++		return 0;
++	log(TERM, LOG_INFO, "extlog_record store: %p\n", priv->stmt_extlog_record);
++
++	sqlite3_bind_text  (priv->stmt_extlog_record,  1, ev->timestamp, -1, NULL);
++	sqlite3_bind_int   (priv->stmt_extlog_record,  2, ev->etype);
++	sqlite3_bind_int   (priv->stmt_extlog_record,  3, ev->error_seq);
++	sqlite3_bind_int   (priv->stmt_extlog_record,  4, ev->severity);
++	sqlite3_bind_int64 (priv->stmt_extlog_record,  5, ev->address);
++	sqlite3_bind_blob  (priv->stmt_extlog_record,  6, ev->fru_id, 16, NULL);
++	sqlite3_bind_text  (priv->stmt_extlog_record,  7, ev->fru_text, -1, NULL);
++	sqlite3_bind_blob  (priv->stmt_extlog_record,  8, ev->cper_data, ev->cper_data_length, NULL);
++
++	rc = sqlite3_step(priv->stmt_extlog_record);
++	if (rc != SQLITE_OK && rc != SQLITE_DONE)
++		log(TERM, LOG_ERR,
++		    "Failed to do extlog_mem_record step on sqlite: error = %d\n", rc);
++	rc = sqlite3_reset(priv->stmt_extlog_record);
++	if (rc != SQLITE_OK && rc != SQLITE_DONE)
++		log(TERM, LOG_ERR,
++		    "Failed reset extlog_mem_record on sqlite: error = %d\n",
++		    rc);
++	log(TERM, LOG_INFO, "register inserted at db\n");
++
++	return rc;
++}
++#endif
+ 
+ /*
+  * Table and functions to handle mce:mce_record
+@@ -385,6 +436,13 @@ int ras_mc_event_opendb(unsigned cpu, struct ras_events *ras)
+ 					 &aer_event_tab);
+ #endif
+ 
++#ifdef HAVE_EXTLOG
++	rc = ras_mc_create_table(priv, &extlog_event_tab);
++	if (rc == SQLITE_OK)
++		rc = ras_mc_prepare_stmt(priv, &priv->stmt_extlog_record,
++					 &extlog_event_tab);
++#endif
++
+ #ifdef HAVE_MCE
+ 	rc = ras_mc_create_table(priv, &mce_record_tab);
+ 	if (rc == SQLITE_OK)
+diff --git a/ras-record.h b/ras-record.h
+index 6f146a8..5d84297 100644
+--- a/ras-record.h
++++ b/ras-record.h
+@@ -19,8 +19,11 @@
+ #ifndef __RAS_RECORD_H
+ #define __RAS_RECORD_H
+ 
++#include <stdint.h>
+ #include "config.h"
+ 
++extern long user_hz;
++
+ struct ras_events *ras;
+ 
+ struct ras_mc_event {
+@@ -40,8 +43,22 @@ struct ras_aer_event {
+ 	const char *msg;
+ };
+ 
++struct ras_extlog_event {
++	char timestamp[64];
++	int32_t error_seq;
++	int8_t etype;
++	int8_t severity;
++	unsigned long long address;
++	int8_t pa_mask_lsb;
++	const char *fru_id;
++	const char *fru_text;
++	const char *cper_data;
++	unsigned short cper_data_length;
++};
++
+ struct ras_mc_event;
+ struct ras_aer_event;
++struct ras_extlog_event;
+ struct mce_event;
+ 
+ #ifdef HAVE_SQLITE3
+@@ -57,18 +74,23 @@ struct sqlite3_priv {
+ #ifdef HAVE_MCE
+ 	sqlite3_stmt	*stmt_mce_record;
+ #endif
++#ifdef HAVE_EXTLOG
++	sqlite3_stmt	*stmt_extlog_record;
++#endif
+ };
+ 
+ int ras_mc_event_opendb(unsigned cpu, struct ras_events *ras);
+ int ras_store_mc_event(struct ras_events *ras, struct ras_mc_event *ev);
+ int ras_store_aer_event(struct ras_events *ras, struct ras_aer_event *ev);
+ int ras_store_mce_record(struct ras_events *ras, struct mce_event *ev);
++int ras_store_extlog_mem_record(struct ras_events *ras, struct ras_extlog_event *ev);
+ 
+ #else
+ static inline int ras_mc_event_opendb(unsigned cpu, struct ras_events *ras) { return 0; };
+ static inline int ras_store_mc_event(struct ras_events *ras, struct ras_mc_event *ev) { return 0; };
+ static inline int ras_store_aer_event(struct ras_events *ras, struct ras_aer_event *ev) { return 0; };
+ static inline int ras_store_mce_record(struct ras_events *ras, struct mce_event *ev) { return 0; };
++static inline int ras_store_extlog_mem_record(struct ras_events *ras, struct ras_extlog_event *ev) { return 0; };
+ 
+ #endif
+ 
+diff --git a/rasdaemon.c b/rasdaemon.c
+index 85ac2d4..41022ef 100644
+--- a/rasdaemon.c
++++ b/rasdaemon.c
+@@ -68,6 +68,8 @@ static error_t parse_opt(int k, char *arg, struct argp_state *state)
+ 	return 0;
+ }
+ 
++long user_hz;
++
+ int main(int argc, char *argv[])
+ {
+ 	struct arguments args;
+@@ -91,6 +93,8 @@ int main(int argc, char *argv[])
+ 	};
+ 	memset (&args, 0, sizeof(args));
+ 
++	user_hz = sysconf(_SC_CLK_TCK);
++
+ 	argp_parse(&argp, argc, argv, 0,  &idx, &args);
+ 
+ 	if (idx < 0) {
+diff --git a/util/ras-mc-ctl.in b/util/ras-mc-ctl.in
+index e9f9c59..110262f 100755
+--- a/util/ras-mc-ctl.in
++++ b/util/ras-mc-ctl.in
+@@ -842,11 +842,141 @@ sub find_prog
+     return "";
+ }
+ 
++sub get_extlog_type
++{
++    my @types;
++
++    if ($_[0] < 0 || $_[0] > 15) {
++        return "unknown-type";
++    }
++
++    @types = ("unknown",
++              "no error",
++              "single-bit ECC",
++              "multi-bit ECC",
++              "single-symbol chipkill ECC",
++              "multi-symbol chipkill ECC",
++              "master abort",
++              "target abort",
++              "parity error",
++              "watchdog timeout",
++              "invalid address",
++              "mirror Broken",
++              "memory sparing",
++              "scrub corrected error",
++              "scrub uncorrected error",
++              "physical memory map-out event",
++              "unknown-type");
++    return $types[$_[0]];
++}
++
++sub get_extlog_severity
++{
++    my @sev;
++
++    if ($_[0] < 0 || $_[0] > 3) {
++        return "unknown-severity";
++    }
++
++    @sev = ("recoverable",
++            "fatal",
++            "corrected",
++            "informational",
++            "unknown-severity");
++    return $sev[$_[0]];
++}
++
++use constant {
++    CPER_MEM_VALID_NODE => 0x0008,
++    CPER_MEM_VALID_CARD => 0x0010,
++    CPER_MEM_VALID_MODULE => 0x0020,
++    CPER_MEM_VALID_BANK => 0x0040,
++    CPER_MEM_VALID_DEVICE => 0x0080,
++    CPER_MEM_VALID_ROW => 0x0100,
++    CPER_MEM_VALID_COLUMN => 0x0200,
++    CPER_MEM_VALID_BIT_POSITION => 0x0400,
++    CPER_MEM_VALID_REQUESTOR_ID => 0x0800,
++    CPER_MEM_VALID_RESPONDER_ID => 0x1000,
++    CPER_MEM_VALID_TARGET_ID => 0x2000,
++    CPER_MEM_VALID_ERROR_TYPE => 0x4000,
++    CPER_MEM_VALID_RANK_NUMBER => 0x8000,
++    CPER_MEM_VALID_CARD_HANDLE => 0x10000,
++    CPER_MEM_VALID_MODULE_HANDLE => 0x20000,
++};
++
++sub get_cper_data_text
++{
++    my $cper_data = $_[0];
++    my ($validation_bits, $node, $card, $module, $bank, $device, $row, $column, $bit_pos, $requestor_id, $responder_id, $target_id, $rank, $mem_array_handle, $mem_dev_handle) = unpack 'QSSSSSSSSQQQSSS', $cper_data;
++    my @out;
++
++    if ($validation_bits & CPER_MEM_VALID_NODE) {
++        push @out, (sprintf "node=%d", $node);
++    }
++    if ($validation_bits & CPER_MEM_VALID_CARD) {
++        push @out, (sprintf "card=%d", $card);
++    }
++    if ($validation_bits & CPER_MEM_VALID_MODULE) {
++        push @out, (sprintf "module=%d", $module);
++    }
++    if ($validation_bits & CPER_MEM_VALID_BANK) {
++        push @out, (sprintf "bank=%d", $bank);
++    }
++    if ($validation_bits & CPER_MEM_VALID_DEVICE) {
++        push @out, (sprintf "device=%d", $device);
++    }
++    if ($validation_bits & CPER_MEM_VALID_ROW) {
++        push @out, (sprintf "row=%d", $row);
++    }
++    if ($validation_bits & CPER_MEM_VALID_COLUMN) {
++        push @out, (sprintf "column=%d", $column);
++    }
++    if ($validation_bits & CPER_MEM_VALID_BIT_POSITION) {
++        push @out, (sprintf "bit_position=%d", $bit_pos);
++    }
++    if ($validation_bits & CPER_MEM_VALID_REQUESTOR_ID) {
++        push @out, (sprintf "0x%08x", $requestor_id);
++    }
++    if ($validation_bits & CPER_MEM_VALID_RESPONDER_ID) {
++        push @out, (sprintf "0x%08x", $responder_id);
++    }
++    if ($validation_bits & CPER_MEM_VALID_TARGET_ID) {
++        push @out, (sprintf "0x%08x", $target_id);
++    }
++    if ($validation_bits & CPER_MEM_VALID_RANK_NUMBER) {
++        push @out, (sprintf "rank=%d", $rank);
++    }
++    if ($validation_bits & CPER_MEM_VALID_CARD_HANDLE) {
++        push @out, (sprintf "mem_array_handle=%d", $mem_array_handle);
++    }
++    if ($validation_bits & CPER_MEM_VALID_MODULE_HANDLE) {
++        push @out, (sprintf "mem_dev_handle=%d", $mem_dev_handle);
++    }
++
++    return join (", ", @out);
++}
++
++sub get_uuid_le
++{
++    my $out = "";
++    my @bytes = unpack "C*", $_[0];
++    my @le16_table = (3, 2, 1, 0, 5, 4, 7, 6, 8, 9, 10, 11, 12, 13, 14, 15);
++
++    for (my $i = 0; $i < 16; $i++) {
++        $out .= sprintf "%.2x", $bytes[$le16_table[$i]];
++        if ($i == 3 or $i == 5 or $i == 7 or $i == 9) {
++            $out .= "-";
++        }
++    }
++    return $out;
++}
++
+ sub summary
+ {
+     require DBI;
+     my ($query, $query_handle, $out);
+     my ($err_type, $label, $mc, $top, $mid, $low, $count, $msg);
++    my ($etype, $severity, $etype_string, $severity_string);
+ 
+     my $dbh = DBI->connect("dbi:SQLite:dbname=$dbname", "", "", {});
+ 
+@@ -882,6 +1012,24 @@ sub summary
+     }
+     $query_handle->finish;
+ 
++    # extlog errors
++    $query = "select etype, severity, count(*) from extlog_event group by etype, severity";
++    $query_handle = $dbh->prepare($query);
++    $query_handle->execute();
++    $query_handle->bind_columns(\($etype, $severity, $count));
++    $out = "";
++    while($query_handle->fetch()) {
++        $etype_string = get_extlog_type($etype);
++        $severity_string = get_extlog_severity($severity);
++        $out .= "\t$count $etype_string $severity_string errors\n";
++    }
++    if ($out ne "") {
++        print "Extlog records summary:\n$out";
++    } else {
++        print "No Extlog errors.\n";
++    }
++    $query_handle->finish;
++
+     # MCE mce_record errors
+     $query = "select error_msg, count(*) from mce_record group by error_msg";
+     $query_handle = $dbh->prepare($query);
+@@ -906,6 +1054,7 @@ sub errors
+     require DBI;
+     my ($query, $query_handle, $id, $time, $count, $type, $msg, $label, $mc, $top, $mid, $low, $addr, $grain, $syndrome, $detail, $out);
+     my ($mcgcap,$mcgstatus, $status, $misc, $ip, $tsc, $walltime, $cpu, $cpuid, $apicid, $socketid, $cs, $bank, $cpuvendor, $bank_name, $mcgstatus_msg, $mcistatus_msg, $user_action, $mc_location);
++    my ($timestamp, $etype, $severity, $etype_string, $severity_string, $fru_id, $fru_text, $cper_data);
+ 
+     my $dbh = DBI->connect("dbi:SQLite:dbname=$dbname", "", "", {});
+ 
+@@ -945,6 +1094,31 @@ sub errors
+     }
+     $query_handle->finish;
+ 
++    # Extlog errors
++    $query = "select id, timestamp, etype, severity, address, fru_id, fru_text, cper_data from extlog_event order by id";
++    $query_handle = $dbh->prepare($query);
++    $query_handle->execute();
++    $query_handle->bind_columns(\($id, $timestamp, $etype, $severity, $addr, $fru_id, $fru_text, $cper_data));
++    $out = "";
++    while($query_handle->fetch()) {
++        $etype_string = get_extlog_type($etype);
++        $severity_string = get_extlog_severity($severity);
++        $out .= "$id $timestamp error: ";
++        $out .= "type=$etype_string, ";
++        $out .= "severity=$severity_string, ";
++        $out .= sprintf "address=0x%08x, ", $addr;
++        $out .= sprintf "fru_id=%s, ", get_uuid_le($fru_id);
++        $out .= "fru_text='$fru_text', ";
++        $out .= get_cper_data_text($cper_data) if ($cper_data);
++        $out .= "\n";
++    }
++    if ($out ne "") {
++        print "Extlog events:\n$out\n";
++    } else {
++        print "No Extlog errors.\n\n";
++    }
++    $query_handle->finish;
++
+     # MCE mce_record errors
+     $query = "select id, timestamp, mcgcap, mcgstatus, status, addr, misc, ip, tsc, walltime, cpu, cpuid, apicid, socketid, cs, bank, cpuvendor, bank_name, error_msg, mcgstatus_msg, mcistatus_msg, user_action, mc_location from mce_record order by id";
+     $query_handle = $dbh->prepare($query);
diff --git a/SOURCES/0036-rasdaemon-fix-some-errors-in-sqlite.patch b/SOURCES/0036-rasdaemon-fix-some-errors-in-sqlite.patch
new file mode 100644
index 0000000..35c3636
--- /dev/null
+++ b/SOURCES/0036-rasdaemon-fix-some-errors-in-sqlite.patch
@@ -0,0 +1,37 @@
+commit d3d336471119f16368e40b68643d9dd928be5385
+Author: Luck, Tony <tony.luck@intel.com>
+Date:   Mon Apr 7 12:23:25 2014 -0700
+
+    rasdaemon: fix some typos and cut/paste errors in sqlite bits
+    
+    aer event has the error_type as field 2 and msg as field 3 - but the calls
+    the sqlite3_bind_text use 3 and 4.
+    
+    mce event forgot to declare the "mcastatus_msg"
+    
+    Signed-off-by: Tony Luck <tony.luck@intel.com>
+    Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
+
+diff --git a/ras-record.c b/ras-record.c
+index daa3cb1..e602edb 100644
+--- a/ras-record.c
++++ b/ras-record.c
+@@ -139,8 +139,8 @@ int ras_store_aer_event(struct ras_events *ras, struct ras_aer_event *ev)
+ 	log(TERM, LOG_INFO, "aer_event store: %p\n", priv->stmt_aer_event);
+ 
+ 	sqlite3_bind_text(priv->stmt_aer_event,  1, ev->timestamp, -1, NULL);
+-	sqlite3_bind_text(priv->stmt_aer_event,  3, ev->error_type, -1, NULL);
+-	sqlite3_bind_text(priv->stmt_aer_event,  4, ev->msg, -1, NULL);
++	sqlite3_bind_text(priv->stmt_aer_event,  2, ev->error_type, -1, NULL);
++	sqlite3_bind_text(priv->stmt_aer_event,  3, ev->msg, -1, NULL);
+ 
+ 	rc = sqlite3_step(priv->stmt_aer_event);
+ 	if (rc != SQLITE_OK && rc != SQLITE_DONE)
+@@ -189,6 +189,7 @@ static const struct db_fields mce_record_fields[] = {
+ 		{ .name="error_msg",		.type="TEXT" },
+ 		{ .name="mcgstatus_msg",	.type="TEXT" },
+ 		{ .name="mcistatus_msg",	.type="TEXT" }, // 20
++		{ .name="mcastatus_msg",	.type="TEXT" },
+ 		{ .name="user_action",		.type="TEXT" },
+ 		{ .name="mc_location",		.type="TEXT" },
+ };
diff --git a/SOURCES/0037-rasdaemon-sqlite-truncates-some-MCE-fields-to-32-bit.patch b/SOURCES/0037-rasdaemon-sqlite-truncates-some-MCE-fields-to-32-bit.patch
new file mode 100644
index 0000000..2b30c4f
--- /dev/null
+++ b/SOURCES/0037-rasdaemon-sqlite-truncates-some-MCE-fields-to-32-bit.patch
@@ -0,0 +1,73 @@
+commit 52e60e3050105a55e1ff2382979d5f370f398200
+Author: Luck, Tony <tony.luck@intel.com>
+Date:   Mon Apr 7 11:27:47 2014 -0700
+
+    rasdaemon: sqlite truncates some MCE fields to 32-bit
+    
+    The sqlite3_bind_int() function takes an "int" as the argument value to
+    save to the database. But some fields are wider than 32-bits.  Use
+    sqlite3_bind_int64() for the fields where we know values can exceed
+    4G.
+    
+    Before:
+    
+    # ./rasdaemon/util/ras-mc-ctl --errors
+     ...
+    MCE events:
+    1 2014-04-04 08:50:32 -0700 error: MEMORY CONTROLLER RD_CHANNEL0_ERR Transaction: Memory read error, mcg mcgstatus= 0, mci Corrected_error, mcgcap=0x07000c16, status=0x00010090, addr=0x35fcb9c0, misc=0x5026a686, walltime=0x5342e4f9, cpu=0x0000000e, cpuid=0x000306f1, apicid=0x00000020, socketid=0x00000001, bank=0x00000008
+    2 2014-04-04 08:50:35 -0700 error: MEMORY CONTROLLER RD_CHANNEL0_ERR Transaction: Memory read error, mcg mcgstatus= 0, mci Corrected_error, mcgcap=0x07000c16, status=0x00010090, addr=0x4187adc0, misc=0x4274f486, walltime=0x5342e4fc, cpu=0x0000000e, cpuid=0x000306f1, apicid=0x00000020, socketid=0x00000001, bank=0x00000007
+    3 2014-04-04 08:50:37 -0700 error: MEMORY CONTROLLER RD_CHANNEL0_ERR Transaction: Memory read error, mcg mcgstatus= 0, mci Corrected_error, mcgcap=0x07000c16, status=0x00010090, addr=0x52efc600, misc=0x50028286, walltime=0x5342e4fd, cpu=0x0000000e, cpuid=0x000306f1, apicid=0x00000020, socketid=0x00000001, bank=0x00000008
+    
+    After:
+    ./rasdaemon/util/ras-mc-ctl --errors
+     ...
+    1 2014-04-04 09:00:07 -0700 error: MEMORY CONTROLLER RD_CHANNEL0_ERR Transaction: Memory read error, mcg mcgstatus= 0, mci Corrected_error, mcgcap=0x07000c16, status=0x8c00004000010090, addr=0x45340a180, misc=0x140686886, walltime=0x5342e736, cpuid=0x000306f1, bank=0x00000008
+    2 2014-04-04 09:00:08 -0700 error: MEMORY CONTROLLER RD_CHANNEL0_ERR Transaction: Memory read error, mcg mcgstatus= 0, mci Corrected_error, mcgcap=0x07000c16, status=0x8c00004000010090, addr=0x44d6e4780, misc=0x15060e086, walltime=0x5342e737, cpuid=0x000306f1, bank=0x00000007
+    3 2014-04-04 09:00:10 -0700 error: MEMORY CONTROLLER RD_CHANNEL0_ERR Transaction: Memory read error, mcg mcgstatus= 0, mci Corrected_error, mcgcap=0x07000c16, status=0x8c00004000010090, addr=0x44cb64640, misc=0x140505086, walltime=0x5342e739, cpuid=0x000306f1, bank=0x00000008
+    
+    Signed-off-by: Tony Luck <tony.luck@intel.com>
+    Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
+
+diff --git a/ras-record.c b/ras-record.c
+index e602edb..e5150ad 100644
+--- a/ras-record.c
++++ b/ras-record.c
+@@ -209,22 +209,22 @@ int ras_store_mce_record(struct ras_events *ras, struct mce_event *ev)
+ 		return 0;
+ 	log(TERM, LOG_INFO, "mce_record store: %p\n", priv->stmt_mce_record);
+ 
+-	sqlite3_bind_text(priv->stmt_mce_record,  1, ev->timestamp, -1, NULL);
+-	sqlite3_bind_int (priv->stmt_mce_record,  2, ev->mcgcap);
+-	sqlite3_bind_int (priv->stmt_mce_record,  3, ev->mcgstatus);
+-	sqlite3_bind_int (priv->stmt_mce_record,  4, ev->status);
+-	sqlite3_bind_int (priv->stmt_mce_record,  5, ev->addr);
+-	sqlite3_bind_int (priv->stmt_mce_record,  6, ev->misc);
+-	sqlite3_bind_int (priv->stmt_mce_record,  7, ev->ip);
+-	sqlite3_bind_int (priv->stmt_mce_record,  8, ev->tsc);
+-	sqlite3_bind_int (priv->stmt_mce_record,  9, ev->walltime);
+-	sqlite3_bind_int (priv->stmt_mce_record, 10, ev->cpu);
+-	sqlite3_bind_int (priv->stmt_mce_record, 11, ev->cpuid);
+-	sqlite3_bind_int (priv->stmt_mce_record, 12, ev->apicid);
+-	sqlite3_bind_int (priv->stmt_mce_record, 13, ev->socketid);
+-	sqlite3_bind_int (priv->stmt_mce_record, 14, ev->cs);
+-	sqlite3_bind_int (priv->stmt_mce_record, 15, ev->bank);
+-	sqlite3_bind_int (priv->stmt_mce_record, 16, ev->cpuvendor);
++	sqlite3_bind_text  (priv->stmt_mce_record,  1, ev->timestamp, -1, NULL);
++	sqlite3_bind_int   (priv->stmt_mce_record,  2, ev->mcgcap);
++	sqlite3_bind_int   (priv->stmt_mce_record,  3, ev->mcgstatus);
++	sqlite3_bind_int64 (priv->stmt_mce_record,  4, ev->status);
++	sqlite3_bind_int64 (priv->stmt_mce_record,  5, ev->addr);
++	sqlite3_bind_int64 (priv->stmt_mce_record,  6, ev->misc);
++	sqlite3_bind_int64 (priv->stmt_mce_record,  7, ev->ip);
++	sqlite3_bind_int64 (priv->stmt_mce_record,  8, ev->tsc);
++	sqlite3_bind_int64 (priv->stmt_mce_record,  9, ev->walltime);
++	sqlite3_bind_int   (priv->stmt_mce_record, 10, ev->cpu);
++	sqlite3_bind_int   (priv->stmt_mce_record, 11, ev->cpuid);
++	sqlite3_bind_int   (priv->stmt_mce_record, 12, ev->apicid);
++	sqlite3_bind_int   (priv->stmt_mce_record, 13, ev->socketid);
++	sqlite3_bind_int   (priv->stmt_mce_record, 14, ev->cs);
++	sqlite3_bind_int   (priv->stmt_mce_record, 15, ev->bank);
++	sqlite3_bind_int   (priv->stmt_mce_record, 16, ev->cpuvendor);
+ 
+ 	sqlite3_bind_text(priv->stmt_mce_record, 17, ev->bank_name, -1, NULL);
+ 	sqlite3_bind_text(priv->stmt_mce_record, 18, ev->error_msg, -1, NULL);
diff --git a/SOURCES/0038-rasdaemon-fix-mce-numfield-decoded-error.patch b/SOURCES/0038-rasdaemon-fix-mce-numfield-decoded-error.patch
new file mode 100644
index 0000000..6e45309
--- /dev/null
+++ b/SOURCES/0038-rasdaemon-fix-mce-numfield-decoded-error.patch
@@ -0,0 +1,44 @@
+commit f20a366a9b7a32a1be6fc89e7546cc2b4cb690bf
+Author: Xie XiuQi <xiexiuqi@huawei.com>
+Date:   Thu May 8 20:07:19 2014 +0800
+
+    rasdaemon: fix mce numfield decoded error
+    
+    Some fields are missing in mce decode information, as below:
+    ...
+    rasdaemon: register inserted at db
+               <...>-31568 [000]  4023.214080: mce_record:
+    2014-05-07 15:51:16 +0800 bank=2, status= bd000000000000c0, MEMORY
+    CONTROLLER MS_CHANNEL0_ERR Transaction: Memory scrubbing error %s: %Lu
+     %s: %Lx
+     %s: %Lx
+     %s: %Lu
+     %s: %Lu
+     %s: %Lx
+    , mci=Uncorrected_error Error_enabled SRAO, n_errors=0 channel=0,
+    dimm=0, cpu_type= Intel Xeon 5500 series / Core i3/5/7
+    ("Nehalem/Westmere"), cpu= 0, socketid= 0, ip= 1eadbabe (INEXACT), cs=
+    73, misc= 8c, addr= 62b000, mcgstatus= 5 RIPV MCIP, mcgcap= 1c09,
+    apicid= 0
+    
+    "f->name" & "v" are missed to print in decode_numfield(), so fix it.
+    
+    Signed-off-by: Xie XiuQi <xiexiuqi@huawei.com>
+    Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
+
+diff --git a/bitfield.c b/bitfield.c
+index b2895b4..07795a9 100644
+--- a/bitfield.c
++++ b/bitfield.c
+@@ -92,8 +92,9 @@ void decode_numfield(struct mce_event *e, uint64_t status,
+ 		uint64_t mask = (1ULL << (f->end - f->start + 1)) - 1;
+ 		uint64_t v = (status >> f->start) & mask;
+ 		if (v > 0 || f->force) {
+-			mce_snprintf(e->error_msg, "%%s: %s\n",
+-				     f->fmt ? f->fmt : "%Lu");
++			char fmt[32] = {0};
++			snprintf(fmt, 32, "%%s: %s\n", f->fmt ? f->fmt : "%Lu");
++			mce_snprintf(e->error_msg, fmt, f->name, v);
+ 		}
+ 	}
+ }
diff --git a/SOURCES/0039-rasdaemon-do-not-assume-dimmX-directories-will-be-pr.patch b/SOURCES/0039-rasdaemon-do-not-assume-dimmX-directories-will-be-pr.patch
new file mode 100644
index 0000000..c1baea8
--- /dev/null
+++ b/SOURCES/0039-rasdaemon-do-not-assume-dimmX-directories-will-be-pr.patch
@@ -0,0 +1,84 @@
+From 7e79fa94dc6c294cd731c0c684b277dd4811c5db Mon Sep 17 00:00:00 2001
+From: Aristeu Rozanski <aris@redhat.com>
+Date: Fri, 15 Aug 2014 13:50:58 -0400
+Subject: [PATCH 3/4] rasdaemon: do not assume dimmX/ directories will be
+ present
+
+While finding the labels, size and location, ras-mc-ctl will search /sys for
+the files and calculate the location. When it uses the location trying to map
+back to files to print labels or write labels, it'll just assume dimm*
+directories exist which is not correct while using drivers like amd64_edac.
+This patch adds two new hashes to store the location and the label file path
+so it can be used later.
+
+Signed-off-by: Aristeu Rozanski <aris@redhat.com>
+Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
+---
+ util/ras-mc-ctl.in | 21 +++++++++++++--------
+ 1 file changed, 13 insertions(+), 8 deletions(-)
+
+diff --git a/util/ras-mc-ctl.in b/util/ras-mc-ctl.in
+index 110262f..7b6d798 100755
+--- a/util/ras-mc-ctl.in
++++ b/util/ras-mc-ctl.in
+@@ -45,6 +45,8 @@ my %conf        = ();
+ my %bus         = ();
+ my %dimm_size   = ();
+ my %dimm_node   = ();
++my %dimm_label_file = ();
++my %dimm_location = ();
+ my %csrow_size  = ();
+ my %rank_size   = ();
+ my %csrow_ranks = ();
+@@ -278,6 +280,9 @@ sub parse_dimm_nodes
+         my $str_loc = join(':', $mc, @pos);
+         $dimm_size{$str_loc} = $size;
+         $dimm_node{$str_loc} = $dimm;
++        $file =~ s/size/dimm_label/;
++        $dimm_label_file{$str_loc} = $file;
++        $dimm_location{$str_loc} = $location;
+ 
+         return;
+     }
+@@ -557,12 +562,14 @@ sub read_dimm_label
+ 
+     my $dimm = $dimm_node{$pos};
+ 
+-    my $file = "$sysfs/mc$mc/dimm$dimm/dimm_label";
++    my $dimm_label_file = $dimm_label_file{$pos};
+ 
+-    return ("$pos missing") unless -f $file;
++    my $location = $dimm_location{$pos};
+ 
+-    if (!open (LABEL, "$file")) {
+-        warn "Failed to open $file: $!\n";
++    return ("label missing", "$pos missing") unless -f $dimm_label_file;
++
++    if (!open (LABEL, "$dimm_label_file")) {
++        warn "Failed to open $dimm_label_file: $!\n";
+         return ("Error");
+     }
+ 
+@@ -570,7 +577,7 @@ sub read_dimm_label
+ 
+     close (LABEL);
+ 
+-    $pos = "mc$mc " . qx(cat $sysfs/mc$mc/dimm$dimm/dimm_location);
++    $pos = "mc$mc $location";
+ 
+     return ($label, $pos);
+ }
+@@ -587,9 +594,7 @@ sub get_dimm_label_node
+ 
+     return "" if (!defined($dimm_node{$pos}));
+ 
+-    my $dimm = $dimm_node{$pos};
+-
+-    return "$sysfs/mc$mc/dimm$dimm/dimm_label";
++    return "$dimm_label_file{$pos}";
+ }
+ 
+ 
+-- 
+1.8.3.1
+
diff --git a/SOURCES/0040-rasdaemon-add-more-dell-labels.patch b/SOURCES/0040-rasdaemon-add-more-dell-labels.patch
new file mode 100644
index 0000000..7cd76b8
--- /dev/null
+++ b/SOURCES/0040-rasdaemon-add-more-dell-labels.patch
@@ -0,0 +1,119 @@
+Hello,
+
+This patch adds labels for these Dell PowerEdge Servers:
+
+R610,R/T710, R220, R/T620, R720/xd, R730/xd, M520, M620 and M820.
+
+The current T610 (0F5XM3) mapping is incorrect. This patch fixes it.
+
+Reqest review and inclusion to git repo.
+
+Acked-by: Aristeu Rozanski <aris@redhat.com>
+Signed-off-by: Charles Rose <charles.rose.linux@gmail.com>
+---
+Changes in v2:
+- Include T110 II, T20, R/T320, M420, R/T420, R/T630, FC620, FC420
+- Include additional model numbers for M820 and some 2-socket systems.
+- Consolidate systems with similar maps.
+---
+ labels/dell | 86 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++-----
+ 1 file changed, 79 insertions(+), 7 deletions(-)
+
+diff --git a/labels/dell b/labels/dell
+index e1a09a7..d7e797b 100644
+--- a/labels/dell
++++ b/labels/dell
+@@ -9,12 +9,84 @@
+ #
+ 
+ Vendor: Dell Inc.
++#### 11G ####
++# 2-socket
++# PowerEdge R610
++  Model: 0K399H, 0F0XJ6
++    DIMM_A1: 0.0.0;	DIMM_A2:  0.0.1;	DIMM_A3:  0.0.2;
++    DIMM_A4: 0.1.0;	DIMM_A5:  0.1.1;	DIMM_A6:  0.1.2;
+ 
+-  Model: 0F5XM3
+-    DIMM_A1: 0.0.0;	DIMM_A2:  0.0.1;	DIMM_A3:  0.0.2;	DIMM_A4:  0.0.3;
+-    DIMM_A5: 0.1.0;	DIMM_A6:  0.1.1;	DIMM_A7:  0.1.2;	DIMM_A8:  0.1.3;
+-    DIMM_A9: 0.2.0;	DIMM_A10: 0.2.1;	DIMM_A11: 0.2.2;	DIMM_A12: 0.2.3;
++    DIMM_B1: 1.0.0;	DIMM_B2:  1.0.1;	DIMM_B3:  1.0.2;
++    DIMM_B4: 1.1.0;	DIMM_B5:  1.1.1;	DIMM_B6:  1.1.2;
+ 
+-    DIMM_B1: 1.0.0;	DIMM_B2:  1.0.1;	DIMM_B3:  1.0.2;	DIMM_B4:  1.0.3;
+-    DIMM_B5: 1.1.0;	DIMM_B6:  1.1.1;	DIMM_B7:  1.1.2;	DIMM_B8:  1.1.3;
+-    DIMM_B9: 1.2.0;	DIMM_B10: 1.2.1;	DIMM_B11: 1.2.2;	DIMM_B12: 1.2.3;
++# PowerEdge T710	R710
++  Model: 01CTXG,	0N0H4P, 0MD99X, 0N047H, 0PV9DG
++    DIMM_A3: 0.0.0;	DIMM_A2:  0.1.0;	DIMM_A1:  0.2.0;
++    DIMM_A6: 0.0.1;	DIMM_A5:  0.1.1;	DIMM_A4:  0.2.1;
++    DIMM_A9: 0.0.2;	DIMM_A8:  0.1.2;	DIMM_A7:  0.2.2;
++
++    DIMM_B3: 1.0.0;	DIMM_B2:  1.1.0;	DIMM_B1:  1.2.0;
++    DIMM_B6: 1.0.1;	DIMM_B5:  1.1.1;	DIMM_B4:  1.2.1;
++    DIMM_B9: 1.0.2;	DIMM_B8:  1.1.2;	DIMM_B7:  1.2.2;
++
++#### 12/13G ####
++# 1-socket
++# PowerEdge R220
++  Model: 081N4V
++    DIMM_A1: 0.0.0;    DIMM_A2: 0.0.1;
++    DIMM_A3: 0.1.0;    DIMM_A4: 0.1.1;
++
++#PowerEdge T110 II, T20
++  Model: 0PC2WT, 0PM2CW, 015TH9,  0MDHN4, 0VD5HY
++    DIMM_A1:  0.0.0;    DIMM_A2:   0.1.0;
++
++    DIMM_B1:  0.0.1;    DIMM_B2:   0.1.1;
++
++#PowerEdge R320 T320
++  Model: 0YCV59, 0Y97HY, 07DKYR, 0VJ84C,  07MYHN, 04DMNN, 0W7H8C, 0K20G5, 0V719V, 0FDT3J
++    DIMM_A1:  0.0.0;    DIMM_A2:   0.1.0;       DIMM_A3:   0.2.0;
++    DIMM_A4:  0.0.1;    DIMM_A5:   0.1.1;       DIMM_A6:   0.2.1;
++
++# 2-socket
++# PowerEdge R620/T620			R720/xd					R730/xd		T630	R730		R630	T620	M620, FC620
++  Model: 0VWT90, 07NDJ2, 0F5XM3,	0PXXHP, 0X3D66, 061P35, 0H5J4J, 00W9X3,	0599V5,		0W9WXC, 0599V5, 0H21J3, 0CNCJW,  02CD1V, 0T5TFW, 0F5XM3, 0G1CNH,  05YV77, 0PDCCX, 093MW8, 0NJVT7
++    DIMM_A1:  0.0.0;	DIMM_A2:   0.1.0;	DIMM_A3:   0.2.0;	DIMM_A4:   0.3.0;
++    DIMM_A5:  0.0.1;	DIMM_A6:   0.1.1;	DIMM_A7:   0.2.1;	DIMM_A8:   0.3.1;
++    DIMM_A9:  0.0.2;	DIMM_A10:  0.1.2;	DIMM_A11:  0.2.2;	DIMM_A12:  0.3.2;
++
++    DIMM_B1:  1.0.0;	DIMM_B2:   1.1.0;	DIMM_B3:   1.2.0;	DIMM_B4:   1.3.0;
++    DIMM_B5:  1.0.1;	DIMM_B6:   1.1.1;	DIMM_B7:   1.2.1;	DIMM_B8:   1.3.1;
++    DIMM_B9:  1.0.2;	DIMM_B10:  1.1.2;	DIMM_B11:  1.2.2;	DIMM_B12:  1.3.2;
++
++# PowerEdge M520		R420								   T420
++  Model: 0NRG83, 0DW6GX,	03WPHJ, 06HTRX, 0H1Y24, 02T9N6,  0TT5P2, 0CPKXG, 03015M, 061VPC,   0PC9H0, 0K3G34, 0PC0V5, 08NVYK
++    DIMM_A1:  0.0.0;	DIMM_A2:   0.1.0;	DIMM_A3:   0.2.0;
++    DIMM_A4:  0.0.1;	DIMM_A5:   0.1.1;	DIMM_A6:   0.2.1;
++
++    DIMM_B1:  1.0.0;	DIMM_B2:   1.1.0;	DIMM_B3:   1.2.0;
++    DIMM_B4:  1.0.1;	DIMM_B5:   1.1.1;	DIMM_B6:   1.2.1;
++
++#PowerEdge FC420, M420
++  Model: 0DPJGD, 068CTP, 0MN3VC, 0417VP
++     DIMM_A1:  0.0.0;   DIMM_A2:   0.1.0;       DIMM_A3:   0.2.0;
++
++     DIMM_B1:  1.0.0;   DIMM_B2:   1.1.0;       DIMM_B3:   1.2.0;
++
++# 4-socket
++# # PowerEdge M820
++  Model: 0RN9TC, 0YWR73, 066N7P, 0PFG1N, 0JC2W3
++    DIMM_A1:  0.0.0;    DIMM_A2:   0.1.0;       DIMM_A3:   0.2.0;       DIMM_A4:   0.3.0;
++    DIMM_A5:  0.0.1;    DIMM_A6:   0.1.1;       DIMM_A7:   0.2.1;       DIMM_A8:   0.3.1;
++    DIMM_A9:  0.0.2;    DIMM_A10:  0.1.2;       DIMM_A11:  0.2.2;       DIMM_A12:  0.3.2;
++
++    DIMM_B1:  1.0.0;    DIMM_B2:   1.1.0;       DIMM_B3:   1.2.0;       DIMM_B4:   1.3.0;
++    DIMM_B5:  1.0.1;    DIMM_B6:   1.1.1;       DIMM_B7:   1.2.1;       DIMM_B8:   1.3.1;
++    DIMM_B9:  1.0.2;    DIMM_B10:  1.1.2;       DIMM_B11:  1.2.2;       DIMM_B12:  1.3.2;
++
++    DIMM_C1:  2.0.0;    DIMM_C2:   2.1.0;       DIMM_C3:   2.2.0;       DIMM_C4:   2.3.0;
++    DIMM_C5:  2.0.1;    DIMM_C6:   2.1.1;       DIMM_C7:   2.2.1;       DIMM_C8:   2.3.1;
++    DIMM_C9:  2.0.2;    DIMM_C10:  2.1.2;       DIMM_C11:  2.2.2;       DIMM_C12:  2.3.2;
++
++    DIMM_D1:  3.0.0;    DIMM_D2:   3.1.0;       DIMM_D3:   3.2.0;       DIMM_D4:   3.3.0;
++    DIMM_D5:  3.0.1;    DIMM_D6:   3.1.1;       DIMM_D7:   3.2.1;       DIMM_D8:   3.3.1;
++    DIMM_D9:  3.0.2;    DIMM_D10:  3.1.2;       DIMM_D11:  3.2.2;       DIMM_D12:  3.3.2;
+-- 
+1.9.3
diff --git a/SOURCES/rasdaemon-fix_service_file.patch b/SOURCES/rasdaemon-fix_service_file.patch
deleted file mode 100644
index 8a62c0b..0000000
--- a/SOURCES/rasdaemon-fix_service_file.patch
+++ /dev/null
@@ -1,15 +0,0 @@
----
- misc/rasdaemon.service |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- rasdaemon-0.4.1.orig/misc/rasdaemon.service	2013-04-08 18:53:08.000000000 -0400
-+++ rasdaemon-0.4.1/misc/rasdaemon.service	2014-01-17 10:09:50.723418658 -0500
-@@ -3,7 +3,7 @@ Description=RAS daemon to log the RAS ev
- After=syslog.target
- 
- [Service]
--ExecStart=/usr/local/sbin/rasdaemon -f
-+ExecStart=/usr/sbin/rasdaemon -f
- Restart=on-abort
- 
- [Install]
diff --git a/SPECS/rasdaemon.spec b/SPECS/rasdaemon.spec
index c202e09..f3c59de 100644
--- a/SPECS/rasdaemon.spec
+++ b/SPECS/rasdaemon.spec
@@ -1,25 +1,59 @@
+%define _hardened_build 1
+
 Name:			rasdaemon
 Version:		0.4.1
-Release:		7%{?dist}
+Release:		14%{?dist}
 Summary:		Utility to receive RAS error tracings
 Group:			Applications/System
 License:		GPLv2
 URL:			https://git.fedorahosted.org/git/rasdaemon.git
 Source0:		http://mchehab.fedorapeople.org/%{name}-%{version}.tar.bz2
 
-ExclusiveArch:		%{ix86} x86_64 %{arm}
+ExclusiveArch:		%{ix86} x86_64 aarch64 %{power64}
 BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 BuildRequires:		autoconf, automake, gettext-devel, libtool, sqlite-devel
 Requires:		hwdata, perl-DBD-SQLite
 %ifnarch %{arm}
+%ifnarch ppc64le
 Requires:		dmidecode
 %endif
+%endif
 
 Requires(post):		systemd-units
 Requires(preun):	systemd-units
 Requires(postun):	systemd-units
 
-Patch:			rasdaemon-fix_service_file.patch
+Patch1: 0001-ras-mc-ctl-Improve-error-summary-to-show-label-and-m.patch
+Patch2: 0002-ras-record-make-the-code-more-generic.patch
+Patch3: 0003-ras-record-rename-stmt-to-stmt_mc_event.patch
+Patch4: 0004-ras-record-reorder-functions.patch
+Patch5: 0005-ras-record-Make-the-code-easier-to-add-support-for-o.patch
+Patch6: 0006-Add-support-to-record-AER-events.patch
+Patch7: 0007-Add-support-to-store-MCE-events-at-the-database.patch
+Patch8: 0008-ras-mc-ctl-add-summary-for-MCE-and-PCIe-AER-errors.patch
+Patch9: 0009-ras-mc-ctl-report-errors-also-for-PCIe-AER-and-MCE.patch
+Patch10: 0010-ras-mc-ctl-Fix-the-name-of-the-error-table-data.patch
+Patch11: 0013-ras-mc-ctl-Improve-parser.patch
+Patch12: 0014-ras-mc-ctl-Fix-label-register-with-2-layers.patch
+Patch13: 0015-Add-an-example-of-labels-file.patch
+Patch14: 0017-ras-mc-ctl-Fix-the-DIMM-layout-display.patch
+Patch15: 0019-ras-mc-ctl-remove-completely-use-of-modprobe.patch
+Patch16: 0022-mce-amd-k8.c-fix-a-warning.patch
+Patch17: 0023-add-abrt-suppport-for-rasdaemon.patch
+Patch18: 0026-rasdaemon-Add-record-option-to-rasdaemon-man-page.patch
+Patch19: 0027-ras-mc-ctl-Print-useful-message-when-run-without-ras.patch
+Patch20: 0028-Make-paths-in-the-systemd-services-configurable.patch
+Patch21: 0031-Correct-ABRT-report-data.patch
+Patch22: 0032-rasdaemon-handle-failures-of-snprintf.patch
+Patch23: 0033-rasdaemon-correct-range-while-parsing-top-middle-and.patch
+Patch24: 0034-rasdaemon-enable-recording-by-default.patch
+Patch25: 0035-eMCA-support.patch
+Patch26: 0036-rasdaemon-fix-some-errors-in-sqlite.patch
+Patch27: 0037-rasdaemon-sqlite-truncates-some-MCE-fields-to-32-bit.patch
+Patch28: 0038-rasdaemon-fix-mce-numfield-decoded-error.patch
+Patch29: 0039-rasdaemon-do-not-assume-dimmX-directories-will-be-pr.patch
+Patch30: 0040-rasdaemon-add-more-dell-labels.patch
+
 
 %description
 %{name} is a RAS (Reliability, Availability and Serviceability) logging tool.
@@ -33,17 +67,47 @@ an utility for reporting current error counts from the EDAC sysfs files.
 
 %prep
 %setup -q
-%patch -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
+%patch7 -p1
+%patch8 -p1
+%patch9 -p1
+%patch10 -p1
+%patch11 -p1
+%patch12 -p1
+%patch13 -p1
+%patch14 -p1
+%patch15 -p1
+%patch16 -p1
+%patch17 -p1
+%patch18 -p1
+%patch19 -p1
+%patch20 -p1
+%patch21 -p1
+%patch22 -p1
+%patch23 -p1
+%patch24 -p1
+%patch25 -p1
+%patch26 -p1
+%patch27 -p1
+%patch28 -p1
+%patch29 -p1
+%patch30 -p1
 
 %build
 autoreconf -vfi
-%configure --enable-mce --enable-aer --enable-sqlite3
+%configure --enable-mce --enable-aer --enable-sqlite3 --enable-extlog
 make %{?_smp_mflags}
 
 %install
 make install DESTDIR=%{buildroot}
 install -D -p -m 0644 misc/rasdaemon.service %{buildroot}/%{_unitdir}/rasdaemon.service
 install -D -p -m 0644 misc/ras-mc-ctl.service %{buildroot}%{_unitdir}/ras-mc-ctl.service
+install -D -p -m 0655 labels/* %{buildroot}%{_sysconfdir}/ras/dimm_labels.d
 rm INSTALL %{buildroot}/usr/include/*.h
 
 %clean
@@ -60,6 +124,35 @@ rm -rf %{buildroot}
 %{_sysconfdir}/ras/dimm_labels.d
 
 %changelog
+* Tue Dec 16 2014 Aristeu Rozanski <aris@redhat.com> 0.4.1-14.el7
+- properly install the labels so it can be packaged [1073090]
+
+* Tue Dec 02 2014 Aristeu Rozanski <aris@redhat.com> 0.4.1-13.el7
+- updated labels patch to the new version submitted upstream [1073090]
+
+* Tue Nov 25 2014 Aristeu Rozanski <aris@redhat.com> 0.4.1-12.el7
+- fix on how sysfs tree is parsed for DIMMs [1073090]
+- include new Dell labels [1073090]
+
+* Fri Oct 10 2014 Aristeu Rozanski <aris@redhat.com> 0.4.1-11.el7
+- don't require dmidecode for ppc64le [1151385]
+
+* Fri Aug 22 2014 Aristeu Rozanski <aris@redhat.com> 0.4.1-10.el7
+- use power64 macro instead, we have a driver enabled on ppc64 [1125663]
+
+* Mon Aug 18 2014 Aristeu Rozanski <aris@redhat.com> 0.4.1-9.el7
+- eMCA support [1085519]
+- enable ppc64le [1125663]
+
+* Mon Jun 09 2014 Aristeu Rozanski <aris@redhat.com> 0.4.1-8.el7
+- Revert patch in 0.4.1-7.el7, replaced by a better patch
+- Fix sizeof() usage on pointer [1035742]
+- Added macro to build the package with stack protector [1092558]
+- Handle failures of snprintf() [1035741]
+- Fix range checking on signed char variables [1035746]
+- Added aarch64 as architecture [1070973]
+- Start recording by default [1117366] [1117367]
+
 * Fri Jan 17 2014 Aristeu Rozanski <aris@redhat.com> 0.4.1-7.el7
 - Fixed rasdaemon.service executable path [1043478]