|
@@ -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 */
|
|
|
}
|
|
|
|
|
|
/* --------------------------------------------------------------------------
|