From: Len Brown <lenb@kernel.org>
To: linux-kernel@vger.kernel.org, linux-acpi@vger.kernel.org
Cc: Huang Ying <ying.huang@intel.com>, Len Brown <len.brown@intel.com>
Subject: [PATCH 09/19] ACPI, APEI, Add WHEA _OSC support
Date: Tue, 02 Aug 2011 18:14:42 -0400 [thread overview]
Message-ID: <9fb0bfe1408d5506b7b83d13d1eed573fd71d67d.1312323131.git.len.brown@intel.com> (raw)
In-Reply-To: <1312323292-2986-1-git-send-email-lenb@kernel.org>
In-Reply-To: <ca7cc5110a313a609da40ae948978a585352564b.1312323131.git.len.brown@intel.com>
From: Huang Ying <ying.huang@intel.com>
APEI firmware first mode must be turned on explicitly on some
machines, otherwise there may be no GHES hardware error record for
hardware error notification. APEI bit in generic _OSC call can be
used to do that, but on some machine, a special WHEA _OSC call must be
used. This patch adds the support to that WHEA _OSC call.
Signed-off-by: Huang Ying <ying.huang@intel.com>
Reviewed-by: Andi Kleen <ak@linux.intel.com>
Reviewed-by: Matthew Garrett <mjg@redhat.com>
Signed-off-by: Len Brown <len.brown@intel.com>
---
drivers/acpi/apei/apei-base.c | 26 ++++++++++++++++++++++++++
drivers/acpi/apei/apei-internal.h | 2 ++
drivers/acpi/apei/ghes.c | 10 ++++++++++
3 files changed, 38 insertions(+), 0 deletions(-)
diff --git a/drivers/acpi/apei/apei-base.c b/drivers/acpi/apei/apei-base.c
index 0714194..8041248 100644
--- a/drivers/acpi/apei/apei-base.c
+++ b/drivers/acpi/apei/apei-base.c
@@ -604,3 +604,29 @@ struct dentry *apei_get_debugfs_dir(void)
return dapei;
}
EXPORT_SYMBOL_GPL(apei_get_debugfs_dir);
+
+int apei_osc_setup(void)
+{
+ static u8 whea_uuid_str[] = "ed855e0c-6c90-47bf-a62a-26de0fc5ad5c";
+ acpi_handle handle;
+ u32 capbuf[3];
+ struct acpi_osc_context context = {
+ .uuid_str = whea_uuid_str,
+ .rev = 1,
+ .cap.length = sizeof(capbuf),
+ .cap.pointer = capbuf,
+ };
+
+ capbuf[OSC_QUERY_TYPE] = OSC_QUERY_ENABLE;
+ capbuf[OSC_SUPPORT_TYPE] = 0;
+ capbuf[OSC_CONTROL_TYPE] = 0;
+
+ if (ACPI_FAILURE(acpi_get_handle(NULL, "\\_SB", &handle))
+ || ACPI_FAILURE(acpi_run_osc(handle, &context)))
+ return -EIO;
+ else {
+ kfree(context.ret.pointer);
+ return 0;
+ }
+}
+EXPORT_SYMBOL_GPL(apei_osc_setup);
diff --git a/drivers/acpi/apei/apei-internal.h b/drivers/acpi/apei/apei-internal.h
index f286cf7..f57050e 100644
--- a/drivers/acpi/apei/apei-internal.h
+++ b/drivers/acpi/apei/apei-internal.h
@@ -124,4 +124,6 @@ void apei_estatus_print(const char *pfx,
const struct acpi_hest_generic_status *estatus);
int apei_estatus_check_header(const struct acpi_hest_generic_status *estatus);
int apei_estatus_check(const struct acpi_hest_generic_status *estatus);
+
+int apei_osc_setup(void);
#endif
diff --git a/drivers/acpi/apei/ghes.c b/drivers/acpi/apei/ghes.c
index b142b94..b1390a6 100644
--- a/drivers/acpi/apei/ghes.c
+++ b/drivers/acpi/apei/ghes.c
@@ -681,6 +681,16 @@ static int __init ghes_init(void)
if (rc)
goto err_ioremap_exit;
+ rc = apei_osc_setup();
+ if (rc == 0 && osc_sb_apei_support_acked)
+ pr_info(GHES_PFX "APEI firmware first mode is enabled by APEI bit and WHEA _OSC.\n");
+ else if (rc == 0 && !osc_sb_apei_support_acked)
+ pr_info(GHES_PFX "APEI firmware first mode is enabled by WHEA _OSC.\n");
+ else if (rc && osc_sb_apei_support_acked)
+ pr_info(GHES_PFX "APEI firmware first mode is enabled by APEI bit.\n");
+ else
+ pr_info(GHES_PFX "Failed to enable APEI firmware first mode.\n");
+
return 0;
err_ioremap_exit:
ghes_ioremap_exit();
--
1.7.6.396.ge0613
next prev parent reply other threads:[~2011-08-02 22:16 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-08-02 22:14 APEI patches for Linux 3.1 Len Brown
2011-08-02 22:14 ` [PATCH 01/19] ACPI, APEI, ERST, Prevent erst_dbg from loading if ERST is disabled Len Brown
2011-08-02 22:14 ` [PATCH 02/19] ACPI, APEI, ERST, Fix erst-dbg long record reading issue Len Brown
2011-08-02 22:14 ` [PATCH 03/19] ACPI, APEI, GHES, Do not ratelimit fatal error printk before panic Len Brown
2011-08-02 22:14 ` [PATCH 04/19] ACPI, APEI, Add apei_exec_run_optional Len Brown
2011-08-02 22:14 ` [PATCH 05/19] ACPI, APEI, Use apei_exec_run_optional in APEI EINJ and ERST Len Brown
2011-08-02 22:14 ` [PATCH 06/19] ACPI, APEI, GHES, Prevent GHES to be built as module Len Brown
2011-08-02 22:14 ` [PATCH 07/19] ACPI, APEI, GHES, Support disable GHES at boot time Len Brown
2011-08-02 22:14 ` [PATCH 08/19] ACPI, APEI, Add APEI bit support in generic _OSC call Len Brown
2011-08-02 22:14 ` Len Brown [this message]
2011-08-02 22:14 ` [PATCH 10/19] Add Kconfig option ARCH_HAVE_NMI_SAFE_CMPXCHG Len Brown
2011-08-03 9:04 ` Ralf Baechle
2011-08-03 15:00 ` Richard Henderson
2011-08-02 22:14 ` [PATCH 11/19] lib, Add lock-less NULL terminated single list Len Brown
2011-08-02 22:14 ` [PATCH 12/19] lib, Make gen_pool memory allocator lockless Len Brown
2011-08-02 22:14 ` [PATCH 13/19] ACPI, APEI, GHES, printk support for recoverable error via NMI Len Brown
2011-08-02 22:14 ` [PATCH 14/19] ACPI, APEI, GHES, Error records content based throttle Len Brown
2011-08-02 22:14 ` [PATCH 15/19] HWPoison: add memory_failure_queue() Len Brown
2011-08-02 22:14 ` [PATCH 16/19] ACPI, APEI, GHES: Add hardware memory error recovery support Len Brown
2011-08-02 22:14 ` [PATCH 17/19] ACPI: APEI build fix Len Brown
2011-08-02 22:14 ` [PATCH 18/19] APEI GHES: 32-bit buildfix Len Brown
2011-08-02 22:14 ` [PATCH 19/19] ACPI, APEI, EINJ Param support is disabled by default Len Brown
2011-08-03 8:44 ` [PATCH 10/19] Add Kconfig option ARCH_HAVE_NMI_SAFE_CMPXCHG David Howells
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=9fb0bfe1408d5506b7b83d13d1eed573fd71d67d.1312323131.git.len.brown@intel.com \
--to=lenb@kernel.org \
--cc=len.brown@intel.com \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=ying.huang@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
all inboxes | Powered by JetHome®