Skip to content

Revert "Move ethernet DMA reset slightly earlier to eliminate freeze on h723" #450

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 12, 2023
Merged

Revert "Move ethernet DMA reset slightly earlier to eliminate freeze on h723" #450

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 4 additions & 6 deletions src/ethernet/eth.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -455,12 +455,6 @@ pub unsafe fn new_unchecked<const TD: usize, const RD: usize>(
// Ensure syscfg is enabled (for PMCR)
rcc.apb4enr.modify(|_, w| w.syscfgen().set_bit());

// Reset ETH_DMA - write 1 and wait for 0.
// On the H723, we have to do this before prec.enable()
// or the DMA will never come out of reset
eth_dma.dmamr.modify(|_, w| w.swr().set_bit());
while eth_dma.dmamr.read().swr().bit_is_set() {}

// AHB1 ETH1MACEN
prec.enable();

Expand All @@ -478,6 +472,10 @@ pub unsafe fn new_unchecked<const TD: usize, const RD: usize>(
//rcc.ahb1rstr.modify(|_, w| w.eth1macrst().clear_bit());

cortex_m::interrupt::free(|_cs| {
// reset ETH_DMA - write 1 and wait for 0
eth_dma.dmamr.modify(|_, w| w.swr().set_bit());
while eth_dma.dmamr.read().swr().bit_is_set() {}

// 200 MHz
eth_mac
.mac1ustcr
Expand Down