H7 support: take 2

.github/workflows/build.yml

@@ -77,6 +77,16 @@ jobs:
           - stm32f777
           - stm32f778
           - stm32f779
+          - stm32h735
+          - stm32h742
+          - stm32h742v
+          - stm32h743
+          - stm32h743v
+          - stm32h747cm7
+          - stm32h750
+          - stm32h750v
+          - stm32h753
+          - stm32h753v
     steps:
       - name: Checkout
         uses: actions/checkout@v3
@@ -110,6 +120,7 @@ jobs:
           - stm32f107
           - stm32f407
           - stm32f745
+          - stm32h735
     steps:
       - name: Checkout
         uses: actions/checkout@v3
@@ -182,6 +193,7 @@ jobs:
           - stm32f107
           - stm32f429
           - stm32f745
+          - stm32h735
         pins:
           - nucleo
           - default

Cargo.toml

@@ -21,6 +21,7 @@ features = ["smoltcp-phy", "stm32f429", "async-await"]
 [dependencies]
 volatile-register = "0.2"
 aligned = "0.4"
+stm32h7xx-hal = { version = "0.13", optional = true }
 stm32f7xx-hal = { version = "0.7.0", optional = true }
 stm32f4xx-hal = { version = "0.14", optional = true }
 stm32f4 = { version = "0.15", optional = true }
@@ -41,8 +42,14 @@ default = [ "defmt", "ptp" ]
 device-selected = []
 fence = []
 ptp = [ "smoltcp/packetmeta-id" ]
+f-series = [ ]
 async-await = ["dep:futures"]
 
+stm32f1xx-hal = [ "dep:stm32f1xx-hal", "f-series" ]
+stm32f4xx-hal = [ "dep:stm32f4xx-hal", "f-series" ]
+stm32f7xx-hal = [ "dep:stm32f7xx-hal", "f-series" ]
+stm32h7xx-hal = [ "dep:stm32h7xx-hal"  ]
+
 stm32f107 = ["stm32f1xx-hal/stm32f107", "device-selected"]
 
 stm32f407 = ["stm32f4xx-hal/stm32f407", "stm32f4", "device-selected"]
@@ -64,6 +71,17 @@ stm32f777 = ["stm32f7xx-hal/stm32f777", "device-selected", "fence"]
 stm32f778 = ["stm32f7xx-hal/stm32f778", "device-selected", "fence"]
 stm32f779 = ["stm32f7xx-hal/stm32f779", "device-selected", "fence"]
 
+stm32h735    = ["device-selected", "fence", "stm32h7xx-hal/stm32h735"   ]
+stm32h742    = ["device-selected", "fence", "stm32h7xx-hal/stm32h742"   ]
+stm32h742v   = ["device-selected", "fence", "stm32h7xx-hal/stm32h742v"  ]
+stm32h743    = ["device-selected", "fence", "stm32h7xx-hal/stm32h743"   ]
+stm32h743v   = ["device-selected", "fence", "stm32h7xx-hal/stm32h743v"  ]
+stm32h747cm7 = ["device-selected", "fence", "stm32h7xx-hal/stm32h747cm7"]
+stm32h750    = ["device-selected", "fence", "stm32h7xx-hal/stm32h750"   ]
+stm32h750v   = ["device-selected", "fence", "stm32h7xx-hal/stm32h750v"  ]
+stm32h753    = ["device-selected", "fence", "stm32h7xx-hal/stm32h753"   ]
+stm32h753v   = ["device-selected", "fence", "stm32h7xx-hal/stm32h753v"  ]
+
 smoltcp-phy = ["smoltcp"]
 
 [dev-dependencies]

README.md

@@ -27,7 +27,7 @@ use stm32_eth::{
     hal::gpio::GpioExt,
     hal::rcc::RccExt,
     stm32::Peripherals,
-    dma::{RxRingEntry, TxRingEntry},
+    dma::{MTU, TxDescriptorRing, TxDescriptor, RxDescriptorRing, RxDescriptor},
     EthPins,
 };
 use fugit::RateExtU32;
@@ -54,20 +54,29 @@ fn main() {
         rx_d1: gpioc.pc5,
     };
 
