Skip to content

Commit

Permalink
[dep] Update dependencies versions
Browse files Browse the repository at this point in the history
  • Loading branch information
equation314 committed Aug 2, 2024
1 parent 25d75ce commit f488812
Show file tree
Hide file tree
Showing 5 changed files with 33 additions and 29 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,5 +44,5 @@ jobs:
run: |
make disk_img
git clone https://github.com/arceos-org/arceos-apps.git
cd arceos-apps && git reset --hard ${{ env.arceos-apps }} && cd ..
cd arceos-apps cp ../Cargo.lock . && git reset --hard ${{ env.arceos-apps }} && cd ..
make -C arceos-apps test AX_ROOT=$(pwd) ARCH=${{ matrix.arch }}
49 changes: 26 additions & 23 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions modules/axhal/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ axalloc = { workspace = true, optional = true }
x86 = "0.52"
x86_64 = "0.15"
x2apic = "0.4"
raw-cpuid = "11.0"
raw-cpuid = "11.1"
x86_rtc = { version = "0.1", optional = true }

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

[build-dependencies]
Expand Down
5 changes: 3 additions & 2 deletions modules/axhal/src/platform/aarch64_common/generic_timer.rs
Original file line number Diff line number Diff line change
Expand Up @@ -64,10 +64,11 @@ pub(crate) fn init_early() {
use memory_addr::PhysAddr;

const PL031_BASE: PhysAddr = PhysAddr::from(axconfig::RTC_PADDR);

let rtc = unsafe { Rtc::new(phys_to_virt(PL031_BASE).as_usize() as _) };
// Get the current time in microseconds since the epoch (1970-01-01) from the aarch64 pl031 RTC.
// Subtract the timer ticks to get the actual time when ArceOS was booted.
let epoch_time_nanos =
Rtc::new(phys_to_virt(PL031_BASE).as_usize()).get_unix_timestamp() * 1_000_000_000;
let epoch_time_nanos = rtc.get_unix_timestamp() as u64 * 1_000_000_000;

unsafe {
RTC_EPOCHOFFSET_NANOS = epoch_time_nanos - ticks_to_nanos(current_ticks());
Expand Down
2 changes: 1 addition & 1 deletion modules/axmm/src/aspace.rs
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ impl AddrSpace {
false, // flush_tlb_by_page
)
.map_err(paging_err_to_ax_err)?
.flush();
.flush_all();
Ok(())
}

Expand Down

0 comments on commit f488812

Please sign in to comment.