diff --git a/Cargo.lock b/Cargo.lock index 1cc3500..7b71b62 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -72,13 +72,68 @@ dependencies = [ [[package]] name = "arm-sysregs" -version = "0.3.0" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eea2d77c3eac6be0a300ba179e7bf051ffaec797c39dee0b631c21668b12e1f3" +dependencies = [ + "arm-sysregs-aarch32", + "arm-sysregs-common", + "arm-sysregs-el0", + "arm-sysregs-el1", + "arm-sysregs-el2", +] + +[[package]] +name = "arm-sysregs-aarch32" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d1ab4219ed830e610ebf45350dd1bd688accfb1d34612ccd7ad73966a8ab908" +checksum = "aeac85b36432f9427827c31c2da2b42fe4928e35b3dbedbe9c9ded5e4d013789" dependencies = [ + "arm-sysregs-common", "bitflags", +] + +[[package]] +name = "arm-sysregs-common" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "11447113c834b1cb206262297477a467c090a3768765bef861858b6098dcac39" +dependencies = [ "num_enum", - "paste", + "pastey", +] + +[[package]] +name = "arm-sysregs-el0" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a680f4741d246b3f72f977da72f7df76cb9c3227e565acad801ca3c504947d92" +dependencies = [ + "arm-sysregs-aarch32", + "arm-sysregs-common", + "bitflags", +] + +[[package]] +name = "arm-sysregs-el1" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5dcc832aff5e63bad65c4cdcb17a7a5c07a711a4ce365d7a69785efb3a64fc47" +dependencies = [ + "arm-sysregs-common", + "arm-sysregs-el0", + "bitflags", +] + +[[package]] +name = "arm-sysregs-el2" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4749bc9818f7ebef235bab12e818fdd4081dfffe44491c941b6f6530ee960686" +dependencies = [ + "arm-sysregs-common", + "arm-sysregs-el1", + "bitflags", ] [[package]] @@ -165,7 +220,7 @@ version = "0.1.0" dependencies = [ "aarch64-rt", "arm-pl011-uart", - "arm-sysregs 0.3.0", + "arm-sysregs 0.5.1", "smccc", "spin 0.12.3", ] @@ -222,6 +277,12 @@ version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" +[[package]] +name = "pastey" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2ee67f1008b1ba2321834326597b8e186293b049a023cdef258527550b9935b4" + [[package]] name = "percore" version = "0.3.0" @@ -248,7 +309,7 @@ dependencies = [ "arm-gic", "arm-pl011-uart", "arm-psci", - "arm-sysregs 0.3.0", + "arm-sysregs 0.5.1", "percore", "smccc", "spin 0.12.3", @@ -271,7 +332,7 @@ dependencies = [ "aarch64-rt", "arm-pl011-uart", "arm-psci", - "arm-sysregs 0.3.0", + "arm-sysregs 0.5.1", "arrayvec", "buddy_system_allocator", "dtoolkit", diff --git a/Cargo.toml b/Cargo.toml index 36e9516..2098233 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -22,7 +22,7 @@ aarch64-paging = "0.12" aarch64-rt = { version = "0.4.3", features = ["el2", "exceptions", "initial-pagetable", "psci"], default-features = false } arm-pl011-uart = "0.5" arm-psci = "0.2" -arm-sysregs = { version = "0.3", features = ["el1", "el2"] } +arm-sysregs = { version = "0.5", features = ["el1", "el2"] } arrayvec = { version = "0.7", default-features = false } buddy_system_allocator = { version = "0.13", default-features = false, features = ["alloc", "use_spin"] } dtoolkit = { version = "0.4", features = ["write"] } diff --git a/tests/integration_test/Cargo.toml b/tests/integration_test/Cargo.toml index b8bf701..40821af 100644 --- a/tests/integration_test/Cargo.toml +++ b/tests/integration_test/Cargo.toml @@ -7,6 +7,6 @@ publish = false [dependencies] aarch64-rt = { version = "0.4", features = ["el1", "exceptions"], default-features = false } arm-pl011-uart = "0.5" -arm-sysregs = { version = "0.3", features = ["el1"] } +arm-sysregs = { version = "0.5", features = ["el1"] } smccc = "0.2" spin = { version = "0.12", features = ["lazy", "once", "spin_mutex"], default-features = false } diff --git a/tests/psci_test/Cargo.toml b/tests/psci_test/Cargo.toml index 29e8287..87f5cb2 100644 --- a/tests/psci_test/Cargo.toml +++ b/tests/psci_test/Cargo.toml @@ -9,7 +9,7 @@ aarch64-rt = { version = "0.4", features = ["el1", "exceptions", "psci"], defaul arm-gic = "0.8" arm-pl011-uart = "0.5" arm-psci = "0.2" -arm-sysregs = { version = "0.3", features = ["el1"] } +arm-sysregs = { version = "0.5", features = ["el1"] } percore = { version = "0.3", default-features = false } smccc = "0.2" spin = "0.12" \ No newline at end of file