Author: Huang Ying <[email protected]>
upstream commit b6a9501658530d8b8374e37f1edb549039a8a260
Some machine may have broken firmware so that GHES and firmware first
mode should be disabled. This patch adds support to that.
Signed-off-by: Huang Ying <[email protected]>
Reviewed-by: Andi Kleen <[email protected]>
Reviewed-by: Matthew Garrett <[email protected]>
Signed-off-by: Len Brown <[email protected]>
Signed-off-by: Stephen Hemminger <[email protected]>
---
drivers/acpi/apei/ghes.c | 8 ++++++++
drivers/acpi/apei/hest.c | 17 +++++++++--------
include/acpi/apei.h | 1 +
3 files changed, 18 insertions(+), 8 deletions(-)
--- a/drivers/acpi/apei/ghes.c 2012-05-21 17:24:11.528242941 -0700
+++ b/drivers/acpi/apei/ghes.c 2012-05-21 17:24:39.620565184 -0700
@@ -77,6 +77,9 @@ struct ghes {
};
};
+int ghes_disable;
+module_param_named(disable, ghes_disable, bool, 0);
+
static int ghes_panic_timeout __read_mostly = 30;
/*
@@ -662,6 +665,11 @@ static int __init ghes_init(void)
return -EINVAL;
}
+ if (ghes_disable) {
+ pr_info(GHES_PFX "GHES is not enabled!\n");
+ return -EINVAL;
+ }
+
rc = ghes_ioremap_init();
if (rc)
goto err;
--- a/drivers/acpi/apei/hest.c 2012-05-21 17:24:11.528242941 -0700
+++ b/drivers/acpi/apei/hest.c 2012-05-21 17:24:39.620565184 -0700
@@ -231,16 +231,17 @@ void __init acpi_hest_init(void)
goto err;
}
- rc = apei_hest_parse(hest_parse_ghes_count, &ghes_count);
- if (rc)
- goto err;
-
- rc = hest_ghes_dev_register(ghes_count);
- if (!rc) {
- pr_info(HEST_PFX "Table parsing has been initialized.\n");
- return;
+ if (!ghes_disable) {
+ rc = apei_hest_parse(hest_parse_ghes_count, &ghes_count);
+ if (rc)
+ goto err;
+ rc = hest_ghes_dev_register(ghes_count);
+ if (rc)
+ goto err;
}
+ pr_info(HEST_PFX "Table parsing has been initialized.\n");
+ return;
err:
hest_disable = 1;
}
--- a/include/acpi/apei.h 2012-05-21 17:24:13.340263727 -0700
+++ b/include/acpi/apei.h 2012-05-21 17:24:39.624565230 -0700
@@ -18,6 +18,7 @@
extern int hest_disable;
extern int erst_disable;
+extern int ghes_disable;
#ifdef CONFIG_ACPI_APEI
void __init acpi_hest_init(void);
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
