fix: incorrect settings of msi registers.

[lunaix-os.git] / lunaix-os / kernel / proc0.c

diff --git a/lunaix-os/kernel/proc0.c b/lunaix-os/kernel/proc0.c
index 61a6dfc16164e44fe1e1ab318f558613f64c4020..759db2c0d19906bdffd2a34e8639615659e50bdb 100644 (file)
--- a/lunaix-os/kernel/proc0.c
+++ b/lunaix-os/kernel/proc0.c
@@ -2,7 +2,9 @@
 #include <lunaix/common.h>
 #include <lunaix/lunistd.h>
 #include <lunaix/lxconsole.h>
 #include <lunaix/common.h>
 #include <lunaix/lunistd.h>
 #include <lunaix/lxconsole.h>

+#include <lunaix/mm/cake.h>

 #include <lunaix/mm/pmm.h>
 #include <lunaix/mm/pmm.h>

+#include <lunaix/mm/valloc.h>

 #include <lunaix/mm/vmm.h>
 #include <lunaix/peripheral/ps2kbd.h>
 #include <lunaix/proc.h>
 #include <lunaix/mm/vmm.h>
 #include <lunaix/peripheral/ps2kbd.h>
 #include <lunaix/proc.h>


@@ -12,8 +14,12 @@
 #include <stddef.h>
 
 #include <hal/acpi/acpi.h>
 #include <stddef.h>
 
 #include <hal/acpi/acpi.h>

+#include <hal/ahci/ahci.h>

 #include <hal/apic.h>
 #include <hal/ioapic.h>
 #include <hal/apic.h>
 #include <hal/ioapic.h>

+#include <hal/pci.h>
+
+#include <klibc/string.h>

 
 LOG_MODULE("PROC0")
 
 
 LOG_MODULE("PROC0")
 


@@ -32,19 +38,38 @@ unlock_reserved_memory();
 void
 __do_reserved_memory(int unlock);
 
 void
 __do_reserved_memory(int unlock);
 

