alnyan/yggdrasil
1
0
Fork 0
Code Issues 33 Pull Requests Packages Projects Releases Wiki Activity

maint: update kernel dependencies

Browse Source
This commit is contained in:
Mark Poliakov 2024-11-01 20:47:37 +02:00
parent 109f290c67
commit bcf1e74a04
6 changed files with 64 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
Cargo.lock generated
View File

@ -4,11 +4,11 @@ version = 4
[[package]]
name = "aarch64-cpu"
version = "9.4.0"
version = "10.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ac42a04a61c19fc8196dd728022a784baecc5d63d7e256c01ad1b3fbfab26287"
checksum = "6a21cd0131c25c438e19cd6a774adf7e3f64f7f4d723022882facc2dee0f8bc9"
dependencies = [
"tock-registers",
"tock-registers 0.9.0",
]
[[package]]
@ -857,7 +857,7 @@ dependencies = [
"libk-mm-interface",
"memtables",
"static_assertions",
"tock-registers",
"tock-registers 0.9.0",
"yggdrasil-abi",
]
@ -881,7 +881,7 @@ dependencies = [
"libk-mm-interface",
"log",
"static_assertions",
"tock-registers",
"tock-registers 0.9.0",
"yggdrasil-abi",
]
@ -902,7 +902,7 @@ dependencies = [
"kernel-arch-interface",
"log",
"static_assertions",
"tock-registers",
"tock-registers 0.9.0",
]
[[package]]
@ -916,7 +916,7 @@ dependencies = [
"libk-mm-interface",
"memtables",
"static_assertions",
"tock-registers",
"tock-registers 0.9.0",
"yggdrasil-abi",
]
@ -1666,6 +1666,12 @@ version = "0.8.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "696941a0aee7e276a165a978b37918fd5d22c55c3d6bda197813070ca9c0f21c"
[[package]]
name = "tock-registers"
version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2b9e2fdb3a1e862c0661768b7ed25390811df1947a8acbfbefe09b47078d93c4"
[[package]]
name = "toml"
version = "0.8.19"
@ -2063,7 +2069,7 @@ dependencies = [
"log",
"memoffset 0.9.1",
"static_assertions",
"tock-registers",
"tock-registers 0.9.0",
"ygg_driver_pci",
"yggdrasil-abi",
]
@ -2120,7 +2126,7 @@ dependencies = [
"libk-util",
"log",
"static_assertions",
"tock-registers",
"tock-registers 0.9.0",
"ygg_driver_pci",
"yggdrasil-abi",
]
@ -2136,7 +2142,7 @@ dependencies = [
"libk-mm",
"libk-util",
"log",
"tock-registers",
"tock-registers 0.9.0",
"yggdrasil-abi",
]
@ -2167,7 +2173,7 @@ dependencies = [
"libk-mm",
"libk-util",
"log",
"tock-registers",
"tock-registers 0.8.1",
"xhci",
"ygg_driver_pci",
"ygg_driver_usb",
@ -2182,7 +2188,7 @@ dependencies = [
"device-api",
"libk-mm",
"log",
"tock-registers",
"tock-registers 0.9.0",
"ygg_driver_pci",
"yggdrasil-abi",
]
@ -2197,7 +2203,7 @@ dependencies = [
"libk-mm",
"libk-util",
"log",
"tock-registers",
"tock-registers 0.9.0",
"ygg_driver_net_core",
"ygg_driver_pci",
"ygg_driver_virtio_core",
@ -2255,7 +2261,7 @@ dependencies = [
"memtables",
"prettyplease",
"static_assertions",
"tock-registers",
"tock-registers 0.9.0",
"vmalloc",
"yboot-proto",
"ygg_driver_ahci",

16
Cargo.toml
View File

@ -22,15 +22,15 @@ log = "0.4.22"
atomic_enum = "0.3.0"
bitflags = "2.6.0"
static_assertions = "1.1.0"
tock-registers = "0.8.1"
bytemuck = { version = "1.16.1", features = ["derive"] }
futures-util = { version = "0.3.30", default-features = false, features = ["alloc", "async-await"] }
tock-registers = "0.9.0"
bytemuck = { version = "1.19.0", features = ["derive"] }
futures-util = { version = "0.3.31", default-features = false, features = ["alloc", "async-await"] }
crossbeam-queue = { version = "0.3.11", default-features = false, features = ["alloc"] }
async-trait = "0.1.81"
async-trait = "0.1.83"
cfg-if = "1.0.0"
serde_json = { version = "1.0.111", default-features = false, features = ["alloc"] }
serde = { version = "1.0.193", features = ["derive"], default-features = false }
memoffset = "0.9.0"
serde_json = { version = "1.0.132", default-features = false, features = ["alloc"] }
serde = { version = "1.0.214", features = ["derive"], default-features = false }
memoffset = "0.9.1"
ahash = { version = "0.8.11", default-features = false, features = ["no-rng"] }
# acpi
@ -66,7 +66,7 @@ device-tree.path = "kernel/lib/device-tree"
# AArch64
fdt-rs = { version = "0.4.5", default-features = false }
aarch64-cpu = "9.4.0"
aarch64-cpu = "10.0.0"
discrete_range_map = { git = "https://git.alnyan.me/yggdrasil/discrete_range_map.git" }

2
kernel/driver/block/ahci/src/port.rs
View File

@ -105,7 +105,7 @@ impl PortInner {
}
// TODO deal with this async way
while self.regs.TFD.matches_any(TFD::BSY::SET + TFD::DRQ::SET) {
while self.regs.TFD.matches_any(&[TFD::BSY::SET, TFD::DRQ::SET]) {
core::hint::spin_loop();
}

6
kernel/driver/block/ahci/src/regs.rs
View File

@ -124,7 +124,7 @@ impl PortRegs {
self.CMD.modify(CMD::ST::CLEAR + CMD::FRE::CLEAR);
// TODO timeout here
while self.CMD.matches_any(CMD::FR::SET + CMD::CR::SET) {
while self.CMD.matches_any(&[CMD::FR::SET, CMD::CR::SET]) {
core::hint::spin_loop();
}
@ -162,11 +162,11 @@ impl PortRegs {
self.IS.set(u32::MAX);
if is.matches_any(IS::HBDS::SET + IS::HBFS::SET) {
if is.matches_any(&[IS::HBDS::SET, IS::HBFS::SET]) {
todo!("Host communication error unhandled");
}
if is.matches_any(IS::TFES::SET + IS::IFS::SET + IS::OFS::SET) {
if is.matches_any(&[IS::TFES::SET, IS::IFS::SET, IS::OFS::SET]) {
Some(CMD_ERROR)
} else {
Some(CMD_READY)

2
kernel/driver/block/nvme/src/lib.rs
View File

@ -386,7 +386,7 @@ impl Device for NvmeController {
log::debug!("Reset the controller");
while !regs.CSTS.matches_any(CSTS::RDY::SET + CSTS::CFS::SET) {
while !regs.CSTS.matches_any(&[CSTS::RDY::SET, CSTS::CFS::SET]) {
core::hint::spin_loop();
}

55
kernel/modules/test_mod/Cargo.lock generated
View File

@ -4,9 +4,9 @@ version = 4
[[package]]
name = "aarch64-cpu"
version = "9.4.0"
version = "10.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ac42a04a61c19fc8196dd728022a784baecc5d63d7e256c01ad1b3fbfab26287"
checksum = "6a21cd0131c25c438e19cd6a774adf7e3f64f7f4d723022882facc2dee0f8bc9"
dependencies = [
"tock-registers",
]
@ -45,9 +45,9 @@ checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f"
[[package]]
name = "async-trait"
version = "0.1.81"
version = "0.1.83"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6e0c28dcc82d7c8ead5cb13beb15405b57b8546e93215673ff8ca0349a028107"
checksum = "721cae7de5c34fbb2acd27e21e6d2cf7b886dce0c27388d46c4e6c47ea4318dd"
dependencies = [
"proc-macro2",
"quote",
@ -83,9 +83,9 @@ dependencies = [
[[package]]
name = "bytemuck"
version = "1.16.1"
version = "1.19.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b236fc92302c97ed75b38da1f4917b5cdda4984745740f153a5d3059e48d725e"
checksum = "8334215b81e418a0a7bdb8ef0849474f40bb10c8b71f1c4ed315cff49f32494d"
dependencies = [
"bytemuck_derive",
]
@ -172,21 +172,21 @@ dependencies = [
[[package]]
name = "futures-core"
version = "0.3.30"
version = "0.3.31"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d"
checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e"
[[package]]
name = "futures-task"
version = "0.3.30"
version = "0.3.31"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004"
checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988"
[[package]]
name = "futures-util"
version = "0.3.30"
version = "0.3.31"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48"
checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81"
dependencies = [
"futures-core",
"futures-task",
@ -406,6 +406,12 @@ dependencies = [
"hashbrown",
]
[[package]]
name = "memchr"
version = "2.7.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
[[package]]
name = "memtables"
version = "0.1.0"
@ -447,9 +453,9 @@ dependencies = [
[[package]]
name = "proc-macro2"
version = "1.0.79"
version = "1.0.89"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e835ff2298f5721608eb1a980ecaee1aef2c132bf95ecc026a11b7bf3c01c02e"
checksum = "f139b0662de085916d1fb67d2b4169d1addddda1919e696f3252b740b629986e"
dependencies = [
"unicode-ident",
]
@ -477,18 +483,18 @@ checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1"
[[package]]
name = "serde"
version = "1.0.197"
version = "1.0.214"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2"
checksum = "f55c3193aca71c12ad7890f1785d2b73e1b9f63a0bbc353c08ef26fe03fc56b5"
dependencies = [
"serde_derive",
]
[[package]]
name = "serde_derive"
version = "1.0.197"
version = "1.0.214"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b"
checksum = "de523f781f095e28fa605cdce0f8307e451cc0fd14e2eb4cd2e98a355b147766"
dependencies = [
"proc-macro2",
"quote",
@ -497,11 +503,12 @@ dependencies = [
[[package]]
name = "serde_json"
version = "1.0.114"
version = "1.0.132"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c5f09b1bd632ef549eaa9f60a1f8de742bdbc698e6cee2095fc84dde5f549ae0"
checksum = "d726bfaff4b320266d395898905d0eba0345aae23b54aee3a737e260fd46db03"
dependencies = [
"itoa",
"memchr",
"ryu",
"serde",
]
@ -514,9 +521,9 @@ checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
[[package]]
name = "syn"
version = "2.0.53"
version = "2.0.86"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7383cd0e49fff4b6b90ca5670bfd3e9d6a733b3f90c686605aa7eec8c4996032"
checksum = "e89275301d38033efb81a6e60e3497e734dfcc62571f2854bf4b16690398824c"
dependencies = [
"proc-macro2",
"quote",
@ -553,9 +560,9 @@ dependencies = [
[[package]]
name = "tock-registers"
version = "0.8.1"
version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "696941a0aee7e276a165a978b37918fd5d22c55c3d6bda197813070ca9c0f21c"
checksum = "2b9e2fdb3a1e862c0661768b7ed25390811df1947a8acbfbefe09b47078d93c4"
[[package]]
name = "unicode-ident"