Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes...
[safe/jmp/linux-2.6] / drivers / pci / hotplug / acpi_pcihp.c
index 270a33c..3c76fc6 100644 (file)
 #include <linux/types.h>
 #include <linux/pci.h>
 #include <linux/pci_hotplug.h>
-#include <acpi/acpi.h>
-#include <acpi/acpi_bus.h>
-#include <acpi/actypes.h>
+#include <linux/acpi.h>
+#include <linux/pci-acpi.h>
 
 #define MY_NAME        "acpi_pcihp"
 
-#define dbg(fmt, arg...) do { if (debug_acpi) printk(KERN_DEBUG "%s: %s: " fmt , MY_NAME , __FUNCTION__ , ## arg); } while (0)
+#define dbg(fmt, arg...) do { if (debug_acpi) printk(KERN_DEBUG "%s: %s: " fmt , MY_NAME , __func__ , ## arg); } while (0)
 #define err(format, arg...) printk(KERN_ERR "%s: " format , MY_NAME , ## arg)
 #define info(format, arg...) printk(KERN_INFO "%s: " format , MY_NAME , ## arg)
 #define warn(format, arg...) printk(KERN_WARNING "%s: " format , MY_NAME , ## arg)
 
 #define        METHOD_NAME__SUN        "_SUN"
-#define        METHOD_NAME__HPP        "_HPP"
 #define        METHOD_NAME_OSHP        "OSHP"
 
 static int debug_acpi;
@@ -71,7 +69,7 @@ decode_type0_hpx_record(union acpi_object *record, struct hotplug_params *hpx)
        default:
                printk(KERN_WARNING
                       "%s: Type 0 Revision %d record not supported\n",
-                      __FUNCTION__, revision);
+                      __func__, revision);
                return AE_ERROR;
        }
        return AE_OK;
@@ -100,7 +98,7 @@ decode_type1_hpx_record(union acpi_object *record, struct hotplug_params *hpx)
        default:
                printk(KERN_WARNING
                       "%s: Type 1 Revision %d record not supported\n",
-                      __FUNCTION__, revision);
+                      __func__, revision);
                return AE_ERROR;
        }
        return AE_OK;
@@ -142,7 +140,7 @@ decode_type2_hpx_record(union acpi_object *record, struct hotplug_params *hpx)
        default:
                printk(KERN_WARNING
                       "%s: Type 2 Revision %d record not supported\n",
-                      __FUNCTION__, revision);
+                      __func__, revision);
                return AE_ERROR;
        }
        return AE_OK;
@@ -203,7 +201,7 @@ acpi_run_hpx(acpi_handle handle, struct hotplug_params *hpx)
                        break;
                default:
                        printk(KERN_ERR "%s: Type %d record not supported\n",
-                              __FUNCTION__, type);
+                              __func__, type);
                        status = AE_ERROR;
                        goto exit;
                }
@@ -216,80 +214,41 @@ acpi_run_hpx(acpi_handle handle, struct hotplug_params *hpx)
 static acpi_status
 acpi_run_hpp(acpi_handle handle, struct hotplug_params *hpp)
 {
-       acpi_status             status;
-       u8                      nui[4];
-       struct acpi_buffer      ret_buf = { 0, NULL};
-       struct acpi_buffer      string = { ACPI_ALLOCATE_BUFFER, NULL };
-       union acpi_object       *ext_obj, *package;
-       int                     i, len = 0;
-
-       acpi_get_name(handle, ACPI_FULL_PATHNAME, &string);
+       acpi_status status;
+       struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL };
+       union acpi_object *package, *fields;
+       int i;
 
-       /* Clear the return buffer with zeros */
        memset(hpp, 0, sizeof(struct hotplug_params));
 
-       /* get _hpp */
-       status = acpi_evaluate_object(handle, METHOD_NAME__HPP, NULL, &ret_buf);
-       switch (status) {
-       case AE_BUFFER_OVERFLOW:
-               ret_buf.pointer = kmalloc (ret_buf.length, GFP_KERNEL);
-               if (!ret_buf.pointer) {
-                       printk(KERN_ERR "%s:%s alloc for _HPP fail\n",
-                               __FUNCTION__, (char *)string.pointer);
-                       kfree(string.pointer);
-                       return AE_NO_MEMORY;
-               }
-               status = acpi_evaluate_object(handle, METHOD_NAME__HPP,
-                               NULL, &ret_buf);
-               if (ACPI_SUCCESS(status))
-                       break;
-       default:
-               if (ACPI_FAILURE(status)) {
-                       pr_debug("%s:%s _HPP fail=0x%x\n", __FUNCTION__,
-                               (char *)string.pointer, status);
-                       kfree(string.pointer);
-                       return status;
-               }
-       }
+       status = acpi_evaluate_object(handle, "_HPP", NULL, &buffer);
+       if (ACPI_FAILURE(status))
+               return status;
 
