Fix up PC port a bit

badgeteam · Aug 29, 2024 · ccbecf0 · ccbecf0
1 parent fc82cd6
commit ccbecf0
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 4 deletions.
diff --git a/kernel/port/generic/src/port.c b/kernel/port/generic/src/port.c
@@ -6,6 +6,7 @@
 #include "assertions.h"
 #include "cpu/mmu.h"
 #include "cpu/panic.h"
+#include "interrupt.h"
 #include "isr_ctx.h"
 #include "limine.h"
 #include "memprotect.h"
@@ -198,6 +199,12 @@ void port_init() {
     }
 }
 
+// Power off.
+void port_poweroff(bool restart) {
+    irq_disable();
+    while (1);
+}
+
 // Send a single character to the log output.
 void port_putc(char msg) {
     register char a0 asm("a0") = msg;

diff --git a/kernel/port/generic/src/smp.c b/kernel/port/generic/src/smp.c
@@ -129,6 +129,7 @@ int smp_cur_cpu() {
 
 // Get the SMP CPU index from the CPU ID value.
 int smp_get_cpu(size_t cpuid) {
+    return 0;
     smp_map_t         dummy = {.cpuid = cpuid};
     array_binsearch_t res   = array_binsearch(smp_map, sizeof(smp_map_t), smp_map_len, &dummy, smp_cpuid_cmp);
     if (res.found) {

diff --git a/kernel/src/main.c b/kernel/src/main.c
@@ -1,6 +1,7 @@
 
 // SPDX-License-Identifier: MIT
 
+#include "assertions.h"
 #include "cpu/panic.h"
 #include "filesystem.h"
 #include "housekeeping.h"

diff --git a/kernel/src/process/proc_memmap.c b/kernel/src/process/proc_memmap.c
@@ -142,10 +142,39 @@ size_t proc_map_raw(
 
 // Release memory allocated to a process.
 void proc_unmap_raw(badge_err_t *ec, process_t *proc, size_t base) {
-    (void)ec;
-    (void)proc;
-    (void)base;
-    logk(LOG_WARN, "TODO: proc_unmap_raw");
+    // Search the memory map for the specified region.
+    proc_memmap_ent_t dummy = {.vaddr = base};
+    array_binsearch_t res   = array_binsearch(
+        proc->memmap.regions,
+        sizeof(proc_memmap_ent_t),
+        proc->memmap.regions_len,
+        &dummy,
+        proc_memmap_cmp
+    );
+    if (!res.found) {
+        badge_err_set(ec, ELOC_PROCESS, ECAUSE_NOTFOUND);
+        return;
+    }
+
+    // Remove the region from the memory map.
+    proc_memmap_ent_t removed;
+    array_lencap_remove(
+        &proc->memmap.regions,
+        sizeof(proc_memmap_ent_t),
+        &proc->memmap.regions_len,
+        &proc->memmap.regions_cap,
+        &removed,
+        res.index
+    );
+
+    // Remove it from the MMU.
+    assert_dev_keep(memprotect_u(&proc->memmap, &proc->memmap.mpu_ctx, removed.vaddr, 0, removed.size, 0));
+    memprotect_commit(&proc->memmap.mpu_ctx);
+
+    // Free the memory from PMM.
+    phys_page_free(removed.paddr / MEMMAP_PAGE_SIZE);
+
+    badge_err_set_ok(ec);
 }
 
 // Whether the process owns this range of virtual memory.