From 97aafe32913939c63a87204c56fccd83353db71a Mon Sep 17 00:00:00 2001 From: Sebastien Bourdeauducq Date: Mon, 13 Apr 2020 13:48:08 +0800 Subject: [PATCH] integrate inter-CPU communication --- Cargo.lock | 11 ++++---- runtime/Cargo.toml | 1 + runtime/src/{network.rs => comms.rs} | 4 +-- runtime/src/kernel.rs | 9 +++++++ runtime/src/main.rs | 39 +++++++++++++++++++++++----- 5 files changed, 51 insertions(+), 13 deletions(-) rename runtime/src/{network.rs => comms.rs} (97%) create mode 100644 runtime/src/kernel.rs diff --git a/Cargo.lock b/Cargo.lock index 23cb5a8..f871158 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -43,7 +43,7 @@ version = "0.1.0" [[package]] name = "libasync" version = "0.0.0" -source = "git+https://git.m-labs.hk/M-Labs/zc706.git#526cfe7577c189687ed1fdca512120dd1460bb80" +source = "git+https://git.m-labs.hk/M-Labs/zc706.git#b26327e474ef224c91f704b7f513a1495a981f87" dependencies = [ "libcortex_a9", "pin-utils", @@ -53,7 +53,7 @@ dependencies = [ [[package]] name = "libboard_zynq" version = "0.0.0" -source = "git+https://git.m-labs.hk/M-Labs/zc706.git#526cfe7577c189687ed1fdca512120dd1460bb80" +source = "git+https://git.m-labs.hk/M-Labs/zc706.git#b26327e474ef224c91f704b7f513a1495a981f87" dependencies = [ "bit_field", "libcortex_a9", @@ -65,7 +65,7 @@ dependencies = [ [[package]] name = "libcortex_a9" version = "0.0.0" -source = "git+https://git.m-labs.hk/M-Labs/zc706.git#526cfe7577c189687ed1fdca512120dd1460bb80" +source = "git+https://git.m-labs.hk/M-Labs/zc706.git#b26327e474ef224c91f704b7f513a1495a981f87" dependencies = [ "bit_field", "libregister", @@ -74,7 +74,7 @@ dependencies = [ [[package]] name = "libregister" version = "0.0.0" -source = "git+https://git.m-labs.hk/M-Labs/zc706.git#526cfe7577c189687ed1fdca512120dd1460bb80" +source = "git+https://git.m-labs.hk/M-Labs/zc706.git#b26327e474ef224c91f704b7f513a1495a981f87" dependencies = [ "bit_field", "vcell", @@ -84,7 +84,7 @@ dependencies = [ [[package]] name = "libsupport_zynq" version = "0.0.0" -source = "git+https://git.m-labs.hk/M-Labs/zc706.git#526cfe7577c189687ed1fdca512120dd1460bb80" +source = "git+https://git.m-labs.hk/M-Labs/zc706.git#b26327e474ef224c91f704b7f513a1495a981f87" dependencies = [ "compiler_builtins", "libboard_zynq", @@ -164,6 +164,7 @@ dependencies = [ "dyld", "libasync", "libboard_zynq", + "libcortex_a9", "libsupport_zynq", "num-derive", "num-traits", diff --git a/runtime/Cargo.toml b/runtime/Cargo.toml index befa694..04f5e51 100644 --- a/runtime/Cargo.toml +++ b/runtime/Cargo.toml @@ -15,5 +15,6 @@ num-derive = "0.3" cslice = "0.3" libboard_zynq = { git = "https://git.m-labs.hk/M-Labs/zc706.git" } libsupport_zynq = { git = "https://git.m-labs.hk/M-Labs/zc706.git" } +libcortex_a9 = { git = "https://git.m-labs.hk/M-Labs/zc706.git" } libasync = { git = "https://git.m-labs.hk/M-Labs/zc706.git" } dyld = { path = "../libdyld" } diff --git a/runtime/src/network.rs b/runtime/src/comms.rs similarity index 97% rename from runtime/src/network.rs rename to runtime/src/comms.rs index ab81dc4..9d9186f 100644 --- a/runtime/src/network.rs +++ b/runtime/src/comms.rs @@ -15,7 +15,7 @@ use libboard_zynq::{ }, }; use libsupport_zynq::alloc::{vec, vec::Vec}; - +use libcortex_a9::sync_channel; use libasync::smoltcp::{Sockets, TcpStream}; @@ -118,7 +118,7 @@ async fn handle_connection(stream: TcpStream) -> Result<()> { const HWADDR: [u8; 6] = [0, 0x23, 0xab, 0xad, 0x1d, 0xea]; const IPADDR: IpAddress = IpAddress::Ipv4(Ipv4Address([192, 168, 1, 52])); -pub fn network_main() { +pub fn main(mut sc_tx: sync_channel::Sender, mut sc_rx: sync_channel::Receiver) { let eth = zynq::eth::Eth::default(HWADDR.clone()); const RX_LEN: usize = 8; let mut rx_descs = (0..RX_LEN) diff --git a/runtime/src/kernel.rs b/runtime/src/kernel.rs new file mode 100644 index 0000000..b272d61 --- /dev/null +++ b/runtime/src/kernel.rs @@ -0,0 +1,9 @@ +use libcortex_a9::sync_channel; + +pub fn main(mut sc_tx: sync_channel::Sender, mut sc_rx: sync_channel::Receiver) { + for i in sc_rx { + sc_tx.send(*i * *i); + } + + loop {} +} diff --git a/runtime/src/main.rs b/runtime/src/main.rs index 6464695..8f6118f 100644 --- a/runtime/src/main.rs +++ b/runtime/src/main.rs @@ -9,12 +9,14 @@ use libboard_zynq::{ println, self as zynq, clocks::Clocks, clocks::source::{ClockSource, ArmPll, IoPll}, }; -use libsupport_zynq::ram; - +use libsupport_zynq::{ram, boot}; +use libcortex_a9::{mutex::Mutex, sync_channel::{self, sync_channel}}; +mod comms; mod pl; mod rtio; -mod network; +mod kernel; + fn identifier_read(buf: &mut [u8]) -> &str { unsafe { @@ -29,6 +31,10 @@ fn identifier_read(buf: &mut [u8]) -> &str { } } +static mut STACK_CORE1: [u32; 512] = [0; 512]; +static CHANNEL_0TO1: Mutex>> = Mutex::new(None); +static CHANNEL_1TO0: Mutex>> = Mutex::new(None); + #[no_mangle] pub fn main_core0() { println!("ARTIQ runtime starting..."); @@ -44,11 +50,32 @@ pub fn main_core0() { println!("Detected gateware: {}", identifier_read(&mut [0; 64])); - network::network_main(); + let core1_stack = unsafe { &mut STACK_CORE1[..] }; + let core1 = boot::Core1::start(core1_stack); + + let (mut core0_tx, core1_rx) = sync_channel(4); + let (core1_tx, mut core0_rx) = sync_channel(4); + *CHANNEL_0TO1.lock() = Some(core1_rx); + *CHANNEL_1TO0.lock() = Some(core1_tx); + + comms::main(core0_tx, core0_rx); } #[no_mangle] pub fn main_core1() { - println!("[CORE1] hello world {}", identifier_read(&mut [0; 64])); - loop {} + println!("Core1 started"); + + let mut core1_tx = None; + while core1_tx.is_none() { + core1_tx = CHANNEL_1TO0.lock().take(); + } + let mut core1_tx = core1_tx.unwrap(); + + let mut core1_rx = None; + while core1_rx.is_none() { + core1_rx = CHANNEL_0TO1.lock().take(); + } + let mut core1_rx = core1_rx.unwrap(); + + kernel::main(core1_tx, core1_rx); }