runtime: initialize more

Cargo.lock

@@ -24,6 +24,16 @@ version = "0.1.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "036b035e9ebcd705affece16319223d19f229e2358be6e3b7b094e57193312e6"
 
+[[package]]
+name = "libasync"
+version = "0.0.0"
+source = "git+https://git.m-labs.hk/M-Labs/zc706.git#526cfe7577c189687ed1fdca512120dd1460bb80"
+dependencies = [
+ "libcortex_a9",
+ "pin-utils",
+ "smoltcp",
+]
+
 [[package]]
 name = "libboard_zynq"
 version = "0.0.0"
@@ -80,6 +90,12 @@ version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fdcec5e97041c7f0f1c5b7d93f12e57293c831c646f4cc7a5db59460c7ea8de6"
 
+[[package]]
+name = "pin-utils"
+version = "0.1.0-alpha.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5894c618ce612a3fa23881b152b608bafb8c56cfc22f434a3ba3120b40f7b587"
+
 [[package]]
 name = "r0"
 version = "1.0.0"
@@ -90,6 +106,7 @@ checksum = "bd7a31eed1591dcbc95d92ad7161908e72f4677f8fabf2a32ca49b4237cbf211"
 name = "runtime"
 version = "0.1.0"
 dependencies = [
+ "libasync",
  "libboard_zynq",
  "libsupport_zynq",
 ]

runtime/Cargo.toml

@@ -7,9 +7,9 @@ edition = "2018"
 
 [features]
 target_zc706 = ["libboard_zynq/target_zc706", "libsupport_zynq/target_zc706"]
-target_cora_z7_10 = ["libboard_zynq/target_cora_z7_10", "libsupport_zynq/target_cora_z7_10"]
 default = ["target_zc706"]
 
 [dependencies]
 libboard_zynq = { git = "https://git.m-labs.hk/M-Labs/zc706.git" }
 libsupport_zynq = { git = "https://git.m-labs.hk/M-Labs/zc706.git" }
+libasync = { git = "https://git.m-labs.hk/M-Labs/zc706.git" }

runtime/src/main.rs

@@ -3,9 +3,22 @@
 
 extern crate alloc;
 
-use libboard_zynq::println;
-use libsupport_zynq::ram;
 use core::{cmp, str};
+use core::mem::transmute;
+
+use libboard_zynq::{
+    println,
+    self as zynq, clocks::Clocks, clocks::source::{ClockSource, ArmPll, IoPll},
+    smoltcp::{
+        wire::{EthernetAddress, IpAddress, IpCidr},
+        iface::{NeighborCache, EthernetInterfaceBuilder, Routes},
+        time::Instant,
+    },
+};
+use libsupport_zynq::{
+    ram, alloc::{vec, vec::Vec},
+};
+use libasync::smoltcp::Sockets;
 
 mod pl;
 
@@ -22,10 +35,63 @@ fn identifier_read(buf: &mut [u8]) -> &str {
     }
 }
 
+const HWADDR: [u8; 6] = [0, 0x23, 0xab, 0xad, 0x1d, 0xea];
+
 #[no_mangle]
 pub fn main_core0() {
-    println!("[CORE0] hello world {}", identifier_read(&mut [0; 64]));
-    loop {}
+    println!("ARTIQ runtime starting...");
+
+    const CPU_FREQ: u32 = 800_000_000;
+
+    ArmPll::setup(2 * CPU_FREQ);
+    Clocks::set_cpu_freq(CPU_FREQ);
+    IoPll::setup(1_000_000_000);
+    libboard_zynq::stdio::drop_uart(); // why?
+    let mut ddr = zynq::ddr::DdrRam::new();
+    ram::init_alloc(&mut ddr);
+
+    println!("Detected gateware: {}", identifier_read(&mut [0; 64]));
+
+    let eth = zynq::eth::Eth::default(HWADDR.clone());
+    const RX_LEN: usize = 8;
+    let mut rx_descs = (0..RX_LEN)
+        .map(|_| zynq::eth::rx::DescEntry::zeroed())
+        .collect::<Vec<_>>();
+    let mut rx_buffers = vec![zynq::eth::Buffer::new(); RX_LEN];
+    // Number of transmission buffers (minimum is two because with
+    // one, duplicate packet transmission occurs)
+    const TX_LEN: usize = 8;
+    let mut tx_descs = (0..TX_LEN)
+        .map(|_| zynq::eth::tx::DescEntry::zeroed())
+        .collect::<Vec<_>>();
+    let mut tx_buffers = vec![zynq::eth::Buffer::new(); TX_LEN];
+    let eth = eth.start_rx(&mut rx_descs, &mut rx_buffers);
+    let mut eth = eth.start_tx(
+        // HACK
+        unsafe { transmute(tx_descs.as_mut_slice()) },
+        unsafe { transmute(tx_buffers.as_mut_slice()) },
+    );
+    let ethernet_addr = EthernetAddress(HWADDR);
+
+    let local_addr = IpAddress::v4(192, 168, 1, 52);
+    let mut ip_addrs = [IpCidr::new(local_addr, 24)];
+    let mut routes_storage = vec![None; 4];
+    let routes = Routes::new(&mut routes_storage[..]);
+    let mut neighbor_storage = vec![None; 256];
+    let neighbor_cache = NeighborCache::new(&mut neighbor_storage[..]);
+    let mut iface = EthernetInterfaceBuilder::new(&mut eth)
+        .ethernet_addr(ethernet_addr)
+        .ip_addrs(&mut ip_addrs[..])
+        .routes(routes)
+        .neighbor_cache(neighbor_cache)
+        .finalize();
+
+    Sockets::init(32);
+    let mut time = 0u32;
+    Sockets::run(&mut iface, || {
+        time += 1;
+        Instant::from_millis(time)
+    });
 }
 
 #[no_mangle]