9 files changed, 139 insertions, 26 deletions

diff --git a/drivers/acpi/namespace/nsnames.c b/drivers/acpi/namespace/nsnames.c
index cffef1bcbdbc..549db42f16cf 100644
--- a/drivers/acpi/namespace/nsnames.c
+++ b/drivers/acpi/namespace/nsnames.c
@@ -137,6 +137,10 @@ char *acpi_ns_get_external_pathname(struct acpi_namespace_node *node)
         /* Calculate required buffer size based on depth below root */
 
         size = acpi_ns_get_pathname_length(node);
+        if (!size) {
+                ACPI_ERROR((AE_INFO, "Invalid node failure"));
+                return_PTR(NULL);
+        }
 
         /* Allocate a buffer to be returned to caller */
 
@@ -229,6 +233,10 @@ acpi_ns_handle_to_pathname(acpi_handle target_handle,
         /* Determine size required for the caller buffer */
 
         required_size = acpi_ns_get_pathname_length(node);
+        if (!required_size) {
+                ACPI_ERROR((AE_INFO, "Invalid node failure"));
+                return_ACPI_STATUS(AE_ERROR);
+        }
 
         /* Validate/Allocate/Clear caller buffer */
 
diff --git a/drivers/acpi/pci_link.c b/drivers/acpi/pci_link.c
index 233c40c51684..89f3b2abfdc7 100644
--- a/drivers/acpi/pci_link.c
+++ b/drivers/acpi/pci_link.c
@@ -113,20 +113,23 @@ acpi_pci_link_check_possible(struct acpi_resource *resource, void *context)
 
         switch (resource->type) {
         case ACPI_RESOURCE_TYPE_START_DEPENDENT:
+        case ACPI_RESOURCE_TYPE_END_TAG:
                 return AE_OK;
         case ACPI_RESOURCE_TYPE_IRQ:
                 {
                         struct acpi_resource_irq *p = &resource->data.irq;
                         if (!p || !p->interrupt_count) {
-                                printk(KERN_WARNING PREFIX "Blank IRQ resource\n");
+                                ACPI_DEBUG_PRINT((ACPI_DB_INFO,
+                                                  "Blank _PRS IRQ resource\n"));
                                 return AE_OK;
                         }
                         for (i = 0;
                              (i < p->interrupt_count
                               && i < ACPI_PCI_LINK_MAX_POSSIBLE); i++) {
                                 if (!p->interrupts[i]) {
-                                        printk(KERN_WARNING PREFIX "Invalid IRQ %d\n",
-                                                      p->interrupts[i]);
+                                        printk(KERN_WARNING PREFIX
+                                               "Invalid _PRS IRQ %d\n",
+                                               p->interrupts[i]);
                                         continue;
                                 }
                                 link->irq.possible[i] = p->interrupts[i];
@@ -143,15 +146,16 @@ acpi_pci_link_check_possible(struct acpi_resource *resource, void *context)
                             &resource->data.extended_irq;
                         if (!p || !p->interrupt_count) {
                                 printk(KERN_WARNING PREFIX
-                                              "Blank EXT IRQ resource\n");
+                                              "Blank _PRS EXT IRQ resource\n");
                                 return AE_OK;
                         }
                         for (i = 0;
                              (i < p->interrupt_count
                               && i < ACPI_PCI_LINK_MAX_POSSIBLE); i++) {
                                 if (!p->interrupts[i]) {
-                                        printk(KERN_WARNING PREFIX "Invalid IRQ %d\n",
-                                                      p->interrupts[i]);
+                                        printk(KERN_WARNING PREFIX
+                                               "Invalid _PRS IRQ %d\n",
+                                               p->interrupts[i]);
                                         continue;
                                 }
                                 link->irq.possible[i] = p->interrupts[i];
@@ -163,7 +167,8 @@ acpi_pci_link_check_possible(struct acpi_resource *resource, void *context)
                         break;
                 }
         default:
-                printk(KERN_ERR PREFIX "Resource is not an IRQ entry\n");
+                printk(KERN_ERR PREFIX "_PRS resource type 0x%x isn't an IRQ\n",
+                       resource->type);
                 return AE_OK;
         }
 
@@ -199,6 +204,9 @@ acpi_pci_link_check_current(struct acpi_resource *resource, void *context)
 
 
         switch (resource->type) {
+        case ACPI_RESOURCE_TYPE_START_DEPENDENT:
+        case ACPI_RESOURCE_TYPE_END_TAG:
+                return AE_OK;
         case ACPI_RESOURCE_TYPE_IRQ:
                 {
                         struct acpi_resource_irq *p = &resource->data.irq;
@@ -208,7 +216,7 @@ acpi_pci_link_check_current(struct acpi_resource *resource, void *context)
                                  * particularly those those w/ _STA disabled
                                  */
                                 ACPI_DEBUG_PRINT((ACPI_DB_INFO,
-                                                  "Blank IRQ resource\n"));
+                                                  "Blank _CRS IRQ resource\n"));
                                 return AE_OK;
                         }
                         *irq = p->interrupts[0];
@@ -224,7 +232,7 @@ acpi_pci_link_check_current(struct acpi_resource *resource, void *context)
                                  * return at least 1 IRQ
                                  */
                                 printk(KERN_WARNING PREFIX
-                                              "Blank EXT IRQ resource\n");
+                                              "Blank _CRS EXT IRQ resource\n");
                                 return AE_OK;
                         }
                         *irq = p->interrupts[0];
