Add generic_timer tests for Armv7-A

Requires we change the emulated CPU from Cortex-A8 to Cortex-A15, as
Cortex-A8 doesn't have the timer extensions.

That in turn meant we booted into EL2, so we needed to bounce ourselves
into EL1 that the examples were expecting. And that meant making a bunch
of Hyp registers available on Armv7-A and Armv8-R, and changing the
Armv7-A start-up routine to be the Armv8-R routine.

Author: jonathanpallant

.cargo/config.toml

@@ -23,16 +23,16 @@ runner = "qemu-system-arm -machine versatileab -cpu cortex-r5 -semihosting -nogr
 runner = "qemu-system-arm -machine versatileab -cpu cortex-r5 -semihosting -nographic -audio none -kernel"
 
 [target.armv7a-none-eabihf]
-runner = "qemu-system-arm -machine versatileab -cpu cortex-a8 -semihosting -nographic -audio none -kernel"
+runner = "qemu-system-arm -machine versatileab -cpu cortex-a15 -semihosting -nographic -audio none -kernel"
 
 [target.thumbv7a-none-eabihf]
-runner = "qemu-system-arm -machine versatileab -cpu cortex-a8 -semihosting -nographic -audio none -kernel"
+runner = "qemu-system-arm -machine versatileab -cpu cortex-a15 -semihosting -nographic -audio none -kernel"
 
 [target.armv7a-none-eabi]
-runner = "qemu-system-arm -machine versatileab -cpu cortex-a8 -semihosting -nographic -audio none -kernel"
+runner = "qemu-system-arm -machine versatileab -cpu cortex-a15 -semihosting -nographic -audio none -kernel"
 
 [target.thumbv7a-none-eabi]
-runner = "qemu-system-arm -machine versatileab -cpu cortex-a8 -semihosting -nographic -audio none -kernel"
+runner = "qemu-system-arm -machine versatileab -cpu cortex-a15 -semihosting -nographic -audio none -kernel"
 
 [target.armv6-none-eabihf]
 runner = "qemu-system-arm -machine versatileab -cpu arm1176 -semihosting -nographic -audio none -kernel"

aarch32-cpu/src/cache.rs

@@ -1,3 +1,5 @@
+//! Helper functions for cache operations
+
 use arbitrary_int::u3;
 
 use crate::register::{Dccimvac, Dccisw, Dccmvac, Dccsw, Dcimvac, Dcisw, SysRegWrite};

aarch32-cpu/src/generic_timer/el0.rs

@@ -2,7 +2,7 @@
 
 use crate::register;
 
-/// Represents our Generic Timer when we are running at EL0.
+/// Represents our Physical Timer when we are running at EL0.
 ///
 /// Note that for most of these APIs to work, EL0 needs to have been granted
 /// access using methods like
@@ -75,6 +75,11 @@ impl super::GenericTimer for El0PhysicalTimer {
     }
 }
 
+/// Represents our Virtual Timer when we are running at EL0.
+///
+/// Note that for most of these APIs to work, EL0 needs to have been granted
+/// access using methods like
+/// [El1PhysicalTimer::el0_access_virtual_counter](crate::generic_timer::El1VirtualTimer::el0_access_virtual_counter).
 pub struct El0VirtualTimer();
 
 impl El0VirtualTimer {

aarch32-cpu/src/mmu.rs

@@ -1,4 +1,4 @@
-//! Code and types for use with MMU programming on a VMSA (Virtual Memory System Architecture) platform
+//! Support for the VMSAv7 MMU
 
 use arbitrary_int::{u12, u2, u3, u4};
 

aarch32-cpu/src/register/armv8r/mod.rs

@@ -1,22 +1,6 @@
 //! Access registers for Armv8-R only
 
-pub mod hacr;
-pub mod hactlr;
-pub mod hactlr2;
-pub mod hadfsr;
-pub mod haifsr;
-pub mod hamair0;
-pub mod hamair1;
-pub mod hcptr;
-pub mod hcr;
-pub mod hcr2;
-pub mod hdcr;
-pub mod hdfar;
-pub mod hifar;
-pub mod hmair0;
-pub mod hmair1;
 pub mod hmpuir;
-pub mod hpfar;
 pub mod hprbar;
 pub mod hprbar0;
 pub mod hprbar1;
@@ -53,11 +37,6 @@ pub mod hprlar7;
 pub mod hprlar8;
 pub mod hprlar9;
 pub mod hprselr;
-pub mod hsctlr;
-pub mod hsr;
-pub mod hstr;
-pub mod htpidr;
-pub mod hvbar;
 pub mod prbar;
 pub mod prbar0;
 pub mod prbar1;
@@ -95,23 +74,7 @@ pub mod prlar9;
 pub mod prselr;
 pub mod vbar;
 
-pub use hacr::Hacr;
-pub use hactlr::Hactlr;
-pub use hactlr2::Hactlr2;
-pub use hadfsr::Hadfsr;
-pub use haifsr::Haifsr;
-pub use hamair0::Hamair0;
-pub use hamair1::Hamair1;
-pub use hcptr::Hcptr;
-pub use hcr::Hcr;
-pub use hcr2::Hcr2;
-pub use hdcr::Hdcr;
-pub use hdfar::Hdfar;
-pub use hifar::Hifar;
-pub use hmair0::Hmair0;
-pub use hmair1::Hmair1;
 pub use hmpuir::Hmpuir;
-pub use hpfar::Hpfar;
 pub use hprbar::Hprbar;
 pub use hprbar0::Hprbar0;
 pub use hprbar1::Hprbar1;
@@ -148,11 +111,6 @@ pub use hprlar7::Hprlar7;
 pub use hprlar8::Hprlar8;
 pub use hprlar9::Hprlar9;
 pub use hprselr::Hprselr;
-pub use hsctlr::Hsctlr;
-pub use hsr::Hsr;
-pub use hstr::Hstr;
-pub use htpidr::Htpidr;
-pub use hvbar::Hvbar;
 pub use prbar::Prbar;
 pub use prbar0::Prbar0;
 pub use prbar1::Prbar1;