Merge to Fedora kernel-2.6.7-1.492

[linux-2.6.git] / include / asm-ia64 / sn / sn_sal.h

diff --git a/include/asm-ia64/sn/sn_sal.h b/include/asm-ia64/sn/sn_sal.h
index 0c23431..cc06342 100644 (file)
--- a/include/asm-ia64/sn/sn_sal.h
+++ b/include/asm-ia64/sn/sn_sal.h
@@ -33,6 +33,7 @@
 #define  SN_SAL_NO_FAULT_ZONE_VIRTUAL             0x02000010
 #define  SN_SAL_NO_FAULT_ZONE_PHYSICAL            0x02000011
 #define  SN_SAL_PRINT_ERROR                       0x02000012
+#define  SN_SAL_SET_ERROR_HANDLING_FEATURES       0x0200001a   // reentrant
 #define  SN_SAL_CONSOLE_PUTC                       0x02000021
 #define  SN_SAL_CONSOLE_GETC                       0x02000022
 #define  SN_SAL_CONSOLE_PUTS                       0x02000023
@@ -92,6 +93,19 @@
 #define SALRET_INVALID_ARG     -2
 #define SALRET_ERROR           -3
 
+/*
+ * SN_SAL_SET_ERROR_HANDLING_FEATURES bit settings
+ */
+enum 
+{
+       /* if "rz always" is set, have the mca slaves call os_init_slave */
+       SN_SAL_EHF_MCA_SLV_TO_OS_INIT_SLV=0,
+       /* do not rz on tlb checks, even if "rz always" is set */
+       SN_SAL_EHF_NO_RZ_TLBC,
+       /* do not rz on PIO reads to I/O space, even if "rz always" is set */
+       SN_SAL_EHF_NO_RZ_IO_READ,
+};
+
 
 /**
  * sn_sal_rev_major - get the major SGI SAL revision number
@@ -670,4 +684,24 @@ ia64_sn_sysctl_iobrick_pci_op(nasid_t n, u64 connection_type,
        return 0;
 }
 
+/*
+ * Tell the prom how the OS wants to handle specific error features.
+ * It takes an array of 7 u64.
+ */
+static inline u64
+ia64_sn_set_error_handling_features(const u64 *feature_bits)
+{
+       struct ia64_sal_retval rv = {0, 0, 0, 0};
+
+       SAL_CALL_REENTRANT(rv, SN_SAL_SET_ERROR_HANDLING_FEATURES,
+                       feature_bits[0],
+                       feature_bits[1],
+                       feature_bits[2],
+                       feature_bits[3],
+                       feature_bits[4],
+                       feature_bits[5],
+                       feature_bits[6]);
+       return rv.status;
+}
+
 #endif /* _ASM_IA64_SN_SN_SAL_H */