armv7: Fix for kaluga changes
authorLukas Humbel <lukas.humbel@inf.ethz.ch>
Mon, 18 Nov 2019 14:07:55 +0000 (15:07 +0100)
committerLukas Humbel <lukas.humbel@inf.ethz.ch>
Mon, 18 Nov 2019 14:07:55 +0000 (15:07 +0100)
Signed-off-by: Lukas Humbel <lukas.humbel@inf.ethz.ch>

tools/harness/Hakefile
usr/kaluga/start_cpu.c

index 661e084..0bfe645 100644 (file)
@@ -74,8 +74,8 @@ let
     jobs "armv7"  = [
          testJob "armv7-qemu-zynq7" "Memtest on qemu-zynq7" $
             scalebench ["memtest"] ["qemu_armv7_zynq7"],
-         testJob "armv7-qemu" "Memtest on qemu" $
-            scalebench ["memtest"] ["qemu_armv7"],
+         testJob "armv7-qemu" "Multicore Memtest on 4 core qemu" $
+            scalebench ["memtest_multicore"] ["qemu_armv7_c4"],
          testJob "armv7-gem5" "Gem5 simulator" $
             scalebench ["memtest"] ["armv7_gem5"],
          testJob "armv7-fvp" "FVP simulator" $
index 1e4e1f1..16050c6 100644 (file)
@@ -61,8 +61,9 @@ static void cpu_change_event(octopus_mode_t mode, const char* record, void* stat
         }
         err = mi->start_function(0, mi, (CONST_CAST)record, NULL);
         if (err_is_fail(err)) {
-            debug_printf("Boot driver not found. Do not boot discovered CPU %"
-                   PRIu64".\n", barrelfish_id);
+            DEBUG_ERR(err, "corectrl start");
+            debug_printf("Not booting discovered CPU %"PRIu64".\n",
+                    barrelfish_id);
             goto out;
         }
     }
@@ -174,10 +175,8 @@ errval_t start_boot_driver(coreid_t where, struct module_info* mi,
         }
 
         struct module_info* cpu_module = find_module(cpu_binary);
-        if(cpu_module == NULL){
-            debug_printf("Module %s not found\n", cpu_binary);
-            return KALUGA_ERR_MODULE_NOT_FOUND;
-        }
+        // ARMv7 doesn't need a cpu_module, hence cpu_module == NULL is acceptable
+        // here.
         if (cpu_module != NULL && strlen(cpu_module->args) > 1) {
             KALUGA_DEBUG("%s:%s:%d: Boot with cpu arg %s and barrelfish_id_s=%s\n",
                          __FILE__, __FUNCTION__, __LINE__, cpu_module->args, barrelfish_id_s);