Call axhal::platform_init in axruntime

it's allow to use `info!()` in `axhal::platform_init()`
arceos-org · Apr 27, 2023 · 3bb1cc4 · 3bb1cc4
1 parent b008feb
commit 3bb1cc4
Show file tree

Hide file tree

Showing 43 changed files with 253 additions and 182 deletions.
diff --git a/apps/c/helloworld/expect_info.out b/apps/c/helloworld/expect_info.out
@@ -11,6 +11,7 @@ Found physcial memory regions:
  boot stack (READ | WRITE | RESERVED)
  .bss (READ | WRITE | RESERVED)
  free memory (READ | WRITE | FREE)
+Initialize platform devices...
 Primary CPU 0 init OK.
 Hello, C app!
 Shutting down...
diff --git a/apps/c/helloworld/expect_info_smp4.out b/apps/c/helloworld/expect_info_smp4.out
@@ -11,6 +11,7 @@ Found physcial memory regions:
  boot stack (READ | WRITE | RESERVED)
  .bss (READ | WRITE | RESERVED)
  free memory (READ | WRITE | FREE)
+Initialize platform devices...
 CPU 0 init OK
 CPU 1 started
 CPU 2 started

diff --git a/apps/c/memtest/expect_trace.out b/apps/c/memtest/expect_trace.out
@@ -14,6 +14,7 @@ Found physcial memory regions:
 Initialize global memory allocator...
 initialize global allocator at: \[0x[0-9a-f]\+, 0x[0-9a-f]\+)
 Initialize kernel page table...
+Initialize platform devices...
 map_region(PA:0x[0-9a-f]\+): \[VA:0x[0-9a-f]\+, VA:0x[0-9a-f]\+) -> \[PA:0x[0-9a-f]\+, PA:0x[0-9a-f]\+) MappingFlags(READ | EXECUTE)
 map_region(PA:0x[0-9a-f]\+): \[VA:0x[0-9a-f]\+, VA:0x[0-9a-f]\+) -> \[PA:0x[0-9a-f]\+, PA:0x[0-9a-f]\+) MappingFlags(READ)
 map_region(PA:0x[0-9a-f]\+): \[VA:0x[0-9a-f]\+, VA:0x[0-9a-f]\+) -> \[PA:0x[0-9a-f]\+, PA:0x[0-9a-f]\+) MappingFlags(READ | WRITE)

diff --git a/apps/c/sqlite3/expect_info.out b/apps/c/sqlite3/expect_info.out
@@ -13,6 +13,7 @@ Found physcial memory regions:
  free memory (READ | WRITE | FREE)
 Initialize global memory allocator...
 Initialize kernel page table...
+Initialize platform devices...
 Initialize device drivers...
 created a new Block device: "virtio-blk"
 Initialize filesystems...

diff --git a/apps/c/sqlite3/expect_info_again.out b/apps/c/sqlite3/expect_info_again.out
@@ -13,6 +13,7 @@ Found physcial memory regions:
  free memory (READ | WRITE | FREE)
 Initialize global memory allocator...
 Initialize kernel page table...
+Initialize platform devices...
 Initialize device drivers...
 created a new Block device: "virtio-blk"
 Initialize filesystems...

diff --git a/apps/exception/expect_debug_aarch64.out b/apps/exception/expect_debug_aarch64.out
@@ -13,6 +13,7 @@ Found physcial memory regions:
  free memory (READ | WRITE | FREE)
 Initialize global memory allocator...
 Initialize kernel page table...
+Initialize platform devices...
 Primary CPU 0 init OK.
 Running exception tests...
 BRK #0x0 @

diff --git a/apps/exception/expect_debug_riscv64.out b/apps/exception/expect_debug_riscv64.out
@@ -13,6 +13,7 @@ Found physcial memory regions:
  free memory (READ | WRITE | FREE)
 Initialize global memory allocator...
 Initialize kernel page table...
+Initialize platform devices...
 Primary CPU 0 init OK.
 Running exception tests...
 Exception(Breakpoint) @