@@ -232,10 +240,11 @@ acpi_pci_link_check_current(struct acpi_resource *resource, void *context)
                 }
                 break;
         default:
-                printk(KERN_ERR PREFIX "Resource %d isn't an IRQ\n", resource->type);
-        case ACPI_RESOURCE_TYPE_END_TAG:
+                printk(KERN_ERR PREFIX "_CRS resource type 0x%x isn't an IRQ\n",
+                       resource->type);
                 return AE_OK;
         }
+
         return AE_CTRL_TERMINATE;
 }
 
diff --git a/drivers/acpi/pci_slot.c b/drivers/acpi/pci_slot.c
index b9ab030a52d5..dd376f7ad090 100644
--- a/drivers/acpi/pci_slot.c
+++ b/drivers/acpi/pci_slot.c
@@ -6,8 +6,8 @@
  *  Thanks to Kenji Kaneshige <kaneshige.kenji@jp.fujitsu.com> for code
  *  review and fixes.
  *
- *  Copyright (C) 2007 Alex Chiang <achiang@hp.com>
- *  Copyright (C) 2007 Hewlett-Packard Development Company, L.P.
+ *  Copyright (C) 2007-2008 Hewlett-Packard Development Company, L.P.
+ *      Alex Chiang <achiang@hp.com>
  *
  *  This program is free software; you can redistribute it and/or modify it
  *  under the terms and conditions of the GNU General Public License,
@@ -158,6 +158,7 @@ register_slot(acpi_handle handle, u32 lvl, void *context, void **rv)
         if (IS_ERR(pci_slot)) {
                 err("pci_create_slot returned %ld\n", PTR_ERR(pci_slot));
                 kfree(slot);
+                return AE_OK;
         }
 
         slot->root_handle = parent_context->root_handle;
diff --git a/drivers/acpi/sleep/main.c b/drivers/acpi/sleep/main.c
index 0489a7d1d42c..d13194a031bf 100644
--- a/drivers/acpi/sleep/main.c
+++ b/drivers/acpi/sleep/main.c
@@ -280,9 +280,36 @@ static struct platform_suspend_ops acpi_suspend_ops_old = {
         .end = acpi_pm_end,
         .recover = acpi_pm_finish,
 };
+
+static int __init init_old_suspend_ordering(const struct dmi_system_id *d)
+{
+        old_suspend_ordering = true;
+        return 0;
+}
+
+static struct dmi_system_id __initdata acpisleep_dmi_table[] = {
+        {
+        .callback = init_old_suspend_ordering,
+        .ident = "Abit KN9 (nForce4 variant)",
+        .matches = {
+                DMI_MATCH(DMI_BOARD_VENDOR, "http://www.abit.com.tw/"),
+                DMI_MATCH(DMI_BOARD_NAME, "KN9 Series(NF-CK804)"),
+                },
+        },
+        {},
+};
 #endif /* CONFIG_SUSPEND */
 
 #ifdef CONFIG_HIBERNATION
