From 7014c0cdfd6c5bff4cb5a6267ae03e2186cf4467 Mon Sep 17 00:00:00 2001 From: Andre Richter Date: Mon, 26 Sep 2022 23:15:07 +0200 Subject: [PATCH] Bump dependencies --- 02_runtime_init/Cargo.lock | 8 ++++---- 02_runtime_init/Cargo.toml | 2 +- 02_runtime_init/README.md | 2 +- 03_hacky_hello_world/Cargo.lock | 8 ++++---- 03_hacky_hello_world/Cargo.toml | 2 +- 04_safe_globals/Cargo.lock | 8 ++++---- 04_safe_globals/Cargo.toml | 2 +- 05_drivers_gpio_uart/Cargo.lock | 8 ++++---- 05_drivers_gpio_uart/Cargo.toml | 4 ++-- 05_drivers_gpio_uart/README.md | 4 ++-- 06_uart_chainloader/Cargo.lock | 8 ++++---- 06_uart_chainloader/Cargo.toml | 4 ++-- 06_uart_chainloader/demo_payload_rpi3.img | Bin 7648 -> 7648 bytes 06_uart_chainloader/demo_payload_rpi4.img | Bin 7576 -> 7584 bytes 07_timestamps/Cargo.lock | 8 ++++---- 07_timestamps/Cargo.toml | 4 ++-- 07_timestamps/README.md | 2 +- 07_timestamps/src/_arch/aarch64/time.rs | 2 +- 08_hw_debug_JTAG/Cargo.lock | 8 ++++---- 08_hw_debug_JTAG/Cargo.toml | 4 ++-- 08_hw_debug_JTAG/src/_arch/aarch64/time.rs | 2 +- 09_privilege_level/Cargo.lock | 8 ++++---- 09_privilege_level/Cargo.toml | 4 ++-- 09_privilege_level/src/_arch/aarch64/time.rs | 2 +- .../Cargo.lock | 8 ++++---- .../Cargo.toml | 4 ++-- .../src/_arch/aarch64/time.rs | 2 +- 11_exceptions_part1_groundwork/Cargo.lock | 8 ++++---- 11_exceptions_part1_groundwork/Cargo.toml | 4 ++-- .../src/_arch/aarch64/time.rs | 2 +- 12_integrated_testing/Cargo.lock | 16 ++++++++-------- 12_integrated_testing/kernel/Cargo.toml | 4 ++-- .../kernel/src/_arch/aarch64/time.rs | 2 +- .../Cargo.lock | 16 ++++++++-------- 13_exceptions_part2_peripheral_IRQs/README.md | 12 ++++++------ .../kernel/Cargo.toml | 4 ++-- .../kernel/src/_arch/aarch64/time.rs | 2 +- .../src/bsp/device_driver/arm/gicv2/gicd.rs | 6 +++--- 14_virtual_mem_part2_mmio_remap/Cargo.lock | 16 ++++++++-------- .../kernel/Cargo.toml | 4 ++-- .../kernel/src/_arch/aarch64/time.rs | 2 +- .../src/bsp/device_driver/arm/gicv2/gicd.rs | 6 +++--- .../Cargo.lock | 16 ++++++++-------- .../kernel/Cargo.toml | 4 ++-- .../kernel/src/_arch/aarch64/time.rs | 2 +- .../src/bsp/device_driver/arm/gicv2/gicd.rs | 6 +++--- .../Cargo.lock | 16 ++++++++-------- .../kernel/Cargo.toml | 4 ++-- .../kernel/src/_arch/aarch64/time.rs | 2 +- .../src/bsp/device_driver/arm/gicv2/gicd.rs | 6 +++--- 17_kernel_symbols/Cargo.lock | 16 ++++++++-------- 17_kernel_symbols/README.md | 2 +- 17_kernel_symbols/kernel/Cargo.toml | 4 ++-- .../kernel/src/_arch/aarch64/time.rs | 2 +- .../src/bsp/device_driver/arm/gicv2/gicd.rs | 6 +++--- 18_backtrace/Cargo.lock | 16 ++++++++-------- 18_backtrace/kernel/Cargo.toml | 4 ++-- 18_backtrace/kernel/src/_arch/aarch64/time.rs | 2 +- .../src/bsp/device_driver/arm/gicv2/gicd.rs | 6 +++--- 19_kernel_heap/Cargo.lock | 16 ++++++++-------- 19_kernel_heap/README.md | 2 +- 19_kernel_heap/kernel/Cargo.toml | 4 ++-- .../kernel/src/_arch/aarch64/time.rs | 2 +- .../src/bsp/device_driver/arm/gicv2/gicd.rs | 6 +++--- X1_JTAG_boot/Cargo.lock | 8 ++++---- X1_JTAG_boot/Cargo.toml | 4 ++-- X1_JTAG_boot/jtag_boot_rpi3.img | Bin 8656 -> 8648 bytes X1_JTAG_boot/jtag_boot_rpi4.img | Bin 7752 -> 7744 bytes X1_JTAG_boot/src/_arch/aarch64/time.rs | 2 +- 69 files changed, 190 insertions(+), 190 deletions(-) diff --git a/02_runtime_init/Cargo.lock b/02_runtime_init/Cargo.lock index bae18da0..17e64197 100644 --- a/02_runtime_init/Cargo.lock +++ b/02_runtime_init/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "cortex-a" -version = "7.5.0" +version = "8.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdecfbb28672ad3664e71ae05a398a52df430d86d660691501b28968cc4467e6" +checksum = "0cd4524931a4e0ec50ae91f0d55f571f31ffe11dd9ce2f9905b8343c018c25bb" dependencies = [ "tock-registers", ] @@ -20,6 +20,6 @@ dependencies = [ [[package]] name = "tock-registers" -version = "0.7.0" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ee8fba06c1f4d0b396ef61a54530bb6b28f0dc61c38bc8bc5a5a48161e6282e" +checksum = "696941a0aee7e276a165a978b37918fd5d22c55c3d6bda197813070ca9c0f21c" diff --git a/02_runtime_init/Cargo.toml b/02_runtime_init/Cargo.toml index 52786a40..59566db0 100644 --- a/02_runtime_init/Cargo.toml +++ b/02_runtime_init/Cargo.toml @@ -24,4 +24,4 @@ path = "src/main.rs" # Platform specific dependencies [target.'cfg(target_arch = "aarch64")'.dependencies] -cortex-a = { version = "7.x.x" } +cortex-a = { version = "8.x.x" } diff --git a/02_runtime_init/README.md b/02_runtime_init/README.md index f5b9355c..80fd77a4 100644 --- a/02_runtime_init/README.md +++ b/02_runtime_init/README.md @@ -47,7 +47,7 @@ diff -uNr 01_wait_forever/Cargo.toml 02_runtime_init/Cargo.toml + +# Platform specific dependencies +[target.'cfg(target_arch = "aarch64")'.dependencies] -+cortex-a = { version = "7.x.x" } ++cortex-a = { version = "8.x.x" } diff -uNr 01_wait_forever/Makefile 02_runtime_init/Makefile --- 01_wait_forever/Makefile diff --git a/03_hacky_hello_world/Cargo.lock b/03_hacky_hello_world/Cargo.lock index baa9f9c4..6b68a92e 100644 --- a/03_hacky_hello_world/Cargo.lock +++ b/03_hacky_hello_world/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "cortex-a" -version = "7.5.0" +version = "8.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdecfbb28672ad3664e71ae05a398a52df430d86d660691501b28968cc4467e6" +checksum = "0cd4524931a4e0ec50ae91f0d55f571f31ffe11dd9ce2f9905b8343c018c25bb" dependencies = [ "tock-registers", ] @@ -20,6 +20,6 @@ dependencies = [ [[package]] name = "tock-registers" -version = "0.7.0" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ee8fba06c1f4d0b396ef61a54530bb6b28f0dc61c38bc8bc5a5a48161e6282e" +checksum = "696941a0aee7e276a165a978b37918fd5d22c55c3d6bda197813070ca9c0f21c" diff --git a/03_hacky_hello_world/Cargo.toml b/03_hacky_hello_world/Cargo.toml index cca92834..e3e95003 100644 --- a/03_hacky_hello_world/Cargo.toml +++ b/03_hacky_hello_world/Cargo.toml @@ -24,4 +24,4 @@ path = "src/main.rs" # Platform specific dependencies [target.'cfg(target_arch = "aarch64")'.dependencies] -cortex-a = { version = "7.x.x" } +cortex-a = { version = "8.x.x" } diff --git a/04_safe_globals/Cargo.lock b/04_safe_globals/Cargo.lock index 72bdf630..21c1ad6f 100644 --- a/04_safe_globals/Cargo.lock +++ b/04_safe_globals/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "cortex-a" -version = "7.5.0" +version = "8.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdecfbb28672ad3664e71ae05a398a52df430d86d660691501b28968cc4467e6" +checksum = "0cd4524931a4e0ec50ae91f0d55f571f31ffe11dd9ce2f9905b8343c018c25bb" dependencies = [ "tock-registers", ] @@ -20,6 +20,6 @@ dependencies = [ [[package]] name = "tock-registers" -version = "0.7.0" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ee8fba06c1f4d0b396ef61a54530bb6b28f0dc61c38bc8bc5a5a48161e6282e" +checksum = "696941a0aee7e276a165a978b37918fd5d22c55c3d6bda197813070ca9c0f21c" diff --git a/04_safe_globals/Cargo.toml b/04_safe_globals/Cargo.toml index cb51da55..51ddd52b 100644 --- a/04_safe_globals/Cargo.toml +++ b/04_safe_globals/Cargo.toml @@ -24,4 +24,4 @@ path = "src/main.rs" # Platform specific dependencies [target.'cfg(target_arch = "aarch64")'.dependencies] -cortex-a = { version = "7.x.x" } +cortex-a = { version = "8.x.x" } diff --git a/05_drivers_gpio_uart/Cargo.lock b/05_drivers_gpio_uart/Cargo.lock index 87686e39..93873c45 100644 --- a/05_drivers_gpio_uart/Cargo.lock +++ b/05_drivers_gpio_uart/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "cortex-a" -version = "7.5.0" +version = "8.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdecfbb28672ad3664e71ae05a398a52df430d86d660691501b28968cc4467e6" +checksum = "0cd4524931a4e0ec50ae91f0d55f571f31ffe11dd9ce2f9905b8343c018c25bb" dependencies = [ "tock-registers", ] @@ -21,6 +21,6 @@ dependencies = [ [[package]] name = "tock-registers" -version = "0.7.0" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ee8fba06c1f4d0b396ef61a54530bb6b28f0dc61c38bc8bc5a5a48161e6282e" +checksum = "696941a0aee7e276a165a978b37918fd5d22c55c3d6bda197813070ca9c0f21c" diff --git a/05_drivers_gpio_uart/Cargo.toml b/05_drivers_gpio_uart/Cargo.toml index b2f17d8d..1f6db5de 100644 --- a/05_drivers_gpio_uart/Cargo.toml +++ b/05_drivers_gpio_uart/Cargo.toml @@ -23,8 +23,8 @@ path = "src/main.rs" [dependencies] # Optional dependencies -tock-registers = { version = "0.7.x", default-features = false, features = ["register_types"], optional = true } +tock-registers = { version = "0.8.x", default-features = false, features = ["register_types"], optional = true } # Platform specific dependencies [target.'cfg(target_arch = "aarch64")'.dependencies] -cortex-a = { version = "7.x.x" } +cortex-a = { version = "8.x.x" } diff --git a/05_drivers_gpio_uart/README.md b/05_drivers_gpio_uart/README.md index 572cd1a8..cbd43e71 100644 --- a/05_drivers_gpio_uart/README.md +++ b/05_drivers_gpio_uart/README.md @@ -131,11 +131,11 @@ diff -uNr 04_safe_globals/Cargo.toml 05_drivers_gpio_uart/Cargo.toml [dependencies] +# Optional dependencies -+tock-registers = { version = "0.7.x", default-features = false, features = ["register_types"], optional = true } ++tock-registers = { version = "0.8.x", default-features = false, features = ["register_types"], optional = true } + # Platform specific dependencies [target.'cfg(target_arch = "aarch64")'.dependencies] - cortex-a = { version = "7.x.x" } + cortex-a = { version = "8.x.x" } diff -uNr 04_safe_globals/Makefile 05_drivers_gpio_uart/Makefile --- 04_safe_globals/Makefile diff --git a/06_uart_chainloader/Cargo.lock b/06_uart_chainloader/Cargo.lock index 0936e7c6..c26c68d1 100644 --- a/06_uart_chainloader/Cargo.lock +++ b/06_uart_chainloader/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "cortex-a" -version = "7.5.0" +version = "8.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdecfbb28672ad3664e71ae05a398a52df430d86d660691501b28968cc4467e6" +checksum = "0cd4524931a4e0ec50ae91f0d55f571f31ffe11dd9ce2f9905b8343c018c25bb" dependencies = [ "tock-registers", ] @@ -21,6 +21,6 @@ dependencies = [ [[package]] name = "tock-registers" -version = "0.7.0" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ee8fba06c1f4d0b396ef61a54530bb6b28f0dc61c38bc8bc5a5a48161e6282e" +checksum = "696941a0aee7e276a165a978b37918fd5d22c55c3d6bda197813070ca9c0f21c" diff --git a/06_uart_chainloader/Cargo.toml b/06_uart_chainloader/Cargo.toml index f00c87a8..8770d7a0 100644 --- a/06_uart_chainloader/Cargo.toml +++ b/06_uart_chainloader/Cargo.toml @@ -23,8 +23,8 @@ path = "src/main.rs" [dependencies] # Optional dependencies -tock-registers = { version = "0.7.x", default-features = false, features = ["register_types"], optional = true } +tock-registers = { version = "0.8.x", default-features = false, features = ["register_types"], optional = true } # Platform specific dependencies [target.'cfg(target_arch = "aarch64")'.dependencies] -cortex-a = { version = "7.x.x" } +cortex-a = { version = "8.x.x" } diff --git a/06_uart_chainloader/demo_payload_rpi3.img b/06_uart_chainloader/demo_payload_rpi3.img index 2016c14e26bd5edce571ca2424a5cfa9b916d826..20f13981c87fa20c518e3039149ff063beb0eb3d 100755 GIT binary patch delta 1090 zcmYjPO-vI(6n?u?U@0O^w?9H#yQTcJ(iFs&s%TR1;9rbbO*GMng&?4S1fz);D8Yp2 zMTRkQF$VO|Y)=}*7!L+wV!+_RC|ta(UTisNqQ=+|yUuP0@g=)E^S$rA_w6^MG%L+z z)3AF54AIFJ9?rOd!(}J5#*W)VgG0~R>nD5@d8dKLH0o+mVN|#-Wq0eD9Q0N zq1j}?!!6tbIb!}b0uar<%Bgl>Ayh@>&xlJYNJxD`#i{q|W{y!NI4%)`L>-<-?W+oM zQ=U7et+l+0_;8%jfa0Q8}vJE4s6 zc$^KN4QxBbnSCxgWCQ~vEVDgzNRRVO19eM}{@#J^D|96| z^NkA_-Vh828|Ydh3r@FrH_Mt>_PmRHch>CfVX%e4k{&^6g5iY>zsL6cW_iq2V_sx1 zy_b5>uD4w^rNAWW|46zV!OH=u^Ge^f{sGBoG{T09b*w5~kyoC71Ds^#8-IL`?Kg+# ZnHvto;#UVdx`u{sNNv5+F7nb<`4=y6B{Kj3 delta 1118 zcmZ8fU1$?o6h3!ut!b2+=C`&Jb8FkQp&`cpm^KwH5fMdMErLZK+GvZ0ZCaVK3qGZ# zu(JEG^!5rB{Gr;1I8hX>1@&QR*_W-pSkSU>I~5-ipF}|jV#j+YH_NgIhPmgv=R4>7 z=8Vy6^zOI=-ESKz`eqXf3>*Z7?l`4XYgZ(Hx&hrS5DrvUrM=gq7{=%;Lz{;QZ|+V%W2(85J1nhV?XTbt(G5J1-; zXPKtyGo}?f&HEA{Z@`Ma;`FBJE1dy^j&~U43~bA7;Hn(sobsJ`n^;-f?1dsf&H#zg z<*(*k5D+X0S@TE1@gCrs0kAa7hcxiB7$olgin5okPDc&>fPorYD|G>G#96i5>(RTx zVP+J)(1`Q`Mzqj~^+&A79d5YOPL~ojw2Du2@h7yhmm>bop8<=XkF#Ig`|1vGlf(sG z;$y9%$$r~ZoAsHJ^=#c8XrJn!d9%V=#OEy5^D!v4amKO(xG0N~@Yd z+!-8?&}BThZr}i4Par4Gi{aYS$O$TU|DW)xi?cg-A-kitgp*qKqApn7pPaaSeniu* zkdrCW!9LbS*{=FytkvI^NgO&sj+{LDLra*9rp87{m|Pei{V6?0>~?@l^`$m#a>Nap zmxnIMoO`k2fy@<|r=>jZ(~85IHm;G;@#Ju7>>?S~Qa^W(XmJuJWgmPiR(K_`+-O3( zuqT~NjYYHx>%LoMPwE@@bBRN;vO+S4WnPx_e+g+md7RhIvl`Whp0SV`aK4rthwPD7 z*;zFh2Y<<@Tf)SO2x*mgrNkpLFN@{$7i!QsBw_vwTfyN^YOwmcgiBW0AO79n0rA2r A9RL6T diff --git a/06_uart_chainloader/demo_payload_rpi4.img b/06_uart_chainloader/demo_payload_rpi4.img index 7be0ece0ad39e99544280e4fe3d9f82d0d874875..779cc308d9b2decf926e6ea6a4e3f8764183ede1 100755 GIT binary patch delta 908 zcmYjPT}V@57=FKv7d`JhBCV_lEii64=AZr(u~NP8eJI) zd3pn_2u3$?23>@C;hhRWUJR1dg1VU1#f*p`kyhmCJKHDq!pHkP@AJOzd7h865Y0x9 zWg)Z$`q;g=4pJ^4&yRKL$mn99ZkFgs+u|o~t(>14)_F3pc%}9o=W7heE{WSZ-3`L- z@nvOKRlgTGkbN5=x!@8`D7T^Og%S&mY~Hi6O!p&;Rd%0oGZ6Ok9MaVsGM%& zAPS{&pA?i||5oRLz>+30OC|29>U;rU=?Tqlfcp|in;Q439Rv=*tbLM?H_Jvh$b~9U zfW%5(dia`H3CJnDYpxX|oy9(VC2cpw;@Uw5J~w?LJ0p#eSlg z=<2Dap!`FGl2-SIu+>qkm=RB_wl7=kWAxA zYodBH1VVu`=f5Rhl(`+>*zKVzA*OM{>MArW80n z_u@bm0b->`e^e2_ihFwP*|5+sRJUTM?*EHzJlpsIAKMZ>L3Clap^>5>j-9>&Pad^U#qoSqko$@CbK2#K7n6TMPboC^? z58<#wB-e4;;i{WsJ(>GD6o22$PR)ketUJ4-`-j~nmfdx2ldNrZ1E-cm3oJ#^F6pU5r_2tXYU>mz z2<60=pZ=6*@+B&qT zZ&}uMi3csQp3#gX(ZA-PtiM$8TJ4BusoiW4)WtDJzUPWZZf+1@QCz~`wU>y97u|8< zz}xPmhX<(?6Lb+^;s8mP>sL>k?b^O#7SFBkX2GOr z0wAre?O0PlVBTJFs1u~m0Fws5{3FYniqJR=;WxI{aSS9LK(E~ctfZ@HaQS1&V^#hC*SXNW&c&drUSMgRLGYI2(wyEHGBCkPt3gDr_)* fALG9;{BLhpFy^Xb--7-NWs72GFh(xmaPY_ GenericTimerCounterValue { + // Prevent that the counter is read ahead of time due to out-of-order execution. -+ unsafe { barrier::isb(barrier::SY) }; ++ barrier::isb(barrier::SY); + let cnt = CNTPCT_EL0.get(); + + GenericTimerCounterValue(cnt) diff --git a/07_timestamps/src/_arch/aarch64/time.rs b/07_timestamps/src/_arch/aarch64/time.rs index ad8ba84d..1e2efbec 100644 --- a/07_timestamps/src/_arch/aarch64/time.rs +++ b/07_timestamps/src/_arch/aarch64/time.rs @@ -120,7 +120,7 @@ impl TryFrom for GenericTimerCounterValue { #[inline(always)] fn read_cntpct() -> GenericTimerCounterValue { // Prevent that the counter is read ahead of time due to out-of-order execution. - unsafe { barrier::isb(barrier::SY) }; + barrier::isb(barrier::SY); let cnt = CNTPCT_EL0.get(); GenericTimerCounterValue(cnt) diff --git a/08_hw_debug_JTAG/Cargo.lock b/08_hw_debug_JTAG/Cargo.lock index 6e628b86..bcfb442a 100644 --- a/08_hw_debug_JTAG/Cargo.lock +++ b/08_hw_debug_JTAG/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "cortex-a" -version = "7.5.0" +version = "8.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdecfbb28672ad3664e71ae05a398a52df430d86d660691501b28968cc4467e6" +checksum = "0cd4524931a4e0ec50ae91f0d55f571f31ffe11dd9ce2f9905b8343c018c25bb" dependencies = [ "tock-registers", ] @@ -21,6 +21,6 @@ dependencies = [ [[package]] name = "tock-registers" -version = "0.7.0" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ee8fba06c1f4d0b396ef61a54530bb6b28f0dc61c38bc8bc5a5a48161e6282e" +checksum = "696941a0aee7e276a165a978b37918fd5d22c55c3d6bda197813070ca9c0f21c" diff --git a/08_hw_debug_JTAG/Cargo.toml b/08_hw_debug_JTAG/Cargo.toml index 638d4de1..55963c38 100644 --- a/08_hw_debug_JTAG/Cargo.toml +++ b/08_hw_debug_JTAG/Cargo.toml @@ -23,8 +23,8 @@ path = "src/main.rs" [dependencies] # Optional dependencies -tock-registers = { version = "0.7.x", default-features = false, features = ["register_types"], optional = true } +tock-registers = { version = "0.8.x", default-features = false, features = ["register_types"], optional = true } # Platform specific dependencies [target.'cfg(target_arch = "aarch64")'.dependencies] -cortex-a = { version = "7.x.x" } +cortex-a = { version = "8.x.x" } diff --git a/08_hw_debug_JTAG/src/_arch/aarch64/time.rs b/08_hw_debug_JTAG/src/_arch/aarch64/time.rs index ad8ba84d..1e2efbec 100644 --- a/08_hw_debug_JTAG/src/_arch/aarch64/time.rs +++ b/08_hw_debug_JTAG/src/_arch/aarch64/time.rs @@ -120,7 +120,7 @@ impl TryFrom for GenericTimerCounterValue { #[inline(always)] fn read_cntpct() -> GenericTimerCounterValue { // Prevent that the counter is read ahead of time due to out-of-order execution. - unsafe { barrier::isb(barrier::SY) }; + barrier::isb(barrier::SY); let cnt = CNTPCT_EL0.get(); GenericTimerCounterValue(cnt) diff --git a/09_privilege_level/Cargo.lock b/09_privilege_level/Cargo.lock index 5dc791a2..29c6ef54 100644 --- a/09_privilege_level/Cargo.lock +++ b/09_privilege_level/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "cortex-a" -version = "7.5.0" +version = "8.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdecfbb28672ad3664e71ae05a398a52df430d86d660691501b28968cc4467e6" +checksum = "0cd4524931a4e0ec50ae91f0d55f571f31ffe11dd9ce2f9905b8343c018c25bb" dependencies = [ "tock-registers", ] @@ -21,6 +21,6 @@ dependencies = [ [[package]] name = "tock-registers" -version = "0.7.0" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ee8fba06c1f4d0b396ef61a54530bb6b28f0dc61c38bc8bc5a5a48161e6282e" +checksum = "696941a0aee7e276a165a978b37918fd5d22c55c3d6bda197813070ca9c0f21c" diff --git a/09_privilege_level/Cargo.toml b/09_privilege_level/Cargo.toml index dccb5622..a89435bc 100644 --- a/09_privilege_level/Cargo.toml +++ b/09_privilege_level/Cargo.toml @@ -23,8 +23,8 @@ path = "src/main.rs" [dependencies] # Optional dependencies -tock-registers = { version = "0.7.x", default-features = false, features = ["register_types"], optional = true } +tock-registers = { version = "0.8.x", default-features = false, features = ["register_types"], optional = true } # Platform specific dependencies [target.'cfg(target_arch = "aarch64")'.dependencies] -cortex-a = { version = "7.x.x" } +cortex-a = { version = "8.x.x" } diff --git a/09_privilege_level/src/_arch/aarch64/time.rs b/09_privilege_level/src/_arch/aarch64/time.rs index ad8ba84d..1e2efbec 100644 --- a/09_privilege_level/src/_arch/aarch64/time.rs +++ b/09_privilege_level/src/_arch/aarch64/time.rs @@ -120,7 +120,7 @@ impl TryFrom for GenericTimerCounterValue { #[inline(always)] fn read_cntpct() -> GenericTimerCounterValue { // Prevent that the counter is read ahead of time due to out-of-order execution. - unsafe { barrier::isb(barrier::SY) }; + barrier::isb(barrier::SY); let cnt = CNTPCT_EL0.get(); GenericTimerCounterValue(cnt) diff --git a/10_virtual_mem_part1_identity_mapping/Cargo.lock b/10_virtual_mem_part1_identity_mapping/Cargo.lock index 1115edab..4bfff935 100644 --- a/10_virtual_mem_part1_identity_mapping/Cargo.lock +++ b/10_virtual_mem_part1_identity_mapping/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "cortex-a" -version = "7.5.0" +version = "8.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdecfbb28672ad3664e71ae05a398a52df430d86d660691501b28968cc4467e6" +checksum = "0cd4524931a4e0ec50ae91f0d55f571f31ffe11dd9ce2f9905b8343c018c25bb" dependencies = [ "tock-registers", ] @@ -21,6 +21,6 @@ dependencies = [ [[package]] name = "tock-registers" -version = "0.7.0" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ee8fba06c1f4d0b396ef61a54530bb6b28f0dc61c38bc8bc5a5a48161e6282e" +checksum = "696941a0aee7e276a165a978b37918fd5d22c55c3d6bda197813070ca9c0f21c" diff --git a/10_virtual_mem_part1_identity_mapping/Cargo.toml b/10_virtual_mem_part1_identity_mapping/Cargo.toml index 144767d3..d3e2582d 100644 --- a/10_virtual_mem_part1_identity_mapping/Cargo.toml +++ b/10_virtual_mem_part1_identity_mapping/Cargo.toml @@ -23,8 +23,8 @@ path = "src/main.rs" [dependencies] # Optional dependencies -tock-registers = { version = "0.7.x", default-features = false, features = ["register_types"], optional = true } +tock-registers = { version = "0.8.x", default-features = false, features = ["register_types"], optional = true } # Platform specific dependencies [target.'cfg(target_arch = "aarch64")'.dependencies] -cortex-a = { version = "7.x.x" } +cortex-a = { version = "8.x.x" } diff --git a/10_virtual_mem_part1_identity_mapping/src/_arch/aarch64/time.rs b/10_virtual_mem_part1_identity_mapping/src/_arch/aarch64/time.rs index ad8ba84d..1e2efbec 100644 --- a/10_virtual_mem_part1_identity_mapping/src/_arch/aarch64/time.rs +++ b/10_virtual_mem_part1_identity_mapping/src/_arch/aarch64/time.rs @@ -120,7 +120,7 @@ impl TryFrom for GenericTimerCounterValue { #[inline(always)] fn read_cntpct() -> GenericTimerCounterValue { // Prevent that the counter is read ahead of time due to out-of-order execution. - unsafe { barrier::isb(barrier::SY) }; + barrier::isb(barrier::SY); let cnt = CNTPCT_EL0.get(); GenericTimerCounterValue(cnt) diff --git a/11_exceptions_part1_groundwork/Cargo.lock b/11_exceptions_part1_groundwork/Cargo.lock index f1d4af57..c7bfdadd 100644 --- a/11_exceptions_part1_groundwork/Cargo.lock +++ b/11_exceptions_part1_groundwork/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "cortex-a" -version = "7.5.0" +version = "8.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdecfbb28672ad3664e71ae05a398a52df430d86d660691501b28968cc4467e6" +checksum = "0cd4524931a4e0ec50ae91f0d55f571f31ffe11dd9ce2f9905b8343c018c25bb" dependencies = [ "tock-registers", ] @@ -21,6 +21,6 @@ dependencies = [ [[package]] name = "tock-registers" -version = "0.7.0" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ee8fba06c1f4d0b396ef61a54530bb6b28f0dc61c38bc8bc5a5a48161e6282e" +checksum = "696941a0aee7e276a165a978b37918fd5d22c55c3d6bda197813070ca9c0f21c" diff --git a/11_exceptions_part1_groundwork/Cargo.toml b/11_exceptions_part1_groundwork/Cargo.toml index aa8a870c..c8d3613f 100644 --- a/11_exceptions_part1_groundwork/Cargo.toml +++ b/11_exceptions_part1_groundwork/Cargo.toml @@ -23,8 +23,8 @@ path = "src/main.rs" [dependencies] # Optional dependencies -tock-registers = { version = "0.7.x", default-features = false, features = ["register_types"], optional = true } +tock-registers = { version = "0.8.x", default-features = false, features = ["register_types"], optional = true } # Platform specific dependencies [target.'cfg(target_arch = "aarch64")'.dependencies] -cortex-a = { version = "7.x.x" } +cortex-a = { version = "8.x.x" } diff --git a/11_exceptions_part1_groundwork/src/_arch/aarch64/time.rs b/11_exceptions_part1_groundwork/src/_arch/aarch64/time.rs index ad8ba84d..1e2efbec 100644 --- a/11_exceptions_part1_groundwork/src/_arch/aarch64/time.rs +++ b/11_exceptions_part1_groundwork/src/_arch/aarch64/time.rs @@ -120,7 +120,7 @@ impl TryFrom for GenericTimerCounterValue { #[inline(always)] fn read_cntpct() -> GenericTimerCounterValue { // Prevent that the counter is read ahead of time due to out-of-order execution. - unsafe { barrier::isb(barrier::SY) }; + barrier::isb(barrier::SY); let cnt = CNTPCT_EL0.get(); GenericTimerCounterValue(cnt) diff --git a/12_integrated_testing/Cargo.lock b/12_integrated_testing/Cargo.lock index f188bfe0..7af740b1 100644 --- a/12_integrated_testing/Cargo.lock +++ b/12_integrated_testing/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "cortex-a" -version = "7.5.0" +version = "8.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdecfbb28672ad3664e71ae05a398a52df430d86d660691501b28968cc4467e6" +checksum = "0cd4524931a4e0ec50ae91f0d55f571f31ffe11dd9ce2f9905b8343c018c25bb" dependencies = [ "tock-registers", ] @@ -24,9 +24,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.43" +version = "1.0.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a2ca2c61bc9f3d74d2886294ab7b9853abd9c1ad903a3ac7815c58989bb7bab" +checksum = "7bd7356a8122b6c4a24a82b278680c73357984ca2fc79a0f9fa6dea7dced7c58" dependencies = [ "unicode-ident", ] @@ -48,9 +48,9 @@ dependencies = [ [[package]] name = "syn" -version = "1.0.100" +version = "1.0.101" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52205623b1b0f064a4e71182c3b18ae902267282930c6d5462c91b859668426e" +checksum = "e90cde112c4b9690b8cbe810cba9ddd8bc1d7472e2cae317b69e9438c1cba7d2" dependencies = [ "proc-macro2", "quote", @@ -73,9 +73,9 @@ version = "0.1.0" [[package]] name = "tock-registers" -version = "0.7.0" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ee8fba06c1f4d0b396ef61a54530bb6b28f0dc61c38bc8bc5a5a48161e6282e" +checksum = "696941a0aee7e276a165a978b37918fd5d22c55c3d6bda197813070ca9c0f21c" [[package]] name = "unicode-ident" diff --git a/12_integrated_testing/kernel/Cargo.toml b/12_integrated_testing/kernel/Cargo.toml index 864cfb61..7bbca0b4 100644 --- a/12_integrated_testing/kernel/Cargo.toml +++ b/12_integrated_testing/kernel/Cargo.toml @@ -18,12 +18,12 @@ test_build = ["qemu-exit"] test-types = { path = "../libraries/test-types" } # Optional dependencies -tock-registers = { version = "0.7.x", default-features = false, features = ["register_types"], optional = true } +tock-registers = { version = "0.8.x", default-features = false, features = ["register_types"], optional = true } qemu-exit = { version = "3.x.x", optional = true } # Platform specific dependencies [target.'cfg(target_arch = "aarch64")'.dependencies] -cortex-a = { version = "7.x.x" } +cortex-a = { version = "8.x.x" } ##-------------------------------------------------------------------------------------------------- ## Testing diff --git a/12_integrated_testing/kernel/src/_arch/aarch64/time.rs b/12_integrated_testing/kernel/src/_arch/aarch64/time.rs index ad8ba84d..1e2efbec 100644 --- a/12_integrated_testing/kernel/src/_arch/aarch64/time.rs +++ b/12_integrated_testing/kernel/src/_arch/aarch64/time.rs @@ -120,7 +120,7 @@ impl TryFrom for GenericTimerCounterValue { #[inline(always)] fn read_cntpct() -> GenericTimerCounterValue { // Prevent that the counter is read ahead of time due to out-of-order execution. - unsafe { barrier::isb(barrier::SY) }; + barrier::isb(barrier::SY); let cnt = CNTPCT_EL0.get(); GenericTimerCounterValue(cnt) diff --git a/13_exceptions_part2_peripheral_IRQs/Cargo.lock b/13_exceptions_part2_peripheral_IRQs/Cargo.lock index e5a8e81c..59d40ee6 100644 --- a/13_exceptions_part2_peripheral_IRQs/Cargo.lock +++ b/13_exceptions_part2_peripheral_IRQs/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "cortex-a" -version = "7.5.0" +version = "8.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdecfbb28672ad3664e71ae05a398a52df430d86d660691501b28968cc4467e6" +checksum = "0cd4524931a4e0ec50ae91f0d55f571f31ffe11dd9ce2f9905b8343c018c25bb" dependencies = [ "tock-registers", ] @@ -24,9 +24,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.43" +version = "1.0.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a2ca2c61bc9f3d74d2886294ab7b9853abd9c1ad903a3ac7815c58989bb7bab" +checksum = "7bd7356a8122b6c4a24a82b278680c73357984ca2fc79a0f9fa6dea7dced7c58" dependencies = [ "unicode-ident", ] @@ -48,9 +48,9 @@ dependencies = [ [[package]] name = "syn" -version = "1.0.100" +version = "1.0.101" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52205623b1b0f064a4e71182c3b18ae902267282930c6d5462c91b859668426e" +checksum = "e90cde112c4b9690b8cbe810cba9ddd8bc1d7472e2cae317b69e9438c1cba7d2" dependencies = [ "proc-macro2", "quote", @@ -73,9 +73,9 @@ version = "0.1.0" [[package]] name = "tock-registers" -version = "0.7.0" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ee8fba06c1f4d0b396ef61a54530bb6b28f0dc61c38bc8bc5a5a48161e6282e" +checksum = "696941a0aee7e276a165a978b37918fd5d22c55c3d6bda197813070ca9c0f21c" [[package]] name = "unicode-ident" diff --git a/13_exceptions_part2_peripheral_IRQs/README.md b/13_exceptions_part2_peripheral_IRQs/README.md index 0bb676db..3d6d5f16 100644 --- a/13_exceptions_part2_peripheral_IRQs/README.md +++ b/13_exceptions_part2_peripheral_IRQs/README.md @@ -609,9 +609,9 @@ register_structs! { (0x004 => TYPER: ReadOnly), (0x008 => _reserved1), (0x104 => ISENABLER: [ReadWrite; 31]), - (0x108 => _reserved2), + (0x180 => _reserved2), (0x820 => ITARGETSR: [ReadWrite; 248]), - (0x824 => @END), + (0xC00 => @END), } } @@ -622,7 +622,7 @@ register_structs! { (0x100 => ISENABLER: ReadWrite), (0x104 => _reserved2), (0x800 => ITARGETSR: [ReadOnly; 8]), - (0x804 => @END), + (0x820 => @END), } } ``` @@ -1098,9 +1098,9 @@ diff -uNr 12_integrated_testing/kernel/src/bsp/device_driver/arm/gicv2/gicd.rs 1 + (0x004 => TYPER: ReadOnly), + (0x008 => _reserved1), + (0x104 => ISENABLER: [ReadWrite; 31]), -+ (0x108 => _reserved2), ++ (0x180 => _reserved2), + (0x820 => ITARGETSR: [ReadWrite; 248]), -+ (0x824 => @END), ++ (0xC00 => @END), + } +} + @@ -1111,7 +1111,7 @@ diff -uNr 12_integrated_testing/kernel/src/bsp/device_driver/arm/gicv2/gicd.rs 1 + (0x100 => ISENABLER: ReadWrite), + (0x104 => _reserved2), + (0x800 => ITARGETSR: [ReadOnly; 8]), -+ (0x804 => @END), ++ (0x820 => @END), + } +} + diff --git a/13_exceptions_part2_peripheral_IRQs/kernel/Cargo.toml b/13_exceptions_part2_peripheral_IRQs/kernel/Cargo.toml index f45458f9..5f371dda 100644 --- a/13_exceptions_part2_peripheral_IRQs/kernel/Cargo.toml +++ b/13_exceptions_part2_peripheral_IRQs/kernel/Cargo.toml @@ -18,12 +18,12 @@ test_build = ["qemu-exit"] test-types = { path = "../libraries/test-types" } # Optional dependencies -tock-registers = { version = "0.7.x", default-features = false, features = ["register_types"], optional = true } +tock-registers = { version = "0.8.x", default-features = false, features = ["register_types"], optional = true } qemu-exit = { version = "3.x.x", optional = true } # Platform specific dependencies [target.'cfg(target_arch = "aarch64")'.dependencies] -cortex-a = { version = "7.x.x" } +cortex-a = { version = "8.x.x" } ##-------------------------------------------------------------------------------------------------- ## Testing diff --git a/13_exceptions_part2_peripheral_IRQs/kernel/src/_arch/aarch64/time.rs b/13_exceptions_part2_peripheral_IRQs/kernel/src/_arch/aarch64/time.rs index ad8ba84d..1e2efbec 100644 --- a/13_exceptions_part2_peripheral_IRQs/kernel/src/_arch/aarch64/time.rs +++ b/13_exceptions_part2_peripheral_IRQs/kernel/src/_arch/aarch64/time.rs @@ -120,7 +120,7 @@ impl TryFrom for GenericTimerCounterValue { #[inline(always)] fn read_cntpct() -> GenericTimerCounterValue { // Prevent that the counter is read ahead of time due to out-of-order execution. - unsafe { barrier::isb(barrier::SY) }; + barrier::isb(barrier::SY); let cnt = CNTPCT_EL0.get(); GenericTimerCounterValue(cnt) diff --git a/13_exceptions_part2_peripheral_IRQs/kernel/src/bsp/device_driver/arm/gicv2/gicd.rs b/13_exceptions_part2_peripheral_IRQs/kernel/src/bsp/device_driver/arm/gicv2/gicd.rs index bc7f7f23..54aab60c 100644 --- a/13_exceptions_part2_peripheral_IRQs/kernel/src/bsp/device_driver/arm/gicv2/gicd.rs +++ b/13_exceptions_part2_peripheral_IRQs/kernel/src/bsp/device_driver/arm/gicv2/gicd.rs @@ -50,9 +50,9 @@ register_structs! { (0x004 => TYPER: ReadOnly), (0x008 => _reserved1), (0x104 => ISENABLER: [ReadWrite; 31]), - (0x108 => _reserved2), + (0x180 => _reserved2), (0x820 => ITARGETSR: [ReadWrite; 248]), - (0x824 => @END), + (0xC00 => @END), } } @@ -63,7 +63,7 @@ register_structs! { (0x100 => ISENABLER: ReadWrite), (0x104 => _reserved2), (0x800 => ITARGETSR: [ReadOnly; 8]), - (0x804 => @END), + (0x820 => @END), } } diff --git a/14_virtual_mem_part2_mmio_remap/Cargo.lock b/14_virtual_mem_part2_mmio_remap/Cargo.lock index 163a6526..a66dec99 100644 --- a/14_virtual_mem_part2_mmio_remap/Cargo.lock +++ b/14_virtual_mem_part2_mmio_remap/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "cortex-a" -version = "7.5.0" +version = "8.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdecfbb28672ad3664e71ae05a398a52df430d86d660691501b28968cc4467e6" +checksum = "0cd4524931a4e0ec50ae91f0d55f571f31ffe11dd9ce2f9905b8343c018c25bb" dependencies = [ "tock-registers", ] @@ -24,9 +24,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.43" +version = "1.0.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a2ca2c61bc9f3d74d2886294ab7b9853abd9c1ad903a3ac7815c58989bb7bab" +checksum = "7bd7356a8122b6c4a24a82b278680c73357984ca2fc79a0f9fa6dea7dced7c58" dependencies = [ "unicode-ident", ] @@ -48,9 +48,9 @@ dependencies = [ [[package]] name = "syn" -version = "1.0.100" +version = "1.0.101" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52205623b1b0f064a4e71182c3b18ae902267282930c6d5462c91b859668426e" +checksum = "e90cde112c4b9690b8cbe810cba9ddd8bc1d7472e2cae317b69e9438c1cba7d2" dependencies = [ "proc-macro2", "quote", @@ -73,9 +73,9 @@ version = "0.1.0" [[package]] name = "tock-registers" -version = "0.7.0" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ee8fba06c1f4d0b396ef61a54530bb6b28f0dc61c38bc8bc5a5a48161e6282e" +checksum = "696941a0aee7e276a165a978b37918fd5d22c55c3d6bda197813070ca9c0f21c" [[package]] name = "unicode-ident" diff --git a/14_virtual_mem_part2_mmio_remap/kernel/Cargo.toml b/14_virtual_mem_part2_mmio_remap/kernel/Cargo.toml index f187a467..fe4e48e7 100644 --- a/14_virtual_mem_part2_mmio_remap/kernel/Cargo.toml +++ b/14_virtual_mem_part2_mmio_remap/kernel/Cargo.toml @@ -18,12 +18,12 @@ test_build = ["qemu-exit"] test-types = { path = "../libraries/test-types" } # Optional dependencies -tock-registers = { version = "0.7.x", default-features = false, features = ["register_types"], optional = true } +tock-registers = { version = "0.8.x", default-features = false, features = ["register_types"], optional = true } qemu-exit = { version = "3.x.x", optional = true } # Platform specific dependencies [target.'cfg(target_arch = "aarch64")'.dependencies] -cortex-a = { version = "7.x.x" } +cortex-a = { version = "8.x.x" } ##-------------------------------------------------------------------------------------------------- ## Testing diff --git a/14_virtual_mem_part2_mmio_remap/kernel/src/_arch/aarch64/time.rs b/14_virtual_mem_part2_mmio_remap/kernel/src/_arch/aarch64/time.rs index ad8ba84d..1e2efbec 100644 --- a/14_virtual_mem_part2_mmio_remap/kernel/src/_arch/aarch64/time.rs +++ b/14_virtual_mem_part2_mmio_remap/kernel/src/_arch/aarch64/time.rs @@ -120,7 +120,7 @@ impl TryFrom for GenericTimerCounterValue { #[inline(always)] fn read_cntpct() -> GenericTimerCounterValue { // Prevent that the counter is read ahead of time due to out-of-order execution. - unsafe { barrier::isb(barrier::SY) }; + barrier::isb(barrier::SY); let cnt = CNTPCT_EL0.get(); GenericTimerCounterValue(cnt) diff --git a/14_virtual_mem_part2_mmio_remap/kernel/src/bsp/device_driver/arm/gicv2/gicd.rs b/14_virtual_mem_part2_mmio_remap/kernel/src/bsp/device_driver/arm/gicv2/gicd.rs index d9f63d1b..a9c97a8e 100644 --- a/14_virtual_mem_part2_mmio_remap/kernel/src/bsp/device_driver/arm/gicv2/gicd.rs +++ b/14_virtual_mem_part2_mmio_remap/kernel/src/bsp/device_driver/arm/gicv2/gicd.rs @@ -52,9 +52,9 @@ register_structs! { (0x004 => TYPER: ReadOnly), (0x008 => _reserved1), (0x104 => ISENABLER: [ReadWrite; 31]), - (0x108 => _reserved2), + (0x180 => _reserved2), (0x820 => ITARGETSR: [ReadWrite; 248]), - (0x824 => @END), + (0xC00 => @END), } } @@ -65,7 +65,7 @@ register_structs! { (0x100 => ISENABLER: ReadWrite), (0x104 => _reserved2), (0x800 => ITARGETSR: [ReadOnly; 8]), - (0x804 => @END), + (0x820 => @END), } } diff --git a/15_virtual_mem_part3_precomputed_tables/Cargo.lock b/15_virtual_mem_part3_precomputed_tables/Cargo.lock index 6cac9dcb..e0c25535 100644 --- a/15_virtual_mem_part3_precomputed_tables/Cargo.lock +++ b/15_virtual_mem_part3_precomputed_tables/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "cortex-a" -version = "7.5.0" +version = "8.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdecfbb28672ad3664e71ae05a398a52df430d86d660691501b28968cc4467e6" +checksum = "0cd4524931a4e0ec50ae91f0d55f571f31ffe11dd9ce2f9905b8343c018c25bb" dependencies = [ "tock-registers", ] @@ -24,9 +24,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.43" +version = "1.0.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a2ca2c61bc9f3d74d2886294ab7b9853abd9c1ad903a3ac7815c58989bb7bab" +checksum = "7bd7356a8122b6c4a24a82b278680c73357984ca2fc79a0f9fa6dea7dced7c58" dependencies = [ "unicode-ident", ] @@ -48,9 +48,9 @@ dependencies = [ [[package]] name = "syn" -version = "1.0.100" +version = "1.0.101" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52205623b1b0f064a4e71182c3b18ae902267282930c6d5462c91b859668426e" +checksum = "e90cde112c4b9690b8cbe810cba9ddd8bc1d7472e2cae317b69e9438c1cba7d2" dependencies = [ "proc-macro2", "quote", @@ -73,9 +73,9 @@ version = "0.1.0" [[package]] name = "tock-registers" -version = "0.7.0" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ee8fba06c1f4d0b396ef61a54530bb6b28f0dc61c38bc8bc5a5a48161e6282e" +checksum = "696941a0aee7e276a165a978b37918fd5d22c55c3d6bda197813070ca9c0f21c" [[package]] name = "unicode-ident" diff --git a/15_virtual_mem_part3_precomputed_tables/kernel/Cargo.toml b/15_virtual_mem_part3_precomputed_tables/kernel/Cargo.toml index 4641b0e8..9a0408ad 100644 --- a/15_virtual_mem_part3_precomputed_tables/kernel/Cargo.toml +++ b/15_virtual_mem_part3_precomputed_tables/kernel/Cargo.toml @@ -18,12 +18,12 @@ test_build = ["qemu-exit"] test-types = { path = "../libraries/test-types" } # Optional dependencies -tock-registers = { version = "0.7.x", default-features = false, features = ["register_types"], optional = true } +tock-registers = { version = "0.8.x", default-features = false, features = ["register_types"], optional = true } qemu-exit = { version = "3.x.x", optional = true } # Platform specific dependencies [target.'cfg(target_arch = "aarch64")'.dependencies] -cortex-a = { version = "7.x.x" } +cortex-a = { version = "8.x.x" } ##-------------------------------------------------------------------------------------------------- ## Testing diff --git a/15_virtual_mem_part3_precomputed_tables/kernel/src/_arch/aarch64/time.rs b/15_virtual_mem_part3_precomputed_tables/kernel/src/_arch/aarch64/time.rs index ad8ba84d..1e2efbec 100644 --- a/15_virtual_mem_part3_precomputed_tables/kernel/src/_arch/aarch64/time.rs +++ b/15_virtual_mem_part3_precomputed_tables/kernel/src/_arch/aarch64/time.rs @@ -120,7 +120,7 @@ impl TryFrom for GenericTimerCounterValue { #[inline(always)] fn read_cntpct() -> GenericTimerCounterValue { // Prevent that the counter is read ahead of time due to out-of-order execution. - unsafe { barrier::isb(barrier::SY) }; + barrier::isb(barrier::SY); let cnt = CNTPCT_EL0.get(); GenericTimerCounterValue(cnt) diff --git a/15_virtual_mem_part3_precomputed_tables/kernel/src/bsp/device_driver/arm/gicv2/gicd.rs b/15_virtual_mem_part3_precomputed_tables/kernel/src/bsp/device_driver/arm/gicv2/gicd.rs index d9f63d1b..a9c97a8e 100644 --- a/15_virtual_mem_part3_precomputed_tables/kernel/src/bsp/device_driver/arm/gicv2/gicd.rs +++ b/15_virtual_mem_part3_precomputed_tables/kernel/src/bsp/device_driver/arm/gicv2/gicd.rs @@ -52,9 +52,9 @@ register_structs! { (0x004 => TYPER: ReadOnly), (0x008 => _reserved1), (0x104 => ISENABLER: [ReadWrite; 31]), - (0x108 => _reserved2), + (0x180 => _reserved2), (0x820 => ITARGETSR: [ReadWrite; 248]), - (0x824 => @END), + (0xC00 => @END), } } @@ -65,7 +65,7 @@ register_structs! { (0x100 => ISENABLER: ReadWrite), (0x104 => _reserved2), (0x800 => ITARGETSR: [ReadOnly; 8]), - (0x804 => @END), + (0x820 => @END), } } diff --git a/16_virtual_mem_part4_higher_half_kernel/Cargo.lock b/16_virtual_mem_part4_higher_half_kernel/Cargo.lock index a529e673..95941be4 100644 --- a/16_virtual_mem_part4_higher_half_kernel/Cargo.lock +++ b/16_virtual_mem_part4_higher_half_kernel/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "cortex-a" -version = "7.5.0" +version = "8.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdecfbb28672ad3664e71ae05a398a52df430d86d660691501b28968cc4467e6" +checksum = "0cd4524931a4e0ec50ae91f0d55f571f31ffe11dd9ce2f9905b8343c018c25bb" dependencies = [ "tock-registers", ] @@ -24,9 +24,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.43" +version = "1.0.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a2ca2c61bc9f3d74d2886294ab7b9853abd9c1ad903a3ac7815c58989bb7bab" +checksum = "7bd7356a8122b6c4a24a82b278680c73357984ca2fc79a0f9fa6dea7dced7c58" dependencies = [ "unicode-ident", ] @@ -48,9 +48,9 @@ dependencies = [ [[package]] name = "syn" -version = "1.0.100" +version = "1.0.101" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52205623b1b0f064a4e71182c3b18ae902267282930c6d5462c91b859668426e" +checksum = "e90cde112c4b9690b8cbe810cba9ddd8bc1d7472e2cae317b69e9438c1cba7d2" dependencies = [ "proc-macro2", "quote", @@ -73,9 +73,9 @@ version = "0.1.0" [[package]] name = "tock-registers" -version = "0.7.0" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ee8fba06c1f4d0b396ef61a54530bb6b28f0dc61c38bc8bc5a5a48161e6282e" +checksum = "696941a0aee7e276a165a978b37918fd5d22c55c3d6bda197813070ca9c0f21c" [[package]] name = "unicode-ident" diff --git a/16_virtual_mem_part4_higher_half_kernel/kernel/Cargo.toml b/16_virtual_mem_part4_higher_half_kernel/kernel/Cargo.toml index 28f87a50..06b2573c 100644 --- a/16_virtual_mem_part4_higher_half_kernel/kernel/Cargo.toml +++ b/16_virtual_mem_part4_higher_half_kernel/kernel/Cargo.toml @@ -18,12 +18,12 @@ test_build = ["qemu-exit"] test-types = { path = "../libraries/test-types" } # Optional dependencies -tock-registers = { version = "0.7.x", default-features = false, features = ["register_types"], optional = true } +tock-registers = { version = "0.8.x", default-features = false, features = ["register_types"], optional = true } qemu-exit = { version = "3.x.x", optional = true } # Platform specific dependencies [target.'cfg(target_arch = "aarch64")'.dependencies] -cortex-a = { version = "7.x.x" } +cortex-a = { version = "8.x.x" } ##-------------------------------------------------------------------------------------------------- ## Testing diff --git a/16_virtual_mem_part4_higher_half_kernel/kernel/src/_arch/aarch64/time.rs b/16_virtual_mem_part4_higher_half_kernel/kernel/src/_arch/aarch64/time.rs index ad8ba84d..1e2efbec 100644 --- a/16_virtual_mem_part4_higher_half_kernel/kernel/src/_arch/aarch64/time.rs +++ b/16_virtual_mem_part4_higher_half_kernel/kernel/src/_arch/aarch64/time.rs @@ -120,7 +120,7 @@ impl TryFrom for GenericTimerCounterValue { #[inline(always)] fn read_cntpct() -> GenericTimerCounterValue { // Prevent that the counter is read ahead of time due to out-of-order execution. - unsafe { barrier::isb(barrier::SY) }; + barrier::isb(barrier::SY); let cnt = CNTPCT_EL0.get(); GenericTimerCounterValue(cnt) diff --git a/16_virtual_mem_part4_higher_half_kernel/kernel/src/bsp/device_driver/arm/gicv2/gicd.rs b/16_virtual_mem_part4_higher_half_kernel/kernel/src/bsp/device_driver/arm/gicv2/gicd.rs index d9f63d1b..a9c97a8e 100644 --- a/16_virtual_mem_part4_higher_half_kernel/kernel/src/bsp/device_driver/arm/gicv2/gicd.rs +++ b/16_virtual_mem_part4_higher_half_kernel/kernel/src/bsp/device_driver/arm/gicv2/gicd.rs @@ -52,9 +52,9 @@ register_structs! { (0x004 => TYPER: ReadOnly), (0x008 => _reserved1), (0x104 => ISENABLER: [ReadWrite; 31]), - (0x108 => _reserved2), + (0x180 => _reserved2), (0x820 => ITARGETSR: [ReadWrite; 248]), - (0x824 => @END), + (0xC00 => @END), } } @@ -65,7 +65,7 @@ register_structs! { (0x100 => ISENABLER: ReadWrite), (0x104 => _reserved2), (0x800 => ITARGETSR: [ReadOnly; 8]), - (0x804 => @END), + (0x820 => @END), } } diff --git a/17_kernel_symbols/Cargo.lock b/17_kernel_symbols/Cargo.lock index d52e3863..8c84705d 100644 --- a/17_kernel_symbols/Cargo.lock +++ b/17_kernel_symbols/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "cortex-a" -version = "7.5.0" +version = "8.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdecfbb28672ad3664e71ae05a398a52df430d86d660691501b28968cc4467e6" +checksum = "0cd4524931a4e0ec50ae91f0d55f571f31ffe11dd9ce2f9905b8343c018c25bb" dependencies = [ "tock-registers", ] @@ -36,9 +36,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.43" +version = "1.0.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a2ca2c61bc9f3d74d2886294ab7b9853abd9c1ad903a3ac7815c58989bb7bab" +checksum = "7bd7356a8122b6c4a24a82b278680c73357984ca2fc79a0f9fa6dea7dced7c58" dependencies = [ "unicode-ident", ] @@ -60,9 +60,9 @@ dependencies = [ [[package]] name = "syn" -version = "1.0.100" +version = "1.0.101" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52205623b1b0f064a4e71182c3b18ae902267282930c6d5462c91b859668426e" +checksum = "e90cde112c4b9690b8cbe810cba9ddd8bc1d7472e2cae317b69e9438c1cba7d2" dependencies = [ "proc-macro2", "quote", @@ -85,9 +85,9 @@ version = "0.1.0" [[package]] name = "tock-registers" -version = "0.7.0" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ee8fba06c1f4d0b396ef61a54530bb6b28f0dc61c38bc8bc5a5a48161e6282e" +checksum = "696941a0aee7e276a165a978b37918fd5d22c55c3d6bda197813070ca9c0f21c" [[package]] name = "unicode-ident" diff --git a/17_kernel_symbols/README.md b/17_kernel_symbols/README.md index e88795ab..87264162 100644 --- a/17_kernel_symbols/README.md +++ b/17_kernel_symbols/README.md @@ -261,7 +261,7 @@ diff -uNr 16_virtual_mem_part4_higher_half_kernel/kernel/Cargo.toml 17_kernel_sy +debug-symbol-types = { path = "../libraries/debug-symbol-types" } # Optional dependencies - tock-registers = { version = "0.7.x", default-features = false, features = ["register_types"], optional = true } + tock-registers = { version = "0.8.x", default-features = false, features = ["register_types"], optional = true } diff -uNr 16_virtual_mem_part4_higher_half_kernel/kernel/src/_arch/aarch64/exception.rs 17_kernel_symbols/kernel/src/_arch/aarch64/exception.rs --- 16_virtual_mem_part4_higher_half_kernel/kernel/src/_arch/aarch64/exception.rs diff --git a/17_kernel_symbols/kernel/Cargo.toml b/17_kernel_symbols/kernel/Cargo.toml index c040d60c..a2a83aad 100644 --- a/17_kernel_symbols/kernel/Cargo.toml +++ b/17_kernel_symbols/kernel/Cargo.toml @@ -19,12 +19,12 @@ test-types = { path = "../libraries/test-types" } debug-symbol-types = { path = "../libraries/debug-symbol-types" } # Optional dependencies -tock-registers = { version = "0.7.x", default-features = false, features = ["register_types"], optional = true } +tock-registers = { version = "0.8.x", default-features = false, features = ["register_types"], optional = true } qemu-exit = { version = "3.x.x", optional = true } # Platform specific dependencies [target.'cfg(target_arch = "aarch64")'.dependencies] -cortex-a = { version = "7.x.x" } +cortex-a = { version = "8.x.x" } ##-------------------------------------------------------------------------------------------------- ## Testing diff --git a/17_kernel_symbols/kernel/src/_arch/aarch64/time.rs b/17_kernel_symbols/kernel/src/_arch/aarch64/time.rs index ad8ba84d..1e2efbec 100644 --- a/17_kernel_symbols/kernel/src/_arch/aarch64/time.rs +++ b/17_kernel_symbols/kernel/src/_arch/aarch64/time.rs @@ -120,7 +120,7 @@ impl TryFrom for GenericTimerCounterValue { #[inline(always)] fn read_cntpct() -> GenericTimerCounterValue { // Prevent that the counter is read ahead of time due to out-of-order execution. - unsafe { barrier::isb(barrier::SY) }; + barrier::isb(barrier::SY); let cnt = CNTPCT_EL0.get(); GenericTimerCounterValue(cnt) diff --git a/17_kernel_symbols/kernel/src/bsp/device_driver/arm/gicv2/gicd.rs b/17_kernel_symbols/kernel/src/bsp/device_driver/arm/gicv2/gicd.rs index d9f63d1b..a9c97a8e 100644 --- a/17_kernel_symbols/kernel/src/bsp/device_driver/arm/gicv2/gicd.rs +++ b/17_kernel_symbols/kernel/src/bsp/device_driver/arm/gicv2/gicd.rs @@ -52,9 +52,9 @@ register_structs! { (0x004 => TYPER: ReadOnly), (0x008 => _reserved1), (0x104 => ISENABLER: [ReadWrite; 31]), - (0x108 => _reserved2), + (0x180 => _reserved2), (0x820 => ITARGETSR: [ReadWrite; 248]), - (0x824 => @END), + (0xC00 => @END), } } @@ -65,7 +65,7 @@ register_structs! { (0x100 => ISENABLER: ReadWrite), (0x104 => _reserved2), (0x800 => ITARGETSR: [ReadOnly; 8]), - (0x804 => @END), + (0x820 => @END), } } diff --git a/18_backtrace/Cargo.lock b/18_backtrace/Cargo.lock index 82df825a..f662e8a6 100644 --- a/18_backtrace/Cargo.lock +++ b/18_backtrace/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "cortex-a" -version = "7.5.0" +version = "8.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdecfbb28672ad3664e71ae05a398a52df430d86d660691501b28968cc4467e6" +checksum = "0cd4524931a4e0ec50ae91f0d55f571f31ffe11dd9ce2f9905b8343c018c25bb" dependencies = [ "tock-registers", ] @@ -36,9 +36,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.43" +version = "1.0.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a2ca2c61bc9f3d74d2886294ab7b9853abd9c1ad903a3ac7815c58989bb7bab" +checksum = "7bd7356a8122b6c4a24a82b278680c73357984ca2fc79a0f9fa6dea7dced7c58" dependencies = [ "unicode-ident", ] @@ -60,9 +60,9 @@ dependencies = [ [[package]] name = "syn" -version = "1.0.100" +version = "1.0.101" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52205623b1b0f064a4e71182c3b18ae902267282930c6d5462c91b859668426e" +checksum = "e90cde112c4b9690b8cbe810cba9ddd8bc1d7472e2cae317b69e9438c1cba7d2" dependencies = [ "proc-macro2", "quote", @@ -85,9 +85,9 @@ version = "0.1.0" [[package]] name = "tock-registers" -version = "0.7.0" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ee8fba06c1f4d0b396ef61a54530bb6b28f0dc61c38bc8bc5a5a48161e6282e" +checksum = "696941a0aee7e276a165a978b37918fd5d22c55c3d6bda197813070ca9c0f21c" [[package]] name = "unicode-ident" diff --git a/18_backtrace/kernel/Cargo.toml b/18_backtrace/kernel/Cargo.toml index 9e5f55be..5a443538 100644 --- a/18_backtrace/kernel/Cargo.toml +++ b/18_backtrace/kernel/Cargo.toml @@ -19,12 +19,12 @@ test-types = { path = "../libraries/test-types" } debug-symbol-types = { path = "../libraries/debug-symbol-types" } # Optional dependencies -tock-registers = { version = "0.7.x", default-features = false, features = ["register_types"], optional = true } +tock-registers = { version = "0.8.x", default-features = false, features = ["register_types"], optional = true } qemu-exit = { version = "3.x.x", optional = true } # Platform specific dependencies [target.'cfg(target_arch = "aarch64")'.dependencies] -cortex-a = { version = "7.x.x" } +cortex-a = { version = "8.x.x" } ##-------------------------------------------------------------------------------------------------- ## Testing diff --git a/18_backtrace/kernel/src/_arch/aarch64/time.rs b/18_backtrace/kernel/src/_arch/aarch64/time.rs index ad8ba84d..1e2efbec 100644 --- a/18_backtrace/kernel/src/_arch/aarch64/time.rs +++ b/18_backtrace/kernel/src/_arch/aarch64/time.rs @@ -120,7 +120,7 @@ impl TryFrom for GenericTimerCounterValue { #[inline(always)] fn read_cntpct() -> GenericTimerCounterValue { // Prevent that the counter is read ahead of time due to out-of-order execution. - unsafe { barrier::isb(barrier::SY) }; + barrier::isb(barrier::SY); let cnt = CNTPCT_EL0.get(); GenericTimerCounterValue(cnt) diff --git a/18_backtrace/kernel/src/bsp/device_driver/arm/gicv2/gicd.rs b/18_backtrace/kernel/src/bsp/device_driver/arm/gicv2/gicd.rs index d9f63d1b..a9c97a8e 100644 --- a/18_backtrace/kernel/src/bsp/device_driver/arm/gicv2/gicd.rs +++ b/18_backtrace/kernel/src/bsp/device_driver/arm/gicv2/gicd.rs @@ -52,9 +52,9 @@ register_structs! { (0x004 => TYPER: ReadOnly), (0x008 => _reserved1), (0x104 => ISENABLER: [ReadWrite; 31]), - (0x108 => _reserved2), + (0x180 => _reserved2), (0x820 => ITARGETSR: [ReadWrite; 248]), - (0x824 => @END), + (0xC00 => @END), } } @@ -65,7 +65,7 @@ register_structs! { (0x100 => ISENABLER: ReadWrite), (0x104 => _reserved2), (0x800 => ITARGETSR: [ReadOnly; 8]), - (0x804 => @END), + (0x820 => @END), } } diff --git a/19_kernel_heap/Cargo.lock b/19_kernel_heap/Cargo.lock index cc7a9c20..f8d4b6f8 100644 --- a/19_kernel_heap/Cargo.lock +++ b/19_kernel_heap/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "cortex-a" -version = "7.5.0" +version = "8.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdecfbb28672ad3664e71ae05a398a52df430d86d660691501b28968cc4467e6" +checksum = "0cd4524931a4e0ec50ae91f0d55f571f31ffe11dd9ce2f9905b8343c018c25bb" dependencies = [ "tock-registers", ] @@ -43,9 +43,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.43" +version = "1.0.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a2ca2c61bc9f3d74d2886294ab7b9853abd9c1ad903a3ac7815c58989bb7bab" +checksum = "7bd7356a8122b6c4a24a82b278680c73357984ca2fc79a0f9fa6dea7dced7c58" dependencies = [ "unicode-ident", ] @@ -67,9 +67,9 @@ dependencies = [ [[package]] name = "syn" -version = "1.0.100" +version = "1.0.101" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52205623b1b0f064a4e71182c3b18ae902267282930c6d5462c91b859668426e" +checksum = "e90cde112c4b9690b8cbe810cba9ddd8bc1d7472e2cae317b69e9438c1cba7d2" dependencies = [ "proc-macro2", "quote", @@ -92,9 +92,9 @@ version = "0.1.0" [[package]] name = "tock-registers" -version = "0.7.0" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ee8fba06c1f4d0b396ef61a54530bb6b28f0dc61c38bc8bc5a5a48161e6282e" +checksum = "696941a0aee7e276a165a978b37918fd5d22c55c3d6bda197813070ca9c0f21c" [[package]] name = "unicode-ident" diff --git a/19_kernel_heap/README.md b/19_kernel_heap/README.md index b1463fc5..4eafd344 100644 --- a/19_kernel_heap/README.md +++ b/19_kernel_heap/README.md @@ -283,7 +283,7 @@ diff -uNr 18_backtrace/kernel/Cargo.toml 19_kernel_heap/kernel/Cargo.toml +linked_list_allocator = { version = "0.10.x", default-features = false, features = ["const_mut_refs"] } # Optional dependencies - tock-registers = { version = "0.7.x", default-features = false, features = ["register_types"], optional = true } + tock-registers = { version = "0.8.x", default-features = false, features = ["register_types"], optional = true } diff -uNr 18_backtrace/kernel/src/bsp/device_driver/arm/gicv2.rs 19_kernel_heap/kernel/src/bsp/device_driver/arm/gicv2.rs --- 18_backtrace/kernel/src/bsp/device_driver/arm/gicv2.rs diff --git a/19_kernel_heap/kernel/Cargo.toml b/19_kernel_heap/kernel/Cargo.toml index 61a16158..bccd0882 100644 --- a/19_kernel_heap/kernel/Cargo.toml +++ b/19_kernel_heap/kernel/Cargo.toml @@ -21,12 +21,12 @@ debug-symbol-types = { path = "../libraries/debug-symbol-types" } linked_list_allocator = { version = "0.10.x", default-features = false, features = ["const_mut_refs"] } # Optional dependencies -tock-registers = { version = "0.7.x", default-features = false, features = ["register_types"], optional = true } +tock-registers = { version = "0.8.x", default-features = false, features = ["register_types"], optional = true } qemu-exit = { version = "3.x.x", optional = true } # Platform specific dependencies [target.'cfg(target_arch = "aarch64")'.dependencies] -cortex-a = { version = "7.x.x" } +cortex-a = { version = "8.x.x" } ##-------------------------------------------------------------------------------------------------- ## Testing diff --git a/19_kernel_heap/kernel/src/_arch/aarch64/time.rs b/19_kernel_heap/kernel/src/_arch/aarch64/time.rs index ad8ba84d..1e2efbec 100644 --- a/19_kernel_heap/kernel/src/_arch/aarch64/time.rs +++ b/19_kernel_heap/kernel/src/_arch/aarch64/time.rs @@ -120,7 +120,7 @@ impl TryFrom for GenericTimerCounterValue { #[inline(always)] fn read_cntpct() -> GenericTimerCounterValue { // Prevent that the counter is read ahead of time due to out-of-order execution. - unsafe { barrier::isb(barrier::SY) }; + barrier::isb(barrier::SY); let cnt = CNTPCT_EL0.get(); GenericTimerCounterValue(cnt) diff --git a/19_kernel_heap/kernel/src/bsp/device_driver/arm/gicv2/gicd.rs b/19_kernel_heap/kernel/src/bsp/device_driver/arm/gicv2/gicd.rs index d9f63d1b..a9c97a8e 100644 --- a/19_kernel_heap/kernel/src/bsp/device_driver/arm/gicv2/gicd.rs +++ b/19_kernel_heap/kernel/src/bsp/device_driver/arm/gicv2/gicd.rs @@ -52,9 +52,9 @@ register_structs! { (0x004 => TYPER: ReadOnly), (0x008 => _reserved1), (0x104 => ISENABLER: [ReadWrite; 31]), - (0x108 => _reserved2), + (0x180 => _reserved2), (0x820 => ITARGETSR: [ReadWrite; 248]), - (0x824 => @END), + (0xC00 => @END), } } @@ -65,7 +65,7 @@ register_structs! { (0x100 => ISENABLER: ReadWrite), (0x104 => _reserved2), (0x800 => ITARGETSR: [ReadOnly; 8]), - (0x804 => @END), + (0x820 => @END), } } diff --git a/X1_JTAG_boot/Cargo.lock b/X1_JTAG_boot/Cargo.lock index 6e628b86..bcfb442a 100644 --- a/X1_JTAG_boot/Cargo.lock +++ b/X1_JTAG_boot/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "cortex-a" -version = "7.5.0" +version = "8.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdecfbb28672ad3664e71ae05a398a52df430d86d660691501b28968cc4467e6" +checksum = "0cd4524931a4e0ec50ae91f0d55f571f31ffe11dd9ce2f9905b8343c018c25bb" dependencies = [ "tock-registers", ] @@ -21,6 +21,6 @@ dependencies = [ [[package]] name = "tock-registers" -version = "0.7.0" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ee8fba06c1f4d0b396ef61a54530bb6b28f0dc61c38bc8bc5a5a48161e6282e" +checksum = "696941a0aee7e276a165a978b37918fd5d22c55c3d6bda197813070ca9c0f21c" diff --git a/X1_JTAG_boot/Cargo.toml b/X1_JTAG_boot/Cargo.toml index 638d4de1..55963c38 100644 --- a/X1_JTAG_boot/Cargo.toml +++ b/X1_JTAG_boot/Cargo.toml @@ -23,8 +23,8 @@ path = "src/main.rs" [dependencies] # Optional dependencies -tock-registers = { version = "0.7.x", default-features = false, features = ["register_types"], optional = true } +tock-registers = { version = "0.8.x", default-features = false, features = ["register_types"], optional = true } # Platform specific dependencies [target.'cfg(target_arch = "aarch64")'.dependencies] -cortex-a = { version = "7.x.x" } +cortex-a = { version = "8.x.x" } diff --git a/X1_JTAG_boot/jtag_boot_rpi3.img b/X1_JTAG_boot/jtag_boot_rpi3.img index 844015333d4c9c99ddbb059320b89f37229f2328..8c67b2dd87ca95ac69ab1567d94595d9cb5bc53f 100755 GIT binary patch delta 322 zcmccMe8PExE7NU;jqXB190yq@$}2Em<(ix*B+uA5xlw49$b|d$%vZG@SYPFIm>J|* zyu2vmp!Z~Z;b=zh$+Lx%#02#xzSU+}2~(8C%&;XJs6bf69;hH#q>b_5Pi5Fy{O|vC z5Sx=>MiA#rhMoCf{^l&nU?z432B2*W43qat+b}+x%qSx-_);2Z5fJczNd|_mn+;|9 hStg%Q2$0;M2$4FV0HIev`7b6LDyB0wOrEJ|4gj%_YEA$E delta 327 zcmX@%e8G8wD-$#0Mt310j)yE0J|* zyu2vmpu=Q);b=yO$+Lx%#J=iHe5=i{5~e7NnPE#dP=Th=ce);#F2dA6t+BT#&k*lNKCY!i8Y|DVpl$gmY;u|m+~JaH+$4j%>qW(Eck4hDt| z91AB;6K~|%zy&nG3u3@zWr9b#FQR#|NoZXZ?WUk&jxKaXP*7A9&JjdE zH#>boti;LMv6AsW(7-}wo>>%IAS-k;}v-iL3oZ=o;S zR2N+bzRg1yGwV`&J4#ANgUIvh>IULM3{2<+uX34kA*wWk@6nf-OjruU@Gm+}9eb`+ z`7pwFmW>Ci(2Z$llB2LjKA2$5V{pf0USt>X-(5y8#LqtFdpYnB=WVNF8WKoMV5xw96&bE zg~N>xksr@D4xw6H>+ty*;Oj``_*9Ri&eqDhhS4DKYiX#I35zP$8@VBT%HcvWoN@%y zqcPz14eBg1YHC05nnua0MjO~W0DS2JNXwhr6AySk!M0eXQJ$@d$|ai3-y~`QqLoBd zf6dTn>SMJRDgeB2ckV`Ac+xp?=!(Xd?}AkJfvhTKcdDpu`5>BiEry5>2ceQO zd@yf&*@+Je!j5nCgmoH8tM5SKa8hVI@}p`VtFLCsPQxJ49J;@k7?dW`(u`ry+c23X zlY?6ZWxi{ zEB*wr)yJ-)UrKvB$|%P|$TL5&iG(l*5A;Mry~4N=<9mju*~?req68E8HydZ}&Z<>0 zg77U)Mj7=jx6Gq}nzG+yP+8p)M^Ip~SJC@zBOsPL3b`^NKQtDUphH$lA(Yz~0wbTo zsX8|!gz-$>5SqeY>-=4VH{>Kh&nWFCgt#|Z$OmC6E)2@@x5Mmepwz$0v+!B~NC#yc zslSKD@j`tJd2p?>Bj5tjMl&ZD`xI@iHmC294S~2Z36(OPqWSk2+#P({=|(A>bcW7l z2SL;ov^iwt0#OhNVR9N_4V)MPv2+2H<-g>S4}2@ID+tSctoB2NQfVmmDKBUZAb6we zmQG;1)M$?#1(5}C^0b6c;a for GenericTimerCounterValue { #[inline(always)] fn read_cntpct() -> GenericTimerCounterValue { // Prevent that the counter is read ahead of time due to out-of-order execution. - unsafe { barrier::isb(barrier::SY) }; + barrier::isb(barrier::SY); let cnt = CNTPCT_EL0.get(); GenericTimerCounterValue(cnt)