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 08/19] ACPI, APEI, Add APEI bit support in generic _OSC call
Date: Tue, 02 Aug 2011 18:14:41 -0400 [thread overview]
Message-ID: <eccddd32ced0df8f9130024157bf8d37df860d76.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>
In APEI firmware first mode, hardware error is reported by hardware to
firmware firstly, then firmware reports the error to Linux in a GHES
error record via POLL/SCI/IRQ/NMI etc.
This may result in some issues if OS has no full APEI support. So
some firmware implementation will work in a back-compatible mode by
default. Where firmware will only notify OS in old-fashion, without
GHES record. For example, for a fatal hardware error, only NMI is
signaled, no GHES record.
To gain full APEI power on these machines, APEI bit in generic _OSC
call can be specified to tell firmware that Linux has full APEI
support. This patch adds the APEI bit support in generic _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/bus.c | 16 ++++++++++++++--
include/linux/acpi.h | 2 ++
2 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c
index d1e06c1..43ce3b0 100644
--- a/drivers/acpi/bus.c
+++ b/drivers/acpi/bus.c
@@ -39,6 +39,7 @@
#include <linux/pci.h>
#include <acpi/acpi_bus.h>
#include <acpi/acpi_drivers.h>
+#include <acpi/apei.h>
#include <linux/dmi.h>
#include <linux/suspend.h>
@@ -519,6 +520,7 @@ out_kfree:
}
EXPORT_SYMBOL(acpi_run_osc);
+bool osc_sb_apei_support_acked;
static u8 sb_uuid_str[] = "0811B06E-4A27-44F9-8D60-3CBBC22E7B48";
static void acpi_bus_osc_support(void)
{
@@ -541,11 +543,21 @@ static void acpi_bus_osc_support(void)
#if defined(CONFIG_ACPI_PROCESSOR) || defined(CONFIG_ACPI_PROCESSOR_MODULE)
capbuf[OSC_SUPPORT_TYPE] |= OSC_SB_PPC_OST_SUPPORT;
#endif
+
+#ifdef CONFIG_ACPI_APEI_GHES
+ if (!ghes_disable)
+ capbuf[OSC_SUPPORT_TYPE] |= OSC_SB_APEI_SUPPORT;
+#endif
if (ACPI_FAILURE(acpi_get_handle(NULL, "\\_SB", &handle)))
return;
- if (ACPI_SUCCESS(acpi_run_osc(handle, &context)))
+ if (ACPI_SUCCESS(acpi_run_osc(handle, &context))) {
+ u32 *capbuf_ret = context.ret.pointer;
+ if (context.ret.length > OSC_SUPPORT_TYPE)
+ osc_sb_apei_support_acked =
+ capbuf_ret[OSC_SUPPORT_TYPE] & OSC_SB_APEI_SUPPORT;
kfree(context.ret.pointer);
- /* do we need to check the returned cap? Sounds no */
+ }
+ /* do we need to check other returned cap? Sounds no */
}
/* --------------------------------------------------------------------------
diff --git a/include/linux/acpi.h b/include/linux/acpi.h
index 1deb2a7..e19527d 100644
--- a/include/linux/acpi.h
+++ b/include/linux/acpi.h
@@ -280,6 +280,8 @@ acpi_status acpi_run_osc(acpi_handle handle, struct acpi_osc_context *context);
#define OSC_SB_CPUHP_OST_SUPPORT 8
#define OSC_SB_APEI_SUPPORT 16
+extern bool osc_sb_apei_support_acked;
+
/* PCI defined _OSC bits */
/* _OSC DW1 Definition (OS Support Fields) */
#define OSC_EXT_PCI_CONFIG_SUPPORT 1
--
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 ` Len Brown [this message]
2011-08-02 22:14 ` [PATCH 09/19] ACPI, APEI, Add WHEA _OSC support Len Brown
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=eccddd32ced0df8f9130024157bf8d37df860d76.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
Powered by JetHome