-    let mut rx_ring: [RxRingEntry; 16] = Default::default();
-    let mut tx_ring: [TxRingEntry; 8] = Default::default();
+    let mut rx_ring: [RxDescriptor; 16] = Default::default();
+    let mut rx_buffers: [[u8; MTU + 2]; 16] = [[0u8; MTU + 2]; 16];
+    let rx_ring = RxDescriptorRing::new(&mut rx_ring[..], &mut rx_buffers[..]);
+
+    let mut tx_ring: [TxDescriptor; 8] = Default::default();
+    let mut tx_buffers: [[u8; MTU + 2]; 8] = [[0u8; MTU + 2]; 8];
+    let tx_ring = TxDescriptorRing::new(&mut tx_ring[..], &mut tx_buffers[..]);
 
     let parts = stm32_eth::PartsIn {
         mac: p.ETHERNET_MAC,
+        #[cfg(any(feature = "stm32f1xx-hal", feature = "stm32f4xx-hal", feature = "stm32f7xx-hal"))]
         mmc: p.ETHERNET_MMC,
+        #[cfg(feature = "stm32h7xx-hal")]
+        mtl: p.ETHERNET_MTL,
         dma: p.ETHERNET_DMA,
+        #[cfg(any(feature = "stm32f1xx-hal", feature = "stm32f4xx-hal", feature = "stm32f7xx-hal"))]
         ptp: p.ETHERNET_PTP,
     };
 
     let stm32_eth::Parts { dma: mut eth_dma, mac: _, ptp: _ } = stm32_eth::new(
         parts,
-        &mut rx_ring[..],
-        &mut tx_ring[..],
+        rx_ring,
+        tx_ring,
         clocks,
         eth_pins,
     )

build.rs

@@ -1,5 +1,4 @@
 fn main() {
-    #[cfg(feature = "stm32f1xx-hal")]
     println!("cargo:rustc-link-search=memory.x");
 
     let hse = std::env::var("STM32_ETH_EXAMPLE_HSE");

examples/arp.rs

@@ -23,7 +23,7 @@ use stm32_eth::{
 
 pub mod common;
 
-use stm32_eth::dma::{RxRingEntry, TxError, TxRingEntry};
+use stm32_eth::dma::TxError;
 
 const PHY_ADDR: u8 = 0;
 
@@ -43,22 +43,14 @@ fn main() -> ! {
 
     let (eth_pins, mdio, mdc, _) = common::setup_pins(gpio);
 
-    let mut rx_ring: [RxRingEntry; 2] = Default::default();
-    let mut tx_ring: [TxRingEntry; 2] = Default::default();
+    let (rx_ring, tx_ring) = crate::common::setup_rings();
 
     let Parts {
         mut dma,
         mac,
         #[cfg(feature = "ptp")]
             ptp: _,
-    } = stm32_eth::new(
-        ethernet,
-        &mut rx_ring[..],
-        &mut tx_ring[..],
-        clocks,
-        eth_pins,
-    )
-    .unwrap();
+    } = stm32_eth::new(ethernet, rx_ring, tx_ring, clocks, eth_pins).unwrap();
     dma.enable_interrupt();
 
     let mut last_link_up = false;
@@ -109,6 +101,8 @@ fn main() -> ! {
                 buf[38..42].copy_from_slice(&TARGET_IP);
             });
 
+            stm32_eth::eth_interrupt_handler();
+
             match r {
                 Ok(()) => {
                     defmt::info!("ARP sent");

examples/async-rtic-timestamp.rs

@@ -38,6 +38,10 @@ mod common;
 
 extern crate async_rtic as rtic;
 
+defmt::timestamp!("{=u64:us}", {
+    (stm32_eth::ptp::EthernetPTP::now().total_nanos() / 1_000) as u64
+});
+
 #[rtic::app(device = stm32_eth::stm32, dispatchers = [SPI1])]
 mod app {
 
@@ -51,7 +55,7 @@ mod app {
     use ieee802_3_miim::{phy::PhySpeed, Phy};
 
     use stm32_eth::{
-        dma::{EthernetDMA, PacketId, RxRing, RxRingEntry, TxRing, TxRingEntry},
+        dma::{EthernetDMA, PacketId, RxRing, TxRing},
         mac::Speed,
         ptp::{EthernetPTP, Subseconds, Timestamp},
         Parts,
@@ -66,8 +70,6 @@ mod app {
     struct Shared {}
 
     #[init(local = [
-        rx_ring: [RxRingEntry; 2] = [RxRingEntry::new(),RxRingEntry::new()],
-        tx_ring: [TxRingEntry; 2] = [TxRingEntry::new(),TxRingEntry::new()],
         dma: MaybeUninit<EthernetDMA<'static, 'static>> = MaybeUninit::uninit(),
         arbiter: MaybeUninit<Arbiter<EthernetPTP> > = MaybeUninit::uninit(),
         // We use a channel to signal when 1 second has passed.
@@ -79,8 +81,7 @@ mod app {
         defmt::info!("Pre-init");
         let p = cx.device;
 
-        let rx_ring = cx.local.rx_ring;
-        let tx_ring = cx.local.tx_ring;
+        let (rx_ring, tx_ring) = crate::common::setup_rings();
 
         let (clocks, gpio, ethernet) = crate::common::setup_peripherals(p);
 
@@ -162,7 +163,7 @@ mod app {
                 continue;
             };
 
-            defmt::debug!("RX timestamp: {}", rx_timestamp);
+            defmt::info!("RX timestamp: {}", rx_timestamp);
 
             if dst_mac == [0xAB, 0xCD, 0xEF, 0x12, 0x34, 0x56] {
                 let mut timestamp_data = [0u8; 8];