]> www.pilppa.org Git - linux-2.6-omap-h63xx.git/blobdiff - drivers/pci/pci-acpi.c
PCI: Introduce platform_pci_power_manageable function
[linux-2.6-omap-h63xx.git] / drivers / pci / pci-acpi.c
index 72f7476930c857ffa20a4c323dff3af6bf7c9baa..e4df71ab79b3508df99a1d57c5489966f737c7cc 100644 (file)
 #include <linux/pci-acpi.h>
 #include "pci.h"
 
-static u32 ctrlset_buf[3] = {0, 0, 0};
-static u32 global_ctrlsets = 0;
-static u8 OSC_UUID[16] = {0x5B, 0x4D, 0xDB, 0x33, 0xF7, 0x1F, 0x1C, 0x40, 0x96, 0x57, 0x74, 0x41, 0xC0, 0x3D, 0xD7, 0x66};
-
-static acpi_status  
-acpi_query_osc (
-       acpi_handle     handle,
-       u32             level,
-       void            *context,
-       void            **retval )
-{
-       acpi_status             status;
-       struct acpi_object_list input;
-       union acpi_object       in_params[4];
-       struct acpi_buffer      output = {ACPI_ALLOCATE_BUFFER, NULL};
-       union acpi_object       *out_obj;
-       u32                     osc_dw0;
-       acpi_status *ret_status = (acpi_status *)retval;
-
-       
-       /* Setting up input parameters */
-       input.count = 4;
-       input.pointer = in_params;
-       in_params[0].type               = ACPI_TYPE_BUFFER;
-       in_params[0].buffer.length      = 16;
-       in_params[0].buffer.pointer     = OSC_UUID;
-       in_params[1].type               = ACPI_TYPE_INTEGER;
-       in_params[1].integer.value      = 1;
-       in_params[2].type               = ACPI_TYPE_INTEGER;
-       in_params[2].integer.value      = 3;
-       in_params[3].type               = ACPI_TYPE_BUFFER;
-       in_params[3].buffer.length      = 12;
-       in_params[3].buffer.pointer     = (u8 *)context;
-
-       status = acpi_evaluate_object(handle, "_OSC", &input, &output);
-       if (ACPI_FAILURE (status)) {
-               *ret_status = status;
-               return status;
-       }
-       out_obj = output.pointer;
+struct acpi_osc_data {
+       acpi_handle handle;
+       u32 support_set;
+       u32 control_set;
+       int is_queried;
+       u32 query_result;
+       struct list_head sibiling;
+};
+static LIST_HEAD(acpi_osc_data_list);
 
-       if (out_obj->type != ACPI_TYPE_BUFFER) {
-               printk(KERN_DEBUG  
-                       "Evaluate _OSC returns wrong type\n");
-               status = AE_TYPE;
-               goto query_osc_out;
-       }
-       osc_dw0 = *((u32 *) out_obj->buffer.pointer);
-       if (osc_dw0) {
-               if (osc_dw0 & OSC_REQUEST_ERROR)
-                       printk(KERN_DEBUG "_OSC request fails\n"); 
-               if (osc_dw0 & OSC_INVALID_UUID_ERROR)
-                       printk(KERN_DEBUG "_OSC invalid UUID\n"); 
-               if (osc_dw0 & OSC_INVALID_REVISION_ERROR)
-                       printk(KERN_DEBUG "_OSC invalid revision\n"); 
-               if (osc_dw0 & OSC_CAPABILITIES_MASK_ERROR) {
-                       /* Update Global Control Set */
-                       global_ctrlsets = *((u32 *)(out_obj->buffer.pointer+8));
-                       status = AE_OK;
-                       goto query_osc_out;
-               }
-               status = AE_ERROR;
-               goto query_osc_out;
-       }
+struct acpi_osc_args {
+       u32 capbuf[3];
+       u32 query_result;
+};
 
-       /* Update Global Control Set */
-       global_ctrlsets = *((u32 *)(out_obj->buffer.pointer + 8));
-       status = AE_OK;
+static struct acpi_osc_data *acpi_get_osc_data(acpi_handle handle)
+{
+       struct acpi_osc_data *data;
 
-query_osc_out:
-       kfree(output.pointer);
-       *ret_status = status;
-       return status;
+       list_for_each_entry(data, &acpi_osc_data_list, sibiling) {
+               if (data->handle == handle)
+                       return data;
+       }
+       data = kzalloc(sizeof(*data), GFP_KERNEL);
+       if (!data)
+               return NULL;
+       INIT_LIST_HEAD(&data->sibiling);
+       data->handle = handle;
+       list_add_tail(&data->sibiling, &acpi_osc_data_list);
+       return data;
 }
 
+static u8 OSC_UUID[16] = {0x5B, 0x4D, 0xDB, 0x33, 0xF7, 0x1F, 0x1C, 0x40,
+                         0x96, 0x57, 0x74, 0x41, 0xC0, 0x3D, 0xD7, 0x66};
 
-static acpi_status  
-acpi_run_osc (
-       acpi_handle     handle,
-       void            *context)
+static acpi_status acpi_run_osc(acpi_handle handle,
+                               struct acpi_osc_args *osc_args)
 {
-       acpi_status             status;
-       struct acpi_object_list input;
-       union acpi_object       in_params[4];
-       struct acpi_buffer      output = {ACPI_ALLOCATE_BUFFER, NULL};
-       union acpi_object       *out_obj;
-       u32                     osc_dw0;
+       acpi_status status;
+       struct acpi_object_list input;
+       union acpi_object in_params[4];
+       struct acpi_buffer output = {ACPI_ALLOCATE_BUFFER, NULL};
+       union acpi_object *out_obj;
+       u32 osc_dw0, flags = osc_args->capbuf[OSC_QUERY_TYPE];
 
        /* Setting up input parameters */
        input.count = 4;
@@ -119,20 +76,19 @@ acpi_run_osc (
        in_params[2].integer.value      = 3;
        in_params[3].type               = ACPI_TYPE_BUFFER;
        in_params[3].buffer.length      = 12;
-       in_params[3].buffer.pointer     = (u8 *)context;
+       in_params[3].buffer.pointer     = (u8 *)osc_args->capbuf;
 
        status = acpi_evaluate_object(handle, "_OSC", &input, &output);
-       if (ACPI_FAILURE (status))
+       if (ACPI_FAILURE(status))
                return status;
 
        out_obj = output.pointer;
        if (out_obj->type != ACPI_TYPE_BUFFER) {
-               printk(KERN_DEBUG  
-                       "Evaluate _OSC returns wrong type\n");
+               printk(KERN_DEBUG "Evaluate _OSC returns wrong type\n");
                status = AE_TYPE;
-               goto run_osc_out;
+               goto out_kfree;
        }
-       osc_dw0 = *((u32 *) out_obj->buffer.pointer);
+       osc_dw0 = *((u32 *)out_obj->buffer.pointer);
        if (osc_dw0) {
                if (osc_dw0 & OSC_REQUEST_ERROR)
                        printk(KERN_DEBUG "_OSC request fails\n"); 
@@ -141,20 +97,61 @@ acpi_run_osc (
                if (osc_dw0 & OSC_INVALID_REVISION_ERROR)
                        printk(KERN_DEBUG "_OSC invalid revision\n"); 
                if (osc_dw0 & OSC_CAPABILITIES_MASK_ERROR) {
+                       if (flags & OSC_QUERY_ENABLE)
+                               goto out_success;
                        printk(KERN_DEBUG "_OSC FW not grant req. control\n");
                        status = AE_SUPPORT;
-                       goto run_osc_out;
+                       goto out_kfree;
                }
                status = AE_ERROR;
-               goto run_osc_out;
+               goto out_kfree;
        }
+out_success:
+       if (flags & OSC_QUERY_ENABLE)
+               osc_args->query_result =
+                       *((u32 *)(out_obj->buffer.pointer + 8));
        status = AE_OK;
 
-run_osc_out:
+out_kfree:
        kfree(output.pointer);
        return status;
 }
 
+static acpi_status acpi_query_osc(acpi_handle handle,
+                                 u32 level, void *context, void **retval)
+{
+       acpi_status status;
+       struct acpi_osc_data *osc_data;
+       u32 flags = (unsigned long)context, support_set;
+       acpi_handle tmp;
+       struct acpi_osc_args osc_args;
+
+       status = acpi_get_handle(handle, "_OSC", &tmp);
+       if (ACPI_FAILURE(status))
+               return status;
+
+       osc_data = acpi_get_osc_data(handle);
+       if (!osc_data) {
+               printk(KERN_ERR "acpi osc data array is full\n");
+               return AE_ERROR;
+       }
+
+       /* do _OSC query for all possible controls */
+       support_set = osc_data->support_set | (flags & OSC_SUPPORT_MASKS);
+       osc_args.capbuf[OSC_QUERY_TYPE] = OSC_QUERY_ENABLE;
+       osc_args.capbuf[OSC_SUPPORT_TYPE] = support_set;
+       osc_args.capbuf[OSC_CONTROL_TYPE] = OSC_CONTROL_MASKS;
+
+       status = acpi_run_osc(handle, &osc_args);
+       if (ACPI_SUCCESS(status)) {
+               osc_data->support_set = support_set;
+               osc_data->query_result = osc_args.query_result;
+               osc_data->is_queried = 1;
+       }
+
+       return status;
+}
+
 /**
  * __pci_osc_support_set - register OS support to Firmware
  * @flags: OS support bits
@@ -165,28 +162,11 @@ run_osc_out:
  **/
 acpi_status __pci_osc_support_set(u32 flags, const char *hid)
 {
-       u32 temp;
-       acpi_status retval;
-
-       if (!(flags & OSC_SUPPORT_MASKS)) {
+       if (!(flags & OSC_SUPPORT_MASKS))
                return AE_TYPE;
-       }
-       ctrlset_buf[OSC_SUPPORT_TYPE] |= (flags & OSC_SUPPORT_MASKS);
 
-       /* do _OSC query for all possible controls */
-       temp = ctrlset_buf[OSC_CONTROL_TYPE];
-       ctrlset_buf[OSC_QUERY_TYPE] = OSC_QUERY_ENABLE;
-       ctrlset_buf[OSC_CONTROL_TYPE] = OSC_CONTROL_MASKS;
-       acpi_get_devices(hid,
-                       acpi_query_osc,
-                       ctrlset_buf,
-                       (void **) &retval );
-       ctrlset_buf[OSC_QUERY_TYPE] = !OSC_QUERY_ENABLE;
-       ctrlset_buf[OSC_CONTROL_TYPE] = temp;
-       if (ACPI_FAILURE(retval)) {
-               /* no osc support at all */
-               ctrlset_buf[OSC_SUPPORT_TYPE] = 0;
-       }
+       acpi_get_devices(hid, acpi_query_osc,
+                        (void *)(unsigned long)flags, NULL);
        return AE_OK;
 }
 
@@ -199,28 +179,42 @@ acpi_status __pci_osc_support_set(u32 flags, const char *hid)
  **/
 acpi_status pci_osc_control_set(acpi_handle handle, u32 flags)
 {
-       acpi_status     status;
-       u32             ctrlset;
+       acpi_status status;
+       u32 ctrlset, control_set;
+       acpi_handle tmp;
+       struct acpi_osc_data *osc_data;
+       struct acpi_osc_args osc_args;
+
+       status = acpi_get_handle(handle, "_OSC", &tmp);
+       if (ACPI_FAILURE(status))
+               return status;
+
+       osc_data = acpi_get_osc_data(handle);
+       if (!osc_data) {
+               printk(KERN_ERR "acpi osc data array is full\n");
+               return AE_ERROR;
+       }
 
        ctrlset = (flags & OSC_CONTROL_MASKS);
-       if (!ctrlset) {
+       if (!ctrlset)
                return AE_TYPE;
-       }
-       if (ctrlset_buf[OSC_SUPPORT_TYPE] && 
-               ((global_ctrlsets & ctrlset) != ctrlset)) {
+
+       if (osc_data->is_queried &&
+           ((osc_data->query_result & ctrlset) != ctrlset))
                return AE_SUPPORT;
-       }
-       ctrlset_buf[OSC_CONTROL_TYPE] |= ctrlset;
-       status = acpi_run_osc(handle, ctrlset_buf);
-       if (ACPI_FAILURE (status)) {
-               ctrlset_buf[OSC_CONTROL_TYPE] &= ~ctrlset;
-       }
-       
+
+       control_set = osc_data->control_set | ctrlset;
+       osc_args.capbuf[OSC_QUERY_TYPE] = 0;
+       osc_args.capbuf[OSC_SUPPORT_TYPE] = osc_data->support_set;
+       osc_args.capbuf[OSC_CONTROL_TYPE] = control_set;
+       status = acpi_run_osc(handle, &osc_args);
+       if (ACPI_SUCCESS(status))
+               osc_data->control_set = control_set;
+
        return status;
 }
 EXPORT_SYMBOL(pci_osc_control_set);
 
-#ifdef CONFIG_ACPI_SLEEP
 /*
  * _SxD returns the D-state with the highest power
  * (lowest D-state number) supported in the S-state "x".
@@ -244,13 +238,11 @@ EXPORT_SYMBOL(pci_osc_control_set);
  *     choose highest power _SxD or any lower power
  */
 
-static pci_power_t acpi_pci_choose_state(struct pci_dev *pdev,
-       pm_message_t state)
+static pci_power_t acpi_pci_choose_state(struct pci_dev *pdev)
 {
        int acpi_state;
 
-       acpi_state = acpi_pm_device_sleep_state(&pdev->dev,
-               device_may_wakeup(&pdev->dev), NULL);
+       acpi_state = acpi_pm_device_sleep_state(&pdev->dev, NULL);
        if (acpi_state < 0)
                return PCI_POWER_ERROR;
 
@@ -266,7 +258,13 @@ static pci_power_t acpi_pci_choose_state(struct pci_dev *pdev,
        }
        return PCI_POWER_ERROR;
 }
-#endif
+
+static bool acpi_pci_power_manageable(struct pci_dev *dev)
+{
+       acpi_handle handle = DEVICE_ACPI_HANDLE(&dev->dev);
+
+       return handle ? acpi_bus_power_manageable(handle) : false;
+}
 
 static int acpi_pci_set_power_state(struct pci_dev *dev, pci_power_t state)
 {
@@ -297,6 +295,11 @@ static int acpi_pci_set_power_state(struct pci_dev *dev, pci_power_t state)
        return -EINVAL;
 }
 
+static struct pci_platform_pm_ops acpi_pci_platform_pm = {
+       .is_manageable = acpi_pci_power_manageable,
+       .set_state = acpi_pci_set_power_state,
+       .choose_state = acpi_pci_choose_state,
+};
 
 /* ACPI bus type */
 static int acpi_pci_find_device(struct device *dev, acpi_handle *handle)
@@ -348,10 +351,7 @@ static int __init acpi_pci_init(void)
        ret = register_acpi_bus_type(&acpi_pci_bus);
        if (ret)
                return 0;
-#ifdef CONFIG_ACPI_SLEEP
-       platform_pci_choose_state = acpi_pci_choose_state;
-#endif
-       platform_pci_set_power_state = acpi_pci_set_power_state;
+       pci_set_platform_pm(&acpi_pci_platform_pm);
        return 0;
 }
 arch_initcall(acpi_pci_init);