Ptp

.vscode/settings.json

@@ -6,4 +6,10 @@
     ],
     "rust-analyzer.check.allTargets": false,
     "rust-analyzer.check.targets": "thumbv7em-none-eabihf",
-}
+    "rust-analyzer.linkedProjects": [
+        "./Cargo.toml",
+        "./Cargo.toml",
+        "./Cargo.toml",
+        "./Cargo.toml"
+    ],
+}

Cargo.toml

@@ -1,15 +1,17 @@
 [package]
 name = "stm32h7xx-hal"
 version = "0.14.0"
-authors = ["Andrew Straw <[email protected]>",
-           "Richard Meadows <[email protected]>",
-           "Henrik Böving <[email protected]>",
-           "Jan Adä <[email protected]>",
-           "Robert Jördens <[email protected]>",
-           "Ryan Summers <[email protected]>",
-           "Matthew Meyer <[email protected]>",
-           "Florian Jung <[email protected]>",
-           "Matt Ickstadt <[email protected]>"]
+authors = [
+    "Andrew Straw <[email protected]>",
+    "Richard Meadows <[email protected]>",
+    "Henrik Böving <[email protected]>",
+    "Jan Adä <[email protected]>",
+    "Robert Jördens <[email protected]>",
+    "Ryan Summers <[email protected]>",
+    "Matthew Meyer <[email protected]>",
+    "Florian Jung <[email protected]>",
+    "Matt Ickstadt <[email protected]>",
+]
 edition = "2021"
 rust-version = "1.65"
 categories = ["embedded", "hardware-support", "no-std"]
@@ -22,7 +24,24 @@ readme = "README.md"
 exclude = [".gitignore"]
 
 [package.metadata.docs.rs]
-features = ["stm32h743v", "rt", "xspi", "sdmmc", "sdmmc-fatfs", "fmc", "usb_hs", "rtc", "ethernet", "ltdc", "crc", "rand", "can", "defmt", "log", "fugit/defmt"]
+features = [
+    "stm32h743v",
+    "rt",
+    "xspi",
+    "sdmmc",
+    "sdmmc-fatfs",
+    "fmc",
+    "usb_hs",
+    "rtc",
+    "ethernet",
+    "ltdc",
+    "crc",
+    "rand",
+    "can",
+    "defmt",
+    "log",
+    "fugit/defmt",
+]
 targets = ["thumbv7em-none-eabihf"]
 rustdoc-args = ["--cfg", "docsrs"]
 
@@ -41,11 +60,15 @@ bare-metal = "1.0.0"
 sdio-host = { version = "0.9", optional = true }
 embedded-sdmmc = { version = "0.5", optional = true }
 stm32-fmc = { version = "0.3", optional = true }
-synopsys-usb-otg = { version = "^0.3.0", features = ["cortex-m"], optional = true }
+volatile-register = "0.2"
+synopsys-usb-otg = { version = "^0.3.0", features = [
+    "cortex-m",
+], optional = true }
 embedded-display-controller = { version = "^0.1.0", optional = true }
-log = { version = "0.4.14", optional = true} # see also the dev-dependencies section
+log = { version = "0.4.14", optional = true } # see also the dev-dependencies section
 fdcan = { version = "0.2", optional = true }
 embedded-storage = "0.3"
+futures = { version = "0.3", default-features = false, features = ["async-await"], optional = true }
 
 [dependencies.smoltcp]
 version = "0.10.0"
@@ -72,7 +95,11 @@ panic-rtt-target = { version = "0.1.0", features = ["cortex-m"] }
 cfg-if = "1.0.0"
 rtt-target = "0.4.0"
 lazy_static = { version = "1.4.0", features = ["spin_no_std"] }
-cortex-m-log = { version = "0.8.0", features = ["itm", "semihosting", "log-integration"] }
+cortex-m-log = { version = "0.8.0", features = [
+    "itm",
+    "semihosting",
+    "log-integration",
+] }
 cortex-m-semihosting = "0.5.0"
 panic-itm = { version = "~0.4.1" }
 panic-semihosting = "0.6"
@@ -88,18 +115,22 @@ default-features = false
 features = ["medium-ethernet", "proto-ipv4", "proto-ipv6", "socket-raw"]
 
 [features]
-default = ["rt"]
+default = ["rt", 
+  "ethernet",
+  "device-selected", "async-await"]
 device-selected = []
 revision_v = []
-rm0433 = ["gpio-h747"]          # aka. "single core" devices
+rm0433 = ["gpio-h747"] # aka. "single core" devices
 rm0399 = ["gpio-h747"] # TODO: fix gpio  # aka. "dual core" devices
-rm0455 = ["gpio-h7a2"]          # aka. "high memory integration" devices
-rm0468 = ["gpio-h72"]           # aka. "high speed" devices
+rm0455 = ["gpio-h7a2"] # aka. "high memory integration" devices
+rm0468 = ["gpio-h72"]  # aka. "high speed" devices
 
 gpio-h72 = []
 gpio-h747 = []
 gpio-h7a2 = []
 
