Update dependencies, minor fixes

equation314 · equation314 · commit 4c8c4725067c · 2025-07-08T02:10:17.000+08:00
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1 @@
+ulib/axlibc/include/**/*.h linguist-vendored
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -19,10 +19,6 @@ jobs:
         toolchain: ${{ matrix.rust-toolchain }}
         components: rust-src, clippy, rustfmt
         targets: x86_64-unknown-none, riscv64gc-unknown-none-elf, aarch64-unknown-none-softfloat, loongarch64-unknown-none-softfloat
-    - uses: Swatinem/rust-cache@v2
-      with:
-        shared-key: cargo-bin-cache
-        cache-targets: false
     - name: Check rust version
       run: rustc --version --verbose
     - name: Check code format
@@ -55,7 +51,7 @@ jobs:
         targets: x86_64-unknown-none, riscv64gc-unknown-none-elf, aarch64-unknown-none-softfloat, loongarch64-unknown-none-softfloat
     - uses: Swatinem/rust-cache@v2
       with:
-        shared-key: cargo-bin-cache
+        shared-key: cargo-bin-cache-${{ matrix.rust-toolchain }}
         cache-targets: false
     - name: Build helloworld
       continue-on-error: ${{ matrix.rust-toolchain == 'nightly' }}
@@ -100,10 +96,10 @@ jobs:
         targets: x86_64-unknown-none, riscv64gc-unknown-none-elf, aarch64-unknown-none-softfloat, loongarch64-unknown-none-softfloat
     - uses: Swatinem/rust-cache@v2
       with:
-        shared-key: cargo-bin-cache
+        shared-key: cargo-bin-cache-${{ matrix.rust-toolchain }}
         cache-targets: false
 
-    # Test various config files
+    # Test custom config file
     - name: Build helloworld for x86_64-pc-oslab
       continue-on-error: ${{ matrix.rust-toolchain == 'nightly' }}
       run: make PLAT_CONFIG=$(pwd)/configs/custom/x86_64-pc-oslab.toml A=examples/helloworld
@@ -140,27 +136,23 @@ jobs:
       run: |
         make MYPLAT=axplat-aarch64-bsta1000b defconfig
         make MYPLAT=axplat-aarch64-bsta1000b A=examples/helloworld-myplat APP_FEATURES=aarch64-bsta1000b
-      
     - name: Build helloworld-myplat for aarch64-phytium-pi
       continue-on-error: ${{ matrix.rust-toolchain == 'nightly' }}
       run: |
         make MYPLAT=axplat-aarch64-phytium-pi defconfig
         make MYPLAT=axplat-aarch64-phytium-pi A=examples/helloworld-myplat APP_FEATURES=aarch64-phytium-pi
-
     - name: Build helloworld-myplat for loongarch64-qemu-virt
       continue-on-error: ${{ matrix.rust-toolchain == 'nightly' }}
       run: |
         make ARCH=loongarch64 defconfig
         make ARCH=loongarch64 A=examples/helloworld-myplat SMP=4 APP_FEATURES=loongarch64-qemu-virt
         make MYPLAT=axplat-loongarch64-qemu-virt A=examples/helloworld-myplat SMP=4 APP_FEATURES=loongarch64-qemu-virt
-      
     - name: Build helloworld-myplat for riscv64-qemu-virt
       continue-on-error: ${{ matrix.rust-toolchain == 'nightly' }}
       run: |
         make ARCH=riscv64 defconfig
         make ARCH=riscv64 A=examples/helloworld-myplat SMP=4 APP_FEATURES=riscv64-qemu-virt
         make MYPLAT=axplat-riscv64-qemu-virt A=examples/helloworld-myplat SMP=4 APP_FEATURES=riscv64-qemu-virt
-      
 
     # Test platform `aarch64-raspi4` for various apps
     - name: Setup aarch64-raspi4
@@ -210,7 +202,7 @@ jobs:
       continue-on-error: ${{ matrix.rust-toolchain == 'nightly' }}
       run: make MYPLAT=axplat-aarch64-phytium-pi A=examples/shell FEATURES=page-alloc-4g,driver-ramdisk BUS=mmio
 
-    # Test various config files for C apps
+    # Test custom config file for C apps
     - uses: arceos-org/setup-musl@v1
       with:
         arch: x86_64
@@ -233,22 +225,23 @@ jobs:
       fail-fast: false
       matrix:
         rust-toolchain: [nightly, nightly-2025-05-20]
