From: Huang Ying <ying.huang@intel.com>
To: Len Brown <lenb@kernel.org>
Cc: linux-kernel@vger.kernel.org, Andi Kleen <andi@firstfloor.org>,
Tony Luck <tony.luck@intel.com>,
ying.huang@intel.com, linux-acpi@vger.kernel.org,
mjg59@srcf.ucam.org
Subject: [PATCH 2/4] ACPI, APEI, GHES, Support disable GHES at boot time
Date: Tue, 21 Jun 2011 15:16:25 +0800 [thread overview]
Message-ID: <1308640587-24502-3-git-send-email-ying.huang@intel.com> (raw)
In-Reply-To: <1308640587-24502-1-git-send-email-ying.huang@intel.com>
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 <ying.huang@intel.com>
---
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
+++ b/drivers/acpi/apei/ghes.c
@@ -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
+++ b/drivers/acpi/apei/hest.c
@@ -230,16 +230,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
+++ b/include/acpi/apei.h
@@ -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);
next prev parent reply other threads:[~2011-06-21 7:16 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-06-21 7:16 [PATCH 0/4] ACPI, APEI, Add APEI related _OSC support Huang Ying
2011-06-21 7:16 ` [PATCH 1/4] ACPI, APEI, GHES, Prevent GHES to be built as module Huang Ying
2011-06-21 7:23 ` Andi Kleen
2011-06-21 7:30 ` Huang Ying
2011-06-21 13:18 ` Matthew Garrett
2011-06-21 13:23 ` Matthew Garrett
2011-06-21 7:16 ` Huang Ying [this message]
2011-06-21 7:16 ` [PATCH 3/4] ACPI, APEI, Add APEI bit support in generic _OSC call Huang Ying
2011-06-21 7:16 ` [PATCH 4/4] ACPI, APEI, Add APEI _OSC support Huang Ying
2011-06-21 13:22 ` Matthew Garrett
2011-06-22 2:21 ` Huang Ying
2011-06-22 15:49 ` Matthew Garrett
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1308640587-24502-3-git-send-email-ying.huang@intel.com \
--to=ying.huang@intel.com \
--cc=andi@firstfloor.org \
--cc=lenb@kernel.org \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mjg59@srcf.ucam.org \
--cc=tony.luck@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome