summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomasz Nowicki <tomasz.nowicki@linaro.org>2014-01-08 18:01:15 +0100
committerTomasz Nowicki <tomasz.nowicki@linaro.org>2014-01-10 13:59:56 +0100
commit8f7094631de90ed553d3c9b6349cc2621a5cdf02 (patch)
treed1c00f07d5566dd2482c59ac276c1c67de98d2f6
parent6781956d917515cf10e518f936a9df2223745093 (diff)
apei: Follow up lately kernel changes.
Since 3.13 kernel birngs a lot of new features and APEI structure refines, we need to update our tool to make it works with APEI blob. Signed-off-by: Tomasz Nowicki <tomasz.nowicki@linaro.org>
-rw-r--r--tools/bfapei/bfapei.c2
-rw-r--r--tools/common/include/acpi.h14
2 files changed, 10 insertions, 6 deletions
diff --git a/tools/bfapei/bfapei.c b/tools/bfapei/bfapei.c
index b27d0e1..2bf104d 100644
--- a/tools/bfapei/bfapei.c
+++ b/tools/bfapei/bfapei.c
@@ -195,7 +195,7 @@ static int bfapei_hest(char **buf, int *size, uint64_t paddr, int status)
block_ptr = (struct acpi_hest_generic_status *) (++add_ptr);
block_ptr->block_status = status;
block_ptr->data_length = sizeof(struct acpi_hest_generic_data);
- block_ptr->error_severity = GHES_SEV_CORRECTED;
+ block_ptr->error_severity = CPER_SEV_CORRECTED;
/* Fill in generic error data entry */
gdata = (struct acpi_hest_generic_data *) (block_ptr + 1);
diff --git a/tools/common/include/acpi.h b/tools/common/include/acpi.h
index 2b46c9b..01dad20 100644
--- a/tools/common/include/acpi.h
+++ b/tools/common/include/acpi.h
@@ -127,10 +127,10 @@ struct acpi_hest_generic {
};
enum {
- GHES_SEV_NO = 0x0,
- GHES_SEV_CORRECTED = 0x1,
- GHES_SEV_RECOVERABLE = 0x2,
- GHES_SEV_PANIC = 0x3,
+ CPER_SEV_RECOVERABLE,
+ CPER_SEV_FATAL,
+ CPER_SEV_CORRECTED,
+ CPER_SEV_INFORMATIONAL,
};
/* Generic Error Status block */
@@ -213,7 +213,11 @@ struct cper_sec_mem_err {
uint64_t responder_id;
uint64_t target_id;
uint8_t error_type;
-} __attribute__ ((packed));
+ uint8_t reserved;
+ uint16_t rank;
+ uint16_t mem_array_handle; /* card handle in UEFI 2.4 */
+ uint16_t mem_dev_handle; /* module handle in UEFI 2.4 */
+};
/* ERST Error Log Address Range atrributes */
#define ERST_RANGE_RESERVED 0x0001