Ticket #5: acpi_routing_tables.patch

src/system/kernel/arch/x86/irq_routing_table.cpp

@@ -11 +11 @@
 #include <int.h>
 
 
-//#define TRACE_PRT
+#define TRACE_PRT
 #ifdef TRACE_PRT
 #   define TRACE(x...) dprintf("IRQRoutingTable: "x)
 #else
@@ -67 +67 @@
         dprintf("pin: %i\n", entry.pin);
         dprintf("source: %x\n", int(entry.source));
         dprintf("source index: %i\n", entry.source_index);
-
-        dprintf("pci_bus: %i\n", entry.pci_bus);
-        dprintf("pci_device: %i\n", entry.pci_device);
     }
 }
 
 
 static status_t
-find_pci_device(pci_module_info *pci, irq_routing_entry* entry)
-{
-    pci_info info;
-    int pciN = 0;
-    while ((*pci->get_nth_pci_info)(pciN, &info) == B_OK) {
-        pciN ++;
-
-        int16 deviceAddress = entry->device_address >> 16 & 0xFFFF;
-        if (info.device == deviceAddress
-            && info.u.h0.interrupt_pin == entry->pin + 1) {
-            entry->pci_bus = info.bus;
-            entry->pci_device = info.device;
-            return B_OK;
-        }
-    }
-
-    return B_ERROR;
-}
-
-
-static status_t
 read_device_irq_routing_table(pci_module_info *pci, acpi_module_info* acpi,
     acpi_handle device, IRQRoutingTable* table)
 {
@@ -107 +83 @@
         return status;
 
     irq_routing_entry irqEntry;
-    acpi_pci_routing_table* acpiTable
-        = (acpi_pci_routing_table*)buffer.pointer;
+    acpi_pci_routing_table* acpiTable = (acpi_pci_routing_table*)buffer.pointer;
     while (acpiTable->length) {
         irqEntry.device_address = acpiTable->address;
         irqEntry.pin = acpiTable->pin;
         acpi_handle source;
-        if (acpi->get_handle(device, acpiTable->source, &source) != B_OK)
-            continue;
+        if (acpi->get_handle(device, acpiTable->source, &source) == B_OK) {
+            irqEntry.source = source;
+            irqEntry.source_index = acpiTable->sourceIndex;
+            table->PushBack(irqEntry);          
+        }
         irqEntry.source = source;
         irqEntry.source_index = acpiTable->sourceIndex;
-
-        // connect to pci device
-        if (find_pci_device(pci, &irqEntry) != B_OK) {
-            TRACE("no pci dev found, device %x, pin %i\n",
-                irqEntry.device_address, irqEntry.pin);
-            acpiTable = (acpi_pci_routing_table*)((uint8*)acpiTable
-                + acpiTable->length);
-            continue;
-        }
-
         table->PushBack(irqEntry);
         acpiTable = (acpi_pci_routing_table*)((uint8*)acpiTable
             + acpiTable->length);
@@ -153 +121 @@
         return status;
     TRACE("Read root pci bus irq rooting table\n");
     status = read_device_irq_routing_table(pci, acpi, rootPciHandle, table);
-    if (status != B_OK)
-        return status;
 
-    TRACE("find p2p \n");
+    TRACE("find routing tables \n");
 
     char result[255];
     result[0] = 0;
@@ -170 +136 @@
 
         status = read_device_irq_routing_table(pci, acpi, brigde, table);
         if (status == B_OK)
-            TRACE("p2p found %s\n", result);
+            TRACE("routing table found %s\n", result);
     }
 
-    return status;
+    return table->Count() > 0 ? B_OK : B_ERROR;
 }
 
 

src/system/kernel/arch/x86/arch_int.cpp

@@ -39 +39 @@
 #include <stdio.h>
 
 
-//#define TRACE_ARCH_INT
+#define TRACE_ARCH_INT
 #ifdef TRACE_ARCH_INT
 #   define TRACE(x) dprintf x
 #else
@@ -590 +590 @@
     }
 
 // disable io apic for now
-return;
+//return;
 
     // load acpi module
     status_t status;
@@ -668 +668 @@
     // configure apic interrupts assume 1:1 mapping
     for (int i = 0; i < table.Count(); i++) {
         irq_routing_entry& entry = table.ElementAt(i);
+        TRACE(("address: %x pin: %i source: %x source index: %i\n",
+            entry.device_address, entry.pin, int(entry.source),
+            entry.source_index));
+
         irq_descriptor irqDescriptor;
         read_current_irq(acpiModule, entry.source, &irqDescriptor);
         uint32 config = 0;

src/system/kernel/arch/x86/irq_routing_table.h

@@ -19 +19 @@
 
     acpi_handle     source;
     int             source_index;
-
-    // pci busmanager connection
-    uchar           pci_bus;
-    uchar           pci_device;
 };