STM32H7XX support

.github/workflows/build.yml

@@ -76,6 +76,16 @@ jobs:
           - stm32f777
           - stm32f778
           - stm32f779
+          - stm32h735
+          - stm32h742
+          - stm32h742v
+          - stm32h743
+          - stm32h743v
+          - stm32h747cm7
+          - stm32h750
+          - stm32h750v
+          - stm32h753
+          - stm32h753v
     steps:
       - name: Checkout
         uses: actions/checkout@v3
@@ -103,6 +113,7 @@ jobs:
           - stm32f107
           - stm32f407
           - stm32f745
+          - stm32h735
     steps:
       - name: Checkout
         uses: actions/checkout@v3
@@ -138,6 +149,7 @@ jobs:
           - stm32f107
           - stm32f429
           - stm32f745
+          - stm32h735
         toolchain:
           - stable
         target:

Cargo.toml

@@ -25,6 +25,7 @@ stm32f7xx-hal = { version = "0.7.0", optional = true }
 stm32f4xx-hal = { version = "0.14", optional = true }
 stm32f4 = { version = "0.15", optional = true }
 stm32f1xx-hal = { version = "0.10", optional = true }
+stm32h7xx-hal = { version = "0.13", optional = true }
 ieee802_3_miim = "0.8"
 cortex-m = "0.7"
 log = { version = "0.4", optional = true }
@@ -40,6 +41,12 @@ default = [ "defmt", "ptp" ]
 device-selected = []
 fence = []
 ptp = [ ]
+f-series = [ ]
+
+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"]
 
@@ -62,6 +69,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]
@@ -73,6 +91,7 @@ defmt-rtt = "0.4"
 panic-probe = { version = "0.3", features = [ "print-defmt" ] }
 systick-monotonic = "1.0"
 smoltcp = { version = "0.9", features = [ "medium-ethernet", "proto-ipv4", "socket-udp", "socket-tcp", "defmt" ], default-features = false }
+siphasher = "0.3"
 
 [[example]]
 name = "pktgen"

README.md

@@ -25,14 +25,14 @@ stm32-eth = { version = "0.3.0", features = ["stm32f107"] } # For stm32f107
 In `src/main.rs` add:
 
 ```rust,no_run
+use fugit::RateExtU32;
 use stm32_eth::{
+    dma::{RxDescriptor, RxDescriptorRing, TxDescriptor, TxDescriptorRing},
     hal::gpio::GpioExt,
     hal::rcc::RccExt,
     stm32::Peripherals,
-    dma::{RxRingEntry, TxRingEntry},
-    EthPins,
+    EthPins, MTU,
 };
-use fugit::RateExtU32;
 
 fn main() {
     let p = Peripherals::take().unwrap();
@@ -56,8 +56,13 @@ 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,
@@ -66,24 +71,23 @@ fn main() {
         ptp: p.ETHERNET_PTP,
     };
 
-    let stm32_eth::Parts { dma: mut eth_dma, mac: _, ptp: _ } = stm32_eth::new(
-        parts,
-        &mut rx_ring[..],
-        &mut tx_ring[..],
-        clocks,
-        eth_pins,
-    )
-    .unwrap();
+    let stm32_eth::Parts {
+        dma: mut eth_dma,
+        mac: _,
+        ptp: _,
+    } = stm32_eth::new(parts, rx_ring, tx_ring, clocks, eth_pins).unwrap();
     eth_dma.enable_interrupt();
 
     if let Ok(pkt) = eth_dma.recv_next(None) {
         // handle received pkt
     }
 
     let size = 42;
-    eth_dma.send(size, None, |buf| {
-        // write up to `size` bytes into buf before it is being sent
-    }).expect("send");
+    eth_dma
+        .send(size, None, |buf| {
+            // write up to `size` bytes into buf before it is being sent
+        })
+        .expect("send");
 }
 ```
 

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

@@ -8,6 +8,7 @@
 #![no_main]
 
 use defmt_rtt as _;
+use ieee802_3_miim::{phy::BarePhy, Phy};
 use panic_probe as _;
 
 use core::cell::RefCell;
@@ -16,14 +17,13 @@ use cortex_m_rt::{entry, exception};
 
 use cortex_m::interrupt::Mutex;
 use stm32_eth::{
-    mac::{phy::BarePhy, Phy},
     stm32::{interrupt, CorePeripherals, Peripherals, SYST},
     Parts,
 };
 
 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 (tx_ring, rx_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,14 +101,32 @@ fn main() -> ! {
                 buf[38..42].copy_from_slice(&TARGET_IP);
             });
 
+            loop {
+                use core::hash::{Hash, Hasher};
+
+                if let Ok(rx_packet) = dma.recv_next(None) {
+                    let mut hasher = siphasher::sip::SipHasher::new();
+                    rx_packet.hash(&mut hasher);
+
+                    defmt::info!(
+                        "Received {} bytes. Hash: {:016X}",
+                        rx_packet.len(),
+                        hasher.finish()
+                    );
+                    break;
+                }
+            }
+
             match r {
                 Ok(()) => {
                     defmt::info!("ARP sent");
                 }
-                Err(TxError::WouldBlock) => defmt::info!("ARP failed"),
+                Err(TxError::WouldBlock) => {
+                    defmt::info!("ARP failed. {}", dma.tx_state())
+                }
             }
         } else {
-            defmt::info!("Down");
+            // defmt::info!("Down");
         }
 
         cortex_m::interrupt::free(|cs| {