Add cpu_num method to allow get cpu count dynamically, bump axplat and plat crates to 0.3.0 (#33)

aarkegz · web-flow · commit a632f9aeacb5 · 2025-12-19T00:03:56.000+08:00
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -36,5 +36,6 @@ repository = "https://github.com/arceos-org/axplat_crates"
 
 [workspace.dependencies]
 axcpu = "0.2"
-axplat = { version = "0.2.0", path = "./axplat" }
+axplat = { version = "0.3.0", path = "./axplat" }
 axplat-macros = { version = "0.1.0", path = "./axplat-macros" }
+axplat-aarch64-peripherals = { version = "0.3.0", path = "platforms/axplat-aarch64-peripherals" }
diff --git a/axplat/Cargo.toml b/axplat/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "axplat"
-version = "0.2.0"
+version = "0.3.0"
 description = "This crate provides a unified abstraction layer for diverse hardware platforms."
 documentation = "https://docs.rs/axplat"
 keywords = ["arceos", "os", "hal", "embedded"]
diff --git a/axplat/src/power.rs b/axplat/src/power.rs
@@ -13,4 +13,13 @@ pub trait PowerIf {
 
     /// Shutdown the whole system.
     fn system_off() -> !;
+
+    /// Get the number of CPU cores available on this platform.
+    ///
+    /// The platform should either get this value statically from its
+    /// configuration or dynamically by platform-specific methods.
+    ///
+    /// For statically configured platforms, by convention, this value should be
+    /// the same as `MAX_CPU_NUM` defined in the platform configuration.
+    fn cpu_num() -> usize;
 }
diff --git a/cargo-axplat/Cargo.toml b/cargo-axplat/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "cargo-axplat"
-version = "0.2.3"
+version = "0.2.4"
 description = "Manages hardware platform packages using `axplat`"
 keywords = ["arceos", "hal", "hardware", "cargo-subcommand"]
 categories = ["development-tools", "development-tools::cargo-plugins", "embedded", "hardware-support", "os"]
diff --git a/cargo-axplat/template/_Cargo.toml b/cargo-axplat/template/_Cargo.toml
@@ -9,4 +9,4 @@ smp = ["axplat/smp"]
 
 [dependencies]
 axconfig-macros = "0.2"
-axplat = "0.2"
+axplat = "0.3"
diff --git a/cargo-axplat/template/axconfig.toml b/cargo-axplat/template/axconfig.toml
@@ -9,8 +9,9 @@ package = "<PACKAGE>"                           # str
 # Platform configs
 #
 [plat]
-# Number of CPUs.
-cpu-num = 1                     # uint
+# Maximum number of CPUs. For platforms that do not support runtime CPU number
+# detection, it's also the number of CPUs to boot.
+max-cpu-num = 1                 # uint
 # Base address of the whole physical memory.
 phys-memory-base = 0            # uint
 # Size of the whole physical memory. (128M)
diff --git a/cargo-axplat/template/src/power.rs b/cargo-axplat/template/src/power.rs
@@ -18,4 +18,9 @@ impl PowerIf for PowerImpl {
     fn system_off() -> ! {
         todo!()
     }
+
+    /// Get the number of CPU cores available on this platform.
+    fn cpu_num() -> usize {
+        todo!()
+    }
 }
diff --git a/examples/smp-kernel/src/main.rs b/examples/smp-kernel/src/main.rs
@@ -27,7 +27,7 @@ use core::sync::atomic::Ordering::Release;
 
 const CPU_NUM: usize = match option_env!("AX_CPU_NUM") {
     Some(val) => const_str::parse!(val, usize),
-    None => axplat_crate::config::plat::CPU_NUM,
+    None => axplat_crate::config::plat::MAX_CPU_NUM,
 };
 
 #[axplat::main]
diff --git a/platforms/axplat-aarch64-bsta1000b/Cargo.toml b/platforms/axplat-aarch64-bsta1000b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "axplat-aarch64-bsta1000b"
-version = "0.2.0"
+version = "0.3.0"
 description = "Implementation of `axplat` hardware abstraction layer for Black Sesame Technology A1000b SoC."
 documentation = "https://docs.rs/axplat-aarch64-bsta1000b"
 keywords = ["arceos", "os", "hal", "embedded", "aarch64"]
@@ -24,7 +24,7 @@ page_table_entry = "0.5"
 dw_apb_uart = "0.1"
 
 axconfig-macros = "0.2"
-axplat-aarch64-peripherals = { version = "0.2", path = "../axplat-aarch64-peripherals" }
+axplat-aarch64-peripherals = { workspace = true }
 axcpu = { workspace = true }
 axplat = { workspace = true }
 
diff --git a/platforms/axplat-aarch64-bsta1000b/axconfig.toml b/platforms/axplat-aarch64-bsta1000b/axconfig.toml
@@ -9,8 +9,9 @@ package = "axplat-aarch64-bsta1000b"            # str
 # Platform configs
 #
 [plat]
-# Number of CPUs.
-cpu-num = 8                         # uint
+# Maximum number of CPUs. For platforms that do not support runtime CPU number
+# detection, it's also the number of CPUs to boot.
+max-cpu-num = 8                     # uint
 # Base address of the whole physical memory.
 phys-memory-base = 0x8000_0000      # uint
 # Size of the whole physical memory.
diff --git a/platforms/axplat-aarch64-bsta1000b/src/power.rs b/platforms/axplat-aarch64-bsta1000b/src/power.rs
@@ -19,4 +19,9 @@ impl PowerIf for PowerImpl {
     fn system_off() -> ! {
         axplat_aarch64_peripherals::psci::system_off()
     }
+
+    /// Get the number of CPU cores available on this platform.
+    fn cpu_num() -> usize {
+        crate::config::plat::MAX_CPU_NUM
+    }
 }
diff --git a/platforms/axplat-aarch64-peripherals/Cargo.toml b/platforms/axplat-aarch64-peripherals/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "axplat-aarch64-peripherals"
-version = "0.2.0"
+version = "0.3.0"
 description = "ARM64 common peripheral drivers with `axplat` compatibility"
 documentation = "https://docs.rs/axplat-aarch64-peripherals"
 keywords = ["arceos", "os", "hal", "peripheral", "aarch64"]
diff --git a/platforms/axplat-aarch64-phytium-pi/Cargo.toml b/platforms/axplat-aarch64-phytium-pi/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "axplat-aarch64-phytium-pi"
-version = "0.2.0"
+version = "0.3.0"
 description = "Implementation of `axplat` hardware abstraction layer for Phytium Pi board."
 documentation = "https://docs.rs/axplat-aarch64-phytium-pi"
 keywords = ["arceos", "os", "hal", "embedded", "aarch64"]
@@ -21,7 +21,7 @@ smp = ["axplat/smp"]
 log = "0.4"
 page_table_entry = "0.5"
 axconfig-macros = "0.2"
-axplat-aarch64-peripherals = { version = "0.2", path = "../axplat-aarch64-peripherals" }
+axplat-aarch64-peripherals = { workspace = true }
 axcpu = { workspace = true }
 axplat = { workspace = true }
 
diff --git a/platforms/axplat-aarch64-phytium-pi/axconfig.toml b/platforms/axplat-aarch64-phytium-pi/axconfig.toml
@@ -9,8 +9,9 @@ package = "axplat-aarch64-phytium-pi"           # str
 # Platform configs
 #
 [plat]
-# Number of CPUs.
-cpu-num = 4                         # uint
+# Maximum number of CPUs. For platforms that do not support runtime CPU number
+# detection, it's also the number of CPUs to boot.
+max-cpu-num = 4                     # uint
 # Base address of the whole physical memory.
 phys-memory-base = 0x8000_0000      # uint
 # Size of the whole physical memory. (2G)
diff --git a/platforms/axplat-aarch64-phytium-pi/src/power.rs b/platforms/axplat-aarch64-phytium-pi/src/power.rs
@@ -27,4 +27,9 @@ impl PowerIf for PowerImpl {
         info!("Shutting down...");
         axplat_aarch64_peripherals::psci::system_off()
     }
+
+    /// Get the number of CPU cores available on this platform.
+    fn cpu_num() -> usize {
+        crate::config::plat::MAX_CPU_NUM
+    }
 }