-//#define DEMO_SIGNAL
+//#define USE_DEMO
+#define DEMO_SIGNAL
+
+extern void
+_pconsole_main();
+
+extern void
+_signal_demo_main();
+
+extern void
+_lxinit_main();

 
 void __USER__
 __proc0_usr()
 {
 
 void __USER__
 __proc0_usr()
 {

+    pid_t p;

     if (!fork()) {
     if (!fork()) {

-#ifdef DEMO_SIGNAL
-        asm("jmp _signal_demo_main");
+        _pconsole_main();
+    }
+
+    if (!(p = fork())) {
+#ifndef USE_DEMO
+        _exit(0);
+#elif defined DEMO_SIGNAL
+        _signal_demo_main();

 #else
 #else

-        asm("jmp _lxinit_main");
+        _lxinit_main();

 #endif
     }
 
 #endif
     }
 

+    waitpid(p, 0, 0);
+

     while (1) {
         yield();
     }
     while (1) {
         yield();
     }


@@ -86,34 +111,70 @@ extern uint8_t __kernel_end;              /* link/linker.ld */
 extern uint8_t __init_hhk_end;            /* link/linker.ld */
 extern multiboot_info_t* _k_init_mb_info; /* k_init.c */
 
 extern uint8_t __init_hhk_end;            /* link/linker.ld */
 extern multiboot_info_t* _k_init_mb_info; /* k_init.c */
 

+char test_sequence[] = "Once upon a time, in a magical land of Equestria. "
+                       "There were two regal sisters who ruled together "
+                       "and created harmony for all the land.";
+

 void
 void

-init_platform()
+__test_disk_io()

 {
 {

-    assert_msg(kalloc_init(), "Fail to initialize heap");
+    struct hba_port* port = ahci_get_port(0);
+    char* buffer = vcalloc_dma(port->device->block_size);
+    strcpy(buffer, test_sequence);
+    kprintf("WRITE: %s\n", buffer);
+    int result;
+
+    // 写入第一扇区 (LBA=0)
+    result =
+      port->device->ops.write_buffer(port, 0, buffer, port->device->block_size);
+    if (!result) {
+        kprintf(KWARN "fail to write: %x\n", port->device->last_error);
+    }

 
 

+    memset(buffer, 0, port->device->block_size);
+
+    // 读出我们刚刚写的内容！
+    result =
+      port->device->ops.read_buffer(port, 0, buffer, port->device->block_size);
+    kprintf(KDEBUG "%x, %x\n", port->regs[HBA_RPxIS], port->regs[HBA_RPxTFD]);
+    if (!result) {
+        kprintf(KWARN "fail to read: %x\n", port->device->last_error);
+    } else {
+        kprint_hex(buffer, 256);
+    }
+
+    vfree_dma(buffer);
+}
+
+void
+init_platform()
+{

     // 锁定所有系统预留页（内存映射IO，ACPI之类的），并且进行1:1映射
     lock_reserved_memory();
 
     // 锁定所有系统预留页（内存映射IO，ACPI之类的），并且进行1:1映射
     lock_reserved_memory();
 

-    acpi_init(_k_init_mb_info);
-    uintptr_t ioapic_addr = acpi_get_context()->madt.ioapic->ioapic_addr;
-    pmm_mark_page_occupied(
-      KERNEL_PID, FLOOR(__APIC_BASE_PADDR, PG_SIZE_BITS), 0);
-    pmm_mark_page_occupied(KERNEL_PID, FLOOR(ioapic_addr, PG_SIZE_BITS), 0);
+    cake_init();

 
 

-    vmm_set_mapping(
-      PD_REFERENCED, MMIO_APIC, __APIC_BASE_PADDR, PG_PREM_RW, VMAP_NULL);
-    vmm_set_mapping(
-      PD_REFERENCED, MMIO_IOAPIC, ioapic_addr, PG_PREM_RW, VMAP_NULL);
+    assert_msg(kalloc_init(), "Fail to initialize heap");
+    valloc_init();

 
 

+    acpi_init(_k_init_mb_info);

     apic_init();
     ioapic_init();
     timer_init(SYS_TIMER_FREQUENCY_HZ);
     clock_init();
     ps2_kbd_init();
     apic_init();
     ioapic_init();
     timer_init(SYS_TIMER_FREQUENCY_HZ);
     clock_init();
     ps2_kbd_init();

+    pci_init();
+    ahci_init();
+    ahci_list_device();
+
+    __test_disk_io();
+
+    cake_stats();

 
     syscall_install();
 
     console_start_flushing();
 
     syscall_install();
 
     console_start_flushing();

+    console_flush();

 
     unlock_reserved_memory();
 
 
     unlock_reserved_memory();
 


@@ -159,6 +220,8 @@ __do_reserved_memory(int unlock)
                     break;
                 }
                 vmm_set_mapping(PD_REFERENCED, _pa, _pa, PG_PREM_R, VMAP_NULL);
                     break;
                 }
                 vmm_set_mapping(PD_REFERENCED, _pa, _pa, PG_PREM_R, VMAP_NULL);

+                pmm_mark_page_occupied(
+                  KERNEL_PID, _pa >> PG_SIZE_BITS, PP_FGLOCKED);

             }
             // Save the progress for later unmapping.
             mmaps[i].len_low = j * PG_SIZE;
             }
             // Save the progress for later unmapping.
             mmaps[i].len_low = j * PG_SIZE;


@@ -166,6 +229,9 @@ __do_reserved_memory(int unlock)
             for (; j < pg_num; j++) {
                 uintptr_t _pa = pa + (j << PG_SIZE_BITS);
                 vmm_del_mapping(PD_REFERENCED, _pa);
             for (; j < pg_num; j++) {
                 uintptr_t _pa = pa + (j << PG_SIZE_BITS);
                 vmm_del_mapping(PD_REFERENCED, _pa);

+                if (mmap.type == MULTIBOOT_MEMORY_ACPI_RECLAIMABLE) {
+                    pmm_mark_page_free(_pa >> PG_SIZE_BITS);
+                }

             }
         }
     }
             }
         }
     }