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

Jump to bottom

Add Axi bus behind the DMA engine #1878

Merged
merged 11 commits into from
Jan 23, 2025
Merged

Add Axi bus behind the DMA engine #1878

merged 11 commits into from
Jan 23, 2025

Conversation

ArthurHeymans
Copy link
Contributor

This rewrites the DMA engine to operate on the Axi bus which is a 64bit bus.
The recovery register interface is placed on that bus.
An Axi address offset is placed in soc_ifc.

@mhatrevi mhatrevi added the Caliptra v2.0 Items to be considered for v2.0 Release label Jan 6, 2025
@ArthurHeymans ArthurHeymans mentioned this pull request Jan 6, 2025
Open
@ArthurHeymans ArthurHeymans force-pushed the AxiBus branch 3 times, most recently from 25a9e87 to ba108e4 Compare January 8, 2025 17:09
swenson
swenson reviewed Jan 14, 2025
View reviewed changes
Copy link
Contributor

@swenson swenson left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would like to keep the I3C RDL and autogenerated code. I have a PR I am working on that adapts the DMA driver to implement the ureg::Mmio and ureg::MmioMut interfaces, so that we can use the autogenerated I3C code and not write everything manually.

mhatrevi
mhatrevi requested changes Jan 14, 2025
View reviewed changes
Copy link
Collaborator

@mhatrevi mhatrevi left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please see the feedback.

@ArthurHeymans ArthurHeymans force-pushed the AxiBus branch 2 times, most recently from 1707e05 to 0879541 Compare January 15, 2025 09:14
@ArthurHeymans ArthurHeymans force-pushed the AxiBus branch 3 times, most recently from 5ea6b54 to fb49c55 Compare January 15, 2025 09:22
@ArthurHeymans
Copy link
Contributor Author

I would like to keep the I3C RDL and autogenerated code. I have a PR I am working on that adapts the DMA driver to implement the ureg::Mmio and ureg::MmioMut interfaces, so that we can use the autogenerated I3C code and not write everything manually.

Done

@ArthurHeymans
Copy link
Contributor Author

Please see the feedback.

Addressed it all.

I also added some driver and other fixes that should make your test branch get further.

@ArthurHeymans ArthurHeymans mentioned this pull request Jan 16, 2025
Merged
swenson
swenson reviewed Jan 21, 2025
View reviewed changes
drivers/src/dma.rs Outdated Show resolved Hide resolved
sw-emulator/lib/periph/src/dma/axi_root_bus.rs Show resolved Hide resolved
@ArthurHeymans ArthurHeymans force-pushed the AxiBus branch 2 times, most recently from 95d1122 to cc613e5 Compare January 22, 2025 16:28
swenson
swenson previously approved these changes Jan 22, 2025
View reviewed changes
Copy link
Contributor

@swenson swenson left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

ArthurHeymans and others added 11 commits January 22, 2025 15:23
@ArthurHeymans @mhatrevi
hw-model: Revert to proper names
fb35984 
There was confusion on how that the dma engine operated on a axi bus
that replaced the apb bus. This is not true. AXI is a completely
separate bus and the DMA widget is a bridge to it.

Signed-off-by: Arthur Heymans <[email protected]>
@ArthurHeymans @mhatrevi
Remove handle_dma
2230797 
DMA operates on a separate bus and not the root bus so remove it.

Signed-off-by: Arthur Heymans <[email protected]>
@ArthurHeymans @mhatrevi
Add axi root bus peripheral
27ae00a 
This rewrites the dma widget to work with a separate axi_root_bus bus.

Signed-off-by: Arthur Heymans <[email protected]>
@ArthurHeymans @mhatrevi
Move recovery register interface on the AXI bus
89d3fed 
This also adds the offset in the soc_ifc registers.

Signed-off-by: Arthur Heymans <[email protected]>
@ArthurHeymans @mhatrevi
drivers/test-fw: Drop stale DMA unit tests
d67c3ad 
These unit tests had the wrong understanding in mind of the DMA/AXI
widget.

Signed-off-by: Arthur Heymans <[email protected]>
@ArthurHeymans @mhatrevi
drivers/dma: Add method to read a buffer using the FIFO
173df38 
Reading the production debug fuses needs this.

Signed-off-by: Arthur Heymans <[email protected]>
@ArthurHeymans @mhatrevi
Implement add ops for AxiAddr
645e260 
Signed-off-by: Arthur Heymans <[email protected]>
@ArthurHeymans @mhatrevi
Fix drivers/dma: Don't use memcpy
9f9e777 
Don't use memcpy as this results in unaligned reads on the DMA FIFO
read/write registers.

Instead don't allow slices that aren't a multiple of 4.

Signed-off-by: Arthur Heymans <[email protected]>
@ArthurHeymans @mhatrevi
fix: sw-emulator: Match RRI regs with RDL
13a7978 
Signed-off-by: Arthur Heymans <[email protected]>
@ArthurHeymans @mhatrevi
feat: sw-emulator: add active mode
34ed1d7 
Signed-off-by: Arthur Heymans <[email protected]>
@mhatrevi
Minor fixes
6bc4e8e
swenson
swenson approved these changes Jan 23, 2025
View reviewed changes
Copy link
Contributor

@swenson swenson left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@mhatrevi mhatrevi merged commit 051960e into main-2.x Jan 23, 2025
5 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@korran korran korran left review comments

@mhatrevi mhatrevi mhatrevi approved these changes

@swenson swenson swenson approved these changes

@fdamato fdamato Awaiting requested review from fdamato fdamato is a code owner

@jlmahowa-amd jlmahowa-amd Awaiting requested review from jlmahowa-amd jlmahowa-amd is a code owner

@jhand2 jhand2 Awaiting requested review from jhand2 jhand2 is a code owner

@vsonims vsonims Awaiting requested review from vsonims vsonims is a code owner

@ajisaxena ajisaxena Awaiting requested review from ajisaxena ajisaxena is a code owner

@JohnTraverAmd JohnTraverAmd Awaiting requested review from JohnTraverAmd JohnTraverAmd is a code owner

@rusty1968 rusty1968 Awaiting requested review from rusty1968 rusty1968 is a code owner

@wmaroneAMD wmaroneAMD Awaiting requested review from wmaroneAMD wmaroneAMD is a code owner

@nquarton nquarton Awaiting requested review from nquarton nquarton is a code owner

Assignees
No one assigned
Labels
Caliptra v2.0 Items to be considered for v2.0 Release
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@ArthurHeymans @swenson @korran @mhatrevi