kernel: update kernel dependencies
This commit is contained in:
parent
fe5f9649ff
commit
6864447b33
67
Cargo.lock
generated
67
Cargo.lock
generated
@ -8,7 +8,7 @@ version = "9.4.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "ac42a04a61c19fc8196dd728022a784baecc5d63d7e256c01ad1b3fbfab26287"
|
||||
dependencies = [
|
||||
"tock-registers 0.8.1",
|
||||
"tock-registers",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@ -156,13 +156,13 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "atomic_enum"
|
||||
version = "0.2.0"
|
||||
version = "0.3.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "6227a8d6fdb862bcb100c4314d0d9579e5cd73fa6df31a2e6f6e1acd3c5f1207"
|
||||
checksum = "99e1aca718ea7b89985790c94aad72d77533063fe00bc497bb79a7c2dae6a661"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 1.0.109",
|
||||
"syn 2.0.66",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@ -200,9 +200,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
|
||||
|
||||
[[package]]
|
||||
name = "bitflags"
|
||||
version = "2.5.0"
|
||||
version = "2.6.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
|
||||
checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
|
||||
|
||||
[[package]]
|
||||
name = "bitvec"
|
||||
@ -234,9 +234,9 @@ checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c"
|
||||
|
||||
[[package]]
|
||||
name = "bytemuck"
|
||||
version = "1.16.0"
|
||||
version = "1.16.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "78834c15cb5d5efe3452d58b1e8ba890dd62d21907f867f383358198e56ebca5"
|
||||
checksum = "b236fc92302c97ed75b38da1f4917b5cdda4984745740f153a5d3059e48d725e"
|
||||
dependencies = [
|
||||
"bytemuck_derive",
|
||||
]
|
||||
@ -614,7 +614,7 @@ dependencies = [
|
||||
name = "gentables"
|
||||
version = "0.1.0"
|
||||
dependencies = [
|
||||
"bitflags 2.5.0",
|
||||
"bitflags 2.6.0",
|
||||
"bytemuck",
|
||||
"clap",
|
||||
"elf 0.7.4",
|
||||
@ -659,7 +659,7 @@ version = "0.18.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "232e6a7bfe35766bf715e55a88b39a700596c0ccfd88cd3680b4cdb40d66ef70"
|
||||
dependencies = [
|
||||
"bitflags 2.5.0",
|
||||
"bitflags 2.6.0",
|
||||
"libc",
|
||||
"libgit2-sys",
|
||||
"log",
|
||||
@ -802,13 +802,13 @@ name = "kernel-arch-aarch64"
|
||||
version = "0.1.0"
|
||||
dependencies = [
|
||||
"aarch64-cpu",
|
||||
"bitflags 2.5.0",
|
||||
"bitflags 2.6.0",
|
||||
"device-api",
|
||||
"kernel-arch-interface",
|
||||
"libk-mm-interface",
|
||||
"memtables",
|
||||
"static_assertions",
|
||||
"tock-registers 0.8.1",
|
||||
"tock-registers",
|
||||
"yggdrasil-abi",
|
||||
]
|
||||
|
||||
@ -833,13 +833,13 @@ dependencies = [
|
||||
name = "kernel-arch-x86_64"
|
||||
version = "0.1.0"
|
||||
dependencies = [
|
||||
"bitflags 2.5.0",
|
||||
"bitflags 2.6.0",
|
||||
"device-api",
|
||||
"kernel-arch-interface",
|
||||
"libk-mm-interface",
|
||||
"memtables",
|
||||
"static_assertions",
|
||||
"tock-registers 0.8.1",
|
||||
"tock-registers",
|
||||
"yggdrasil-abi",
|
||||
]
|
||||
|
||||
@ -931,7 +931,7 @@ dependencies = [
|
||||
name = "libk-mm-interface"
|
||||
version = "0.1.0"
|
||||
dependencies = [
|
||||
"bitflags 2.5.0",
|
||||
"bitflags 2.6.0",
|
||||
"bytemuck",
|
||||
"kernel-arch-interface",
|
||||
"yggdrasil-abi",
|
||||
@ -1018,9 +1018,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "log"
|
||||
version = "0.4.21"
|
||||
version = "0.4.22"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c"
|
||||
checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"
|
||||
|
||||
[[package]]
|
||||
name = "memchr"
|
||||
@ -1182,7 +1182,7 @@ checksum = "31b476131c3c86cb68032fdc5cb6d5a1045e3e42d96b69fa599fd77701e1f5bf"
|
||||
dependencies = [
|
||||
"bit-set",
|
||||
"bit-vec",
|
||||
"bitflags 2.5.0",
|
||||
"bitflags 2.6.0",
|
||||
"lazy_static",
|
||||
"num-traits",
|
||||
"rand",
|
||||
@ -1331,7 +1331,7 @@ version = "0.38.34"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f"
|
||||
dependencies = [
|
||||
"bitflags 2.5.0",
|
||||
"bitflags 2.6.0",
|
||||
"errno",
|
||||
"libc",
|
||||
"linux-raw-sys",
|
||||
@ -1554,12 +1554,6 @@ 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.14"
|
||||
@ -1937,7 +1931,7 @@ dependencies = [
|
||||
"log",
|
||||
"memoffset 0.9.1",
|
||||
"static_assertions",
|
||||
"tock-registers 0.8.1",
|
||||
"tock-registers",
|
||||
"ygg_driver_pci",
|
||||
"yggdrasil-abi",
|
||||
]
|
||||
@ -1992,7 +1986,7 @@ dependencies = [
|
||||
"libk-util",
|
||||
"log",
|
||||
"static_assertions",
|
||||
"tock-registers 0.8.1",
|
||||
"tock-registers",
|
||||
"ygg_driver_pci",
|
||||
"yggdrasil-abi",
|
||||
]
|
||||
@ -2002,13 +1996,13 @@ name = "ygg_driver_pci"
|
||||
version = "0.1.0"
|
||||
dependencies = [
|
||||
"acpi",
|
||||
"bitflags 2.5.0",
|
||||
"bitflags 2.6.0",
|
||||
"device-api",
|
||||
"libk-device",
|
||||
"libk-mm",
|
||||
"libk-util",
|
||||
"log",
|
||||
"tock-registers 0.8.1",
|
||||
"tock-registers",
|
||||
"yggdrasil-abi",
|
||||
]
|
||||
|
||||
@ -2039,7 +2033,7 @@ dependencies = [
|
||||
"libk-mm",
|
||||
"libk-util",
|
||||
"log",
|
||||
"tock-registers 0.9.0",
|
||||
"tock-registers",
|
||||
"xhci",
|
||||
"ygg_driver_pci",
|
||||
"ygg_driver_usb",
|
||||
@ -2050,11 +2044,11 @@ dependencies = [
|
||||
name = "ygg_driver_virtio_core"
|
||||
version = "0.1.0"
|
||||
dependencies = [
|
||||
"bitflags 2.5.0",
|
||||
"bitflags 2.6.0",
|
||||
"device-api",
|
||||
"libk-mm",
|
||||
"log",
|
||||
"tock-registers 0.8.1",
|
||||
"tock-registers",
|
||||
"ygg_driver_pci",
|
||||
"yggdrasil-abi",
|
||||
]
|
||||
@ -2063,13 +2057,13 @@ dependencies = [
|
||||
name = "ygg_driver_virtio_net"
|
||||
version = "0.1.0"
|
||||
dependencies = [
|
||||
"bitflags 2.5.0",
|
||||
"bitflags 2.6.0",
|
||||
"bytemuck",
|
||||
"device-api",
|
||||
"libk-mm",
|
||||
"libk-util",
|
||||
"log",
|
||||
"tock-registers 0.8.1",
|
||||
"tock-registers",
|
||||
"ygg_driver_net_core",
|
||||
"ygg_driver_pci",
|
||||
"ygg_driver_virtio_core",
|
||||
@ -2101,7 +2095,7 @@ dependencies = [
|
||||
"acpi-system",
|
||||
"aml",
|
||||
"atomic_enum",
|
||||
"bitflags 2.5.0",
|
||||
"bitflags 2.6.0",
|
||||
"bytemuck",
|
||||
"crossbeam-queue",
|
||||
"device-api",
|
||||
@ -2122,9 +2116,8 @@ dependencies = [
|
||||
"memfs",
|
||||
"memtables",
|
||||
"prettyplease",
|
||||
"spinning_top",
|
||||
"static_assertions",
|
||||
"tock-registers 0.8.1",
|
||||
"tock-registers",
|
||||
"vmalloc",
|
||||
"yboot-proto",
|
||||
"ygg_driver_ahci",
|
||||
|
||||
@ -35,16 +35,15 @@ ygg_driver_input = { path = "driver/input" }
|
||||
kernel-fs = { path = "driver/fs/kernel-fs" }
|
||||
memfs = { path = "driver/fs/memfs" }
|
||||
|
||||
atomic_enum = "0.2.0"
|
||||
bitflags = "2.3.3"
|
||||
spinning_top = "0.2.5"
|
||||
atomic_enum = "0.3.0"
|
||||
bitflags = "2.6.0"
|
||||
static_assertions = "1.1.0"
|
||||
tock-registers = "0.8.1"
|
||||
git-version = "0.3.5"
|
||||
log = "0.4.20"
|
||||
futures-util = { version = "0.3.28", default-features = false, features = ["alloc", "async-await"] }
|
||||
crossbeam-queue = { version = "0.3.8", default-features = false, features = ["alloc"] }
|
||||
bytemuck = { version = "1.14.0", features = ["derive"] }
|
||||
git-version = "0.3.9"
|
||||
log = "0.4.22"
|
||||
futures-util = { version = "0.3.30", default-features = false, features = ["alloc", "async-await"] }
|
||||
crossbeam-queue = { version = "0.3.11", default-features = false, features = ["alloc"] }
|
||||
bytemuck = { version = "1.16.1", features = ["derive"] }
|
||||
|
||||
[dependencies.elf]
|
||||
version = "0.7.2"
|
||||
@ -53,7 +52,7 @@ default-features = false
|
||||
features = ["no_std_stream"]
|
||||
|
||||
[target.'cfg(target_arch = "aarch64")'.dependencies]
|
||||
aarch64-cpu = "9.3.1"
|
||||
aarch64-cpu = "9.4.0"
|
||||
device-tree = { path = "lib/device-tree" }
|
||||
kernel-arch-aarch64 = { path = "arch/aarch64" }
|
||||
|
||||
@ -71,7 +70,7 @@ abi-generator = { path = "../tool/abi-generator" }
|
||||
|
||||
# To make rust-analyzer recognize those
|
||||
[dev-dependencies]
|
||||
aarch64-cpu = "9.3.1"
|
||||
aarch64-cpu = "9.4.0"
|
||||
device-tree = { path = "lib/device-tree" }
|
||||
kernel-arch-aarch64 = { path = "arch/aarch64" }
|
||||
|
||||
|
||||
@ -10,7 +10,7 @@ libk-mm-interface = { path = "../../libk/libk-mm/interface" }
|
||||
memtables = { path = "../../lib/memtables" }
|
||||
device-api = { path = "../../lib/device-api", features = ["derive"] }
|
||||
|
||||
bitflags = "2.3.3"
|
||||
bitflags = "2.6.0"
|
||||
static_assertions = "1.1.0"
|
||||
aarch64-cpu = "9.3.1"
|
||||
aarch64-cpu = "9.4.0"
|
||||
tock-registers = "0.8.1"
|
||||
|
||||
@ -8,33 +8,33 @@ use core::{
|
||||
|
||||
use crate::{guard::IrqGuard, Architecture};
|
||||
|
||||
struct SpinlockInner<A: Architecture, T> {
|
||||
pub struct Spinlock<A: Architecture, T> {
|
||||
value: UnsafeCell<T>,
|
||||
state: AtomicBool,
|
||||
_pd: PhantomData<A>,
|
||||
}
|
||||
|
||||
struct SpinlockInnerGuard<'a, A: Architecture, T> {
|
||||
lock: &'a SpinlockInner<A, T>,
|
||||
pub struct SpinlockGuard<'a, A: Architecture, T> {
|
||||
lock: &'a Spinlock<A, T>,
|
||||
}
|
||||
|
||||
/// Spinlock implementation which prevents interrupts to avoid deadlocks when an interrupt handler
|
||||
/// tries to acquire a lock taken before the IRQ fired.
|
||||
pub struct IrqSafeSpinlock<A: Architecture, T> {
|
||||
inner: SpinlockInner<A, T>,
|
||||
inner: Spinlock<A, T>,
|
||||
}
|
||||
|
||||
/// Token type allowing safe access to the underlying data of the [IrqSafeSpinlock]. Resumes normal
|
||||
/// IRQ operation (if enabled before acquiring) when the lifetime is over.
|
||||
pub struct IrqSafeSpinlockGuard<'a, A: Architecture, T> {
|
||||
// Must come first to ensure the lock is dropped first and only then IRQs are re-enabled
|
||||
inner: SpinlockInnerGuard<'a, A, T>,
|
||||
inner: SpinlockGuard<'a, A, T>,
|
||||
_irq: IrqGuard<A>,
|
||||
}
|
||||
|
||||
// Spinlock impls
|
||||
impl<A: Architecture, T> SpinlockInner<A, T> {
|
||||
const fn new(value: T) -> Self {
|
||||
impl<A: Architecture, T> Spinlock<A, T> {
|
||||
pub const fn new(value: T) -> Self {
|
||||
Self {
|
||||
value: UnsafeCell::new(value),
|
||||
state: AtomicBool::new(false),
|
||||
@ -42,7 +42,7 @@ impl<A: Architecture, T> SpinlockInner<A, T> {
|
||||
}
|
||||
}
|
||||
|
||||
fn lock(&self) -> SpinlockInnerGuard<A, T> {
|
||||
pub fn lock(&self) -> SpinlockGuard<A, T> {
|
||||
// Loop until the lock can be acquired
|
||||
// if LOCK_HACK.load(Ordering::Acquire) {
|
||||
// return SpinlockInnerGuard { lock: self };
|
||||
@ -55,11 +55,11 @@ impl<A: Architecture, T> SpinlockInner<A, T> {
|
||||
core::hint::spin_loop();
|
||||
}
|
||||
|
||||
SpinlockInnerGuard { lock: self }
|
||||
SpinlockGuard { lock: self }
|
||||
}
|
||||
}
|
||||
|
||||
impl<'a, A: Architecture, T> Deref for SpinlockInnerGuard<'a, A, T> {
|
||||
impl<'a, A: Architecture, T> Deref for SpinlockGuard<'a, A, T> {
|
||||
type Target = T;
|
||||
|
||||
fn deref(&self) -> &Self::Target {
|
||||
@ -67,13 +67,13 @@ impl<'a, A: Architecture, T> Deref for SpinlockInnerGuard<'a, A, T> {
|
||||
}
|
||||
}
|
||||
|
||||
impl<'a, A: Architecture, T> DerefMut for SpinlockInnerGuard<'a, A, T> {
|
||||
impl<'a, A: Architecture, T> DerefMut for SpinlockGuard<'a, A, T> {
|
||||
fn deref_mut(&mut self) -> &mut Self::Target {
|
||||
unsafe { &mut *self.lock.value.get() }
|
||||
}
|
||||
}
|
||||
|
||||
impl<'a, A: Architecture, T> Drop for SpinlockInnerGuard<'a, A, T> {
|
||||
impl<'a, A: Architecture, T> Drop for SpinlockGuard<'a, A, T> {
|
||||
fn drop(&mut self) {
|
||||
// if !LOCK_HACK.load(Ordering::Acquire) {
|
||||
self.lock
|
||||
@ -84,15 +84,15 @@ impl<'a, A: Architecture, T> Drop for SpinlockInnerGuard<'a, A, T> {
|
||||
}
|
||||
}
|
||||
|
||||
unsafe impl<A: Architecture, T> Sync for SpinlockInner<A, T> {}
|
||||
unsafe impl<A: Architecture, T> Send for SpinlockInner<A, T> {}
|
||||
unsafe impl<A: Architecture, T> Sync for Spinlock<A, T> {}
|
||||
unsafe impl<A: Architecture, T> Send for Spinlock<A, T> {}
|
||||
|
||||
// IrqSafeSpinlock impls
|
||||
impl<A: Architecture, T> IrqSafeSpinlock<A, T> {
|
||||
/// Wraps the value in a spinlock primitive
|
||||
pub const fn new(value: T) -> Self {
|
||||
Self {
|
||||
inner: SpinlockInner::new(value),
|
||||
inner: Spinlock::new(value),
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -10,6 +10,6 @@ libk-mm-interface = { path = "../../libk/libk-mm/interface" }
|
||||
memtables = { path = "../../lib/memtables" }
|
||||
device-api = { path = "../../lib/device-api", features = ["derive"] }
|
||||
|
||||
bitflags = "2.3.3"
|
||||
bitflags = "2.6.0"
|
||||
static_assertions = "1.1.0"
|
||||
tock-registers = "0.8.1"
|
||||
|
||||
@ -14,9 +14,9 @@ device-api = { path = "../../../lib/device-api", features = ["derive"] }
|
||||
ygg_driver_pci = { path = "../../bus/pci" }
|
||||
kernel-fs = { path = "../../fs/kernel-fs" }
|
||||
|
||||
log = "0.4.20"
|
||||
futures-util = { version = "0.3.28", default-features = false, features = ["alloc", "async-await"] }
|
||||
log = "0.4.22"
|
||||
futures-util = { version = "0.3.30", default-features = false, features = ["alloc", "async-await"] }
|
||||
static_assertions = "1.1.0"
|
||||
tock-registers = "0.8.1"
|
||||
bytemuck = { version = "1.14.0", features = ["derive"] }
|
||||
bytemuck = { version = "1.16.1", features = ["derive"] }
|
||||
memoffset = "0.9.0"
|
||||
|
||||
@ -14,8 +14,8 @@ device-api = { path = "../../../lib/device-api", features = ["derive"] }
|
||||
ygg_driver_pci = { path = "../../bus/pci" }
|
||||
kernel-fs = { path = "../../fs/kernel-fs" }
|
||||
|
||||
log = "0.4.20"
|
||||
futures-util = { version = "0.3.28", default-features = false, features = ["alloc", "async-await"] }
|
||||
log = "0.4.22"
|
||||
futures-util = { version = "0.3.30", default-features = false, features = ["alloc", "async-await"] }
|
||||
static_assertions = "1.1.0"
|
||||
tock-registers = "0.8.1"
|
||||
bytemuck = { version = "1.14.0", features = ["derive"] }
|
||||
bytemuck = { version = "1.16.1", features = ["derive"] }
|
||||
|
||||
@ -338,7 +338,7 @@ impl Device for NvmeController {
|
||||
let timeout = Duration::from_millis(regs.CAP.read(CAP::TO) * 500);
|
||||
log::debug!("Worst-case timeout: {:?}", timeout);
|
||||
|
||||
while regs.CSTS.matches_any(CSTS::RDY::SET) {
|
||||
while regs.CSTS.matches_all(CSTS::RDY::SET) {
|
||||
core::hint::spin_loop();
|
||||
}
|
||||
|
||||
@ -389,7 +389,7 @@ impl Device for NvmeController {
|
||||
core::hint::spin_loop();
|
||||
}
|
||||
|
||||
if regs.CSTS.matches_any(CSTS::CFS::SET) {
|
||||
if regs.CSTS.matches_all(CSTS::CFS::SET) {
|
||||
todo!("CFS set after reset!");
|
||||
}
|
||||
|
||||
|
||||
@ -11,8 +11,8 @@ libk-mm = { path = "../../../libk/libk-mm" }
|
||||
libk-device = { path = "../../../libk/libk-device" }
|
||||
libk-util = { path = "../../../libk/libk-util" }
|
||||
|
||||
log = "0.4.20"
|
||||
bitflags = "2.3.3"
|
||||
log = "0.4.22"
|
||||
bitflags = "2.6.0"
|
||||
tock-registers = "0.8.1"
|
||||
|
||||
[target.'cfg(target_arch = "x86_64")'.dependencies]
|
||||
|
||||
@ -13,6 +13,6 @@ libk-util = { path = "../../../libk/libk-util" }
|
||||
libk-mm = { path = "../../../libk/libk-mm" }
|
||||
libk = { path = "../../../libk" }
|
||||
|
||||
log = "0.4.20"
|
||||
bytemuck = { version = "1.14.0", features = ["derive"] }
|
||||
futures-util = { version = "0.3.28", default-features = false, features = ["alloc", "async-await"] }
|
||||
log = "0.4.22"
|
||||
bytemuck = { version = "1.16.1", features = ["derive"] }
|
||||
futures-util = { version = "0.3.30", default-features = false, features = ["alloc", "async-await"] }
|
||||
|
||||
@ -9,4 +9,4 @@ yggdrasil-abi = { path = "../../../../lib/abi" }
|
||||
libk-util = { path = "../../../libk/libk-util" }
|
||||
libk = { path = "../../../libk" }
|
||||
|
||||
log = "0.4.20"
|
||||
log = "0.4.22"
|
||||
|
||||
@ -10,7 +10,7 @@ libk-util = { path = "../../../libk/libk-util" }
|
||||
libk = { path = "../../../libk" }
|
||||
|
||||
static_assertions = "1.1.0"
|
||||
log = "0.4.20"
|
||||
log = "0.4.22"
|
||||
|
||||
[features]
|
||||
default = []
|
||||
|
||||
@ -12,7 +12,7 @@ libk = { path = "../../../libk" }
|
||||
|
||||
kernel-fs = { path = "../../fs/kernel-fs" }
|
||||
|
||||
log = "0.4.20"
|
||||
bytemuck = { version = "1.14.0", features = ["derive"] }
|
||||
log = "0.4.22"
|
||||
bytemuck = { version = "1.16.1", features = ["derive"] }
|
||||
serde_json = { version = "1.0.111", default-features = false, features = ["alloc"] }
|
||||
serde = { version = "1.0.193", features = ["derive"], default-features = false }
|
||||
|
||||
@ -10,4 +10,4 @@ libk-mm = { path = "../../../libk/libk-mm" }
|
||||
|
||||
ygg_driver_net_core = { path = "../../net/core" }
|
||||
|
||||
bytemuck = { version = "1.14.0", features = ["derive"] }
|
||||
bytemuck = { version = "1.16.1", features = ["derive"] }
|
||||
|
||||
@ -16,8 +16,8 @@ libk = { path = "../../../libk" }
|
||||
|
||||
xhci_lib = { git = "https://github.com/rust-osdev/xhci.git", package = "xhci" }
|
||||
|
||||
atomic_enum = "0.2.0"
|
||||
log = "0.4.20"
|
||||
tock-registers = "0.9.0"
|
||||
bytemuck = { version = "1.14.0", features = ["derive"] }
|
||||
futures-util = { version = "0.3.28", default-features = false, features = ["alloc", "async-await"] }
|
||||
atomic_enum = "0.3.0"
|
||||
log = "0.4.22"
|
||||
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"] }
|
||||
|
||||
@ -10,8 +10,8 @@ device-api = { path = "../../../lib/device-api", features = ["derive"] }
|
||||
|
||||
ygg_driver_pci = { path = "../../bus/pci", optional = true }
|
||||
|
||||
log = "0.4.20"
|
||||
bitflags = "2.4.2"
|
||||
log = "0.4.22"
|
||||
bitflags = "2.6.0"
|
||||
tock-registers = "0.8.1"
|
||||
|
||||
[features]
|
||||
|
||||
@ -13,10 +13,10 @@ ygg_driver_virtio_core = { path = "../core" }
|
||||
ygg_driver_net_core = { path = "../../net/core" }
|
||||
ygg_driver_pci = { path = "../../bus/pci", optional = true }
|
||||
|
||||
log = "0.4.20"
|
||||
bitflags = "2.4.2"
|
||||
log = "0.4.22"
|
||||
bitflags = "2.6.0"
|
||||
tock-registers = "0.8.1"
|
||||
bytemuck = { version = "1.14.0", features = ["derive"] }
|
||||
bytemuck = { version = "1.16.1", features = ["derive"] }
|
||||
|
||||
[features]
|
||||
default = []
|
||||
|
||||
@ -10,5 +10,5 @@ yggdrasil-abi = { path = "../../../lib/abi" }
|
||||
device-api = { path = "../device-api", features = ["derive"] }
|
||||
libk-mm = { path = "../../libk/libk-mm" }
|
||||
|
||||
fdt-rs = { version = "0.4.3", default-features = false }
|
||||
log = "0.4.20"
|
||||
fdt-rs = { version = "0.4.5", default-features = false }
|
||||
log = "0.4.22"
|
||||
|
||||
@ -7,7 +7,7 @@ authors = ["Mark Poliakov <mark@alnyan.me>"]
|
||||
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
|
||||
|
||||
[dependencies]
|
||||
bytemuck = { version = "1.14.0", features = ["derive"] }
|
||||
bytemuck = { version = "1.16.1", features = ["derive"] }
|
||||
|
||||
[features]
|
||||
default = []
|
||||
|
||||
@ -20,14 +20,14 @@ yggdrasil-abi = { path = "../../lib/abi", features = ["alloc", "serde"] }
|
||||
device-api = { path = "../lib/device-api", features = ["derive"] }
|
||||
|
||||
cfg-if = "1.0.0"
|
||||
log = "0.4.20"
|
||||
atomic_enum = "0.2.0"
|
||||
futures-util = { version = "0.3.28", default-features = false, features = ["alloc", "async-await"] }
|
||||
crossbeam-queue = { version = "0.3.8", default-features = false, features = ["alloc"] }
|
||||
log = "0.4.22"
|
||||
atomic_enum = "0.3.0"
|
||||
futures-util = { version = "0.3.30", default-features = false, features = ["alloc", "async-await"] }
|
||||
crossbeam-queue = { version = "0.3.11", default-features = false, features = ["alloc"] }
|
||||
|
||||
serde_json = { version = "1.0.111", default-features = false, features = ["alloc"] }
|
||||
serde = { version = "1.0.193", features = ["derive"], default-features = false }
|
||||
bytemuck = { version = "1.14.0", features = ["derive"] }
|
||||
bytemuck = { version = "1.16.1", features = ["derive"] }
|
||||
|
||||
[dependencies.elf]
|
||||
version = "0.7.2"
|
||||
|
||||
@ -14,4 +14,4 @@ vmalloc = { path = "../../lib/vmalloc" }
|
||||
|
||||
libyalloc = { path = "../../../lib/libyalloc", default-features = false, features = ["dep-of-kernel"] }
|
||||
|
||||
log = "0.4.20"
|
||||
log = "0.4.22"
|
||||
|
||||
@ -10,5 +10,5 @@ yggdrasil-abi = { path = "../../../../lib/abi" }
|
||||
|
||||
kernel-arch-interface = { path = "../../../arch/interface" }
|
||||
|
||||
bitflags = "2.3.3"
|
||||
bytemuck = { version = "1.14.0", features = ["derive"] }
|
||||
bitflags = "2.6.0"
|
||||
bytemuck = { version = "1.16.1", features = ["derive"] }
|
||||
|
||||
@ -9,7 +9,7 @@ edition = "2021"
|
||||
yggdrasil-abi = { path = "../../../lib/abi" }
|
||||
kernel-arch = { path = "../../arch" }
|
||||
|
||||
log = "0.4.20"
|
||||
crossbeam-queue = { version = "0.3.8", default-features = false, features = ["alloc"] }
|
||||
futures-util = { version = "0.3.28", default-features = false, features = ["alloc", "async-await"] }
|
||||
log = "0.4.22"
|
||||
crossbeam-queue = { version = "0.3.11", default-features = false, features = ["alloc"] }
|
||||
futures-util = { version = "0.3.30", default-features = false, features = ["alloc", "async-await"] }
|
||||
ahash = { version = "0.8.11", default-features = false, features = ["no-rng"] }
|
||||
|
||||
@ -12,6 +12,9 @@ pub type IrqSafeSpinlockGuard<'a, T> =
|
||||
kernel_arch::sync::IrqSafeSpinlockGuard<'a, ArchitectureImpl, T>;
|
||||
pub type IrqGuard = kernel_arch::guard::IrqGuard<ArchitectureImpl>;
|
||||
|
||||
pub type Spinlock<T> = kernel_arch::sync::Spinlock<ArchitectureImpl, T>;
|
||||
pub type SpinlockGuard<'a, T> = kernel_arch::sync::SpinlockGuard<'a, ArchitectureImpl, T>;
|
||||
|
||||
static LOCK_HACK: AtomicBool = AtomicBool::new(false);
|
||||
|
||||
pub trait LockMethod<'q>: Sync {
|
||||
|
||||
43
kernel/modules/test_mod/Cargo.lock
generated
43
kernel/modules/test_mod/Cargo.lock
generated
@ -17,7 +17,7 @@ version = "0.1.0"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 2.0.53",
|
||||
"syn",
|
||||
"thiserror",
|
||||
]
|
||||
|
||||
@ -39,20 +39,20 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "atomic_enum"
|
||||
version = "0.2.0"
|
||||
version = "0.3.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "6227a8d6fdb862bcb100c4314d0d9579e5cd73fa6df31a2e6f6e1acd3c5f1207"
|
||||
checksum = "99e1aca718ea7b89985790c94aad72d77533063fe00bc497bb79a7c2dae6a661"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 1.0.109",
|
||||
"syn",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "bitflags"
|
||||
version = "2.5.0"
|
||||
version = "2.6.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
|
||||
checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
|
||||
|
||||
[[package]]
|
||||
name = "btree_monstrousity"
|
||||
@ -66,9 +66,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "bytemuck"
|
||||
version = "1.15.0"
|
||||
version = "1.16.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "5d6d68c57235a3a081186990eca2867354726650f42f7516ca50c28d6281fd15"
|
||||
checksum = "b236fc92302c97ed75b38da1f4917b5cdda4984745740f153a5d3059e48d725e"
|
||||
dependencies = [
|
||||
"bytemuck_derive",
|
||||
]
|
||||
@ -81,7 +81,7 @@ checksum = "4da9a32f3fed317401fa3c862968128267c3106685286e15d5aaa3d7389c2f60"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 2.0.53",
|
||||
"syn",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@ -125,7 +125,7 @@ version = "0.1.0"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 2.0.53",
|
||||
"syn",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@ -338,9 +338,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "log"
|
||||
version = "0.4.21"
|
||||
version = "0.4.22"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c"
|
||||
checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"
|
||||
|
||||
[[package]]
|
||||
name = "memtables"
|
||||
@ -378,7 +378,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "a41cf62165e97c7f814d2221421dbb9afcbcdb0a88068e5ea206e19951c2cbb5"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"syn 2.0.53",
|
||||
"syn",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@ -428,7 +428,7 @@ checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 2.0.53",
|
||||
"syn",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@ -448,17 +448,6 @@ version = "1.1.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
|
||||
|
||||
[[package]]
|
||||
name = "syn"
|
||||
version = "1.0.109"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"unicode-ident",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "syn"
|
||||
version = "2.0.53"
|
||||
@ -495,7 +484,7 @@ checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 2.0.53",
|
||||
"syn",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@ -562,5 +551,5 @@ checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 2.0.53",
|
||||
"syn",
|
||||
]
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
//! ARM GICv2 Distributor registers
|
||||
use device_api::interrupt::{IpiDeliveryTarget, IrqLevel, IrqOptions, IrqTrigger};
|
||||
use libk_mm::device::DeviceMemoryIo;
|
||||
use spinning_top::Spinlock;
|
||||
use libk_util::sync::Spinlock;
|
||||
use tock_registers::{
|
||||
interfaces::{ReadWriteable, Readable, Writeable},
|
||||
register_bitfields, register_structs,
|
||||
|
||||
@ -9,8 +9,8 @@ authors = ["Mark Poliakov <mark@alnyan.me>"]
|
||||
[dependencies]
|
||||
memtables = { path = "../../lib/memtables", features = ["all"] }
|
||||
|
||||
bytemuck = "1.14.0"
|
||||
bytemuck = "1.16.1"
|
||||
elf = "0.7.2"
|
||||
thiserror = "1.0.48"
|
||||
clap = { version = "4.4.2", features = ["derive"] }
|
||||
bitflags = "2.4.0"
|
||||
bitflags = "2.6.0"
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user