l2 cache init now done in user app

examples/embassy/src/bin/dht22-open-drain-pins.rs

@@ -15,6 +15,7 @@ use zynq7000_hal::{
     gic::{GicConfigurator, GicInterruptHelper, Interrupt},
     gpio::{Flex, Output, PinState, mio},
     gtc::Gtc,
+    l2_cache,
     time::Hertz,
     uart::{ClkConfigRaw, Uart, UartConfig},
 };
@@ -43,7 +44,9 @@ const OPEN_DRAIN_PINS_MIO9_TO_MIO14: bool = false;
 #[embassy_executor::main]
 #[unsafe(export_name = "main")]
 async fn main(_spawner: Spawner) -> ! {
-    let dp = PsPeripherals::take().unwrap();
+    let mut dp = PsPeripherals::take().unwrap();
+    l2_cache::init_with_defaults(&mut dp.l2c);
+
     // Clock was already initialized by PS7 Init TCL script or FSBL, we just read it.
     let clocks = Clocks::new_from_regs(PS_CLOCK_FREQUENCY).unwrap();
     // Set up the global interrupt controller.

examples/embassy/src/bin/logger-non-blocking.rs

@@ -16,6 +16,7 @@ use zynq7000_hal::{
     gic::{GicConfigurator, GicInterruptHelper, Interrupt},
     gpio::{Output, PinState, mio},
     gtc::Gtc,
+    l2_cache,
     time::Hertz,
     uart::{ClkConfigRaw, TxAsync, Uart, UartConfig, on_interrupt_tx},
 };
@@ -37,7 +38,9 @@ pub extern "C" fn boot_core(cpu_id: u32) -> ! {
 #[unsafe(export_name = "main")]
 #[embassy_executor::main]
 async fn main(spawner: Spawner) -> ! {
-    let dp = PsPeripherals::take().unwrap();
+    let mut dp = PsPeripherals::take().unwrap();
+    l2_cache::init_with_defaults(&mut dp.l2c);
+
     // Clock was already initialized by PS7 Init TCL script or FSBL, we just read it.
     let clocks = Clocks::new_from_regs(PS_CLOCK_FREQUENCY).unwrap();
     // Set up the global interrupt controller.

examples/embassy/src/bin/pwm.rs

@@ -21,6 +21,7 @@ use zynq7000_hal::{
     gic::{GicConfigurator, GicInterruptHelper, Interrupt},
     gpio::{Output, PinState, mio},
     gtc::Gtc,
+    l2_cache,
     time::Hertz,
     uart::{ClkConfigRaw, Uart, UartConfig},
 };
@@ -43,7 +44,9 @@ pub extern "C" fn boot_core(cpu_id: u32) -> ! {
 #[embassy_executor::main]
 #[unsafe(export_name = "main")]
 async fn main(_spawner: Spawner) -> ! {
-    let dp = PsPeripherals::take().unwrap();
+    let mut dp = PsPeripherals::take().unwrap();
+    l2_cache::init_with_defaults(&mut dp.l2c);
+
     // Clock was already initialized by PS7 Init TCL script or FSBL, we just read it.
     let clocks = Clocks::new_from_regs(PS_CLOCK_FREQUENCY).unwrap();
     // Set up the global interrupt controller.

examples/embassy/src/main.rs

@@ -14,6 +14,7 @@ use zynq7000_hal::{
     gic::{GicConfigurator, GicInterruptHelper, Interrupt},
     gpio::{Output, PinState, mio},
     gtc::Gtc,
+    l2_cache,
     time::Hertz,
     uart::{ClkConfigRaw, Uart, UartConfig},
 };
@@ -33,11 +34,12 @@ pub extern "C" fn boot_core(cpu_id: u32) -> ! {
     main();
 }
 
-// TODO: The export name is ignored..
 #[embassy_executor::main]
 #[unsafe(export_name = "main")]
 async fn main(_spawner: Spawner) -> ! {
-    let dp = PsPeripherals::take().unwrap();
+    let mut dp = PsPeripherals::take().unwrap();
+    l2_cache::init_with_defaults(&mut dp.l2c);
+
     // Clock was already initialized by PS7 Init TCL script or FSBL, we just read it.
     let clocks = Clocks::new_from_regs(PS_CLOCK_FREQUENCY).unwrap();
     // Set up the global interrupt controller.

examples/simple/src/bin/gtc-ticks.rs

@@ -12,6 +12,7 @@ use zynq7000_hal::{
     gic::{GicConfigurator, GicInterruptHelper, Interrupt},
     gpio::{Output, PinState, mio},
     gtc::Gtc,
+    l2_cache,
     prelude::*,
     time::Hertz,
     uart::{ClkConfigRaw, Uart, UartConfig},
@@ -35,7 +36,9 @@ pub extern "C" fn boot_core(cpu_id: u32) -> ! {
 
 #[unsafe(export_name = "main")]
 pub fn main() -> ! {
-    let dp = zynq7000::PsPeripherals::take().unwrap();
+    let mut dp = zynq7000::PsPeripherals::take().unwrap();
+    l2_cache::init_with_defaults(&mut dp.l2c);
+
     // Clock was already initialized by PS7 Init TCL script or FSBL, we just read it.
     let clocks = Clocks::new_from_regs(PS_CLOCK_FREQUENCY).unwrap();
     // Set up the global interrupt controller.

examples/simple/src/bin/logger.rs

@@ -13,6 +13,7 @@ use zynq7000_hal::{
     gic::{GicConfigurator, GicInterruptHelper, Interrupt},
     gpio::{Output, PinState, mio},
     gtc::Gtc,
+    l2_cache,
     prelude::*,
     time::Hertz,
     uart::{ClkConfigRaw, Uart, UartConfig},
@@ -36,7 +37,9 @@ pub extern "C" fn boot_core(cpu_id: u32) -> ! {
 
 #[unsafe(export_name = "main")]
 pub fn main() -> ! {
-    let dp = zynq7000::PsPeripherals::take().unwrap();
+    let mut dp = zynq7000::PsPeripherals::take().unwrap();
+    l2_cache::init_with_defaults(&mut dp.l2c);
+
     // Clock was already initialized by PS7 Init TCL script or FSBL, we just read it.
     let clocks = Clocks::new_from_regs(PS_CLOCK_FREQUENCY).unwrap();
     // Set up the global interrupt controller.

examples/simple/src/main.rs

@@ -6,7 +6,10 @@ use core::panic::PanicInfo;
 use cortex_ar::asm::nop;
 use embedded_hal::digital::StatefulOutputPin;
 use zynq7000::PsPeripherals;
-use zynq7000_hal::gpio::{Output, PinState, mio};
+use zynq7000_hal::{
+    gpio::{Output, PinState, mio},
+    l2_cache,
+};
 use zynq7000_rt as _;
 
 /// One user LED is MIO7
@@ -31,6 +34,7 @@ pub extern "C" fn boot_core(cpu_id: u32) -> ! {
 
 #[unsafe(export_name = "main")]
 pub fn main() -> ! {
+    l2_cache::init_with_defaults(&mut unsafe { zynq7000::l2_cache::L2Cache::new_mmio_fixed() });
     match LIB {
         Lib::Pac => {
             let mut gpio = unsafe { zynq7000::gpio::Gpio::new_mmio_fixed() };

examples/zedboard/src/bin/ethernet.rs

@@ -48,6 +48,7 @@ use zynq7000_hal::{
     gic::{GicConfigurator, GicInterruptHelper, Interrupt},
     gpio::{GpioPins, Output, PinState},
     gtc::Gtc,
+    l2_cache,
     uart::{ClkConfigRaw, Uart, UartConfig},
 };
 
@@ -208,14 +209,17 @@ async fn tcp_task(mut tcp: TcpSocket<'static>) -> ! {
 #[embassy_executor::main]
 #[unsafe(export_name = "main")]
 async fn main(spawner: Spawner) -> ! {
+    let mut dp = PsPeripherals::take().unwrap();
+    l2_cache::init_with_defaults(&mut dp.l2c);
+
+    // Enable PS-PL level shifters.
+    configure_level_shifter(LevelShifterConfig::EnableAll);
+
     // Configure the uncached memory region using the MMU.
     mmu_l1_table_mut()
         .update(UNCACHED_ADDR, SHAREABLE_DEVICE)
         .expect("configuring uncached memory section failed");
 
-    // Enable PS-PL level shifters.
-    configure_level_shifter(LevelShifterConfig::EnableAll);
-    let dp = PsPeripherals::take().unwrap();
     // Clock was already initialized by PS7 Init TCL script or FSBL, we just read it.
     let clocks = Clocks::new_from_regs(PS_CLOCK_FREQUENCY).unwrap();
     // Set up the global interrupt controller.

examples/zedboard/src/bin/l3gd20h-i2c-mio.rs

@@ -24,7 +24,7 @@ use zynq7000_hal::{
     gic::{GicConfigurator, GicInterruptHelper, Interrupt},
     gpio::{GpioPins, Output, PinState},
     gtc::Gtc,
-    i2c,
+    i2c, l2_cache,
     time::Hertz,
     uart,
 };
@@ -48,9 +48,12 @@ pub extern "C" fn boot_core(cpu_id: u32) -> ! {
 #[embassy_executor::main]
 #[unsafe(export_name = "main")]
 async fn main(_spawner: Spawner) -> ! {
+    let mut dp = PsPeripherals::take().unwrap();
+    l2_cache::init_with_defaults(&mut dp.l2c);
+
     // Enable PS-PL level shifters.
     configure_level_shifter(LevelShifterConfig::EnableAll);
-    let dp = PsPeripherals::take().unwrap();
+
     // Clock was already initialized by PS7 Init TCL script or FSBL, we just read it.
     let clocks = Clocks::new_from_regs(PS_CLOCK_FREQUENCY).unwrap();
 

examples/zedboard/src/bin/l3gd20h-spi-mio.rs

@@ -24,6 +24,7 @@ use zynq7000_hal::{
     gic::{GicConfigurator, GicInterruptHelper, Interrupt},
     gpio::{GpioPins, Output, PinState},
     gtc::Gtc,
+    l2_cache,
     spi::{self, SpiAsync, SpiId, SpiWithHwCs, SpiWithHwCsAsync, on_interrupt},
     time::Hertz,
     uart::{self, TxAsync, on_interrupt_tx},
@@ -50,9 +51,12 @@ pub extern "C" fn boot_core(cpu_id: u32) -> ! {
 #[embassy_executor::main]
 #[unsafe(export_name = "main")]
 async fn main(spawner: Spawner) -> ! {
+    let mut dp = PsPeripherals::take().unwrap();
+    l2_cache::init_with_defaults(&mut dp.l2c);
+
     // Enable PS-PL level shifters.
     configure_level_shifter(LevelShifterConfig::EnableAll);
-    let dp = PsPeripherals::take().unwrap();
+
     // Clock was already initialized by PS7 Init TCL script or FSBL, we just read it.
     let mut clocks = Clocks::new_from_regs(PS_CLOCK_FREQUENCY).unwrap();
 

examples/zedboard/src/bin/uart-blocking.rs

@@ -19,6 +19,7 @@ use zynq7000_hal::{
     gic::{GicConfigurator, GicInterruptHelper, Interrupt},
     gpio::{GpioPins, Output, PinState},
     gtc::Gtc,
+    l2_cache,
     uart::{ClkConfigRaw, Uart, UartConfig},
 };
 
@@ -100,9 +101,11 @@ impl UartMultiplexer {
 #[embassy_executor::main]
 #[unsafe(export_name = "main")]
 async fn main(_spawner: Spawner) -> ! {
+    let mut dp = PsPeripherals::take().unwrap();
+    l2_cache::init_with_defaults(&mut dp.l2c);
+
     // Enable PS-PL level shifters.
     configure_level_shifter(LevelShifterConfig::EnableAll);
-    let dp = PsPeripherals::take().unwrap();
     // Clock was already initialized by PS7 Init TCL script or FSBL, we just read it.
     let clocks = Clocks::new_from_regs(PS_CLOCK_FREQUENCY).unwrap();
     // Set up the global interrupt controller.

examples/zedboard/src/bin/uart-non-blocking.rs

@@ -45,6 +45,7 @@ use zynq7000_hal::{
     gic::{GicConfigurator, GicInterruptHelper, Interrupt},
     gpio::{GpioPins, Output, PinState},
     gtc::Gtc,
+    l2_cache,
     time::Hertz,
     uart::{ClkConfigRaw, Uart, UartConfig},
 };
@@ -165,9 +166,12 @@ impl UartMultiplexer {
 #[embassy_executor::main]
 #[unsafe(export_name = "main")]
 async fn main(spawner: Spawner) -> ! {
+    let mut dp = PsPeripherals::take().unwrap();
+    l2_cache::init_with_defaults(&mut dp.l2c);
+
     // Enable PS-PL level shifters.
     configure_level_shifter(LevelShifterConfig::EnableAll);
-    let dp = PsPeripherals::take().unwrap();
+
     // Clock was already initialized by PS7 Init TCL script or FSBL, we just read it.
     let clocks = Clocks::new_from_regs(PS_CLOCK_FREQUENCY).unwrap();
     // Set up the global interrupt controller.

examples/zedboard/src/main.rs

@@ -16,6 +16,7 @@ use zynq7000_hal::{
     gic::{GicConfigurator, GicInterruptHelper, Interrupt},
     gpio::{GpioPins, Output, PinState},
     gtc::Gtc,
+    l2_cache,
     uart::{ClkConfigRaw, Uart, UartConfig},
 };
 
@@ -36,9 +37,12 @@ pub extern "C" fn boot_core(cpu_id: u32) -> ! {
 #[embassy_executor::main]
 #[unsafe(export_name = "main")]
 async fn main(_spawner: Spawner) -> ! {
+    let mut dp = PsPeripherals::take().unwrap();
+    l2_cache::init_with_defaults(&mut dp.l2c);
+
     // Enable PS-PL level shifters.
     configure_level_shifter(LevelShifterConfig::EnableAll);
-    let dp = PsPeripherals::take().unwrap();
+
     // Clock was already initialized by PS7 Init TCL script or FSBL, we just read it.
     let clocks = Clocks::new_from_regs(PS_CLOCK_FREQUENCY).unwrap();
     // Set up the global interrupt controller.