From 3a83dbaa8b439a6e2fffec0694bbed84360751b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8F=A0=E8=90=9D=E6=9C=89=E7=82=B9=E9=85=B8?= Date: Thu, 7 Nov 2024 01:47:46 +0000 Subject: [PATCH 1/5] update src/device/device_tree.rs. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 菠萝有点酸 --- src/device/device_tree.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/device/device_tree.rs b/src/device/device_tree.rs index 28857ba..f9e255c 100644 --- a/src/device/device_tree.rs +++ b/src/device/device_tree.rs @@ -133,7 +133,7 @@ pub unsafe fn init_vm0_dtb(dtb: *mut fdt::myctypes::c_void) -> Result<()> { use crate::arch::PAGE_SIZE; let pi_fdt = PI4_DTB_ADDR as *mut fdt::myctypes::c_void; let len = round_up(fdt_size(pi_fdt) as usize, PAGE_SIZE) + PAGE_SIZE; - info!("fdt orignal size {}", len); + info!("fdt original size {}", len); let slice = core::slice::from_raw_parts(pi_fdt as *const u8, len as usize); SYSTEM_FDT.call_once(|| slice.to_vec()); } -- Gitee From 8b39140ffbf03f1d4e67b0231720cb8f20217a33 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8F=A0=E8=90=9D=E6=9C=89=E7=82=B9=E9=85=B8?= Date: Thu, 7 Nov 2024 01:51:52 +0000 Subject: [PATCH 2/5] update src/kernel/ipi.rs. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 菠萝有点酸 --- src/kernel/ipi.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/kernel/ipi.rs b/src/kernel/ipi.rs index 6ea2e10..254f53f 100644 --- a/src/kernel/ipi.rs +++ b/src/kernel/ipi.rs @@ -157,7 +157,7 @@ pub struct IpiMessage { const IPI_HANDLER_MAX: usize = 16; -/// ipi handler entry, scanning the received ipi list and call the coresponding handler +/// ipi handler entry, scanning the received ipi list and call the corresponding handler pub fn ipi_irq_handler() { let cpu_id = current_cpu().id; let mut cpu_if_list = CPU_IF_LIST.lock(); -- Gitee From 655033747e9e85784292ec952aeebbebeb242714 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8F=A0=E8=90=9D=E6=9C=89=E7=82=B9=E9=85=B8?= Date: Thu, 7 Nov 2024 01:55:43 +0000 Subject: [PATCH 3/5] update src/utils/unilib.rs. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 菠萝有点酸 --- src/utils/unilib.rs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/utils/unilib.rs b/src/utils/unilib.rs index d05d318..0e655b9 100644 --- a/src/utils/unilib.rs +++ b/src/utils/unilib.rs @@ -34,13 +34,13 @@ pub struct UnilibFSCfg { name: [u8; 32], /// The "client" VM who owns this `UnilibFSCfg`, currently it should be our Unishyper. vmid: usize, - /// Size of FS opration buffer, it's provided by the MVM with HUGE_TLB enabled. + /// Size of FS operation buffer, it's provided by the MVM with HUGE_TLB enabled. cache_size: usize, - /// Virtual address of FS opration buffer, it's provided by the MVM with HUGE_TLB enabled. + /// Virtual address of FS operation buffer, it's provided by the MVM with HUGE_TLB enabled. buf_va: usize, - /// Intermediate physical address of FS opration buffer, it's provided by the MVM with HUGE_TLB enabled. + /// Intermediate physical address of FS operation buffer, it's provided by the MVM with HUGE_TLB enabled. buf_ipa: usize, - /// Acutal physical address of FS opration buffer, it's set by the hypervisor during `unilib_fs_append` process. + /// Acutal physical address of FS operation buffer, it's set by the hypervisor during `unilib_fs_append` process. buf_pa: usize, } -- Gitee From dbce8a7072644746053e684891a92d9b6a63005e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8F=A0=E8=90=9D=E6=9C=89=E7=82=B9=E9=85=B8?= Date: Thu, 7 Nov 2024 01:57:31 +0000 Subject: [PATCH 4/5] update src/arch/aarch64/regs.rs. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 菠萝有点酸 --- src/arch/aarch64/regs.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/arch/aarch64/regs.rs b/src/arch/aarch64/regs.rs index 05d2052..7128a41 100644 --- a/src/arch/aarch64/regs.rs +++ b/src/arch/aarch64/regs.rs @@ -41,7 +41,7 @@ macro_rules! mrs { { let r; unsafe { - // TODO: If use 'nomem' option, the system will staff may beacuse of no assign type here + // TODO: If use 'nomem' option, the system will staff may because of no assign type here core::arch::asm!(concat!("mrs {0}, ", stringify!($reg)), out(reg) r, options(pure,readonly, nostack)); } r -- Gitee From bf302a69d8bed143665937dfc705874e4a368d58 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8F=A0=E8=90=9D=E6=9C=89=E7=82=B9=E9=85=B8?= Date: Thu, 7 Nov 2024 01:59:14 +0000 Subject: [PATCH 5/5] update src/kernel/ipi.rs. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 菠萝有点酸 --- src/kernel/ipi.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/kernel/ipi.rs b/src/kernel/ipi.rs index 254f53f..6ea2e10 100644 --- a/src/kernel/ipi.rs +++ b/src/kernel/ipi.rs @@ -157,7 +157,7 @@ pub struct IpiMessage { const IPI_HANDLER_MAX: usize = 16; -/// ipi handler entry, scanning the received ipi list and call the corresponding handler +/// ipi handler entry, scanning the received ipi list and call the coresponding handler pub fn ipi_irq_handler() { let cpu_id = current_cpu().id; let mut cpu_if_list = CPU_IF_LIST.lock(); -- Gitee