Hubris MCTP driver

Cargo.toml

@@ -48,6 +48,8 @@ path = "lib/counters"
 anyhow = { version = "1.0.31", default-features = false, features = ["std"] }
 array-init = { version = "2.1.0" }
 arrayvec = { version = "0.7.4", default-features = false }
+aspeed-ddk = { git = "https://github.com/aspeedtech-bmc/aspeed-rust.git" }
+ast1060-pac = { git = "https://github.com/aspeedtech-bmc/ast1060-pac.git" }
 atty = { version = "0.2", default-features = false }
 bitfield = { version = "0.13", default-features = false }
 bitflags = { version = "2.5.0", default-features = false }
@@ -162,6 +164,7 @@ tlvc = { git = "https://github.com/oxidecomputer/tlvc", default-features = false
 tlvc-text = { git = "https://github.com/oxidecomputer/tlvc", default-features = false, version = "0.3.0" }
 transceiver-messages = { git = "https://github.com/oxidecomputer/transceiver-control/", default-features = false }
 vsc7448-pac = { git = "https://github.com/oxidecomputer/vsc7448", default-features = false }
+mctp = { git = "https://github.com/9elements/mctp-rs.git", branch = "main", default-features = false }
 
 [workspace.lints.rust]
 elided_lifetimes_in_paths = "warn"

app/ast1060-mctp-echo/Cargo.toml

@@ -0,0 +1,25 @@
+[package]
+edition = "2021"
+readme = "README.md"
+name = "ast1060-mctp-echo"
+version = "0.1.0"
+
+[features]
+#dump = ["kern/dump"]
+jtag-halt = []
+
+[dependencies]
+ast1060-pac = { workspace = true, features = ["rt"] }
+cortex-m = { workspace = true }
+cortex-m-rt = { workspace = true }
+kern = { path = "../../sys/kern" }
+
+# this lets you use `cargo fix`!
+[[bin]]
+name = "ast1060-mctp-echo"
+test = false
+doctest = false
+bench = false
+
+[lints]
+workspace = true

app/ast1060-mctp-echo/README.md

@@ -0,0 +1 @@
+# AST1060 mctp over serial echo example

app/ast1060-mctp-echo/app.toml

@@ -0,0 +1,43 @@
+name = "ast1060-mctp-echo"
+target = "thumbv7em-none-eabihf"
+board = "ast1060-rot"
+chip = "../../chips/ast1060"
+stacksize = 1024 
+
+[kernel]
+name = "ast1060-starter"
+requires = {flash = 20000, ram = 3072}
+
+[tasks.jefe]
+name = "task-jefe"
+priority = 0
+max-sizes = {flash = 8192, ram = 4096}
+start = true
+stacksize = 1536
+notifications = ["fault", "timer"]
+
+[tasks.idle]
+name = "task-idle"
+priority = 5
+max-sizes = {flash = 128, ram = 256}
+stacksize = 256
+start = true
+
+[tasks.mctp_echo]
+name = "mctp-echo"
+priority = 2
+max-sizes = {flash = 8192, ram = 4096}
+start = true
+stacksize = 2048
+task-slots = ["mctp_server"]
+
+# app/ast1060-starter/app.toml
+[tasks.mctp_server]
+name = "mctp-server"
+priority = 1
+max-sizes = {flash = 32768, ram = 16384}
+start = true
+stacksize = 12288
+notifications = ["uart-irq", "timer"]
+interrupts = {"uart.irq" = "uart-irq"}
+

app/ast1060-mctp-echo/src/main.rs

@@ -0,0 +1,62 @@
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+#![no_std]
+#![no_main]
+
+// We have to do this if we don't otherwise use it to ensure its vector table
+// gets linked in.
+
+use cortex_m_rt::entry;
+use ast1060_pac::Peripherals;
+
+#[cfg(feature = "jtag-halt")]
+use core::ptr::{self, addr_of};
+
+#[entry]
+fn main() -> ! {
+
+    // This code just forces the ast1060 pac to be linked in.
+    let peripherals = unsafe {
+        Peripherals::steal()
+    };
+    peripherals.scu.scu000().modify(|_, w| {
+        w
+    });
+    peripherals.scu.scu41c().modify(|_, w| {
+        // Set the JTAG pinmux to 0x1f << 25
+        w.enbl_armtmsfn_pin().bit(true)
+            .enbl_armtckfn_pin().bit(true)
+            .enbl_armtrstfn_pin().bit(true)
+            .enbl_armtdifn_pin().bit(true)
+            .enbl_armtdofn_pin().bit(true)
+    });
+
+    #[cfg(feature = "jtag-halt")]
+    jtag_halt();
+
+    // Default boot speed, until we bother raising it:
+    const CYCLES_PER_MS: u32 = 16_000;
+
+    unsafe { kern::startup::start_kernel(CYCLES_PER_MS) }
+}
+
+#[cfg(feature = "jtag-halt")]
+fn jtag_halt() {
+    static mut HALT : u32 = 1;
+
+    // This is a hack to halt the CPU in JTAG mode.
+    // It writes a value to a volatile memory location
+    // Break by jtag and set val to zero to continue.
+    loop {
+        let val;
+        unsafe {
+            val = ptr::read_volatile(addr_of!(HALT));
+        }
+
+        if val == 0 {
+            break;
+        }
+    }
+}

app/ast1060-starter/Cargo.toml

@@ -0,0 +1,25 @@
+[package]
+edition = "2021"
+readme = "README.md"
+name = "ast1060-starter"
+version = "0.1.0"
+
+[features]
+#dump = ["kern/dump"]
+jtag-halt = []
+
+[dependencies]
+ast1060-pac = { workspace = true, features = ["rt"] }
+cortex-m = { workspace = true }
+cortex-m-rt = { workspace = true }
+kern = { path = "../../sys/kern" }
+
+# this lets you use `cargo fix`!
+[[bin]]
+name = "ast1060-starter"
+test = false
+doctest = false
+bench = false
+
+[lints]
+workspace = true

app/ast1060-starter/README.md

@@ -0,0 +1 @@
+# AST1060 minimum application

app/ast1060-starter/app.toml

@@ -0,0 +1,24 @@
+name = "ast1060-starter"
+target = "thumbv7em-none-eabihf"
+board = "ast1060-rot"
+chip = "../../chips/ast1060"
+stacksize = 1024 
+
+[kernel]
+name = "ast1060-starter"
+requires = {flash = 20000, ram = 3072}
+
+[tasks.jefe]
+name = "task-jefe"
+priority = 0
+max-sizes = {flash = 8192, ram = 4096}
+start = true
+stacksize = 1536
+notifications = ["fault", "timer"]
+
+[tasks.idle]
+name = "task-idle"
+priority = 5
+max-sizes = {flash = 128, ram = 256}
+stacksize = 256
+start = true

app/ast1060-starter/src/main.rs

@@ -0,0 +1,62 @@
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+#![no_std]
+#![no_main]
+
+// We have to do this if we don't otherwise use it to ensure its vector table
+// gets linked in.
+
+use cortex_m_rt::entry;
+use ast1060_pac::Peripherals;
+
+#[cfg(feature = "jtag-halt")]
+use core::ptr::{self, addr_of};
+
+#[entry]
+fn main() -> ! {
+
+    // This code just forces the ast1060 pac to be linked in.
+    let peripherals = unsafe {
+        Peripherals::steal()
+    };
+    peripherals.scu.scu000().modify(|_, w| {
+        w
+    });
+    peripherals.scu.scu41c().modify(|_, w| {
+        // Set the JTAG pinmux to 0x1f << 25
+        w.enbl_armtmsfn_pin().bit(true)
+            .enbl_armtckfn_pin().bit(true)
+            .enbl_armtrstfn_pin().bit(true)
+            .enbl_armtdifn_pin().bit(true)
+            .enbl_armtdofn_pin().bit(true)
+    });
+
+    #[cfg(feature = "jtag-halt")]
+    jtag_halt();
+
+    // Default boot speed, until we bother raising it:
+    const CYCLES_PER_MS: u32 = 16_000;
+
+    unsafe { kern::startup::start_kernel(CYCLES_PER_MS) }
+}
+
+#[cfg(feature = "jtag-halt")]
+fn jtag_halt() {
+    static mut HALT : u32 = 1;
+
+    // This is a hack to halt the CPU in JTAG mode.
+    // It writes a value to a volatile memory location
+    // Break by jtag and set val to zero to continue.
+    loop {
+        let val;
+        unsafe {
+            val = ptr::read_volatile(addr_of!(HALT));
+        }
+
+        if val == 0 {
+            break;
+        }
+    }
+}

boards/ast1060-rot.toml

@@ -0,0 +1,4 @@
+# AST1060 RoT board configuration
+[probe-rs]
+chip-name = "AST1060"
+

chips/ast1060/chip.toml

@@ -0,0 +1,10 @@
+# AST1060 SoC peripheral definitions
+
+[hace_controller]
+address = 0x7e6d0000
+size = 0x400
+
+[uart]
+address = 0x7e784000
+size = 0x1000
+interrupts = { irq = 8 }

chips/ast1060/memory.toml

@@ -0,0 +1,21 @@
+[[flash]]
+address = 0x00000000
+size = 65536
+read = true
+write = true
+execute = true
+
+[[ram]]
+address = 0x20000
+size = 65536
+read = true
+write = true
+execute = true
+
+[[sboot_hdr]]
+address = 0x400
+size = 32
+read = true
+write = false
+execute = false
+

chips/ast1060/openocd.gdb

@@ -0,0 +1,12 @@
+target extended-remote :3341
+
+# print demangled symbols
+set print asm-demangle on
+
+# set backtrace limit to not have infinite backtrace loops
+set backtrace limit 32
+
+# detect hard faults
+break HardFault
+
+monitor arm semihosting enable

drv/lpc55-usart/Cargo.toml

@@ -5,7 +5,8 @@ edition = "2021"
 
 [dependencies]
 lpc55-pac = { workspace = true }
-nb = { workspace = true }
+# nb = { workspace = true }
+nb = "1.1.0"
 zerocopy = { workspace = true }
 zerocopy-derive = { workspace = true }