Archives
/
rust-raspberrypi-OS-tutorials
mirror of https://github.com/rust-embedded/rust-raspberrypi-OS-tutorials
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Upgrade to cortex-a 4.x.x

Browse Source
pull/84/head
Andre Richter 4 years ago
parent 690716e4af
commit e7a13e81b8
No known key found for this signature in database
GPG Key ID: 2116C1AB102F615E
59 changed files with 199 additions and 196 deletions
Show Stats Download Patch File Download Diff File

16
04_zero_overhead_abstraction/Cargo.lock generated
Unescape Escape View File

@ -2,33 +2,31 @@
# It is not intended for manual editing.
[[package]]
name = "cortex-a"
version = "3.0.4"
version = "4.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "eda21b8ec67b82099401559fe28cea4508eb1e33217b4dacf60ba22e39b486b1"
dependencies = [
"register 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
"register",
]
[[package]]
name = "kernel"
version = "0.1.0"
dependencies = [
"cortex-a 3.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
"cortex-a",
]
[[package]]
name = "register"
version = "0.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "deaba5b0e477d21f61a57504bb5cef4a1e86de30300b457d38971c1cfc98b815"
dependencies = [
"tock-registers 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
"tock-registers",
]
[[package]]
name = "tock-registers"
version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
[metadata]
"checksum cortex-a 3.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "6922a40af4d1a2deac8c963b9f3e57311b8912490740234f1ad182425c547f80"
"checksum register 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "deaba5b0e477d21f61a57504bb5cef4a1e86de30300b457d38971c1cfc98b815"
"checksum tock-registers 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "70323afdb8082186c0986da0e10f6e4ed103d681c921c00597e98d9806dac20f"
checksum = "70323afdb8082186c0986da0e10f6e4ed103d681c921c00597e98d9806dac20f"

2
04_zero_overhead_abstraction/Cargo.toml
Unescape Escape View File

@ -13,4 +13,4 @@ bsp_rpi4 = ["cortex-a"]
[dependencies]
# Optional dependencies
cortex-a = { version = "3.0.x", optional = true }
cortex-a = { version = "4.x.x", optional = true }

2
04_zero_overhead_abstraction/README.md
Unescape Escape View File

@ -25,7 +25,7 @@ diff -uNr 03_hacky_hello_world/Cargo.toml 04_zero_overhead_abstraction/Cargo.tom
[dependencies]
+
+# Optional dependencies
+cortex-a = { version = "3.0.x", optional = true }
+cortex-a = { version = "4.x.x", optional = true }
diff -uNr 03_hacky_hello_world/src/_arch/aarch64/cpu/smp.rs 04_zero_overhead_abstraction/src/_arch/aarch64/cpu/smp.rs
--- 03_hacky_hello_world/src/_arch/aarch64/cpu/smp.rs

16
05_safe_globals/Cargo.lock generated
Unescape Escape View File

@ -2,33 +2,31 @@
# It is not intended for manual editing.
[[package]]
name = "cortex-a"
version = "3.0.4"
version = "4.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "eda21b8ec67b82099401559fe28cea4508eb1e33217b4dacf60ba22e39b486b1"
dependencies = [
"register 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
"register",
]
[[package]]
name = "kernel"
version = "0.1.0"
dependencies = [
"cortex-a 3.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
"cortex-a",
]
[[package]]
name = "register"
version = "0.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "deaba5b0e477d21f61a57504bb5cef4a1e86de30300b457d38971c1cfc98b815"
dependencies = [
"tock-registers 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
"tock-registers",
]
[[package]]
name = "tock-registers"
version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
[metadata]
"checksum cortex-a 3.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "6922a40af4d1a2deac8c963b9f3e57311b8912490740234f1ad182425c547f80"
"checksum register 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "deaba5b0e477d21f61a57504bb5cef4a1e86de30300b457d38971c1cfc98b815"
"checksum tock-registers 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "70323afdb8082186c0986da0e10f6e4ed103d681c921c00597e98d9806dac20f"
checksum = "70323afdb8082186c0986da0e10f6e4ed103d681c921c00597e98d9806dac20f"

2
05_safe_globals/Cargo.toml
Unescape Escape View File

@ -13,4 +13,4 @@ bsp_rpi4 = ["cortex-a"]
[dependencies]
# Optional dependencies
cortex-a = { version = "3.0.x", optional = true }
cortex-a = { version = "4.x.x", optional = true }

18
06_drivers_gpio_uart/Cargo.lock generated
Unescape Escape View File

@ -2,34 +2,32 @@
# It is not intended for manual editing.
[[package]]
name = "cortex-a"
version = "3.0.4"
version = "4.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "eda21b8ec67b82099401559fe28cea4508eb1e33217b4dacf60ba22e39b486b1"
dependencies = [
"register 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
"register",
]
[[package]]
name = "kernel"
version = "0.1.0"
dependencies = [
"cortex-a 3.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
"register 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
"cortex-a",
"register",
]
[[package]]
name = "register"
version = "0.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "deaba5b0e477d21f61a57504bb5cef4a1e86de30300b457d38971c1cfc98b815"
dependencies = [
"tock-registers 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
"tock-registers",
]
[[package]]
name = "tock-registers"
version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
[metadata]
"checksum cortex-a 3.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "6922a40af4d1a2deac8c963b9f3e57311b8912490740234f1ad182425c547f80"
"checksum register 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "deaba5b0e477d21f61a57504bb5cef4a1e86de30300b457d38971c1cfc98b815"
"checksum tock-registers 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "70323afdb8082186c0986da0e10f6e4ed103d681c921c00597e98d9806dac20f"
checksum = "70323afdb8082186c0986da0e10f6e4ed103d681c921c00597e98d9806dac20f"

2
06_drivers_gpio_uart/Cargo.toml
Unescape Escape View File

@ -13,5 +13,5 @@ bsp_rpi4 = ["cortex-a", "register"]
[dependencies]
# Optional dependencies
cortex-a = { version = "3.0.x", optional = true }
cortex-a = { version = "4.x.x", optional = true }
register = { version = "0.5.x", optional = true }

2
06_drivers_gpio_uart/README.md
Unescape Escape View File

@ -106,7 +106,7 @@ diff -uNr 05_safe_globals/Cargo.toml 06_drivers_gpio_uart/Cargo.toml
[dependencies]
# Optional dependencies
cortex-a = { version = "3.0.x", optional = true }
cortex-a = { version = "4.x.x", optional = true }
+register = { version = "0.5.x", optional = true }
diff -uNr 05_safe_globals/src/_arch/aarch64/cpu.rs 06_drivers_gpio_uart/src/_arch/aarch64/cpu.rs

