Merge branches 'acpi-bus', 'acpi-pci', 'acpica' and 'acpi-doc'

* acpi-bus:
  ACPI / bus: Support for platform initiated graceful shutdown
  ACPI / bus: Correct the comments about acpi_subsystem_init()
  ACPI / bus: Use acpi_handle_debug() in acpi_print_osc_error()

* acpi-pci:
  ACPI / PCI: make pci_slot explicitly non-modular
  ACPI / PCI: pci_slot: Use generic pr_debug utility
  ACPI / PCI: pci_slot: Use more common logging style

* acpica:
  ACPICA: Linux: Enable ACPI_MUTEX_DEBUG for Linux kernel

* acpi-doc:
  ACPI / debugger: Add AML debugger documentation
  ACPI: Add documentation describing ACPICA release automation

diff --combined drivers/acpi/bus.c
index 97e270e,64a3fb0,262ca31,262ca31,262ca31..cb9558e
--- 1/drivers/acpi/bus.c
--- 2/drivers/acpi/bus.c
--- 3/drivers/acpi/bus.c
--- 4/drivers/acpi/bus.c
--- 5/drivers/acpi/bus.c
+++ b/drivers/acpi/bus.c
@@@@@@ -30,6 -30,9 -30,6 -30,6 -30,6 +30,9 @@@@@@
     #include <linux/acpi.h>
     #include <linux/slab.h>
     #include <linux/regulator/machine.h>
+ +++#include <linux/workqueue.h>
+ +++#include <linux/reboot.h>
+ +++#include <linux/delay.h>
     #ifdef CONFIG_X86
     #include <asm/mpspec.h>
     #endif
@@@@@@ -174,22 -177,17 -174,22 -174,22 -174,22 +177,17 @@@@@@ void acpi_bus_detach_private_data(acpi_
     EXPORT_SYMBOL_GPL(acpi_bus_detach_private_data);
     
     static void acpi_print_osc_error(acpi_handle handle,
- ---   struct acpi_osc_context *context, char *error)
+ +++                            struct acpi_osc_context *context, char *error)
     {
- ---   struct acpi_buffer buffer = {ACPI_ALLOCATE_BUFFER};
        int i;
     
- ---   if (ACPI_FAILURE(acpi_get_name(handle, ACPI_FULL_PATHNAME, &buffer)))
- ---           printk(KERN_DEBUG "%s: %s\n", context->uuid_str, error);
- ---   else {
- ---           printk(KERN_DEBUG "%s (%s): %s\n",
- ---                  (char *)buffer.pointer, context->uuid_str, error);
- ---           kfree(buffer.pointer);
- ---   }
- ---   printk(KERN_DEBUG "_OSC request data:");
+ +++   acpi_handle_debug(handle, "(%s): %s\n", context->uuid_str, error);
+ +++
+ +++   pr_debug("_OSC request data:");
        for (i = 0; i < context->cap.length; i += sizeof(u32))
- ---           printk(" %x", *((u32 *)(context->cap.pointer + i)));
- ---   printk("\n");
+ +++           pr_debug(" %x", *((u32 *)(context->cap.pointer + i)));
+ +++
+ +++   pr_debug("\n");
     }
     
     acpi_status acpi_str_to_uuid(char *str, u8 *uuid)
@@@@@@ -475,6 -473,56 -475,6 -475,6 -475,6 +473,56 @@@@@@ static void acpi_device_remove_notify_h
                                           acpi_device_notify);
     }
     
