IRQ: Instantiate pci link controller earlier

On machines with non-trivial pci hierarchies, the pci link
controllers got instantiated too early, before every prt
entry was added to the skb. Now we instantiate the controller
as soon as the discovery is done.

Signed-off-by: Lukas Humbel <lukas.humbel@inf.ethz.ch>

diff --git a/usr/acpi/acpi.c b/usr/acpi/acpi.c
index cf0c1a4..4ddbc50 100644 (file)
--- a/usr/acpi/acpi.c
+++ b/usr/acpi/acpi.c
@@ -431,6 +431,12 @@ static void get_irq_routing(ACPI_HANDLE handle, uint8_t bus)
             }
         }
 
+        errval_t err;
+        err = skb_execute_query("add_pcilnk_controller_by_name(\"%s\", Lbl), "
+                "writeln(Lbl).", esource);
+        if(err_is_fail(err)){
+            DEBUG_SKB_ERR(err, "add_pcilnk_controller_by_name");
+        }
         free(esource);
     }
 }

diff --git a/usr/skb/programs/irq_routing_new.pl b/usr/skb/programs/irq_routing_new.pl
index e34de40..ecc092e 100644 (file)
--- a/usr/skb/programs/irq_routing_new.pl
+++ b/usr/skb/programs/irq_routing_new.pl
@@ -427,16 +427,20 @@ add_x86_controllers :-
         get_min_range(CpuPorts, MinCpu),
         get_unused_range(16, PicInRange),
         assert_controller(pic_a, pic, PicInRange, [MinCpu])
-    ) ; true),
+    ) ; true).
 
     % PIR to pcilnk controllers
-    findall(Name, pir(Name, _),Li),
-    sort(Li,LiUnique),
-    (foreach(Name,LiUnique) do (
-        findall(Gsi, pir(Name, Gsi), GSIListT),
-        sort(GSIListT,GSIList),
-        add_pcilnk_controller(GSIList, Name, _)
-    )).
+    % This is now added on the fly when all pir facts
+    % become available. ACPI calls
+    % add_pcilnk_controller_by_name(Name, Lbl)
+    % after adding all relevant PIR facts.
+    %findall(Name, pir(Name, _),Li),
+    %sort(Li,LiUnique),
+    %(foreach(Name,LiUnique) do (
+    %    findall(Gsi, pir(Name, Gsi), GSIListT),
+    %    sort(GSIListT,GSIList),
+    %    add_pcilnk_controller(GSIList, Name, _)
+    %)).
 
 
 
@@ -577,6 +581,14 @@ add_pcilnk_controller(GSIList, Name, Lbl) :-
     assert(pcilnk_index(Name, Lbl)),
     assert_controller(Lbl, pcilnk, InRange, OutRange).
 
+% For a given (ACPI) pci link controller name, this looks
+% up all the GSI from the pir(..) facts and instantiates the controller
+add_pcilnk_controller_by_name(Name, Lbl) :-
+    findall(Gsi, pir(Name, Gsi), GSIListT),
+    sort(GSIListT,GSIList),
+    add_pcilnk_controller(GSIList, Name, Lbl).
+
+
 
 add_ioapic_controller(Lbl, IoApicId, GSIBase) :-
     ((