18
07_uart_chainloader/Cargo.lock generated
Unescape Escape View File

@ -2,34 +2,32 @@
# It is not intended for manual editing.
[[package]]
name = "cortex-a"
version = "3.0.4"
version = "4.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "eda21b8ec67b82099401559fe28cea4508eb1e33217b4dacf60ba22e39b486b1"
dependencies = [
"register 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
"register",
]
[[package]]
name = "kernel"
version = "0.1.0"
dependencies = [
"cortex-a 3.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
"register 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
"cortex-a",
"register",
]
[[package]]
name = "register"
version = "0.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "deaba5b0e477d21f61a57504bb5cef4a1e86de30300b457d38971c1cfc98b815"
dependencies = [
"tock-registers 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
"tock-registers",
]
[[package]]
name = "tock-registers"
version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
[metadata]
"checksum cortex-a 3.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "6922a40af4d1a2deac8c963b9f3e57311b8912490740234f1ad182425c547f80"
"checksum register 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "deaba5b0e477d21f61a57504bb5cef4a1e86de30300b457d38971c1cfc98b815"
"checksum tock-registers 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "70323afdb8082186c0986da0e10f6e4ed103d681c921c00597e98d9806dac20f"
checksum = "70323afdb8082186c0986da0e10f6e4ed103d681c921c00597e98d9806dac20f"

2
07_uart_chainloader/Cargo.toml
Unescape Escape View File

@ -13,5 +13,5 @@ bsp_rpi4 = ["cortex-a", "register"]
[dependencies]
# Optional dependencies
cortex-a = { version = "3.0.x", optional = true }
cortex-a = { version = "4.x.x", optional = true }
register = { version = "0.5.x", optional = true }

18
08_timestamps/Cargo.lock generated
Unescape Escape View File

@ -2,34 +2,32 @@
# It is not intended for manual editing.
[[package]]
name = "cortex-a"
version = "3.0.4"
version = "4.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "eda21b8ec67b82099401559fe28cea4508eb1e33217b4dacf60ba22e39b486b1"
dependencies = [
"register 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
"register",
]
[[package]]
name = "kernel"
version = "0.1.0"
dependencies = [
"cortex-a 3.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
"register 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
"cortex-a",
"register",
]
[[package]]
name = "register"
version = "0.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "deaba5b0e477d21f61a57504bb5cef4a1e86de30300b457d38971c1cfc98b815"
dependencies = [
"tock-registers 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
"tock-registers",
]
[[package]]
name = "tock-registers"
version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
[metadata]
"checksum cortex-a 3.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "6922a40af4d1a2deac8c963b9f3e57311b8912490740234f1ad182425c547f80"
"checksum register 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "deaba5b0e477d21f61a57504bb5cef4a1e86de30300b457d38971c1cfc98b815"
"checksum tock-registers 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "70323afdb8082186c0986da0e10f6e4ed103d681c921c00597e98d9806dac20f"
checksum = "70323afdb8082186c0986da0e10f6e4ed103d681c921c00597e98d9806dac20f"

2
08_timestamps/Cargo.toml
Unescape Escape View File

@ -13,5 +13,5 @@ bsp_rpi4 = ["cortex-a", "register"]
[dependencies]
# Optional dependencies
cortex-a = { version = "3.0.x", optional = true }
cortex-a = { version = "4.x.x", optional = true }
register = { version = "0.5.x", optional = true }

5
08_timestamps/README.md
Unescape Escape View File

@ -122,7 +122,7 @@ diff -uNr 07_uart_chainloader/src/_arch/aarch64/cpu.rs 08_timestamps/src/_arch/a
diff -uNr 07_uart_chainloader/src/_arch/aarch64/time.rs 08_timestamps/src/_arch/aarch64/time.rs
--- 07_uart_chainloader/src/_arch/aarch64/time.rs
+++ 08_timestamps/src/_arch/aarch64/time.rs
@@ -0,0 +1,97 @@
@@ -0,0 +1,98 @@
+// SPDX-License-Identifier: MIT OR Apache-2.0
+//
+// Copyright (c) 2018-2020 Andre Richter <andre.o.richter@gmail.com>
@ -193,6 +193,7 @@ diff -uNr 07_uart_chainloader/src/_arch/aarch64/time.rs 08_timestamps/src/_arch/
+ // Check if it is within supported bounds.
+ let warn: Option<&str> = if tval == 0 {
+ Some("smaller")
+ // The upper 32 bits of CNTP_TVAL_EL0 are reserved.
+ } else if tval > u32::max_value().into() {
+ Some("bigger")
+ } else {
@ -208,7 +209,7 @@ diff -uNr 07_uart_chainloader/src/_arch/aarch64/time.rs 08_timestamps/src/_arch/
+ }
+
+ // Set the compare value register.
+ CNTP_TVAL_EL0.set(tval as u32);
+ CNTP_TVAL_EL0.set(tval);
+
+ // Kick off the counting. // Disable timer interrupt.
+ CNTP_CTL_EL0.modify(CNTP_CTL_EL0::ENABLE::SET + CNTP_CTL_EL0::IMASK::SET);

3
08_timestamps/src/_arch/aarch64/time.rs
Unescape Escape View File