diff --git a/apps/helloworld/expect_info.out b/apps/helloworld/expect_info.out
@@ -11,6 +11,7 @@ Found physcial memory regions:
  boot stack (READ | WRITE | RESERVED)
  .bss (READ | WRITE | RESERVED)
  free memory (READ | WRITE | FREE)
+Initialize platform devices...
 Primary CPU 0 init OK.
 Hello, world!
 Shutting down...
diff --git a/apps/helloworld/expect_info_smp4.out b/apps/helloworld/expect_info_smp4.out
@@ -11,6 +11,7 @@ Found physcial memory regions:
  boot stack (READ | WRITE | RESERVED)
  .bss (READ | WRITE | RESERVED)
  free memory (READ | WRITE | FREE)
+Initialize platform devices...
 CPU 0 init OK
 CPU 1 started
 CPU 2 started

diff --git a/apps/memtest/expect_trace.out b/apps/memtest/expect_trace.out
@@ -14,6 +14,7 @@ Found physcial memory regions:
 Initialize global memory allocator...
 initialize global allocator at: \[0x[0-9a-f]\+, 0x[0-9a-f]\+)
 Initialize kernel page table...
+Initialize platform devices...
 map_region(PA:0x[0-9a-f]\+): \[VA:0x[0-9a-f]\+, VA:0x[0-9a-f]\+) -> \[PA:0x[0-9a-f]\+, PA:0x[0-9a-f]\+) MappingFlags(READ | EXECUTE)
 map_region(PA:0x[0-9a-f]\+): \[VA:0x[0-9a-f]\+, VA:0x[0-9a-f]\+) -> \[PA:0x[0-9a-f]\+, PA:0x[0-9a-f]\+) MappingFlags(READ)
 map_region(PA:0x[0-9a-f]\+): \[VA:0x[0-9a-f]\+, VA:0x[0-9a-f]\+) -> \[PA:0x[0-9a-f]\+, PA:0x[0-9a-f]\+) MappingFlags(READ | WRITE)

diff --git a/apps/net/httpclient/expect_info.out b/apps/net/httpclient/expect_info.out
@@ -13,6 +13,7 @@ Found physcial memory regions:
  free memory (READ | WRITE | FREE)
 Initialize global memory allocator...
 Initialize kernel page table...
+Initialize platform devices...
 Initialize device drivers...
 created a new Net device: "virtio-net"
 Initialize network subsystem...

diff --git a/apps/net/httpclient/expect_info_dns.out b/apps/net/httpclient/expect_info_dns.out
@@ -13,6 +13,7 @@ Found physcial memory regions:
  free memory (READ | WRITE | FREE)
 Initialize global memory allocator...
 Initialize kernel page table...
+Initialize platform devices...
 Initialize device drivers...
 created a new Net device: "virtio-net"
 Initialize network subsystem...

diff --git a/apps/task/parallel/expect_info_smp1_fifo.out b/apps/task/parallel/expect_info_smp1_fifo.out
@@ -13,6 +13,7 @@ Found physcial memory regions:
  free memory (READ | WRITE | FREE)
 Initialize global memory allocator...
 Initialize kernel page table...
+Initialize platform devices...
 Initialize scheduling...
   use FIFO scheduler.
 Initialize interrupt handlers...

diff --git a/apps/task/parallel/expect_info_smp4_rr.out b/apps/task/parallel/expect_info_smp4_rr.out
@@ -13,6 +13,7 @@ Found physcial memory regions:
  free memory (READ | WRITE | FREE)
 Initialize global memory allocator...
 Initialize kernel page table...
+Initialize platform devices...
 Initialize scheduling...
   use Round-robin scheduler.
 Initialize interrupt handlers...

diff --git a/apps/task/sleep/expect_info_smp4_fifo.out b/apps/task/sleep/expect_info_smp4_fifo.out
@@ -13,6 +13,7 @@ Found physcial memory regions:
  free memory (READ | WRITE | FREE)
 Initialize global memory allocator...
 Initialize kernel page table...
+Initialize platform devices...
 Initialize scheduling...
   use FIFO scheduler.
 Initialize interrupt handlers...

diff --git a/apps/task/sleep/expect_info_smp4_rr.out b/apps/task/sleep/expect_info_smp4_rr.out
@@ -13,6 +13,7 @@ Found physcial memory regions:
  free memory (READ | WRITE | FREE)
 Initialize global memory allocator...
 Initialize kernel page table...
