From cead61c3e8af9ca34ebb78f7d1843b02a1e39301 Mon Sep 17 00:00:00 2001
From: Russ Anderson <(rja@sgi.com)>
Date: Mon, 16 May 2005 15:30:00 -0700
Subject: [PATCH] --- yaml --- r: 1711 b: refs/heads/master c:
 6872ec548970e9fb3ccd61013f84f9bb8b30fa9a h: refs/heads/master i:   1709:
 3866aff83312d1b7f0812c64d9ac3a526bf297f6   1707:
 ce03ac7a41b72c1edab28c8f36a52002c30edc32   1703:
 510ab5378aba5362e2262bb396ae07cd382db3d6   1695:
 3c2f644d718f0212d460e077e49966de327cae74 v: v3

---
 [refs]                             |  2 +-
 trunk/arch/ia64/sn/kernel/setup.c  |  2 ++
 trunk/include/asm-ia64/sn/sn_sal.h | 26 ++++++++++++++++++++++++++
 3 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index b08de44ab06a..3f5ba202b3d5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8eac3757158ccd9c6b43f44f228a5762fec33781
+refs/heads/master: 6872ec548970e9fb3ccd61013f84f9bb8b30fa9a
diff --git a/trunk/arch/ia64/sn/kernel/setup.c b/trunk/arch/ia64/sn/kernel/setup.c
index 4fb44984afe6..e64cb8175f7a 100644
--- a/trunk/arch/ia64/sn/kernel/setup.c
+++ b/trunk/arch/ia64/sn/kernel/setup.c
@@ -271,6 +271,8 @@ void __init sn_setup(char **cmdline_p)
 	int major = sn_sal_rev_major(), minor = sn_sal_rev_minor();
 	extern void sn_cpu_init(void);
 
+	ia64_sn_plat_set_error_handling_features();
+
 	/*
 	 * If the generic code has enabled vga console support - lets
 	 * get rid of it again. This is a kludge for the fact that ACPI
diff --git a/trunk/include/asm-ia64/sn/sn_sal.h b/trunk/include/asm-ia64/sn/sn_sal.h
index 94cc5392533a..eb0395ad0d6a 100644
--- a/trunk/include/asm-ia64/sn/sn_sal.h
+++ b/trunk/include/asm-ia64/sn/sn_sal.h
@@ -115,6 +115,13 @@
 #define SAL_IROUTER_INTR_XMIT	SAL_CONSOLE_INTR_XMIT
 #define SAL_IROUTER_INTR_RECV	SAL_CONSOLE_INTR_RECV
 
+/*
+ * Error Handling Features
+ */
+#define SAL_ERR_FEAT_MCA_SLV_TO_OS_INIT_SLV	0x1
+#define SAL_ERR_FEAT_LOG_SBES			0x2
+#define SAL_ERR_FEAT_MFR_OVERRIDE		0x4
+#define SAL_ERR_FEAT_SBE_THRESHOLD		0xffff0000
 
 /*
  * SAL Error Codes
@@ -341,6 +348,25 @@ ia64_sn_plat_cpei_handler(void)
 	return ret_stuff.status;
 }
 
+/*
+ * Set Error Handling Features
+ */
+static inline u64
+ia64_sn_plat_set_error_handling_features(void)
+{
+	struct ia64_sal_retval ret_stuff;
+
+	ret_stuff.status = 0;
+	ret_stuff.v0 = 0;
+	ret_stuff.v1 = 0;
+	ret_stuff.v2 = 0;
+	SAL_CALL_REENTRANT(ret_stuff, SN_SAL_SET_ERROR_HANDLING_FEATURES,
+		(SAL_ERR_FEAT_MCA_SLV_TO_OS_INIT_SLV | SAL_ERR_FEAT_LOG_SBES),
+		0, 0, 0, 0, 0, 0);
+
+	return ret_stuff.status;
+}
+
 /*
  * Checks for console input.
  */