From: Tony Luck <tony.luck@xxxxxxxxx>
Quoting version 6.1 of the ACPI specification. Section 18.3.1 "Boot
Error Source" says:
The Boot Error Region is a range of addressable memory OSPM can access
during initialization to determine if an unhandled error condition
occurred. System firmware must report this memory range as firmware
reserved. The format of the Boot Error Region follow that of an Error
Status Block, this is defined in Section 18.3.2.7. The format of the
error status block is described by Table 18-342.
This clarifies some points that were obfuscated in earlier versions.
E.g. there is no longer a separate table to describe the format of the
"Boot Error Region" (which was identical to the "Error Status Block").
Also saying "follow that of *an* Error Status Block" makes it clear that
there is just one block (which can still contain multiple "Generic Error
Data Entry structures").
The loop inside bert_print_all() is unnecessary (but probably harmless
as the "while (remain > sizeof(struct acpi_bert_region))" loop should
terminate after we skipped over the first entry.
We can drop the "bert_print_all()" function and just move the four
relevant lines inline in "bert_init()". Since there are no remaining
users of "struct acpi_bert_region" we delete it from <acpi/actbl1.h>
Cc: Len Brown <lenb@xxxxxxxxxx>
Cc: Huang Ying <ying.huang@xxxxxxxxx>
Cc: Borislav Petkov <bp@xxxxxxx>
Cc: Tomasz Nowicki <tomasz.nowicki@xxxxxxxxxx>
Cc: Jonathan (Zhixiong) Zhang <zjzhang@xxxxxxxxxxxxxx>
Cc: Tyler Baicar <tbaicar@xxxxxxxxxxxxxx>
Cc: linux-acpi@xxxxxxxxxxxxxxx
Signed-off-by: Tony Luck <tony.luck@xxxxxxxxx>
---
drivers/acpi/apei/bert.c | 54 +++++++-----------------------------------------
include/acpi/actbl1.h | 11 +---------
2 files changed, 8 insertions(+), 57 deletions(-)
diff --git a/drivers/acpi/apei/bert.c b/drivers/acpi/apei/bert.c
index 12771fcf0417..b28e1573d4cf 100644
--- a/drivers/acpi/apei/bert.c
+++ b/drivers/acpi/apei/bert.c
@@ -34,50 +34,6 @@
static int bert_disable;
-static void __init bert_print_all(struct acpi_bert_region *region,
- unsigned int region_len)
-{
- struct acpi_hest_generic_status *estatus =
- (struct acpi_hest_generic_status *)region;
- int remain = region_len;
- u32 estatus_len;
-
- if (!estatus->block_status)
- return;
-
- while (remain > sizeof(struct acpi_bert_region)) {
- if (cper_estatus_check(estatus)) {
- pr_err(FW_BUG "Invalid error record.\n");
- return;
- }
-
- estatus_len = cper_estatus_len(estatus);
- if (remain < estatus_len) {
- pr_err(FW_BUG "Truncated status block (length: %u).\n",
- estatus_len);
- return;
- }
-
- pr_info_once("Error records from previous boot:\n");
-
- cper_estatus_print(KERN_INFO HW_ERR, estatus);
-
- /*
- * Because the boot error source is "one-time polled" type,
- * clear Block Status of current Generic Error Status Block,
- * once it's printed.
- */
- estatus->block_status = 0;
-
- estatus = (void *)estatus + estatus_len;
- /* No more error records. */
- if (!estatus->block_status)
- return;
-
- remain -= estatus_len;
- }
-}
-
static int __init setup_bert_disable(char *str)
{
bert_disable = 1;
@@ -89,7 +45,7 @@ __setup("bert_disable", setup_bert_disable);
static int __init bert_check_table(struct acpi_table_bert *bert_tab)
{
if (bert_tab->header.length < sizeof(struct acpi_table_bert) ||
- bert_tab->region_length < sizeof(struct acpi_bert_region))
+ bert_tab->region_length < sizeof(struct acpi_hest_generic_status))
return -EINVAL;
return 0;
@@ -98,7 +54,7 @@ static int __init bert_check_table(struct acpi_table_bert *bert_tab)
static int __init bert_init(void)
{
struct apei_resources bert_resources;
- struct acpi_bert_region *boot_error_region;
+ struct acpi_hest_generic_status *boot_error_region;
struct acpi_table_bert *bert_tab;
unsigned int region_len;
acpi_status status;
@@ -138,7 +94,11 @@ static int __init bert_init(void)
goto out_fini;
boot_error_region = ioremap_cache(bert_tab->address, region_len);
if (boot_error_region) {
- bert_print_all(boot_error_region, region_len);
+ if (boot_error_region->block_status) {
+ pr_info("Error records from previous boot:\n");
+ cper_estatus_print(KERN_INFO HW_ERR, boot_error_region);
+ boot_error_region->block_status = 0;
+ }
iounmap(boot_error_region);
} else {
rc = -ENOMEM;
diff --git a/include/acpi/actbl1.h b/include/acpi/actbl1.h
index b4ce55c008b0..cf0bd26774aa 100644
--- a/include/acpi/actbl1.h
+++ b/include/acpi/actbl1.h
@@ -127,16 +127,7 @@ struct acpi_table_bert {
struct acpi_table_header header; /* Common ACPI table header */
u32 region_length; /* Length of the boot error region */
u64 address; /* Physical address of the error region */
-};
-
-/* Boot Error Region (not a subtable, pointed to by Address field above) */
-
-struct acpi_bert_region {
- u32 block_status; /* Type of error information */
- u32 raw_data_offset; /* Offset to raw error data */
- u32 raw_data_length; /* Length of raw error data */
- u32 data_length; /* Length of generic error data */
- u32 error_severity; /* Severity code */
+ /* which is a struct acpi_hest_generic_status */
};
/* Values for block_status flags above */
--
2.11.0
--
To unsubscribe from this list: send the line "unsubscribe linux-acpi" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