+async-await = ["dep:futures"]
+ptp = ["smoltcp/packetmeta-id"]
 dsi = []
 cm4 = []
 cm7 = []
@@ -124,11 +155,43 @@ stm32h742v = ["stm32h7/stm32h743v", "device-selected", "revision_v", "rm0433"]
 stm32h743v = ["stm32h7/stm32h743v", "device-selected", "revision_v", "rm0433"]
 stm32h753v = ["stm32h7/stm32h753v", "device-selected", "revision_v", "rm0433"]
 stm32h750v = ["stm32h7/stm32h743v", "device-selected", "revision_v", "rm0433"]
-stm32h747cm7 = ["stm32h7/stm32h747cm7", "device-selected", "revision_v", "rm0399", "cm7", "dsi", "smps"]
-stm32h7b3 = ["stm32h7/stm32h7b3", "device-selected", "revision_v", "rm0455", "smps"]
-stm32h7b0 = ["stm32h7/stm32h7b3", "device-selected", "revision_v", "rm0455", "smps"]
-stm32h7a3 = ["stm32h7/stm32h7b3", "device-selected", "revision_v", "rm0455", "smps"]
-stm32h735 = ["stm32h7/stm32h735", "device-selected", "revision_v", "rm0468", "smps"]  # Also applies to 723,725,730,733
+stm32h747cm7 = [
+    "stm32h7/stm32h747cm7",
+    "device-selected",
+    "revision_v",
+    "rm0399",
+    "cm7",
+    "dsi",
+    "smps",
+]
+stm32h7b3 = [
+    "stm32h7/stm32h7b3",
+    "device-selected",
+    "revision_v",
+    "rm0455",
+    "smps",
+]
+stm32h7b0 = [
+    "stm32h7/stm32h7b3",
+    "device-selected",
+    "revision_v",
+    "rm0455",
+    "smps",
+]
+stm32h7a3 = [
+    "stm32h7/stm32h7b3",
+    "device-selected",
+    "revision_v",
+    "rm0455",
+    "smps",
+]
+stm32h735 = [
+    "stm32h7/stm32h735",
+    "device-selected",
+    "revision_v",
+    "rm0468",
+    "smps",
+] # Also applies to 723,725,730,733
 # Flags for examples
 log-itm = []
 log-rtt = []
@@ -137,15 +200,15 @@ example-smps = []
 example-ldo = []
 
 [profile.dev]
-codegen-units = 1 # better optimizations
-debug = true # symbols are nice and they don't increase the size in flash
+codegen-units = 1   # better optimizations
+debug = true        # symbols are nice and they don't increase the size in flash
 incremental = false
 
 [profile.release]
 codegen-units = 1 # better optimizations
-debug = true # symbols are nice and they don't increase the size in flash
-lto = true # better optimizations
-opt-level = "s" # optimize for binary size
+debug = true      # symbols are nice and they don't increase the size in flash
+lto = true        # better optimizations
+opt-level = "s"   # optimize for binary size
 
 # The following examples do not build for all feature flag combinations. The
 # `required-features` field specifies the hal features and/or the hardware

examples/ethernet-nucleo-h743zi2.rs

@@ -23,7 +23,13 @@ mod utilities;
 use log::info;
 
 use stm32h7xx_hal::rcc::CoreClocks;
-use stm32h7xx_hal::{ethernet, ethernet::PHY};
+use stm32h7xx_hal::{
+    ethernet,
+    ethernet::{
+        RxDescriptor, RxDescriptorRing, TxDescriptor, TxDescriptorRing, MTU,
+        PHY,
+    },
+};
 use stm32h7xx_hal::{prelude::*, stm32, stm32::interrupt};
 
 /// Configure SYSTICK for 1ms timebase
@@ -49,9 +55,24 @@ static TIME: AtomicU32 = AtomicU32::new(0);
 /// Locally administered MAC address
 const MAC_ADDRESS: [u8; 6] = [0x02, 0x00, 0x11, 0x22, 0x33, 0x44];
 
-/// Ethernet descriptor rings are a global singleton
+/// DesRing TD
+const NUM_DESCRIPTORS: usize = 8;
 #[link_section = ".sram3.eth"]
-static mut DES_RING: ethernet::DesRing<4, 4> = ethernet::DesRing::new();
+/// Doc
+static mut TX_DESCRIPTORS: [TxDescriptor; NUM_DESCRIPTORS] =
+    [TxDescriptor::new(); NUM_DESCRIPTORS];
+#[link_section = ".sram3.eth"]
+/// Doc
+static mut TX_BUFFERS: [[u8; MTU + 2]; NUM_DESCRIPTORS] =
+    [[0u8; MTU + 2]; NUM_DESCRIPTORS];
+#[link_section = ".sram3.eth"]
+/// Doc
+static mut RX_DESCRIPTORS: [RxDescriptor; NUM_DESCRIPTORS] =
+    [RxDescriptor::new(); NUM_DESCRIPTORS];
+#[link_section = ".sram3.eth"]
+/// Doc
+static mut RX_BUFFERS: [[u8; MTU + 2]; NUM_DESCRIPTORS] =
+    [[0u8; MTU + 2]; NUM_DESCRIPTORS];
 
 // the program entry point
 #[entry]
