Ticket #9807: 0001-FreeBSD-compat-layer-implement-MSI-X-support.patch

src/libs/compat/freebsd_network/bus.cpp

@@ -56 +56 @@
     void            *arg;
     int             irq;
     uint32          flags;
-    bool            is_msi;
 
     thread_id       thread;
     sem_id          sem;
@@ -170 +169 @@
             res->r_bustag = 1;
             res->r_bushandle = info->u.h0.interrupt_line + *rid - 1;
             result = 0;
-
-            // TODO: msi-x interrupts
         }
     } else if (type == SYS_RES_MEMORY)
         result = bus_alloc_mem_resource(dev, res, *rid);
@@ -349 +346 @@
     intr->arg = arg;
     intr->irq = res->r_bushandle;
     intr->flags = flags;
-    intr->is_msi = false;
     intr->sem = -1;
     intr->thread = -1;
 
@@ -386 +382 @@
         // this is an msi, enable it
         pci_info *info
             = &((struct root_device_softc *)dev->root->softc)->pci_info;
-        if (gPCIx86->enable_msi(info->bus, info->device,
-                info->function) != B_OK) {
-            device_printf(dev, "enabling msi failed\n");
-            bus_teardown_intr(dev, res, intr);
-            return ENODEV;
+        if (&((struct root_device_softc *)dev->root->softc)->is_msi) {
+            if (gPCIx86->enable_msi(info->bus, info->device,
+                    info->function) != B_OK) {
+                device_printf(dev, "enabling msi failed\n");
+                bus_teardown_intr(dev, res, intr);
+                return ENODEV;
+            }
+        } else if (&((struct root_device_softc *)dev->root->softc)->is_msix) {
+            if (gPCIx86->enable_msix(info->bus, info->device,
+                    info->function) != B_OK) {
+                device_printf(dev, "enabling msix failed\n");
+                bus_teardown_intr(dev, res, intr);
+                return ENODEV;
+            }
         }
-
-        intr->is_msi = true;
     }
 
     if (status < B_OK) {
@@ -412 +415 @@
 bus_teardown_intr(device_t dev, struct resource *res, void *arg)
 {
     struct internal_intr *intr = (struct internal_intr *)arg;
+    struct root_device_softc *root = (struct root_device_softc *)dev->root->softc;
 
-    if (intr->is_msi && gPCIx86 != NULL) {
+    if ((root->is_msi || root->is_msix) && gPCIx86 != NULL) {
         // disable msi generation
-        pci_info *info
-            = &((struct root_device_softc *)dev->root->softc)->pci_info;
+        pci_info *info = &root->pci_info;
         gPCIx86->disable_msi(info->bus, info->device, info->function);
     }
 
@@ -613 +616 @@
     return 0;
 }
 
-uint32_t 
+uint32_t
 pci_get_devid(device_t dev)
 {
     return pci_read_config(dev, PCI_device_id, 2) << 16 |
         pci_read_config(dev, PCI_vendor_id, 2);
 }
 
-uint8_t 
+uint8_t
 pci_get_cachelnsz(device_t dev)
 {
     return pci_read_config(dev, PCI_line_size, 1);
@@ -787 +790 @@
         return ENODEV;
     }
 
+    ((struct root_device_softc *)dev->root->softc)->is_msi = true;
     info->u.h0.interrupt_line = startVector;
     return EOK;
 }
@@ -801 +805 @@
 
     info = &((struct root_device_softc *)dev->root->softc)->pci_info;
     gPCIx86->unconfigure_msi(info->bus, info->device, info->function);
+    ((struct root_device_softc *)dev->root->softc)->is_msi = false;
+    ((struct root_device_softc *)dev->root->softc)->is_msix = false;
     return EOK;
 }
 
@@ -808 +814 @@
 int
 pci_msix_count(device_t dev)
 {
-    return 0;
+    pci_info *info;
+    if (gPCIx86 == NULL)
+        return 0;
+
+    info = &((struct root_device_softc *)dev->root->softc)->pci_info;
+    return gPCIx86->get_msix_count(info->bus, info->device, info->function);
 }
 
 
 int
 pci_alloc_msix(device_t dev, int *count)
 {
-    return ENODEV;
+    pci_info *info;
+    uint8 startVector = 0;
+    if (gPCIx86 == NULL)
+        return ENODEV;
+
+    info = &((struct root_device_softc *)dev->root->softc)->pci_info;
+
+    if (gPCIx86->configure_msix(info->bus, info->device, info->function, *count,
+            &startVector) != B_OK) {
+        return ENODEV;
+    }
+
+    ((struct root_device_softc *)dev->root->softc)->is_msix = true;
+    info->u.h0.interrupt_line = startVector;
+    return EOK;
 }
 
 

src/libs/compat/freebsd_network/device.h

@@ -30 +30 @@
 
 struct root_device_softc {
     struct pci_info pci_info;
+    bool            is_msi;
+    bool            is_msix;
 };
 
 enum {