+static unsigned long s4_hardware_signature;
+static struct acpi_table_facs *facs;
+static bool nosigcheck;
+
+void __init acpi_no_s4_hw_signature(void)
+{
+        nosigcheck = true;
+}
+
 static int acpi_hibernation_begin(void)
 {
         acpi_target_sleep_state = ACPI_STATE_S4;
@@ -316,6 +343,12 @@ static void acpi_hibernation_leave(void)
         acpi_enable();
         /* Reprogram control registers and execute _BFS */
         acpi_leave_sleep_state_prep(ACPI_STATE_S4);
+        /* Check the hardware signature */
+        if (facs && s4_hardware_signature != facs->hardware_signature) {
+                printk(KERN_EMERG "ACPI: Hardware changed while hibernated, "
+                        "cannot resume!\n");
+                panic("ACPI S4 hardware signature mismatch");
+        }
 }
 
 static void acpi_pm_enable_gpes(void)
@@ -516,6 +549,8 @@ int __init acpi_sleep_init(void)
         u8 type_a, type_b;
 #ifdef CONFIG_SUSPEND
         int i = 0;
+
+        dmi_check_system(acpisleep_dmi_table);
 #endif
 
         if (acpi_disabled)
@@ -544,6 +579,13 @@ int __init acpi_sleep_init(void)
                         &acpi_hibernation_ops_old : &acpi_hibernation_ops);
                 sleep_states[ACPI_STATE_S4] = 1;
                 printk(" S4");
+                if (!nosigcheck) {
+                        acpi_get_table_by_index(ACPI_TABLE_INDEX_FACS,
+                                (struct acpi_table_header **)&facs);
+                        if (facs)
+                                s4_hardware_signature =
+                                        facs->hardware_signature;
+                }
         }
 #endif
         status = acpi_get_sleep_type_data(ACPI_STATE_S5, &type_a, &type_b);
diff --git a/drivers/acpi/system.c b/drivers/acpi/system.c
index d8e3f153b295..91dec448b3ed 100644
--- a/drivers/acpi/system.c
+++ b/drivers/acpi/system.c
@@ -26,6 +26,7 @@
 #include <linux/proc_fs.h>
 #include <linux/seq_file.h>
 #include <linux/init.h>
+#include <linux/string.h>
 #include <asm/uaccess.h>
 
 #include <acpi/acpi_drivers.h>
diff --git a/drivers/acpi/tables/tbfadt.c b/drivers/acpi/tables/tbfadt.c
index ccb5b64bbef3..a4a41ba2484b 100644
--- a/drivers/acpi/tables/tbfadt.c
+++ b/drivers/acpi/tables/tbfadt.c
@@ -124,7 +124,7 @@ static struct acpi_fadt_info fadt_info_table[] = {
 
 static void inline
 acpi_tb_init_generic_address(struct acpi_generic_address *generic_address,
-                             u8 byte_width, u64 address)
+                             u8 bit_width, u64 address)
 {
 
         /*
@@ -136,7 +136,7 @@ acpi_tb_init_generic_address(struct acpi_generic_address *generic_address,
         /* All other fields are byte-wide */
 
         generic_address->space_id = ACPI_ADR_SPACE_SYSTEM_IO;
-        generic_address->bit_width = byte_width << 3;
+        generic_address->bit_width = bit_width;
         generic_address->bit_offset = 0;
         generic_address->access_width = 0;
 }
@@ -343,11 +343,9 @@ static void acpi_tb_convert_fadt(void)
          *
          * The PM event blocks are split into two register blocks, first is the
          * PM Status Register block, followed immediately by the PM Enable Register
-         * block. Each is of length (xpm1x_event_block.bit_width/2)
+         * block. Each is of length (pm1_event_length/2)
          */
-        WARN_ON(ACPI_MOD_16(acpi_gbl_FADT.xpm1a_event_block.bit_width));
-        pm1_register_length = (u8) ACPI_DIV_16(acpi_gbl_FADT
-                                               .xpm1a_event_block.bit_width);
+        pm1_register_length = (u8) ACPI_DIV_2(acpi_gbl_FADT.pm1_event_length);
 
         /* The PM1A register block is required */
 
@@ -362,17 +360,14 @@ static void acpi_tb_convert_fadt(void)
         /* The PM1B register block is optional, ignore if not present */
 
         if (acpi_gbl_FADT.xpm1b_event_block.address) {
-                WARN_ON(ACPI_MOD_16(acpi_gbl_FADT.xpm1b_event_block.bit_width));
-                pm1_register_length = (u8) ACPI_DIV_16(acpi_gbl_FADT
-                                                       .xpm1b_event_block
-                                                       .bit_width);
                 acpi_tb_init_generic_address(&acpi_gbl_xpm1b_enable,
                                              pm1_register_length,
                                              (acpi_gbl_FADT.xpm1b_event_block.
                                               address + pm1_register_length));
                 /* Don't forget to copy space_id of the GAS */
                 acpi_gbl_xpm1b_enable.space_id =
-                    acpi_gbl_FADT.xpm1b_event_block.space_id;
+                    acpi_gbl_FADT.xpm1a_event_block.space_id;
+
         }
 }
 