+    env:
+      RUSTUP_TOOLCHAIN: ${{ matrix.rust-toolchain }}
     steps:
     - uses: actions/checkout@v4
     - uses: dtolnay/rust-toolchain@stable
       with:
         toolchain: ${{ matrix.rust-toolchain }}
-        components: rust-src, clippy
+        components: rust-src, clippy, llvm-tools
         targets: x86_64-unknown-none
     - uses: Swatinem/rust-cache@v2
       with:
-        shared-key: cargo-bin-cache
+        shared-key: cargo-bin-cache-${{ matrix.rust-toolchain }}
         cache-targets: false
     - name: Clippy for the default target
       continue-on-error: ${{ matrix.rust-toolchain == 'nightly' }}
       run: make clippy
 
-    - run: cargo install cargo-binutils
     - name: Build helloworld
       continue-on-error: ${{ matrix.rust-toolchain == 'nightly' }}
       run: make A=examples/helloworld
diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
@@ -21,10 +21,6 @@ jobs:
     - uses: dtolnay/rust-toolchain@stable
       with:
         toolchain: ${{ env.rust-toolchain }}
-    - uses: Swatinem/rust-cache@v2
-      with:
-        shared-key: cargo-bin-cache
-        cache-targets: false
     - name: Build docs
       run: make doc_check_missing ARCH=${{ matrix.os == 'macos-latest' && 'aarch64' || 'x86_64' }}
     - name: Deploy to Github Pages
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -15,7 +15,6 @@ jobs:
     - uses: dtolnay/rust-toolchain@stable
       with:
         toolchain: ${{ env.rust-toolchain }}
-        components: rust-src
     - name: Run unit tests
       run: make unittest_no_fail_fast
 
@@ -26,15 +25,18 @@ jobs:
       matrix:
         os: [ubuntu-latest]
         arch: [x86_64, riscv64, aarch64, loongarch64]
+    env:
+      RUSTUP_TOOLCHAIN: nightly-2025-05-20
     steps:
     - uses: actions/checkout@v4
     - uses: dtolnay/rust-toolchain@stable
       with:
         toolchain: ${{ env.rust-toolchain }}
-        components: rust-src
+        components: rust-src, llvm-tools
+        targets: x86_64-unknown-none, riscv64gc-unknown-none-elf, aarch64-unknown-none-softfloat, loongarch64-unknown-none-softfloat
     - uses: Swatinem/rust-cache@v2
       with:
-        shared-key: cargo-bin-cache
+        shared-key: cargo-bin-cache-${{ env.rust-toolchain }}
         cache-targets: false
     - uses: arceos-org/setup-qemu@v1
       with:
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Dockerfile b/Dockerfile
@@ -9,7 +9,7 @@ RUN apt-get update \
         pkg-config libglib2.0-dev git libslirp-dev \
     && rm -rf /var/lib/apt/lists/*
 
-RUN cargo install cargo-binutils axconfig-gen
+RUN cargo install cargo-binutils axconfig-gen cargo-axplat
 
 COPY rust-toolchain.toml /rust-toolchain.toml
 
@@ -25,15 +25,15 @@ RUN wget https://musl.cc/aarch64-linux-musl-cross.tgz \
     && tar zxf loongarch64-linux-musl-cross.tgz \
     && rm -f *.tgz
 
-RUN wget https://download.qemu.org/qemu-9.2.1.tar.xz \
-    && tar xf qemu-9.2.1.tar.xz \
-    && cd qemu-9.2.1 \
-    && ./configure --prefix=/qemu-bin-9.2.1 \
+RUN wget https://download.qemu.org/qemu-9.2.4.tar.xz \
+    && tar xf qemu-9.2.4.tar.xz \
+    && cd qemu-9.2.4 \
+    && ./configure --prefix=/qemu-bin-9.2.4 \
         --target-list=loongarch64-softmmu,riscv64-softmmu,aarch64-softmmu,x86_64-softmmu \
         --enable-gcov --enable-debug --enable-slirp \
     && make -j$(nproc) \
     && make install
-RUN rm -rf qemu-9.2.1 qemu-9.2.1.tar.xz
+RUN rm -rf qemu-9.2.4 qemu-9.2.4.tar.xz
 
 ENV PATH="/x86_64-linux-musl-cross/bin:/aarch64-linux-musl-cross/bin:/riscv64-linux-musl-cross/bin:/loongarch64-linux-musl-cross/bin:$PATH"
-ENV PATH="/qemu-bin-9.2.1/bin:$PATH"
+ENV PATH="/qemu-bin-9.2.4/bin:$PATH"
diff --git a/Makefile b/Makefile
@@ -84,7 +84,7 @@ endif
 
 .DEFAULT_GOAL := all
 
-ifneq ($(filter $(or $(MAKECMDGOALS), $(.DEFAULT_GOAL)), all build run justrun debug defconfig oldconfig),)
+ifneq ($(filter $(or $(MAKECMDGOALS), $(.DEFAULT_GOAL)), all build disasm run justrun debug defconfig oldconfig),)
 # Install dependencies
 include scripts/make/deps.mk
 # Platform resolving
diff --git a/api/arceos_posix_api/Cargo.toml b/api/arceos_posix_api/Cargo.toml
@@ -50,9 +50,9 @@ axio = "0.1"
 axerrno = "0.1"
 flatten_objects = "0.2"
 static_assertions = "1.1.0"
-spin = { version = "0.9" }
+spin = { version = "0.10" }
 lazy_static = { version = "1.5", features = ["spin_no_std"] }
 ctor_bare = "0.2"
 
 [build-dependencies]
-bindgen ={ version = "0.71" }
+bindgen ={ version = "0.72" }
diff --git a/configs/custom/x86_64-pc-oslab.toml b/configs/custom/x86_64-pc-oslab.toml
@@ -55,3 +55,5 @@ pci-ranges = []                 # [(uint, uint)]
 
 # Timer interrupt frequencyin Hz. (4.0GHz)
 timer-frequency = 4_000_000_000     # uint
+# Timer interrupt num.
+timer-irq = 0xf0                    # uint
diff --git a/modules/axfs/Cargo.toml b/modules/axfs/Cargo.toml
@@ -38,7 +38,7 @@ axns = { workspace = true }
 
 [dependencies.fatfs]
 git = "https://github.com/rafalh/rust-fatfs"
-rev = "85f06e0"
+rev = "4eccb50"
 optional = true
 default-features = false
 features = [ # no std
diff --git a/modules/axfs/src/api/mod.rs b/modules/axfs/src/api/mod.rs
@@ -10,7 +10,7 @@ use alloc::{string::String, vec::Vec};
 use axio::{self as io, prelude::*};
 
 /// Returns an iterator over the entries within a directory.
-pub fn read_dir(path: &str) -> io::Result<ReadDir> {
+pub fn read_dir(path: &str) -> io::Result<ReadDir<'_>> {
     ReadDir::new(path)
 }
 
diff --git a/modules/axhal/src/lib.rs b/modules/axhal/src/lib.rs
@@ -104,6 +104,7 @@ pub mod context {
 
 pub use axcpu::asm;
 pub use axplat::init::{init_early, init_later};
+
 #[cfg(feature = "smp")]
 pub use axplat::init::{init_early_secondary, init_later_secondary};
 
@@ -119,6 +120,7 @@ pub fn init_percpu(cpu_id: usize) {
 ///
 /// This function should be called as early as possible, as other initializations
 /// may acess the CPU-local data.
+#[cfg(feature = "smp")]
 pub fn init_percpu_secondary(cpu_id: usize) {
     self::percpu::init_secondary(cpu_id);
 }
diff --git a/modules/axnet/Cargo.toml b/modules/axnet/Cargo.toml
@@ -16,7 +16,7 @@ default = ["smoltcp"]
 [dependencies]
 log = "=0.4.21"
 cfg-if = "1.0"
-spin = "0.9"
+spin = "0.10"
 lazyinit = "0.2"
 axerrno = "0.1"
 axio = "0.1"
diff --git a/modules/axnet/src/smoltcp_impl/tcp.rs b/modules/axnet/src/smoltcp_impl/tcp.rs
diff --git a/modules/axtask/Cargo.toml b/modules/axtask/Cargo.toml
diff --git a/scripts/make/deps.mk b/scripts/make/deps.mk
diff --git a/ulib/axlibc/Cargo.toml b/ulib/axlibc/Cargo.toml
diff --git a/ulib/axstd/src/fs/mod.rs b/ulib/axstd/src/fs/mod.rs

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+ulib/axlibc/include/*/.h linguist-vendored`