+Initialize platform devices...
 Initialize scheduling...
   use Round-robin scheduler.
 Initialize interrupt handlers...

diff --git a/apps/task/yield/expect_info_smp4_fifo.out b/apps/task/yield/expect_info_smp4_fifo.out
@@ -13,6 +13,7 @@ Found physcial memory regions:
  free memory (READ | WRITE | FREE)
 Initialize global memory allocator...
 Initialize kernel page table...
+Initialize platform devices...
 Initialize scheduling...
   use FIFO scheduler.
 CPU 1 init OK

diff --git a/apps/task/yield/expect_info_smp4_rr.out b/apps/task/yield/expect_info_smp4_rr.out
@@ -13,6 +13,7 @@ Found physcial memory regions:
  free memory (READ | WRITE | FREE)
 Initialize global memory allocator...
 Initialize kernel page table...
+Initialize platform devices...
 Initialize scheduling...
   use Round-robin scheduler.
 Initialize interrupt handlers...

diff --git a/doc/build.md b/doc/build.md
@@ -2,7 +2,7 @@
 
 We will provide an example to illustrate the process of building and running ArceOS:
 
-**Examples:**  
+**Examples:**
 
 What happens when "make A=apps/net/httpserver ARCH=aarch64 LOG=info NET=y SMP=1 run" is executed?
 
