Staging: hv: VMBUS is a acpi enumerated device; get irq value from bios

On some Windows hosts, the Linux  PCI sub-system is not
allocating irq resources to the
vmbus driver. It looks like VMBUS is an ACPI enumerated device.
Retrieve the irq information from DSDT.
Currently we use this bios specified irq, if the PCI
sub-system fails to allocate the irq.

Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Abhishek Kane <v-abkane@microsoft.com>
Signed-off-by: Hank Janssen <hjanssen@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/staging/hv/vmbus_drv.c b/drivers/staging/hv/vmbus_drv.c
index 6bf53653a20244843bfa5e0773f82289cf2e0a4d..5dcd87a972a4888be1417bc8fc2e98cf097ae4e7 100644 (file)
--- a/drivers/staging/hv/vmbus_drv.c
+++ b/drivers/staging/hv/vmbus_drv.c
@@ -17,8 +17,8 @@
  * Authors:
  *   Haiyang Zhang <haiyangz@microsoft.com>
  *   Hank Janssen  <hjanssen@microsoft.com>
+ *   K. Y. Srinivasan <kys@microsoft.com>
  *
- * 3/9/2011: K. Y. Srinivasan  - Significant restructuring and cleanup
  */
 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
 
@@ -31,6 +31,8 @@
 #include <linux/pci.h>
 #include <linux/dmi.h>
 #include <linux/slab.h>
+#include <linux/acpi.h>
+#include <acpi/acpi_bus.h>
 #include <linux/completion.h>
 #include "version_info.h"
 #include "hv_api.h"
@@ -52,6 +54,7 @@ EXPORT_SYMBOL(vmbus_loglevel);
 
 static int pci_probe_error;
 static struct completion probe_event;
+static int irq;
 
 static void get_channel_info(struct hv_device *device,
                             struct hv_device_info *info)
@@ -712,6 +715,74 @@ void vmbus_child_device_unregister(struct hv_device *device_obj)
 }
 
 
+/*
+ * VMBUS is an acpi enumerated device. Get the the IRQ information
+ * from DSDT.
+ */
+
+static acpi_status vmbus_walk_resources(struct acpi_resource *res, void *irq)
+{
+
+       if (res->type == ACPI_RESOURCE_TYPE_IRQ) {
+               struct acpi_resource_irq *irqp;
+               irqp = &res->data.irq;
+
+               *((unsigned int *)irq) = irqp->interrupts[0];
+       }
+
+       return AE_OK;
+}
+
+static int vmbus_acpi_add(struct acpi_device *device)
+{
+       acpi_status result;
+
+       result =
+       acpi_walk_resources(device->handle, METHOD_NAME__CRS,
+                       vmbus_walk_resources, &irq);
+
+       if (ACPI_FAILURE(result)) {
+               complete(&probe_event);
+               return -ENODEV;
+       }
+       complete(&probe_event);
+       return 0;
+}
+
+static const struct acpi_device_id vmbus_acpi_device_ids[] = {
+       {"VMBUS", 0},
+       {"", 0},
+};
+MODULE_DEVICE_TABLE(acpi, vmbus_acpi_device_ids);
+
+static struct acpi_driver vmbus_acpi_driver = {
+       .name = "vmbus",
+       .ids = vmbus_acpi_device_ids,
+       .ops = {
+               .add = vmbus_acpi_add,
+       },
+};
+
+static int vmbus_acpi_init(void)
+{
+       int result;
+
+
+       result = acpi_bus_register_driver(&vmbus_acpi_driver);
+       if (result < 0)
+               return result;
+
+       return 0;
+}
+
+static void vmbus_acpi_exit(void)
+{
+       acpi_bus_unregister_driver(&vmbus_acpi_driver);
+
+       return;
+}
+
+
 static int __devinit hv_pci_probe(struct pci_dev *pdev,
                                const struct pci_device_id *ent)
 {
@@ -721,7 +792,16 @@ static int __devinit hv_pci_probe(struct pci_dev *pdev,
        if (pci_probe_error)
                goto probe_cleanup;
 
+       /*
+        * If the PCI sub-sytem did not assign us an
+        * irq, use the bios provided one.
+        */
+
+       if (pdev->irq == 0)
+               pdev->irq = irq;
+
        pci_probe_error = vmbus_bus_init(pdev);
+
        if (pci_probe_error)
                pci_disable_device(pdev);
 
@@ -751,6 +831,25 @@ static struct pci_driver hv_bus_driver = {
 static int __init hv_pci_init(void)
 {
        int ret;
+
+       init_completion(&probe_event);
+
+       /*
+        * Get irq resources first.
+        */
+
+       ret = vmbus_acpi_init();
+       if (ret)
+               return ret;
+
+       wait_for_completion(&probe_event);
+
+       if (irq <= 0) {
+               vmbus_acpi_exit();
+               return -ENODEV;
+       }
+
+       vmbus_acpi_exit();
        init_completion(&probe_event);
        ret = pci_register_driver(&hv_bus_driver);
        if (ret)