Skip to content
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

Fix eth::DesRing alignment #510

Merged
merged 1 commit into from
Dec 6, 2024
Merged

Fix eth::DesRing alignment #510

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
16 changes: 11 additions & 5 deletions src/ethernet/eth.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,12 @@ use self::emac_consts::*;
/// Note that Copy and Clone are derived to support initialising an
/// array of TDes, but you may not move a TDes after its address has
/// been given to the ETH_DMA engine.
///
/// Both order and alignment is required by the ETH peripheral. The repr(C)
/// ensures that alignment of the members is 4 with no padding on the target
/// platform.
#[derive(Copy, Clone)]
#[repr(C, packed)]
#[repr(C)]
struct TDes {
tdes0: u32,
tdes1: u32,
Expand All @@ -94,7 +98,6 @@ impl TDes {
}

/// Store a ring of TDes and associated buffers
#[repr(C, packed)]
struct TDesRing<const TD: usize> {
td: [TDes; TD],
tbuf: [[u32; ETH_BUF_SIZE / 4]; TD],
Expand Down Expand Up @@ -187,7 +190,7 @@ impl<const TD: usize> TDesRing<TD> {
self.td[x].tdes2 = (length as u32) & EMAC_TDES2_B1L;

// Create a raw pointer in place without an intermediate reference. Use
// this to return a slice from the packed buffer
// this to return a slice from the buffer
let addr = ptr::addr_of_mut!(self.tbuf[x]) as *mut _;
core::slice::from_raw_parts_mut(addr, len)
}
Expand All @@ -203,8 +206,12 @@ impl<const TD: usize> TDesRing<TD> {
/// Note that Copy and Clone are derived to support initialising an
/// array of RDes, but you may not move a RDes after its address has
/// been given to the ETH_DMA engine.
///
/// Both order and alignment is required by the ETH peripheral. The repr(C)
/// ensures that alignment of the members is 4 with no padding on the target
/// platform.
#[derive(Copy, Clone)]
#[repr(C, packed)]
#[repr(C)]
struct RDes {
rdes0: u32,
rdes1: u32,
Expand Down Expand Up @@ -239,7 +246,6 @@ impl RDes {
}

/// Store a ring of RDes and associated buffers
#[repr(C, packed)]
struct RDesRing<const RD: usize> {
rd: [RDes; RD],
rbuf: [[u32; ETH_BUF_SIZE / 4]; RD],
Expand Down
Loading