ipmitool to be used with AER only on Ampere Altra platforms

ras-aer-handler.c

@@ -25,6 +25,11 @@
 #include "ras-logger.h"
 #include "bitfield.h"
 #include "ras-report.h"
+#ifdef HAVE_AMP_NS_DECODE
+#include <stdbool.h>
+#include <sys/stat.h>
+#include <sys/utsname.h>
+#endif
 
 /* bit field meaning for correctable error */
 static const char *aer_cor_errors[32] = {
@@ -52,6 +57,86 @@ static const char *aer_uncor_errors[32] = {
 	[20] = "Unsupported Request",
 };
 
+#ifdef HAVE_AMP_NS_DECODE
+#define IPMITOOL_CMD "/usr/bin/ipmitool"
+#define DMIDECODE_CMD "/usr/sbin/dmidecode"
+static bool ampere_ipmitool = false;
+
+static void ras_report_aer_ipmi_init(void)
+{
+	struct utsname unm;
+	struct stat st;
+	int rc;
+
+	/*
+	 * Verify on startup if we are on an Ampere Altra or Altra Max
+	 * platform, to set the use of ipmitool (if installed).
+	 */
+	if (stat(IPMITOOL_CMD, &st) != 0)
+		return;
+
+	if ((uname(&unm) != 0) || (strncmp(unm.machine, "aarch64", 8) != 0))
+		return;
+
+	/* prefer dmidecode as lscpu may not have the necessary dmi info */
+	if (stat(DMIDECODE_CMD, &st) == 0)
+		rc = system(DMIDECODE_CMD" -t 4 | /usr/bin/grep "
+		    "'Ampere(R) Altra(R)' > /dev/null");
+	else
+		rc = system("/usr/bin/lscpu | /usr/bin/grep "
+		    "'Ampere(R) Altra(R)' > /dev/null");
+	if (rc == -1 || !WIFEXITED(rc) || WEXITSTATUS(rc))
+		return;
+
+	ampere_ipmitool = true;
+}
+
+static void ras_report_aer_ipmi(int severity_val, struct ras_aer_event *ev)
+{
+	char ipmi_add_sel[114];
+	uint8_t sel_data[5];
+	int seg, bus, dev, fn, rc;
+
+	if (!ampere_ipmitool)
+		return;
+
+	/*
+	 * Get PCIe AER error source seg/bus/dev/fn and save it into
+	 * BMC OEM SEL, ipmitool raw 0x0a 0x44 is IPMI command-Add SEL
+	 * entry, please refer IPMI specification chapter 31.6. 0xcd3a
+	 * is manufactuer ID(ampere),byte 12 is sensor num(CE is 0xBF,
+	 * UE is 0xCA), byte 13~14 is segment number, byte 15 is bus
+	 * number, byte 16[7:3] is device number, byte 16[2:0] is
+	 * function number.
+	 */
+
+	switch (severity_val) {
+	case HW_EVENT_AER_UNCORRECTED_NON_FATAL:
+	case HW_EVENT_AER_UNCORRECTED_FATAL:
+		sel_data[0] = 0xca;
+		break;
+	case HW_EVENT_AER_CORRECTED:
+	default:
+		sel_data[0] = 0xbf;
+	}
+
+	sscanf(ev->dev_name, "%x:%x:%x.%x", &seg, &bus, &dev, &fn);
+
+	sel_data[1] = seg & 0xff;
+	sel_data[2] = (seg & 0xff00) >> 8;
+	sel_data[3] = bus;
+	sel_data[4] = (((dev & 0x1f) << 3) | (fn & 0x7));
+
+	sprintf(ipmi_add_sel, IPMITOOL_CMD
+	  " raw 0x0a 0x44 0x00 0x00 0xc0 0x00 0x00 0x00 0x00 0x3a 0xcd 0x00 0xc0 0x%02x 0x%02x 0x%02x 0x%02x 0x%02x",
+	  sel_data[0], sel_data[1], sel_data[2], sel_data[3], sel_data[4]);
+
+	rc = system(ipmi_add_sel);
+	if (rc == -1 || !WIFEXITED(rc) || WEXITSTATUS(rc))
+		log(TERM, LOG_ERR, "ipmitool command failed [%d]", rc);
+}
+#endif
+
 #define BUF_LEN	1024
 
 int ras_aer_event_handler(struct trace_seq *s,
@@ -67,9 +152,6 @@ int ras_aer_event_handler(struct trace_seq *s,
 	struct tm *tm;
 	struct ras_aer_event ev;
 	char buf[BUF_LEN];
-	char ipmi_add_sel[105];
-	uint8_t sel_data[5];
-	int seg, bus, dev, fn;
 
 	/*
 	 * Newer kernels (3.10-rc1 or upper) provide an uptime clock.
@@ -132,24 +214,20 @@ int ras_aer_event_handler(struct trace_seq *s,
 	switch (severity_val) {
 	case HW_EVENT_AER_UNCORRECTED_NON_FATAL:
 		ev.error_type = "Uncorrected (Non-Fatal)";
-		sel_data[0] = 0xca;
 		break;
 	case HW_EVENT_AER_UNCORRECTED_FATAL:
 		ev.error_type = "Uncorrected (Fatal)";
-		sel_data[0] = 0xca;
 		break;
 	case HW_EVENT_AER_CORRECTED:
 		ev.error_type = "Corrected";
-		sel_data[0] = 0xbf;
 		break;
 	default:
 		ev.error_type = "Unknown severity";
-		sel_data[0] = 0xbf;
 	}
 	trace_seq_puts(s, ev.error_type);
 
-	/* Insert data into the SGBD */
 #ifdef HAVE_SQLITE3
+	/* Insert data into the SGBD */
 	ras_store_aer_event(ras, &ev);
 #endif
 
@@ -159,28 +237,16 @@ int ras_aer_event_handler(struct trace_seq *s,
 #endif
 
 #ifdef HAVE_AMP_NS_DECODE
-	/*
-	 * Get PCIe AER error source seg/bus/dev/fn and save it into
-	 * BMC OEM SEL, ipmitool raw 0x0a 0x44 is IPMI command-Add SEL
-	 * entry, please refer IPMI specificaiton chapter 31.6. 0xcd3a
-	 * is manufactuer ID(ampere),byte 12 is sensor num(CE is 0xBF,
-	 * UE is 0xCA), byte 13~14 is segment number, byte 15 is bus
-	 * number, byte 16[7:3] is device number, byte 16[2:0] is
-	 * function number
-	 */
-	sscanf(ev.dev_name, "%x:%x:%x.%x", &seg, &bus, &dev, &fn);
-
-	sel_data[1] = seg & 0xff;
-	sel_data[2] = (seg & 0xff00) >> 8;
-	sel_data[3] = bus;
-	sel_data[4] = (((dev & 0x1f) << 3) | (fn & 0x7));
-
-	sprintf(ipmi_add_sel,
-	  "ipmitool raw 0x0a 0x44 0x00 0x00 0xc0 0x00 0x00 0x00 0x00 0x3a 0xcd 0x00 0xc0 0x%02x 0x%02x 0x%02x 0x%02x 0x%02x",
-	  sel_data[0], sel_data[1], sel_data[2], sel_data[3], sel_data[4]);
-
-	system(ipmi_add_sel);
+	/* Give a chance to provide AER error though IPMI */
+	ras_report_aer_ipmi(severity_val, &ev);
 #endif
 
 	return 0;
 }
+
+void ras_aer_handler_init(void)
+{
+#ifdef HAVE_AMP_NS_DECODE
+	ras_report_aer_ipmi_init();
+#endif
+}

ras-aer-handler.h

@@ -26,4 +26,5 @@ int ras_aer_event_handler(struct trace_seq *s,
 			 struct pevent_record *record,
 			 struct event_format *event, void *context);
 
+void ras_aer_handler_init(void);
 #endif

ras-events.c

@@ -824,6 +824,7 @@ int handle_ras_events(int record_events)
 		    "ras", "mc_event");
 
 #ifdef HAVE_AER
+	ras_aer_handler_init();
 	rc = add_event_handler(ras, pevent, page_size, "ras", "aer_event",
 			       ras_aer_event_handler, NULL, AER_EVENT);
 	if (!rc)