+ +++/* Handle events targeting \_SB device (at present only graceful shutdown) */
+ +++
+ +++#define ACPI_SB_NOTIFY_SHUTDOWN_REQUEST 0x81
+ +++#define ACPI_SB_INDICATE_INTERVAL  10000
+ +++
+ +++static void sb_notify_work(struct work_struct *dummy)
+ +++{
+ +++   acpi_handle sb_handle;
+ +++
+ +++   orderly_poweroff(true);
+ +++
+ +++   /*
+ +++    * After initiating graceful shutdown, the ACPI spec requires OSPM
+ +++    * to evaluate _OST method once every 10seconds to indicate that
+ +++    * the shutdown is in progress
+ +++    */
+ +++   acpi_get_handle(NULL, "\\_SB", &sb_handle);
+ +++   while (1) {
+ +++           pr_info("Graceful shutdown in progress.\n");
+ +++           acpi_evaluate_ost(sb_handle, ACPI_OST_EC_OSPM_SHUTDOWN,
+ +++                           ACPI_OST_SC_OS_SHUTDOWN_IN_PROGRESS, NULL);
+ +++           msleep(ACPI_SB_INDICATE_INTERVAL);
+ +++   }
+ +++}
+ +++
+ +++static void acpi_sb_notify(acpi_handle handle, u32 event, void *data)
+ +++{
+ +++   static DECLARE_WORK(acpi_sb_work, sb_notify_work);
+ +++
+ +++   if (event == ACPI_SB_NOTIFY_SHUTDOWN_REQUEST) {
+ +++           if (!work_busy(&acpi_sb_work))
+ +++                   schedule_work(&acpi_sb_work);
+ +++   } else
+ +++           pr_warn("event %x is not supported by \\_SB device\n", event);
+ +++}
+ +++
+ +++static int __init acpi_setup_sb_notify_handler(void)
+ +++{
+ +++   acpi_handle sb_handle;
+ +++
+ +++   if (ACPI_FAILURE(acpi_get_handle(NULL, "\\_SB", &sb_handle)))
+ +++           return -ENXIO;
+ +++
+ +++   if (ACPI_FAILURE(acpi_install_notify_handler(sb_handle, ACPI_DEVICE_NOTIFY,
+ +++                                           acpi_sb_notify, NULL)))
+ +++           return -EINVAL;
+ +++
+ +++   return 0;
+ +++}
+ +++
     /* --------------------------------------------------------------------------
                                  Device Matching
        -------------------------------------------------------------------------- */
@@@@@@ -961,8 -1009,7 -961,8 -961,8 -961,8 +1009,7 @@@@@@ void __init acpi_early_init(void
     /**
      * acpi_subsystem_init - Finalize the early initialization of ACPI.
      *
- --- * Switch over the platform to the ACPI mode (if possible), initialize the
- --- * handling of ACPI events, install the interrupt and global lock handlers.
+ +++ * Switch over the platform to the ACPI mode (if possible).
      *
      * Doing this too early is generally unsafe, but at the same time it needs to be
      * done before all things that really depend on ACPI.  The right spot appears to
@@@@@@ -990,13 -1037,6 -990,6 -990,6 -990,6 +1037,13 @@@@@@ void __init acpi_subsystem_init(void
        }
     }
     
 ++++static acpi_status acpi_bus_table_handler(u32 event, void *table, void *context)
 ++++{
 ++++   acpi_scan_table_handler(event, table, context);
 ++++
 ++++   return acpi_sysfs_table_handler(event, table, context);
 ++++}
 ++++
     static int __init acpi_bus_init(void)
     {
        int result;
@@@@@@ -1050,8 -1090,6 -1043,6 -1043,6 -1043,6 +1097,8 @@@@@@
         * _PDC control method may load dynamic SSDT tables,
         * and we need to install the table handler before that.
         */
 ++++   status = acpi_install_table_handler(acpi_bus_table_handler, NULL);
 ++++
        acpi_sysfs_init();
     
        acpi_early_processor_set_pdc();
@@@@@@ -1133,6 -1171,7 -1124,6 -1124,6 -1124,6 +1180,7 @@@@@@ static int __init acpi_init(void
        acpi_sleep_proc_init();
        acpi_wakeup_device_init();
        acpi_debugger_init();
+ +++   acpi_setup_sb_notify_handler();
        return 0;
     }