diff --git a/platforms/axplat-aarch64-qemu-virt/Cargo.toml b/platforms/axplat-aarch64-qemu-virt/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "axplat-aarch64-qemu-virt"
-version = "0.2.0"
+version = "0.3.0"
 description = "Implementation of `axplat` hardware abstraction layer for QEMU ARM64 virtual machine."
 documentation = "https://docs.rs/axplat-aarch64-qemu-virt"
 keywords = ["arceos", "os", "hal", "embedded", "aarch64"]
@@ -21,7 +21,7 @@ smp = ["axplat/smp"]
 log = "0.4"
 page_table_entry = "0.5"
 axconfig-macros = "0.2"
-axplat-aarch64-peripherals = { version = "0.2", path = "../axplat-aarch64-peripherals" }
+axplat-aarch64-peripherals = { workspace = true }
 axcpu = { workspace = true }
 axplat = { workspace = true }
 
diff --git a/platforms/axplat-aarch64-qemu-virt/axconfig.toml b/platforms/axplat-aarch64-qemu-virt/axconfig.toml
@@ -9,8 +9,9 @@ package = "axplat-aarch64-qemu-virt"            # str
 # Platform configs
 #
 [plat]
-# Number of CPUs.
-cpu-num = 1                         # uint
+# Maximum number of CPUs. For platforms that do not support runtime CPU number
+# detection, it's also the number of CPUs to boot.
+max-cpu-num = 1                     # uint
 # Base address of the whole physical memory.
 phys-memory-base = 0x4000_0000      # uint
 # Size of the whole physical memory. (128M)
