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.

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

soc/integration/soc: Fix CSRBridge Bus Width conversion #2143

Merged
merged 1 commit into from
Dec 18, 2024

Conversation

FlyGoat
Copy link
Contributor

@FlyGoat FlyGoat commented Dec 17, 2024

Wishbone2CSR and AXILite2CSR bridges are incapable for performing bus width conversion, which means it's Bus slave port must have same width as CSRs.

Use CSR width to create slave bus to allow width adaptar to be inserted by add_slave. Also add relevant assertion.

This fixes --bus-data-width 64 build.

@FlyGoat
Copy link
Contributor Author

FlyGoat commented Dec 17, 2024

Maybe --bus-data-width should be covered by CI? I'm not sure if it's worthy :-)

@enjoy-digital
Copy link
Owner

Thanks @FlyGoat! Testing this in CI could indeed be interesting and should not be too complicated with the current CI in place, we could add some --bus-standard / --bus-data-width tests.

I just need to look at the CI failing test (related to the new assert) and we'll be able to merge.

Wishbone2CSR and AXILite2CSR bridges are incapable for performing
bus width conversion, which means it's Bus slave port must have same
width as CSRs.

Use CSR width to create slave bus to allow width adaptar to be inserted
by add_slave. Also add relevant assertion.

Signed-off-by: Jiaxun Yang <[email protected]>
@FlyGoat
Copy link
Contributor Author

FlyGoat commented Dec 18, 2024

@enjoy-digital Sorry for the oversight, CI is now fixed. It was due to difference on default bus parameters. I'm working on a soc_bus test case, will PR when it's ready.

Thanks

@enjoy-digital enjoy-digital merged commit 1b47407 into enjoy-digital:master Dec 18, 2024
1 check passed
@enjoy-digital
Copy link
Owner

Thanks @FlyGoat, this is merged.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants