Skip to content

Commit f488812

Browse files
committed
[dep] Update dependencies versions
1 parent 25d75ce commit f488812

File tree

5 files changed

+33
-29
lines changed

5 files changed

+33
-29
lines changed

.github/workflows/test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,5 +44,5 @@ jobs:
4444
run: |
4545
make disk_img
4646
git clone https://github.com/arceos-org/arceos-apps.git
47-
cd arceos-apps && git reset --hard ${{ env.arceos-apps }} && cd ..
47+
cd arceos-apps cp ../Cargo.lock . && git reset --hard ${{ env.arceos-apps }} && cd ..
4848
make -C arceos-apps test AX_ROOT=$(pwd) ARCH=${{ matrix.arch }}

Cargo.lock

Lines changed: 26 additions & 23 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

modules/axhal/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ axalloc = { workspace = true, optional = true }
4242
x86 = "0.52"
4343
x86_64 = "0.15"
4444
x2apic = "0.4"
45-
raw-cpuid = "11.0"
45+
raw-cpuid = "11.1"
4646
x86_rtc = { version = "0.1", optional = true }
4747

4848
[target.'cfg(any(target_arch = "riscv32", target_arch = "riscv64"))'.dependencies]
@@ -55,7 +55,7 @@ aarch64-cpu = "9.4"
5555
tock-registers = "0.8"
5656
arm_gicv2 = "0.1"
5757
arm_pl011 = "0.1"
58-
arm_pl031 = { version = "0.1", optional = true }
58+
arm_pl031 = { version = "0.2", optional = true }
5959
dw_apb_uart = "0.1"
6060

6161
[build-dependencies]

modules/axhal/src/platform/aarch64_common/generic_timer.rs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,10 +64,11 @@ pub(crate) fn init_early() {
6464
use memory_addr::PhysAddr;
6565

6666
const PL031_BASE: PhysAddr = PhysAddr::from(axconfig::RTC_PADDR);
67+
68+
let rtc = unsafe { Rtc::new(phys_to_virt(PL031_BASE).as_usize() as _) };
6769
// Get the current time in microseconds since the epoch (1970-01-01) from the aarch64 pl031 RTC.
6870
// Subtract the timer ticks to get the actual time when ArceOS was booted.
69-
let epoch_time_nanos =
70-
Rtc::new(phys_to_virt(PL031_BASE).as_usize()).get_unix_timestamp() * 1_000_000_000;
71+
let epoch_time_nanos = rtc.get_unix_timestamp() as u64 * 1_000_000_000;
7172

7273
unsafe {
7374
RTC_EPOCHOFFSET_NANOS = epoch_time_nanos - ticks_to_nanos(current_ticks());

modules/axmm/src/aspace.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ impl AddrSpace {
8686
false, // flush_tlb_by_page
8787
)
8888
.map_err(paging_err_to_ax_err)?
89-
.flush();
89+
.flush_all();
9090
Ok(())
9191
}
9292

0 commit comments

Comments
 (0)