diff --git a/platforms/axplat-aarch64-qemu-virt/src/power.rs b/platforms/axplat-aarch64-qemu-virt/src/power.rs
@@ -20,4 +20,9 @@ impl PowerIf for PowerImpl {
     fn system_off() -> ! {
         axplat_aarch64_peripherals::psci::system_off()
     }
+
+    /// Get the number of CPU cores available on this platform.
+    fn cpu_num() -> usize {
+        crate::config::plat::MAX_CPU_NUM
+    }
 }
diff --git a/platforms/axplat-aarch64-raspi/Cargo.toml b/platforms/axplat-aarch64-raspi/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "axplat-aarch64-raspi"
-version = "0.2.0"
+version = "0.3.0"
 description = "Implementation of `axplat` hardware abstraction layer for Raspberry Pi 4B board."
 documentation = "https://docs.rs/axplat-aarch64-raspi"
 keywords = ["arceos", "os", "hal", "aarch64", "raspi"]
@@ -22,7 +22,7 @@ log = "0.4"
 aarch64-cpu = "10.0"
 page_table_entry = "0.5"
 axconfig-macros = "0.2"
-axplat-aarch64-peripherals = { version = "0.2", path = "../axplat-aarch64-peripherals" }
+axplat-aarch64-peripherals = { workspace = true }
 axcpu = { workspace = true }
 axplat = { workspace = true }
 
diff --git a/platforms/axplat-aarch64-raspi/axconfig.toml b/platforms/axplat-aarch64-raspi/axconfig.toml
@@ -9,8 +9,9 @@ package = "axplat-aarch64-raspi"                # str
 # Platform configs
 #
 [plat]
-# Number of CPUs.
-cpu-num = 4                         # uint
+# Maximum number of CPUs. For platforms that do not support runtime CPU number
+# detection, it's also the number of CPUs to boot.
+max-cpu-num = 4                     # uint
 # Base address of the whole physical memory.
 phys-memory-base = 0x0              # uint
 # Size of the whole physical memory. (2G)
diff --git a/platforms/axplat-aarch64-raspi/src/power.rs b/platforms/axplat-aarch64-raspi/src/power.rs
@@ -22,4 +22,9 @@ impl PowerIf for PowerImpl {
             axcpu::asm::halt();
         }
     }
+
+    /// Get the number of CPU cores available on this platform.
+    fn cpu_num() -> usize {
+        crate::config::plat::MAX_CPU_NUM
+    }
 }