@ -68,6 +68,7 @@ impl time::interface::TimeManager for GenericTimer {
// Check if it is within supported bounds.
let warn: Option<&str> = if tval == 0 {
Some("smaller")
// The upper 32 bits of CNTP_TVAL_EL0 are reserved.
} else if tval > u32::max_value().into() {
Some("bigger")
} else {
@ -83,7 +84,7 @@ impl time::interface::TimeManager for GenericTimer {
}
// Set the compare value register.
CNTP_TVAL_EL0.set(tval as u32);
CNTP_TVAL_EL0.set(tval);
// Kick off the counting. // Disable timer interrupt.
CNTP_CTL_EL0.modify(CNTP_CTL_EL0::ENABLE::SET + CNTP_CTL_EL0::IMASK::SET);

18
09_hw_debug_JTAG/Cargo.lock generated
Unescape Escape View File

@ -2,34 +2,32 @@
# It is not intended for manual editing.
[[package]]
name = "cortex-a"
version = "3.0.4"
version = "4.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "eda21b8ec67b82099401559fe28cea4508eb1e33217b4dacf60ba22e39b486b1"
dependencies = [
"register 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
"register",
]
[[package]]
name = "kernel"
version = "0.1.0"
dependencies = [
"cortex-a 3.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
"register 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
"cortex-a",
"register",
]
[[package]]
name = "register"
version = "0.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "deaba5b0e477d21f61a57504bb5cef4a1e86de30300b457d38971c1cfc98b815"
dependencies = [
"tock-registers 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
"tock-registers",
]
[[package]]
name = "tock-registers"
version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
[metadata]
"checksum cortex-a 3.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "6922a40af4d1a2deac8c963b9f3e57311b8912490740234f1ad182425c547f80"
"checksum register 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "deaba5b0e477d21f61a57504bb5cef4a1e86de30300b457d38971c1cfc98b815"
"checksum tock-registers 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "70323afdb8082186c0986da0e10f6e4ed103d681c921c00597e98d9806dac20f"
checksum = "70323afdb8082186c0986da0e10f6e4ed103d681c921c00597e98d9806dac20f"

2
09_hw_debug_JTAG/Cargo.toml
Unescape Escape View File

@ -13,5 +13,5 @@ bsp_rpi4 = ["cortex-a", "register"]
[dependencies]
# Optional dependencies
cortex-a = { version = "3.0.x", optional = true }
cortex-a = { version = "4.x.x", optional = true }
register = { version = "0.5.x", optional = true }

3
09_hw_debug_JTAG/src/_arch/aarch64/time.rs
Unescape Escape View File

@ -68,6 +68,7 @@ impl time::interface::TimeManager for GenericTimer {
// Check if it is within supported bounds.
let warn: Option<&str> = if tval == 0 {
Some("smaller")
// The upper 32 bits of CNTP_TVAL_EL0 are reserved.
} else if tval > u32::max_value().into() {
Some("bigger")
} else {
@ -83,7 +84,7 @@ impl time::interface::TimeManager for GenericTimer {
}
// Set the compare value register.
CNTP_TVAL_EL0.set(tval as u32);
CNTP_TVAL_EL0.set(tval);
// Kick off the counting. // Disable timer interrupt.
CNTP_CTL_EL0.modify(CNTP_CTL_EL0::ENABLE::SET + CNTP_CTL_EL0::IMASK::SET);

18
10_privilege_level/Cargo.lock generated
Unescape Escape View File

@ -2,34 +2,32 @@
# It is not intended for manual editing.
[[package]]
name = "cortex-a"
version = "3.0.4"
version = "4.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "eda21b8ec67b82099401559fe28cea4508eb1e33217b4dacf60ba22e39b486b1"
dependencies = [
"register 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
"register",
]
[[package]]
name = "kernel"
version = "0.1.0"
dependencies = [
"cortex-a 3.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
"register 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
"cortex-a",
"register",
]
[[package]]
name = "register"
version = "0.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "deaba5b0e477d21f61a57504bb5cef4a1e86de30300b457d38971c1cfc98b815"
dependencies = [
"tock-registers 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
"tock-registers",
]
[[package]]
name = "tock-registers"
version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
[metadata]
"checksum cortex-a 3.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "6922a40af4d1a2deac8c963b9f3e57311b8912490740234f1ad182425c547f80"
"checksum register 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "deaba5b0e477d21f61a57504bb5cef4a1e86de30300b457d38971c1cfc98b815"
"checksum tock-registers 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "70323afdb8082186c0986da0e10f6e4ed103d681c921c00597e98d9806dac20f"
checksum = "70323afdb8082186c0986da0e10f6e4ed103d681c921c00597e98d9806dac20f"

2
10_privilege_level/Cargo.toml
Unescape Escape View File

@ -13,5 +13,5 @@ bsp_rpi4 = ["cortex-a", "register"]
[dependencies]
# Optional dependencies
cortex-a = { version = "3.0.x", optional = true }
cortex-a = { version = "4.x.x", optional = true }
register = { version = "0.5.x", optional = true }

10
10_privilege_level/README.md
Unescape Escape View File

@ -308,7 +308,7 @@ diff -uNr 09_hw_debug_JTAG/src/_arch/aarch64/exception/asynchronous.rs 10_privil
+//--------------------------------------------------------------------------------------------------
+
+trait DaifField {
+ fn daif_field() -> register::Field<u32, DAIF::Register>;
+ fn daif_field() -> register::Field<u64, DAIF::Register>;
+}
+
+struct Debug;
@ -321,25 +321,25 @@ diff -uNr 09_hw_debug_JTAG/src/_arch/aarch64/exception/asynchronous.rs 10_privil
+//--------------------------------------------------------------------------------------------------
+
+impl DaifField for Debug {
+ fn daif_field() -> register::Field<u32, DAIF::Register> {
+ fn daif_field() -> register::Field<u64, DAIF::Register> {
+ DAIF::D
+ }
+}
+
+impl DaifField for SError {
+ fn daif_field() -> register::Field<u32, DAIF::Register> {
+ fn daif_field() -> register::Field<u64, DAIF::Register> {
+ DAIF::A
+ }
+}
+
+impl DaifField for IRQ {
+ fn daif_field() -> register::Field<u32, DAIF::Register> {
+ fn daif_field() -> register::Field<u64, DAIF::Register> {
+ DAIF::I
+ }
+}
+
+impl DaifField for FIQ {
+ fn daif_field() -> register::Field<u32, DAIF::Register> {
+ fn daif_field() -> register::Field<u64, DAIF::Register> {
+ DAIF::F
+ }
+}

10
10_privilege_level/src/_arch/aarch64/exception/asynchronous.rs
Unescape Escape View File

@ -11,7 +11,7 @@ use cortex_a::regs::*;
//--------------------------------------------------------------------------------------------------
trait DaifField {
fn daif_field() -> register::Field<u32, DAIF::Register>;
fn daif_field() -> register::Field<u64, DAIF::Register>;
}
struct Debug;
@ -24,25 +24,25 @@ struct FIQ;
//--------------------------------------------------------------------------------------------------
impl DaifField for Debug {
fn daif_field() -> register::Field<u32, DAIF::Register> {
fn daif_field() -> register::Field<u64, DAIF::Register> {
DAIF::D
}
}
impl DaifField for SError {
fn daif_field() -> register::Field<u32, DAIF::Register> {
fn daif_field() -> register::Field<u64, DAIF::Register> {
DAIF::A
}
}
impl DaifField for IRQ {
fn daif_field() -> register::Field<u32, DAIF::Register> {
fn daif_field() -> register::Field<u64, DAIF::Register> {
DAIF::I
}
}
impl DaifField for FIQ {
fn daif_field() -> register::Field<u32, DAIF::Register> {
fn daif_field() -> register::Field<u64, DAIF::Register> {
DAIF::F
}
}

3
10_privilege_level/src/_arch/aarch64/time.rs
Unescape Escape View File

@ -68,6 +68,7 @@ impl time::interface::TimeManager for GenericTimer {
// Check if it is within supported bounds.
let warn: Option<&str> = if tval == 0 {
Some("smaller")
// The upper 32 bits of CNTP_TVAL_EL0 are reserved.
} else if tval > u32::max_value().into() {
Some("bigger")
} else {
@ -83,7 +84,7 @@ impl time::interface::TimeManager for GenericTimer {
}
// Set the compare value register.
CNTP_TVAL_EL0.set(tval as u32);
CNTP_TVAL_EL0.set(tval);
// Kick off the counting. // Disable timer interrupt.
CNTP_CTL_EL0.modify(CNTP_CTL_EL0::ENABLE::SET + CNTP_CTL_EL0::IMASK::SET);

18
11_virtual_mem_part1_identity_mapping/Cargo.lock generated
Unescape Escape View File

@ -2,34 +2,32 @@
# It is not intended for manual editing.
[[package]]
name = "cortex-a"
version = "3.0.4"
version = "4.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "eda21b8ec67b82099401559fe28cea4508eb1e33217b4dacf60ba22e39b486b1"
dependencies = [
"register 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
"register",
]
[[package]]
name = "kernel"
version = "0.1.0"
dependencies = [
"cortex-a 3.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
"register 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
"cortex-a",
"register",
]
[[package]]
name = "register"
version = "0.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "deaba5b0e477d21f61a57504bb5cef4a1e86de30300b457d38971c1cfc98b815"
dependencies = [
"tock-registers 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
"tock-registers",
]
[[package]]
name = "tock-registers"
version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
[metadata]
"checksum cortex-a 3.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "6922a40af4d1a2deac8c963b9f3e57311b8912490740234f1ad182425c547f80"
"checksum register 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "deaba5b0e477d21f61a57504bb5cef4a1e86de30300b457d38971c1cfc98b815"
"checksum tock-registers 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "70323afdb8082186c0986da0e10f6e4ed103d681c921c00597e98d9806dac20f"
checksum = "70323afdb8082186c0986da0e10f6e4ed103d681c921c00597e98d9806dac20f"

2
11_virtual_mem_part1_identity_mapping/Cargo.toml
Unescape Escape View File

@ -13,5 +13,5 @@ bsp_rpi4 = ["cortex-a", "register"]
[dependencies]
# Optional dependencies
cortex-a = { version = "3.0.x", optional = true }
cortex-a = { version = "4.x.x", optional = true }
register = { version = "0.5.x", optional = true }

10
11_virtual_mem_part1_identity_mapping/src/_arch/aarch64/exception/asynchronous.rs
Unescape Escape View File

@ -11,7 +11,7 @@ use cortex_a::regs::*;
//--------------------------------------------------------------------------------------------------
trait DaifField {
fn daif_field() -> register::Field<u32, DAIF::Register>;
fn daif_field() -> register::Field<u64, DAIF::Register>;
}
struct Debug;
@ -24,25 +24,25 @@ struct FIQ;
//--------------------------------------------------------------------------------------------------
impl DaifField for Debug {
fn daif_field() -> register::Field<u32, DAIF::Register> {
fn daif_field() -> register::Field<u64, DAIF::Register> {
DAIF::D
}
}
impl DaifField for SError {
fn daif_field() -> register::Field<u32, DAIF::Register> {
fn daif_field() -> register::Field<u64, DAIF::Register> {
DAIF::A
}
}
impl DaifField for IRQ {
fn daif_field() -> register::Field<u32, DAIF::Register> {
fn daif_field() -> register::Field<u64, DAIF::Register> {
DAIF::I
}
}
impl DaifField for FIQ {
fn daif_field() -> register::Field<u32, DAIF::Register> {
fn daif_field() -> register::Field<u64, DAIF::Register> {
DAIF::F
}
}

3
11_virtual_mem_part1_identity_mapping/src/_arch/aarch64/time.rs
Unescape Escape View File

@ -68,6 +68,7 @@ impl time::interface::TimeManager for GenericTimer {
// Check if it is within supported bounds.
let warn: Option<&str> = if tval == 0 {
Some("smaller")
// The upper 32 bits of CNTP_TVAL_EL0 are reserved.
} else if tval > u32::max_value().into() {
Some("bigger")
} else {
@ -83,7 +84,7 @@ impl time::interface::TimeManager for GenericTimer {
}
// Set the compare value register.
CNTP_TVAL_EL0.set(tval as u32);
CNTP_TVAL_EL0.set(tval);
// Kick off the counting. // Disable timer interrupt.
CNTP_CTL_EL0.modify(CNTP_CTL_EL0::ENABLE::SET + CNTP_CTL_EL0::IMASK::SET);

18
12_exceptions_part1_groundwork/Cargo.lock generated
Unescape Escape View File

@ -2,34 +2,32 @@
# It is not intended for manual editing.
[[package]]
name = "cortex-a"
version = "3.0.4"
version = "4.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "eda21b8ec67b82099401559fe28cea4508eb1e33217b4dacf60ba22e39b486b1"
dependencies = [
"register 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
"register",
]
[[package]]
name = "kernel"
version = "0.1.0"
dependencies = [
"cortex-a 3.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
"register 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
"cortex-a",
"register",
]
[[package]]
name = "register"
version = "0.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "deaba5b0e477d21f61a57504bb5cef4a1e86de30300b457d38971c1cfc98b815"
dependencies = [
"tock-registers 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
"tock-registers",
]
[[package]]
name = "tock-registers"
version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
[metadata]
"checksum cortex-a 3.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "6922a40af4d1a2deac8c963b9f3e57311b8912490740234f1ad182425c547f80"
"checksum register 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "deaba5b0e477d21f61a57504bb5cef4a1e86de30300b457d38971c1cfc98b815"
"checksum tock-registers 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "70323afdb8082186c0986da0e10f6e4ed103d681c921c00597e98d9806dac20f"
checksum = "70323afdb8082186c0986da0e10f6e4ed103d681c921c00597e98d9806dac20f"

2
12_exceptions_part1_groundwork/Cargo.toml
Unescape Escape View File

@ -13,5 +13,5 @@ bsp_rpi4 = ["cortex-a", "register"]
[dependencies]
# Optional dependencies
cortex-a = { version = "3.0.x", optional = true }
cortex-a = { version = "4.x.x", optional = true }
register = { version = "0.5.x", optional = true }

4
12_exceptions_part1_groundwork/README.md
Unescape Escape View File

@ -499,7 +499,7 @@ diff -uNr 11_virtual_mem_part1_identity_mapping/src/_arch/aarch64/exception.rs 1
+
+/// Wrapper struct for memory copy of SPSR_EL1.
+#[repr(transparent)]
+struct SpsrEL1(InMemoryRegister<u32, SPSR_EL1::Register>);
+struct SpsrEL1(InMemoryRegister<u64, SPSR_EL1::Register>);
+
+/// The exception context as it is stored on the stack on exception entry.
+#[repr(C)]
@ -774,7 +774,7 @@ diff -uNr 11_virtual_mem_part1_identity_mapping/src/_arch/aarch64/exception.S 12
+ mrs x2, SPSR_EL1
+
+ stp lr, x1, [sp, #16 * 15]
+ str w2, [sp, #16 * 16]
+ str x2, [sp, #16 * 16]
+
+ // x0 is the first argument for the function called through `\handler`.
+ mov x0, sp

2
12_exceptions_part1_groundwork/src/_arch/aarch64/exception.S
Unescape Escape View File

@ -30,7 +30,7 @@
mrs x2, SPSR_EL1
stp lr, x1, [sp, #16 * 15]
str w2, [sp, #16 * 16]
str x2, [sp, #16 * 16]
// x0 is the first argument for the function called through `\handler`.
mov x0, sp

2
12_exceptions_part1_groundwork/src/_arch/aarch64/exception.rs
Unescape Escape View File

@ -17,7 +17,7 @@ global_asm!(include_str!("exception.S"));
/// Wrapper struct for memory copy of SPSR_EL1.
#[repr(transparent)]
struct SpsrEL1(InMemoryRegister<u32, SPSR_EL1::Register>);
struct SpsrEL1(InMemoryRegister<u64, SPSR_EL1::Register>);
/// The exception context as it is stored on the stack on exception entry.
#[repr(C)]

10
12_exceptions_part1_groundwork/src/_arch/aarch64/exception/asynchronous.rs
Unescape Escape View File

@ -11,7 +11,7 @@ use cortex_a::regs::*;
//--------------------------------------------------------------------------------------------------
trait DaifField {
fn daif_field() -> register::Field<u32, DAIF::Register>;
fn daif_field() -> register::Field<u64, DAIF::Register>;
}
struct Debug;
@ -24,25 +24,25 @@ struct FIQ;
//--------------------------------------------------------------------------------------------------
impl DaifField for Debug {
fn daif_field() -> register::Field<u32, DAIF::Register> {
fn daif_field() -> register::Field<u64, DAIF::Register> {
DAIF::D
}
}
impl DaifField for SError {
fn daif_field() -> register::Field<u32, DAIF::Register> {
fn daif_field() -> register::Field<u64, DAIF::Register> {
DAIF::A
}
}
impl DaifField for IRQ {
fn daif_field() -> register::Field<u32, DAIF::Register> {
fn daif_field() -> register::Field<u64, DAIF::Register> {
DAIF::I
}
}
impl DaifField for FIQ {
fn daif_field() -> register::Field<u32, DAIF::Register> {
fn daif_field() -> register::Field<u64, DAIF::Register> {
DAIF::F
}
}

3
12_exceptions_part1_groundwork/src/_arch/aarch64/time.rs
Unescape Escape View File

@ -68,6 +68,7 @@ impl time::interface::TimeManager for GenericTimer {
// Check if it is within supported bounds.
let warn: Option<&str> = if tval == 0 {
Some("smaller")
// The upper 32 bits of CNTP_TVAL_EL0 are reserved.
} else if tval > u32::max_value().into() {
Some("bigger")
} else {
@ -83,7 +84,7 @@ impl time::interface::TimeManager for GenericTimer {
}
// Set the compare value register.
CNTP_TVAL_EL0.set(tval as u32);
CNTP_TVAL_EL0.set(tval);
// Kick off the counting. // Disable timer interrupt.
CNTP_CTL_EL0.modify(CNTP_CTL_EL0::ENABLE::SET + CNTP_CTL_EL0::IMASK::SET);

12
13_integrated_testing/Cargo.lock generated
Unescape Escape View File

@ -2,9 +2,9 @@
# It is not intended for manual editing.
[[package]]
name = "cortex-a"
version = "3.0.4"
version = "4.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6922a40af4d1a2deac8c963b9f3e57311b8912490740234f1ad182425c547f80"
checksum = "eda21b8ec67b82099401559fe28cea4508eb1e33217b4dacf60ba22e39b486b1"
dependencies = [
"register",
]
@ -22,9 +22,9 @@ dependencies = [
[[package]]
name = "proc-macro2"
version = "1.0.23"
version = "1.0.24"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "51ef7cd2518ead700af67bf9d1a658d90b6037d77110fd9c0445429d0ba1c6c9"
checksum = "1e0704ee1a7e00d7bb417d0770ea303c1bccbabf0ef1667dae92b5967f5f8a71"
dependencies = [
"unicode-xid",
]
@ -55,9 +55,9 @@ dependencies = [
[[package]]
name = "syn"
version = "1.0.42"
version = "1.0.48"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9c51d92969d209b54a98397e1b91c8ae82d8c87a7bb87df0b29aa2ad81454228"
checksum = "cc371affeffc477f42a221a1e4297aedcea33d47d19b61455588bd9d8f6b19ac"
dependencies = [
"proc-macro2",
"quote",

2
13_integrated_testing/Cargo.toml
Unescape Escape View File

@ -15,7 +15,7 @@ qemu-exit = "1.0.x"
test-types = { path = "test-types" }
# Optional dependencies
cortex-a = { version = "3.0.x", optional = true }
cortex-a = { version = "4.x.x", optional = true }
register = { version = "0.5.x", features = ["no_std_unit_tests"], optional = true }
##--------------------------------------------------------------------------------------------------

2
13_integrated_testing/README.md
Unescape Escape View File

@ -805,7 +805,7 @@ diff -uNr 12_exceptions_part1_groundwork/Cargo.toml 13_integrated_testing/Cargo.
+test-types = { path = "test-types" }
# Optional dependencies
cortex-a = { version = "3.0.x", optional = true }
cortex-a = { version = "4.x.x", optional = true }
-register = { version = "0.5.x", optional = true }
+register = { version = "0.5.x", features = ["no_std_unit_tests"], optional = true }
+

2
13_integrated_testing/src/_arch/aarch64/exception.S
Unescape Escape View File

@ -30,7 +30,7 @@
mrs x2, SPSR_EL1
stp lr, x1, [sp, #16 * 15]
str w2, [sp, #16 * 16]
str x2, [sp, #16 * 16]
// x0 is the first argument for the function called through `\handler`.
mov x0, sp

2
13_integrated_testing/src/_arch/aarch64/exception.rs
Unescape Escape View File

@ -17,7 +17,7 @@ global_asm!(include_str!("exception.S"));
/// Wrapper struct for memory copy of SPSR_EL1.
#[repr(transparent)]
struct SpsrEL1(InMemoryRegister<u32, SPSR_EL1::Register>);
struct SpsrEL1(InMemoryRegister<u64, SPSR_EL1::Register>);
/// The exception context as it is stored on the stack on exception entry.
#[repr(C)]

10
13_integrated_testing/src/_arch/aarch64/exception/asynchronous.rs
Unescape Escape View File

@ -11,7 +11,7 @@ use cortex_a::regs::*;
//--------------------------------------------------------------------------------------------------
trait DaifField {
fn daif_field() -> register::Field<u32, DAIF::Register>;
fn daif_field() -> register::Field<u64, DAIF::Register>;
}
struct Debug;
@ -24,25 +24,25 @@ struct FIQ;
//--------------------------------------------------------------------------------------------------
impl DaifField for Debug {
fn daif_field() -> register::Field<u32, DAIF::Register> {
fn daif_field() -> register::Field<u64, DAIF::Register> {
DAIF::D
}
}
impl DaifField for SError {
fn daif_field() -> register::Field<u32, DAIF::Register> {
fn daif_field() -> register::Field<u64, DAIF::Register> {
DAIF::A
}
}
impl DaifField for IRQ {
fn daif_field() -> register::Field<u32, DAIF::Register> {
fn daif_field() -> register::Field<u64, DAIF::Register> {
DAIF::I
}
}
impl DaifField for FIQ {
fn daif_field() -> register::Field<u32, DAIF::Register> {
fn daif_field() -> register::Field<u64, DAIF::Register> {
DAIF::F
}
}

3
13_integrated_testing/src/_arch/aarch64/time.rs
Unescape Escape View File

@ -68,6 +68,7 @@ impl time::interface::TimeManager for GenericTimer {
// Check if it is within supported bounds.
let warn: Option<&str> = if tval == 0 {
Some("smaller")
// The upper 32 bits of CNTP_TVAL_EL0 are reserved.
} else if tval > u32::max_value().into() {
Some("bigger")
} else {
@ -83,7 +84,7 @@ impl time::interface::TimeManager for GenericTimer {
}
// Set the compare value register.
CNTP_TVAL_EL0.set(tval as u32);
CNTP_TVAL_EL0.set(tval);
// Kick off the counting. // Disable timer interrupt.
CNTP_CTL_EL0.modify(CNTP_CTL_EL0::ENABLE::SET + CNTP_CTL_EL0::IMASK::SET);

12
14_exceptions_part2_peripheral_IRQs/Cargo.lock generated
Unescape Escape View File

@ -2,9 +2,9 @@
# It is not intended for manual editing.
[[package]]
name = "cortex-a"
version = "3.0.4"
version = "4.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6922a40af4d1a2deac8c963b9f3e57311b8912490740234f1ad182425c547f80"
checksum = "eda21b8ec67b82099401559fe28cea4508eb1e33217b4dacf60ba22e39b486b1"
dependencies = [
"register",
]
@ -22,9 +22,9 @@ dependencies = [
[[package]]
name = "proc-macro2"
version = "1.0.23"
version = "1.0.24"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "51ef7cd2518ead700af67bf9d1a658d90b6037d77110fd9c0445429d0ba1c6c9"
checksum = "1e0704ee1a7e00d7bb417d0770ea303c1bccbabf0ef1667dae92b5967f5f8a71"
dependencies = [
"unicode-xid",
]
@ -55,9 +55,9 @@ dependencies = [
[[package]]
name = "syn"
version = "1.0.42"
version = "1.0.48"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9c51d92969d209b54a98397e1b91c8ae82d8c87a7bb87df0b29aa2ad81454228"
checksum = "cc371affeffc477f42a221a1e4297aedcea33d47d19b61455588bd9d8f6b19ac"
dependencies = [
"proc-macro2",
"quote",

2
14_exceptions_part2_peripheral_IRQs/Cargo.toml
Unescape Escape View File

@ -15,7 +15,7 @@ qemu-exit = "1.0.x"
test-types = { path = "test-types" }
# Optional dependencies
cortex-a = { version = "3.0.x", optional = true }
cortex-a = { version = "4.x.x", optional = true }
register = { version = "0.5.x", features = ["no_std_unit_tests"], optional = true }
##--------------------------------------------------------------------------------------------------

6
14_exceptions_part2_peripheral_IRQs/README.md
Unescape Escape View File

@ -770,7 +770,7 @@ diff -uNr 13_integrated_testing/src/_arch/aarch64/exception/asynchronous.rs 14_e
+}
+
trait DaifField {
fn daif_field() -> register::Field<u32, DAIF::Register>;
fn daif_field() -> register::Field<u64, DAIF::Register>;
}
@@ -55,6 +59,71 @@
// Public Code
@ -823,7 +823,7 @@ diff -uNr 13_integrated_testing/src/_arch/aarch64/exception/asynchronous.rs 14_e
+///
+/// - Changes the HW state of the executing core.
+#[inline(always)]
+pub unsafe fn local_irq_mask_save() -> u32 {
+pub unsafe fn local_irq_mask_save() -> u64 {
+ let saved = DAIF.get();
+ local_irq_mask();
+
@ -837,7 +837,7 @@ diff -uNr 13_integrated_testing/src/_arch/aarch64/exception/asynchronous.rs 14_e
+/// - Changes the HW state of the executing core.
+/// - No sanity checks on the input.
+#[inline(always)]
+pub unsafe fn local_irq_restore(saved: u32) {
+pub unsafe fn local_irq_restore(saved: u64) {
+ DAIF.set(saved);
+}
+

2
14_exceptions_part2_peripheral_IRQs/src/_arch/aarch64/exception.S
Unescape Escape View File

@ -30,7 +30,7 @@
mrs x2, SPSR_EL1
stp lr, x1, [sp, #16 * 15]
str w2, [sp, #16 * 16]
str x2, [sp, #16 * 16]
// x0 is the first argument for the function called through `\handler`.
mov x0, sp

2
14_exceptions_part2_peripheral_IRQs/src/_arch/aarch64/exception.rs
Unescape Escape View File

@ -18,7 +18,7 @@ global_asm!(include_str!("exception.S"));
/// Wrapper struct for memory copy of SPSR_EL1.
#[repr(transparent)]
struct SpsrEL1(InMemoryRegister<u32, SPSR_EL1::Register>);
struct SpsrEL1(InMemoryRegister<u64, SPSR_EL1::Register>);
/// The exception context as it is stored on the stack on exception entry.
#[repr(C)]

14
14_exceptions_part2_peripheral_IRQs/src/_arch/aarch64/exception/asynchronous.rs
Unescape Escape View File

@ -15,7 +15,7 @@ mod daif_bits {
}
trait DaifField {
fn daif_field() -> register::Field<u32, DAIF::Register>;
fn daif_field() -> register::Field<u64, DAIF::Register>;
}
struct Debug;
@ -28,25 +28,25 @@ struct FIQ;
//--------------------------------------------------------------------------------------------------
impl DaifField for Debug {
fn daif_field() -> register::Field<u32, DAIF::Register> {
fn daif_field() -> register::Field<u64, DAIF::Register> {
DAIF::D
}
}
impl DaifField for SError {
fn daif_field() -> register::Field<u32, DAIF::Register> {
fn daif_field() -> register::Field<u64, DAIF::Register> {
DAIF::A
}
}
impl DaifField for IRQ {
fn daif_field() -> register::Field<u32, DAIF::Register> {
fn daif_field() -> register::Field<u64, DAIF::Register> {
DAIF::I
}
}
impl DaifField for FIQ {
fn daif_field() -> register::Field<u32, DAIF::Register> {
fn daif_field() -> register::Field<u64, DAIF::Register> {
DAIF::F
}
}
@ -106,7 +106,7 @@ pub unsafe fn local_irq_mask() {
///
/// - Changes the HW state of the executing core.
#[inline(always)]
pub unsafe fn local_irq_mask_save() -> u32 {
pub unsafe fn local_irq_mask_save() -> u64 {
let saved = DAIF.get();
local_irq_mask();
@ -120,7 +120,7 @@ pub unsafe fn local_irq_mask_save() -> u32 {
/// - Changes the HW state of the executing core.
/// - No sanity checks on the input.
#[inline(always)]
pub unsafe fn local_irq_restore(saved: u32) {
pub unsafe fn local_irq_restore(saved: u64) {
DAIF.set(saved);
}

3
14_exceptions_part2_peripheral_IRQs/src/_arch/aarch64/time.rs
Unescape Escape View File

@ -68,6 +68,7 @@ impl time::interface::TimeManager for GenericTimer {
// Check if it is within supported bounds.
let warn: Option<&str> = if tval == 0 {
Some("smaller")
// The upper 32 bits of CNTP_TVAL_EL0 are reserved.
} else if tval > u32::max_value().into() {
Some("bigger")
} else {
@ -83,7 +84,7 @@ impl time::interface::TimeManager for GenericTimer {
}
// Set the compare value register.
CNTP_TVAL_EL0.set(tval as u32);
CNTP_TVAL_EL0.set(tval);
// Kick off the counting. // Disable timer interrupt.
CNTP_CTL_EL0.modify(CNTP_CTL_EL0::ENABLE::SET + CNTP_CTL_EL0::IMASK::SET);

12
15_virtual_mem_part2_mmio_remap/Cargo.lock generated
Unescape Escape View File

@ -2,9 +2,9 @@
# It is not intended for manual editing.
[[package]]
name = "cortex-a"
version = "3.0.4"
version = "4.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6922a40af4d1a2deac8c963b9f3e57311b8912490740234f1ad182425c547f80"
checksum = "eda21b8ec67b82099401559fe28cea4508eb1e33217b4dacf60ba22e39b486b1"
dependencies = [
"register",
]
@ -22,9 +22,9 @@ dependencies = [
[[package]]
name = "proc-macro2"
version = "1.0.23"
version = "1.0.24"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "51ef7cd2518ead700af67bf9d1a658d90b6037d77110fd9c0445429d0ba1c6c9"
checksum = "1e0704ee1a7e00d7bb417d0770ea303c1bccbabf0ef1667dae92b5967f5f8a71"
dependencies = [
"unicode-xid",
]
@ -55,9 +55,9 @@ dependencies = [
[[package]]
name = "syn"
version = "1.0.42"
version = "1.0.48"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9c51d92969d209b54a98397e1b91c8ae82d8c87a7bb87df0b29aa2ad81454228"
checksum = "cc371affeffc477f42a221a1e4297aedcea33d47d19b61455588bd9d8f6b19ac"
dependencies = [
"proc-macro2",
"quote",

2
15_virtual_mem_part2_mmio_remap/Cargo.toml
Unescape Escape View File

@ -15,7 +15,7 @@ qemu-exit = "1.0.x"
test-types = { path = "test-types" }
# Optional dependencies
cortex-a = { version = "3.0.x", optional = true }
cortex-a = { version = "4.x.x", optional = true }
register = { version = "0.5.x", features = ["no_std_unit_tests"], optional = true }
##--------------------------------------------------------------------------------------------------

13
15_virtual_mem_part2_mmio_remap/README.md
Unescape Escape View File

@ -782,6 +782,19 @@ diff -uNr 14_exceptions_part2_peripheral_IRQs/src/_arch/aarch64/memory/mmu.rs 15
assert!(bss_range.contains(&kernel_tables_addr));
}
diff -uNr 14_exceptions_part2_peripheral_IRQs/src/_arch/aarch64/time.rs 15_virtual_mem_part2_mmio_remap/src/_arch/aarch64/time.rs
--- 14_exceptions_part2_peripheral_IRQs/src/_arch/aarch64/time.rs
+++ 15_virtual_mem_part2_mmio_remap/src/_arch/aarch64/time.rs
@@ -55,7 +55,7 @@
}
// Calculate the register compare value.
- let frq = CNTFRQ_EL0.get() as u64;
+ let frq = CNTFRQ_EL0.get();
let x = match frq.checked_mul(duration.as_nanos() as u64) {
None => {
warn!("Spin duration too long, skipping");
diff -uNr 14_exceptions_part2_peripheral_IRQs/src/bsp/device_driver/arm/gicv2/gicc.rs 15_virtual_mem_part2_mmio_remap/src/bsp/device_driver/arm/gicv2/gicc.rs
--- 14_exceptions_part2_peripheral_IRQs/src/bsp/device_driver/arm/gicv2/gicc.rs
+++ 15_virtual_mem_part2_mmio_remap/src/bsp/device_driver/arm/gicv2/gicc.rs

2
15_virtual_mem_part2_mmio_remap/src/_arch/aarch64/exception.S
Unescape Escape View File

@ -30,7 +30,7 @@
mrs x2, SPSR_EL1
stp lr, x1, [sp, #16 * 15]
str w2, [sp, #16 * 16]
str x2, [sp, #16 * 16]
// x0 is the first argument for the function called through `\handler`.
mov x0, sp

2
15_virtual_mem_part2_mmio_remap/src/_arch/aarch64/exception.rs
Unescape Escape View File

@ -18,7 +18,7 @@ global_asm!(include_str!("exception.S"));
/// Wrapper struct for memory copy of SPSR_EL1.
#[repr(transparent)]
struct SpsrEL1(InMemoryRegister<u32, SPSR_EL1::Register>);
struct SpsrEL1(InMemoryRegister<u64, SPSR_EL1::Register>);
/// The exception context as it is stored on the stack on exception entry.
#[repr(C)]

14
15_virtual_mem_part2_mmio_remap/src/_arch/aarch64/exception/asynchronous.rs
Unescape Escape View File

@ -15,7 +15,7 @@ mod daif_bits {
}
trait DaifField {
fn daif_field() -> register::Field<u32, DAIF::Register>;
fn daif_field() -> register::Field<u64, DAIF::Register>;
}
struct Debug;
@ -28,25 +28,25 @@ struct FIQ;
//--------------------------------------------------------------------------------------------------
impl DaifField for Debug {
fn daif_field() -> register::Field<u32, DAIF::Register> {
fn daif_field() -> register::Field<u64, DAIF::Register> {
DAIF::D
}
}
impl DaifField for SError {
fn daif_field() -> register::Field<u32, DAIF::Register> {
fn daif_field() -> register::Field<u64, DAIF::Register> {
DAIF::A
}
}
impl DaifField for IRQ {
fn daif_field() -> register::Field<u32, DAIF::Register> {
fn daif_field() -> register::Field<u64, DAIF::Register> {
DAIF::I
}
}
impl DaifField for FIQ {
fn daif_field() -> register::Field<u32, DAIF::Register> {
fn daif_field() -> register::Field<u64, DAIF::Register> {
DAIF::F
}
}
@ -106,7 +106,7 @@ pub unsafe fn local_irq_mask() {
///
/// - Changes the HW state of the executing core.
#[inline(always)]
pub unsafe fn local_irq_mask_save() -> u32 {
pub unsafe fn local_irq_mask_save() -> u64 {
let saved = DAIF.get();
local_irq_mask();
@ -120,7 +120,7 @@ pub unsafe fn local_irq_mask_save() -> u32 {
/// - Changes the HW state of the executing core.
/// - No sanity checks on the input.
#[inline(always)]
pub unsafe fn local_irq_restore(saved: u32) {
pub unsafe fn local_irq_restore(saved: u64) {
DAIF.set(saved);
}

5
15_virtual_mem_part2_mmio_remap/src/_arch/aarch64/time.rs
Unescape Escape View File

@ -55,7 +55,7 @@ impl time::interface::TimeManager for GenericTimer {
}
// Calculate the register compare value.
let frq = CNTFRQ_EL0.get() as u64;
let frq = CNTFRQ_EL0.get();
let x = match frq.checked_mul(duration.as_nanos() as u64) {
None => {
warn!("Spin duration too long, skipping");
@ -68,6 +68,7 @@ impl time::interface::TimeManager for GenericTimer {
// Check if it is within supported bounds.
let warn: Option<&str> = if tval == 0 {
Some("smaller")
// The upper 32 bits of CNTP_TVAL_EL0 are reserved.
} else if tval > u32::max_value().into() {
Some("bigger")
} else {
@ -83,7 +84,7 @@ impl time::interface::TimeManager for GenericTimer {
}
// Set the compare value register.
CNTP_TVAL_EL0.set(tval as u32);
CNTP_TVAL_EL0.set(tval);
// Kick off the counting. // Disable timer interrupt.
CNTP_CTL_EL0.modify(CNTP_CTL_EL0::ENABLE::SET + CNTP_CTL_EL0::IMASK::SET);

18
X1_JTAG_boot/Cargo.lock generated
Unescape Escape View File

@ -2,34 +2,32 @@
# It is not intended for manual editing.
[[package]]
name = "cortex-a"
version = "3.0.4"
version = "4.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "eda21b8ec67b82099401559fe28cea4508eb1e33217b4dacf60ba22e39b486b1"
dependencies = [
"register 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
"register",
]
[[package]]
name = "kernel"
version = "0.1.0"
dependencies = [
"cortex-a 3.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
"register 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
"cortex-a",
"register",
]
[[package]]
name = "register"
version = "0.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "deaba5b0e477d21f61a57504bb5cef4a1e86de30300b457d38971c1cfc98b815"
dependencies = [
"tock-registers 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
"tock-registers",
]
[[package]]
name = "tock-registers"
version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
[metadata]
"checksum cortex-a 3.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "6922a40af4d1a2deac8c963b9f3e57311b8912490740234f1ad182425c547f80"
"checksum register 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "deaba5b0e477d21f61a57504bb5cef4a1e86de30300b457d38971c1cfc98b815"
"checksum tock-registers 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "70323afdb8082186c0986da0e10f6e4ed103d681c921c00597e98d9806dac20f"
checksum = "70323afdb8082186c0986da0e10f6e4ed103d681c921c00597e98d9806dac20f"

2
X1_JTAG_boot/Cargo.toml
Unescape Escape View File

@ -13,5 +13,5 @@ bsp_rpi4 = ["cortex-a", "register"]
[dependencies]
# Optional dependencies
cortex-a = { version = "3.0.x", optional = true }
cortex-a = { version = "4.x.x", optional = true }
register = { version = "0.5.x", optional = true }

BIN
X1_JTAG_boot/jtag_boot_rpi3.img
View File

Binary file not shown.

BIN
X1_JTAG_boot/jtag_boot_rpi4.img
View File

Binary file not shown.

3
X1_JTAG_boot/src/_arch/aarch64/time.rs
Unescape Escape View File

@ -68,6 +68,7 @@ impl time::interface::TimeManager for GenericTimer {
// Check if it is within supported bounds.
let warn: Option<&str> = if tval == 0 {
Some("smaller")
// The upper 32 bits of CNTP_TVAL_EL0 are reserved.
} else if tval > u32::max_value().into() {
Some("bigger")
} else {
@ -83,7 +84,7 @@ impl time::interface::TimeManager for GenericTimer {
}
// Set the compare value register.
CNTP_TVAL_EL0.set(tval as u32);
CNTP_TVAL_EL0.set(tval);
// Kick off the counting. // Disable timer interrupt.
CNTP_CTL_EL0.modify(CNTP_CTL_EL0::ENABLE::SET + CNTP_CTL_EL0::IMASK::SET);

Write Preview
Loading…
Cancel
Save