@@ -104,43 +125,82 @@ fn main() -> ! {
     let rmii_txd0 = gpiog.pg13.into_alternate();
     let rmii_txd1 = gpiob.pb13.into_alternate();
 
+    let rmii_pins = (
+        rmii_ref_clk,
+        rmii_mdio,
+        rmii_mdc,
+        rmii_crs_dv,
+        rmii_rxd0,
+        rmii_rxd1,
+        rmii_tx_en,
+        rmii_txd0,
+        rmii_txd1,
+    );
     // Initialise ethernet...
     assert_eq!(ccdr.clocks.hclk().raw(), 200_000_000); // HCLK 200MHz
     assert_eq!(ccdr.clocks.pclk1().raw(), 100_000_000); // PCLK 100MHz
     assert_eq!(ccdr.clocks.pclk2().raw(), 100_000_000); // PCLK 100MHz
     assert_eq!(ccdr.clocks.pclk4().raw(), 100_000_000); // PCLK 100MHz
 
     let mac_addr = smoltcp::wire::EthernetAddress::from_bytes(&MAC_ADDRESS);
-    let (_eth_dma, eth_mac) = unsafe {
-        ethernet::new(
-            dp.ETHERNET_MAC,
-            dp.ETHERNET_MTL,
-            dp.ETHERNET_DMA,
-            (
-                rmii_ref_clk,
-                rmii_mdio,
-                rmii_mdc,
-                rmii_crs_dv,
-                rmii_rxd0,
-                rmii_rxd1,
-                rmii_tx_en,
-                rmii_txd0,
-                rmii_txd1,
-            ),
-            &mut DES_RING,
-            mac_addr,
-            ccdr.peripheral.ETH1MAC,
-            &ccdr.clocks,
+    let (rx_ring, tx_ring) = {
+        // let tx_desc = unsafe { TX_DESCRIPTORS.write([TxDescriptor::new(); NUM_DESCRIPTORS]) };
+        // let tx_buf = unsafe { TX_BUFFERS.write([[0u8; MTU + 2]; NUM_DESCRIPTORS]) };
+
+        // let rx_desc = unsafe { RX_DESCRIPTORS.write([RxDescriptor::new(); NUM_DESCRIPTORS]) };
+        // let rx_buf = unsafe { RX_BUFFERS.write([[0u8; MTU + 2]; NUM_DESCRIPTORS]) };
+
+        (
+            RxDescriptorRing::new(unsafe { &mut RX_DESCRIPTORS }, unsafe {
+                &mut RX_BUFFERS
+            }),
+            TxDescriptorRing::new(unsafe { &mut TX_DESCRIPTORS }, unsafe {
+                &mut TX_BUFFERS
+            }),
         )
     };
 
+    #[cfg(feature = "ptp")]
+    let ethernet::Parts {
+        dma: eth_dma,
+        mac: eth_mac,
+        ptp: _ptp,
+    } = ethernet::new(
+        dp.ETHERNET_MAC,
+        dp.ETHERNET_MTL,
+        dp.ETHERNET_DMA,
+        rmii_pins,
+        rx_ring,
+        tx_ring,
+        mac_addr,
+        ccdr.peripheral.ETH1MAC,
+        &ccdr.clocks,
+    );
+
+    #[cfg(not(feature = "ptp"))]
+    let ethernet::Parts {
+        dma: eth_dma,
+        mac: eth_mac,
+    } = ethernet::new(
+        dp.ETHERNET_MAC,
+        dp.ETHERNET_MTL,
+        dp.ETHERNET_DMA,
+        rmii_pins,
+        rx_ring,
+        tx_ring,
+        mac_addr,
+        ccdr.peripheral.ETH1MAC,
+        &ccdr.clocks,
+    );
+    // let start_addend = ptp.addend();
+    eth_dma.enable_interrupt();
+
     // Initialise ethernet PHY...
     let mut lan8742a = ethernet::phy::LAN8742A::new(eth_mac.set_phy_addr(0));
     lan8742a.phy_reset();
     lan8742a.phy_init();
 
     unsafe {
-        ethernet::enable_interrupt();
         cp.NVIC.set_priority(stm32::Interrupt::ETH, 196); // Mid prio
         cortex_m::peripheral::NVIC::unmask(stm32::Interrupt::ETH);
     }
@@ -180,7 +240,7 @@ fn main() -> ! {
 
 #[interrupt]
 fn ETH() {
-    unsafe { ethernet::interrupt_handler() }
+    ethernet::eth_interrupt_handler();
 }
 
 #[exception]