@@ -44,7 +44,7 @@ What happens when "make A=apps/net/httpserver ARCH=aarch64 LOG=info NET=y SMP=1
     #[no_mangle]
     #[link_section = ".text.boot"]
     unsafe extern "C" fn _start() -> ! {
-        extern "Rust" {
+        extern "C" {
             fn rust_main();
         }
         // PC = 0x8020_0000

diff --git a/modules/axhal/src/arch/aarch64/mod.rs b/modules/axhal/src/arch/aarch64/mod.rs
@@ -28,11 +28,20 @@ pub fn irqs_enabled() -> bool {
 }
 
 /// Relaxes the current CPU and waits for interrupts.
+///
+/// It must be called with interrupts enabled, otherwise it will never return.
 #[inline]
 pub fn wait_for_irqs() {
     aarch64_cpu::asm::wfi();
 }
 
+/// Halt the current CPU.
+#[inline]
+pub fn halt() {
+    disable_irqs();
+    aarch64_cpu::asm::wfi(); // should never return
+}
+
 /// Reads the register that stores the current page table root.
 ///
 /// Returns the physical address of the page table root.

diff --git a/modules/axhal/src/arch/riscv/mod.rs b/modules/axhal/src/arch/riscv/mod.rs
@@ -29,11 +29,20 @@ pub fn irqs_enabled() -> bool {
 }
 
 /// Relaxes the current CPU and waits for interrupts.
+///
+/// It must be called with interrupts enabled, otherwise it will never return.
 #[inline]
 pub fn wait_for_irqs() {
     unsafe { riscv::asm::wfi() }
 }
 
+/// Halt the current CPU.
+#[inline]
+pub fn halt() {
+    disable_irqs();
+    unsafe { riscv::asm::wfi() } // should never return
+}
+
 /// Reads the register that stores the current page table root.
 ///
 /// Returns the physical address of the page table root.

diff --git a/modules/axhal/src/arch/x86_64/mod.rs b/modules/axhal/src/arch/x86_64/mod.rs
@@ -36,16 +36,24 @@ pub fn irqs_enabled() -> bool {
 }
 
 /// Relaxes the current CPU and waits for interrupts.
+///
+/// It must be called with interrupts enabled, otherwise it will never return.
 #[inline]
 pub fn wait_for_irqs() {
-    if cfg!(target_os = "none") && irqs_enabled() {
-        // don't halt if local interrupts are disabled
+    if cfg!(target_os = "none") {
         unsafe { asm!("hlt") }
     } else {
         core::hint::spin_loop()
     }
 }
 
+/// Halt the current CPU.
+#[inline]
+pub fn halt() {
+    disable_irqs();
+    wait_for_irqs(); // should never return
+}
+
 /// Reads the register that stores the current page table root.
 ///
 /// Returns the physical address of the page table root.

diff --git a/modules/axhal/src/cpu.rs b/modules/axhal/src/cpu.rs
@@ -74,14 +74,20 @@ pub unsafe fn set_current_task_ptr<T>(ptr: *const T) {
 }
 
 #[allow(dead_code)]
-pub(crate) fn init_percpu(cpu_id: usize, is_bsp: bool) {
-    if is_bsp {
-        percpu::init(axconfig::SMP);
+pub(crate) fn init_primary(cpu_id: usize) {
+    percpu::init(axconfig::SMP);
+    percpu::set_local_thread_pointer(cpu_id);
+    unsafe {
+        CPU_ID.write_current_raw(cpu_id);
+        IS_BSP.write_current_raw(true);
     }
+}
+
+#[allow(dead_code)]
+pub(crate) fn init_secondary(cpu_id: usize) {
     percpu::set_local_thread_pointer(cpu_id);
     unsafe {
-        // preemption is disabled on initialization.
         CPU_ID.write_current_raw(cpu_id);
-        IS_BSP.write_current_raw(is_bsp);
+        IS_BSP.write_current_raw(false);
     }
 }
diff --git a/modules/axhal/src/irq.rs b/modules/axhal/src/irq.rs
@@ -21,6 +21,9 @@ pub(crate) fn dispatch_irq_common(irq_num: usize) {
 }
 
 /// Platform-independent IRQ handler registration.
+///
+/// It also enables the IRQ if the registration succeeds. It returns `false` if
+/// the registration failed.
 #[allow(dead_code)]
 pub(crate) fn register_handler_common(irq_num: usize, handler: IrqHandler) -> bool {
     if irq_num < MAX_IRQ_COUNT && IRQ_HANDLER_TABLE.register_handler(irq_num, handler) {

diff --git a/modules/axhal/src/lib.rs b/modules/axhal/src/lib.rs
@@ -70,3 +70,8 @@ pub mod misc {
 pub mod mp {
     pub use super::platform::mp::*;
 }
+
+pub use self::platform::platform_init;
+
+#[cfg(feature = "smp")]
+pub use self::platform::platform_init_secondary;
diff --git a/modules/axhal/src/platform/dummy/mod.rs b/modules/axhal/src/platform/dummy/mod.rs
@@ -22,16 +22,8 @@ pub mod misc {
 
 #[cfg(feature = "smp")]
 pub mod mp {
-    /// Starts a secondary CPU with the given ID.
-    ///
-    /// When the CPU is started, it will jump to the given entry and set the
-    /// corresponding register to the given argument.
-    pub fn start_secondary_cpu(
-        hardid: usize,
-        entry: crate::mem::PhysAddr,
-        stack_top: crate::mem::PhysAddr,
-    ) {
-    }
+    /// Starts the given secondary CPU with its boot stack.
+    pub fn start_secondary_cpu(cpu_id: usize, stack_top: crate::mem::PhysAddr) {}
 }
 
 pub mod mem {
@@ -48,9 +40,6 @@ pub mod mem {
 }
 
 pub mod time {
-    /// The timer IRQ number.
-    pub const TIMER_IRQ_NUM: usize = 0;
-
     /// Returns the current clock time in hardware ticks.
     pub fn current_ticks() -> u64 {
         0
@@ -77,6 +66,9 @@ pub mod irq {
     /// The maximum number of IRQs.
     pub const MAX_IRQ_COUNT: usize = 256;
 
+    /// The timer IRQ number.
+    pub const TIMER_IRQ_NUM: usize = 0;
+
     /// Enables or disables the given IRQ.
     pub fn set_enable(irq_num: usize, enabled: bool) {}
 
@@ -92,3 +84,10 @@ pub mod irq {
     /// necessary, it also acknowledges the interrupt controller after handling.
     pub fn dispatch_irq(irq_num: usize) {}
 }
+
+/// Initializes the platform devices for the primary CPU.
+pub fn platform_init() {}
+
+/// Initializes the platform devices for secondary CPUs.
+#[cfg(feature = "smp")]
+pub fn platform_init_secondary() {}