Changeset cbddf5de in rtems

Timestamp:

03/15/23 13:31:20 (7 months ago)

Author:

Sebastian Huber <sebastian.huber@…>

Branches:

master

Children:

11cc51e

Parents:

e5233057

git-author:

Sebastian Huber <sebastian.huber@…> (03/15/23 13:31:20)

git-committer:

Sebastian Huber <sebastian.huber@…> (03/17/23 06:25:34)

Message:

bsps/riscv: Fix riscv_get_hart_index_by_phandle()

Take a non-zero RISCV_BOOT_HARTID into account.

Location:

bsps/riscv/riscv/start

Files:

• bspsmp.c (modified) (1 diff)
• bspstart.c (modified) (2 diffs)

bsps/riscv/riscv/start/bspsmp.c

@@ -47 +47 @@
 uint32_t _CPU_SMP_Initialize(void)
 {
-  return riscv_hart_count - RISCV_BOOT_HARTID;
+  return riscv_hart_count;
 }
 

bsps/riscv/riscv/start/bspstart.c

@@ -112 +112 @@
     hart_index = fdt32_to_cpu(val[0]);
 
+#if RISCV_BOOT_HARTID != 0
+    if (hart_index < RISCV_BOOT_HARTID) {
+      continue;
+    }
+
+    hart_index -= RISCV_BOOT_HARTID;
+#endif
+
     if (hart_index >= RTEMS_ARRAY_SIZE(riscv_hart_phandles)) {
       continue;
@@ -167 +175 @@
   for (hart_index = 0; hart_index < riscv_hart_count; ++hart_index) {
     if (riscv_hart_phandles[hart_index] == phandle) {
-      return hart_index;
+      return hart_index + RISCV_BOOT_HARTID;
     }
   }