2 files changed, 33 insertions, 0 deletions

diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c
index 12240be58f27..65f7e335f122 100644
--- a/drivers/acpi/bus.c
+++ b/drivers/acpi/bus.c
@@ -466,6 +466,30 @@ out_kfree:
 }
 EXPORT_SYMBOL(acpi_run_osc);
 
+static u8 sb_uuid_str[] = "0811B06E-4A27-44F9-8D60-3CBBC22E7B48";
+static void acpi_bus_osc_support(void)
+{
+        u32 capbuf[2];
+        struct acpi_osc_context context = {
+                .uuid_str = sb_uuid_str,
+                .rev = 1,
+                .cap.length = 8,
+                .cap.pointer = capbuf,
+        };
+        acpi_handle handle;
+
+        capbuf[OSC_QUERY_TYPE] = OSC_QUERY_ENABLE;
+        capbuf[OSC_SUPPORT_TYPE] = OSC_SB_PR3_SUPPORT; /* _PR3 is in use */
+#ifdef CONFIG_ACPI_PROCESSOR_AGGREGATOR
+        capbuf[OSC_SUPPORT_TYPE] |= OSC_SB_PAD_SUPPORT;
+#endif
+        if (ACPI_FAILURE(acpi_get_handle(NULL, "\\_SB", &handle)))
+                return;
+        if (ACPI_SUCCESS(acpi_run_osc(handle, &context)))
+                kfree(context.ret.pointer);
+        /* do we need to check the returned cap? Sounds no */
+}
+
 /* --------------------------------------------------------------------------
                                 Event Management
    -------------------------------------------------------------------------- */
@@ -856,6 +880,8 @@ static int __init acpi_bus_init(void)
         status = acpi_ec_ecdt_probe();
         /* Ignore result. Not having an ECDT is not fatal. */
 
+        acpi_bus_osc_support();
+
         status = acpi_initialize_objects(ACPI_FULL_INITIALIZATION);
         if (ACPI_FAILURE(status)) {
                 printk(KERN_ERR PREFIX "Unable to initialize ACPI objects\n");
diff --git a/include/linux/acpi.h b/include/linux/acpi.h
index 535beecc37cf..e11090d462d2 100644
--- a/include/linux/acpi.h
+++ b/include/linux/acpi.h
@@ -273,6 +273,13 @@ struct acpi_osc_context {
 
 acpi_status acpi_run_osc(acpi_handle handle, struct acpi_osc_context *context);
 
+/* platform-wide _OSC bits */
+#define OSC_SB_PAD_SUPPORT              1
+#define OSC_SB_PPC_OST_SUPPORT          2
+#define OSC_SB_PR3_SUPPORT              4
+#define OSC_SB_CPUHP_OST_SUPPORT        8
+#define OSC_SB_APEI_SUPPORT             16
+
 /* PCI defined _OSC bits */
 /* _OSC DW1 Definition (OS Support Fields) */
 #define OSC_EXT_PCI_CONFIG_SUPPORT              1