-       ext_obj = (union acpi_object *) ret_buf.pointer;
-       if (ext_obj->type != ACPI_TYPE_PACKAGE) {
-               printk(KERN_ERR "%s:%s _HPP obj not a package\n", __FUNCTION__,
-                               (char *)string.pointer);
+       package = (union acpi_object *) buffer.pointer;
+       if (package->type != ACPI_TYPE_PACKAGE ||
+           package->package.count != 4) {
                status = AE_ERROR;
-               goto free_and_return;
+               goto exit;
        }
 
-       len = ext_obj->package.count;
-       package = (union acpi_object *) ret_buf.pointer;
-       for ( i = 0; (i < len) || (i < 4); i++) {
-               ext_obj = (union acpi_object *) &package->package.elements[i];
-               switch (ext_obj->type) {
-               case ACPI_TYPE_INTEGER:
-                       nui[i] = (u8)ext_obj->integer.value;
-                       break;
-               default:
-                       printk(KERN_ERR "%s:%s _HPP obj type incorrect\n",
-                               __FUNCTION__, (char *)string.pointer);
+       fields = package->package.elements;
+       for (i = 0; i < 4; i++) {
+               if (fields[i].type != ACPI_TYPE_INTEGER) {
                        status = AE_ERROR;
-                       goto free_and_return;
+                       goto exit;
                }
        }
 
        hpp->t0 = &hpp->type0_data;
-       hpp->t0->cache_line_size = nui[0];
-       hpp->t0->latency_timer = nui[1];
-       hpp->t0->enable_serr = nui[2];
-       hpp->t0->enable_perr = nui[3];
-
-       pr_debug("  _HPP: cache_line_size=0x%x\n", hpp->t0->cache_line_size);
-       pr_debug("  _HPP: latency timer  =0x%x\n", hpp->t0->latency_timer);
-       pr_debug("  _HPP: enable SERR    =0x%x\n", hpp->t0->enable_serr);
-       pr_debug("  _HPP: enable PERR    =0x%x\n", hpp->t0->enable_perr);
+       hpp->t0->revision        = 1;
+       hpp->t0->cache_line_size = fields[0].integer.value;
+       hpp->t0->latency_timer   = fields[1].integer.value;
+       hpp->t0->enable_serr     = fields[2].integer.value;
+       hpp->t0->enable_perr     = fields[3].integer.value;
 
-free_and_return:
-       kfree(string.pointer);
-       kfree(ret_buf.pointer);
+exit:
+       kfree(buffer.pointer);
        return status;
 }
 
@@ -299,7 +258,7 @@ free_and_return:
  *
  * @handle - the handle of the hotplug controller.
  */
-acpi_status acpi_run_oshp(acpi_handle handle)
+static acpi_status acpi_run_oshp(acpi_handle handle)
 {
        acpi_status             status;
        struct acpi_buffer      string = { ACPI_ALLOCATE_BUFFER, NULL };
@@ -311,104 +270,212 @@ acpi_status acpi_run_oshp(acpi_handle handle)
        if (ACPI_FAILURE(status))
                if (status != AE_NOT_FOUND)
                        printk(KERN_ERR "%s:%s OSHP fails=0x%x\n",
-                              __FUNCTION__, (char *)string.pointer, status);
+                              __func__, (char *)string.pointer, status);
                else
                        dbg("%s:%s OSHP not found\n",
-                           __FUNCTION__, (char *)string.pointer);
+                           __func__, (char *)string.pointer);
        else
-               pr_debug("%s:%s OSHP passes\n", __FUNCTION__,
+               pr_debug("%s:%s OSHP passes\n", __func__,
                        (char *)string.pointer);
 
        kfree(string.pointer);
        return status;
 }
-EXPORT_SYMBOL_GPL(acpi_run_oshp);
-
 
-
-/* acpi_get_hp_params_from_firmware
+/* pci_get_hp_params
  *
- * @bus - the pci_bus of the bus on which the device is newly added
+ * @dev - the pci_dev for which we want parameters
  * @hpp - allocated by the caller
  */
-acpi_status acpi_get_hp_params_from_firmware(struct pci_bus *bus,
-               struct hotplug_params *hpp)
+int pci_get_hp_params(struct pci_dev *dev, struct hotplug_params *hpp)
 {
-       acpi_status status = AE_NOT_FOUND;
+       acpi_status status;
        acpi_handle handle, phandle;
-       struct pci_bus *pbus = bus;
-       struct pci_dev *pdev;
-
-       do {
-               pdev = pbus->self;
-               if (!pdev) {
-                       handle = acpi_get_pci_rootbridge_handle(
-                               pci_domain_nr(pbus), pbus->number);
+       struct pci_bus *pbus;
+
+       handle = NULL;
+       for (pbus = dev->bus; pbus; pbus = pbus->parent) {
+               handle = acpi_pci_get_bridge_handle(pbus);
+               if (handle)
                        break;
-               }
-               handle = DEVICE_ACPI_HANDLE(&(pdev->dev));
-               pbus = pbus->parent;
-       } while (!handle);
+       }
 
        /*
         * _HPP settings apply to all child buses, until another _HPP is
         * encountered. If we don't find an _HPP for the input pci dev,
         * look for it in the parent device scope since that would apply to
-        * this pci dev. If we don't find any _HPP, use hardcoded defaults
+        * this pci dev.
         */
        while (handle) {
                status = acpi_run_hpx(handle, hpp);
                if (ACPI_SUCCESS(status))
-                       break;
+                       return 0;
                status = acpi_run_hpp(handle, hpp);
                if (ACPI_SUCCESS(status))
-                       break;
-               if (acpi_root_bridge(handle))
+                       return 0;
+               if (acpi_is_root_bridge(handle))
                        break;
                status = acpi_get_parent(handle, &phandle);
                if (ACPI_FAILURE(status))
                        break;
                handle = phandle;
        }
-       return status;
+       return -ENODEV;
 }
-EXPORT_SYMBOL_GPL(acpi_get_hp_params_from_firmware);
+EXPORT_SYMBOL_GPL(pci_get_hp_params);
 
-
-/* acpi_root_bridge - check to see if this acpi object is a root bridge
+/**
+ * acpi_get_hp_hw_control_from_firmware
+ * @dev: the pci_dev of the bridge that has a hotplug controller
+ * @flags: requested control bits for _OSC
  *
- * @handle - the acpi object in question.
+ * Attempt to take hotplug control from firmware.
  */
-int acpi_root_bridge(acpi_handle handle)
+int acpi_get_hp_hw_control_from_firmware(struct pci_dev *pdev, u32 flags)
 {
        acpi_status status;
-       struct acpi_device_info *info;
-       struct acpi_buffer buffer = {ACPI_ALLOCATE_BUFFER, NULL};
-       int i;
+       acpi_handle chandle, handle;
+       struct acpi_buffer string = { ACPI_ALLOCATE_BUFFER, NULL };
+
+       flags &= (OSC_PCI_EXPRESS_NATIVE_HP_CONTROL |
+                 OSC_SHPC_NATIVE_HP_CONTROL |
+                 OSC_PCI_EXPRESS_CAP_STRUCTURE_CONTROL);
+       if (!flags) {
+               err("Invalid flags %u specified!\n", flags);
+               return -EINVAL;
+       }
 
-       status = acpi_get_object_info(handle, &buffer);
-       if (ACPI_SUCCESS(status)) {
-               info = buffer.pointer;
-               if ((info->valid & ACPI_VALID_HID) &&
-                       !strcmp(PCI_ROOT_HID_STRING,
-                                       info->hardware_id.value)) {
-                       kfree(buffer.pointer);
-                       return 1;
-               }
-               if (info->valid & ACPI_VALID_CID) {
-                       for (i=0; i < info->compatibility_id.count; i++) {
-                               if (!strcmp(PCI_ROOT_HID_STRING,
-                                       info->compatibility_id.id[i].value)) {
-                                       kfree(buffer.pointer);
-                                       return 1;
-                               }
-                       }
+       /*
+        * Per PCI firmware specification, we should run the ACPI _OSC
+        * method to get control of hotplug hardware before using it. If
+        * an _OSC is missing, we look for an OSHP to do the same thing.
+        * To handle different BIOS behavior, we look for _OSC on a root
+        * bridge preferentially (according to PCI fw spec). Later for
+        * OSHP within the scope of the hotplug controller and its parents,
+        * upto the host bridge under which this controller exists.
+        */
+       handle = acpi_find_root_bridge_handle(pdev);
+       if (handle) {
+               acpi_get_name(handle, ACPI_FULL_PATHNAME, &string);
+               dbg("Trying to get hotplug control for %s\n",
+                               (char *)string.pointer);
+               status = acpi_pci_osc_control_set(handle, flags);
+               if (ACPI_SUCCESS(status))
+                       goto got_one;
+               if (status == AE_SUPPORT)
+                       goto no_control;
+               kfree(string.pointer);
+               string = (struct acpi_buffer){ ACPI_ALLOCATE_BUFFER, NULL };
+       }
+
+       handle = DEVICE_ACPI_HANDLE(&pdev->dev);
+       if (!handle) {
+               /*
+                * This hotplug controller was not listed in the ACPI name
+                * space at all. Try to get acpi handle of parent pci bus.
+                */
+               struct pci_bus *pbus;
+               for (pbus = pdev->bus; pbus; pbus = pbus->parent) {
+                       handle = acpi_pci_get_bridge_handle(pbus);
+                       if (handle)
+                               break;
                }
-               kfree(buffer.pointer);
        }
+
+       while (handle) {
+               acpi_get_name(handle, ACPI_FULL_PATHNAME, &string);
+               dbg("Trying to get hotplug control for %s \n",
+                   (char *)string.pointer);
+               status = acpi_run_oshp(handle);
+               if (ACPI_SUCCESS(status))
+                       goto got_one;
+               if (acpi_is_root_bridge(handle))
+                       break;
+               chandle = handle;
+               status = acpi_get_parent(chandle, &handle);
+               if (ACPI_FAILURE(status))
+                       break;
+       }
+no_control:
+       dbg("Cannot get control of hotplug hardware for pci %s\n",
+           pci_name(pdev));
+       kfree(string.pointer);
+       return -ENODEV;
+got_one:
+       dbg("Gained control for hotplug HW for pci %s (%s)\n",
+           pci_name(pdev), (char *)string.pointer);
+       kfree(string.pointer);
+       return 0;
+}
+EXPORT_SYMBOL(acpi_get_hp_hw_control_from_firmware);
+
+static int is_ejectable(acpi_handle handle)
+{
+       acpi_status status;
+       acpi_handle tmp;
+       unsigned long long removable;
+       status = acpi_get_handle(handle, "_ADR", &tmp);
+       if (ACPI_FAILURE(status))
+               return 0;
+       status = acpi_get_handle(handle, "_EJ0", &tmp);
+       if (ACPI_SUCCESS(status))
+               return 1;
+       status = acpi_evaluate_integer(handle, "_RMV", NULL, &removable);
+       if (ACPI_SUCCESS(status) && removable)
+               return 1;
        return 0;
 }
-EXPORT_SYMBOL_GPL(acpi_root_bridge);
+
+/**
+ * acpi_pcihp_check_ejectable - check if handle is ejectable ACPI PCI slot
+ * @pbus: the PCI bus of the PCI slot corresponding to 'handle'
+ * @handle: ACPI handle to check
+ *
+ * Return 1 if handle is ejectable PCI slot, 0 otherwise.
+ */
+int acpi_pci_check_ejectable(struct pci_bus *pbus, acpi_handle handle)
+{
+       acpi_handle bridge_handle, parent_handle;
+
+       if (!(bridge_handle = acpi_pci_get_bridge_handle(pbus)))
+               return 0;
+       if ((ACPI_FAILURE(acpi_get_parent(handle, &parent_handle))))
+               return 0;
+       if (bridge_handle != parent_handle)
+               return 0;
+       return is_ejectable(handle);
+}
+EXPORT_SYMBOL_GPL(acpi_pci_check_ejectable);
+
+static acpi_status
+check_hotplug(acpi_handle handle, u32 lvl, void *context, void **rv)
+{
+       int *found = (int *)context;
+       if (is_ejectable(handle)) {
+               *found = 1;
+               return AE_CTRL_TERMINATE;
+       }
+       return AE_OK;
+}
+
+/**
+ * acpi_pci_detect_ejectable - check if the PCI bus has ejectable slots
+ * @handle - handle of the PCI bus to scan
+ *
+ * Returns 1 if the PCI bus has ACPI based ejectable slots, 0 otherwise.
+ */
+int acpi_pci_detect_ejectable(acpi_handle handle)
+{
+       int found = 0;
+
+       if (!handle)
+               return found;
+
+       acpi_walk_namespace(ACPI_TYPE_DEVICE, handle, 1,
+                           check_hotplug, NULL, (void *)&found, NULL);
+       return found;
+}
+EXPORT_SYMBOL_GPL(acpi_pci_detect_ejectable);
 
 module_param(debug_acpi, bool, 0644);
 MODULE_PARM_DESC(debug_acpi, "Debugging mode for ACPI enabled or not");