[IA64] Add error_recovery_info field to SAL section header

[linux-2.6-omap-h63xx.git] / arch / ia64 / include / asm / sal.h

diff --git a/arch/ia64/include/asm/sal.h b/arch/ia64/include/asm/sal.h
index 89594b442f835e3ff162cc60bd8fdb55f099e641..966797a97c94a7c2a8a962dd0ae7b7afbfc2dc2e 100644 (file)
--- a/arch/ia64/include/asm/sal.h
+++ b/arch/ia64/include/asm/sal.h
@@ -236,7 +236,7 @@ extern struct ia64_sal_desc_ptc *ia64_ptc_domain_info;
 
 extern unsigned short sal_revision;    /* supported SAL spec revision */
 extern unsigned short sal_version;     /* SAL version; OEM dependent */
-#define SAL_VERSION_CODE(major, minor) ((BIN2BCD(major) << 8) | BIN2BCD(minor))
+#define SAL_VERSION_CODE(major, minor) ((bin2bcd(major) << 8) | bin2bcd(minor))
 
 extern const char *ia64_sal_strerror (long status);
 extern void ia64_sal_init (struct ia64_sal_systab *sal_systab);
@@ -337,11 +337,24 @@ typedef struct sal_log_record_header {
 #define sal_log_severity_fatal         1
 #define sal_log_severity_corrected     2
 
+/*
+ * Error Recovery Info (ERI) bit decode.  From SAL Spec section B.2.2 Table B-3
+ * Error Section Error_Recovery_Info Field Definition.
+ */
+#define ERI_NOT_VALID          0x0     /* Error Recovery Field is not valid */
+#define ERI_NOT_ACCESSIBLE     0x30    /* Resource not accessible */
+#define ERI_CONTAINMENT_WARN   0x22    /* Corrupt data propagated */
+#define ERI_UNCORRECTED_ERROR  0x20    /* Uncorrected error */
+#define ERI_COMPONENT_RESET    0x24    /* Component must be reset */
+#define ERI_CORR_ERROR_LOG     0x21    /* Corrected error, needs logging */
+#define ERI_CORR_ERROR_THRESH  0x29    /* Corrected error threshold exceeded */
+
 /* Definition of log section header structures */
 typedef struct sal_log_sec_header {
     efi_guid_t guid;                   /* Unique Section ID */
     sal_log_revision_t revision;       /* Major and Minor revision of Section */
-    u16 reserved;
+    u8 error_recovery_info;            /* Platform error recovery status */
+    u8 reserved;
     u32 len;                           /* Section length */
 } sal_log_section_hdr_t;