diff --git a/platforms/axplat-loongarch64-qemu-virt/Cargo.toml b/platforms/axplat-loongarch64-qemu-virt/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "axplat-loongarch64-qemu-virt"
-version = "0.2.0"
+version = "0.3.0"
 description = "Implementation of `axplat` hardware abstraction layer for QEMU LoongArch virtual machine."
 documentation = "https://docs.rs/axplat-loongarch64-qemu-virt"
 keywords = ["arceos", "os", "hal", "embedded", "loongarch"]
diff --git a/platforms/axplat-loongarch64-qemu-virt/axconfig.toml b/platforms/axplat-loongarch64-qemu-virt/axconfig.toml
@@ -9,8 +9,9 @@ package = "axplat-loongarch64-qemu-virt"        # str
 # Platform configs
 #
 [plat]
-# Number of CPUs.
-cpu-num = 1                           # uint
+# Maximum number of CPUs. For platforms that do not support runtime CPU number
+# detection, it's also the number of CPUs to boot.
+max-cpu-num = 1                       # uint
 # Base address of the whole physical memory.
 phys-memory-base = 0x8000_0000        # uint
 # Size of the whole physical memory. (128M)
diff --git a/platforms/axplat-loongarch64-qemu-virt/src/power.rs b/platforms/axplat-loongarch64-qemu-virt/src/power.rs
@@ -28,4 +28,9 @@ impl PowerIf for PowerImpl {
             axcpu::asm::halt();
         }
     }
+
+    /// Get the number of CPU cores available on this platform.
+    fn cpu_num() -> usize {
+        crate::config::plat::MAX_CPU_NUM
+    }
 }
diff --git a/platforms/axplat-riscv64-qemu-virt/Cargo.toml b/platforms/axplat-riscv64-qemu-virt/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "axplat-riscv64-qemu-virt"
-version = "0.2.0"
+version = "0.3.0"
 description = "Implementation of `axplat` hardware abstraction layer for QEMU RISC-V virt board."
 documentation = "https://docs.rs/axplat-riscv64-qemu-virt"
 keywords = ["arceos", "os", "hal", "embedded", "riscv"]
diff --git a/platforms/axplat-riscv64-qemu-virt/axconfig.toml b/platforms/axplat-riscv64-qemu-virt/axconfig.toml
@@ -9,8 +9,9 @@ package = "axplat-riscv64-qemu-virt"            # str
 # Platform configs
 #
 [plat]
-# Number of CPUs.
-cpu-num = 1                         # uint
+# Maximum number of CPUs. For platforms that do not support runtime CPU number
+# detection, it's also the number of CPUs to boot.
+max-cpu-num = 1                     # uint
 # Base address of the whole physical memory.
 phys-memory-base = 0x8000_0000      # uint
 # Size of the whole physical memory. (128M)
diff --git a/platforms/axplat-riscv64-qemu-virt/src/power.rs b/platforms/axplat-riscv64-qemu-virt/src/power.rs
@@ -32,4 +32,9 @@ impl PowerIf for PowerImpl {
             axcpu::asm::halt();
         }
     }
+
+    /// Get the number of CPU cores available on this platform.
+    fn cpu_num() -> usize {
+        crate::config::plat::MAX_CPU_NUM
+    }
 }
diff --git a/platforms/axplat-x86-pc/Cargo.toml b/platforms/axplat-x86-pc/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "axplat-x86-pc"
-version = "0.2.0"
+version = "0.3.0"
 description = "Implementation of `axplat` hardware abstraction layer for x86 Standard PC machine."
 documentation = "https://docs.rs/axplat-x86-pc"
 keywords = ["arceos", "os", "hal", "x86"]
diff --git a/platforms/axplat-x86-pc/axconfig.toml b/platforms/axplat-x86-pc/axconfig.toml
diff --git a/platforms/axplat-x86-pc/src/power.rs b/platforms/axplat-x86-pc/src/power.rs

Original file line number	Diff line number	Diff line change
`@@ -18,4 +18,9 @@ impl PowerIf for PowerImpl {`
`18`	`18`	`fn system_off() -> ! {`
`19`	`19`	`todo!()`
`20`	`20`	`}`
	`21`	`+`
	`22`	`+ /// Get the number of CPU cores available on this platform.`
	`23`	`+ fn cpu_num() -> usize {`
	`24`	`+ todo!()`
	`25`	`+ }`
`21`	`26`	`}`