kernel/amd64: mp: Keep track of CPUs by index

Signed-off-by: Ian Moffett <ian@osmora.org>

3 files changed, 29 insertions, 1 deletions

diff --git a/sys/arch/amd64/amd64/mp.c b/sys/arch/amd64/amd64/mp.c
index 22561d7..fe0dd9f 100644
--- a/sys/arch/amd64/amd64/mp.c
+++ b/sys/arch/amd64/amd64/mp.c
@@ -29,6 +29,7 @@
 
 #include <sys/types.h>
 #include <sys/limine.h>
+#include <sys/limits.h>
 #include <sys/syslog.h>
 #include <sys/spinlock.h>
 #include <sys/sched.h>
@@ -46,6 +47,8 @@ static volatile struct limine_smp_request g_smp_req = {
 };
 
 static volatile uint32_t ncpu_up = 0;
+static struct cpu_info *ci_list[CPU_MAX];
+static struct spinlock ci_list_lock = {0};
 
 static void
 ap_trampoline(struct limine_smp_info *si)
@@ -57,11 +60,31 @@ ap_trampoline(struct limine_smp_info *si)
     memset(ci, 0, sizeof(*ci));
 
     cpu_startup(ci);
+    spinlock_acquire(&ci_list_lock);
+    ci_list[ncpu_up] = ci;
+    spinlock_release(&ci_list_lock);
+
     atomic_inc_int(&ncpu_up);
     sched_enter();
     while (1);
 }
 
+struct cpu_info *
+cpu_get(uint32_t index)
+{
+    if (index >= ncpu_up) {
+        return NULL;
+    }
+
+    return ci_list[index];
+}
+
+uint32_t
+cpu_count(void)
+{
+    return ncpu_up;
+}
+
 void
 mp_bootstrap_aps(struct cpu_info *ci)
 {
diff --git a/sys/include/arch/amd64/cpu.h b/sys/include/arch/amd64/cpu.h
index dd753b7..89bc5e9 100644
--- a/sys/include/arch/amd64/cpu.h
+++ b/sys/include/arch/amd64/cpu.h
@@ -52,6 +52,9 @@ __dead void cpu_halt_all(void);
 void cpu_halt_others(void);
 void cpu_startup(struct cpu_info *ci);
 
+struct cpu_info *cpu_get(uint32_t index);
+uint32_t cpu_count(void);
+
 struct cpu_info *this_cpu(void);
 void mp_bootstrap_aps(struct cpu_info *ci);
 
diff --git a/sys/include/sys/limits.h b/sys/include/sys/limits.h
index 6185719..198c963 100644
--- a/sys/include/sys/limits.h
+++ b/sys/include/sys/limits.h
@@ -33,5 +33,7 @@
 #define PATH_MAX 1024
 #define SSIZE_MAX 32767
 #define CHAR_BIT 8
-
+#if defined(_KERNEL)
+#define CPU_MAX 256
+#endif  /* _KERNEL */
 #endif  /* !_SYS_LIMITS_H_ */