diff --git a/drivers/acpi/thermal.c b/drivers/acpi/thermal.c
index 30a341337933..912703691d36 100644
--- a/drivers/acpi/thermal.c
+++ b/drivers/acpi/thermal.c
@@ -769,6 +769,47 @@ static void acpi_thermal_run(unsigned long data)
                 acpi_os_execute(OSL_GPE_HANDLER, acpi_thermal_check, (void *)data);
 }
 
+static void acpi_thermal_active_off(void *data)
+{
+        int result = 0;
+        struct acpi_thermal *tz = data;
+        int i = 0;
+        int j = 0;
+        struct acpi_thermal_active *active = NULL;
+
+        if (!tz) {
+                printk(KERN_ERR PREFIX "Invalid (NULL) context\n");
+                return;
+        }
+
+        result = acpi_thermal_get_temperature(tz);
+        if (result)
+                return;
+
+        for (i = 0; i < ACPI_THERMAL_MAX_ACTIVE; i++) {
+                active = &(tz->trips.active[i]);
+                if (!active || !active->flags.valid)
+                        break;
+                if (tz->temperature >= active->temperature) {
+                        /*
+                         * If the thermal temperature is greater than the
+                         * active threshod, unnecessary to turn off the
+                         * the active cooling device.
+                         */
+                        continue;
+                }
+                /*
+                 * Below Threshold?
+                 * ----------------
+                 * Turn OFF all cooling devices associated with this
+                 * threshold.
+                 */
+                for (j = 0; j < active->devices.count; j++)
+                        result = acpi_bus_set_power(active->devices.handles[j],
+                                                    ACPI_STATE_D3);
+        }
+}
+
 static void acpi_thermal_check(void *data)
 {
         int result = 0;
@@ -1624,6 +1665,8 @@ static int acpi_thermal_add(struct acpi_device *device)
 
         init_timer(&tz->timer);
 
+        acpi_thermal_active_off(tz);
+
         acpi_thermal_check(tz);
 
         status = acpi_install_notify_handler(device->handle,
diff --git a/drivers/acpi/utilities/utalloc.c b/drivers/acpi/utilities/utalloc.c
index 3dfb8a442b26..e7bf34a7b1d2 100644
--- a/drivers/acpi/utilities/utalloc.c
+++ b/drivers/acpi/utilities/utalloc.c
@@ -242,6 +242,10 @@ acpi_ut_initialize_buffer(struct acpi_buffer * buffer,
 {
         acpi_status status = AE_OK;
 
+        if (!required_length) {
+                WARN_ON(1);
+                return AE_ERROR;
+        }
         switch (buffer->length) {
         case ACPI_NO_BUFFER:
 
diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c
index 37b9e16710d6..e8a51a1700f7 100644
--- a/drivers/acpi/video.c
+++ b/drivers/acpi/video.c
@@ -741,7 +741,7 @@ static void acpi_video_device_find_cap(struct acpi_video_device *device)
 
         max_level = acpi_video_init_brightness(device);
 
-        if (device->cap._BCL && device->cap._BCM && device->cap._BQC && max_level > 0){
+        if (device->cap._BCL && device->cap._BCM && max_level > 0) {
                 int result;
                 static int count = 0;
                 char *name;
@@ -753,7 +753,17 @@ static void acpi_video_device_find_cap(struct acpi_video_device *device)
                 device->backlight = backlight_device_register(name,
                         NULL, device, &acpi_backlight_ops);
                 device->backlight->props.max_brightness = device->brightness->count-3;
-                device->backlight->props.brightness = acpi_video_get_brightness(device->backlight);
+                /*
+                 * If there exists the _BQC object, the _BQC object will be
+                 * called to get the current backlight brightness. Otherwise
+                 * the brightness will be set to the maximum.
+                 */
+                if (device->cap._BQC)
+                        device->backlight->props.brightness =
+                                acpi_video_get_brightness(device->backlight);
+                else
+                        device->backlight->props.brightness =
+                                device->backlight->props.max_brightness;
                 backlight_update_status(device->backlight);
                 kfree(name);