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

Change the default IRQs. #34

Merged
merged 5 commits into from Oct 30, 2017
Merged

Conversation

mithro
Copy link
Collaborator

@mithro mithro commented Oct 29, 2017

  • Reserve IRQ 0 to be used as a "non-maskable interrupt" (NMI) in the future.

  • Make it harder to define duplicate IRQs and provide better error messages when it happens.

  • Use IRQ 2 for the LiteX. This matches the standard mor1k config which connects the UART to IRQ 2.

This change is needed for Linux running on LiteX as it gets grumpy with using IRQ 0 for anything other other than an NMI.

 * Better error messages.
 * Search correct directories;
   - XXX/Vivado/<version>
   - XXX/<version>/ISE_DS/
@mithro
Copy link
Collaborator Author

mithro commented Oct 29, 2017

@stffrdhrn - Can you give this change a test?

Copy link
Owner

@enjoy-digital enjoy-digital left a comment

Choose a reason for hiding this comment

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

Seems fine, but be since uart is changed to uart0, don't you need to change some software elsewhere?

@mithro
Copy link
Collaborator Author

mithro commented Oct 29, 2017

Adding a bunch of fixes.

  • Put uart back to 'uart' rather than 'uart0'.
  • Made it harder to accidently define duplicate IRQs.

@mithro
Copy link
Collaborator Author

mithro commented Oct 29, 2017

And a datapoint why something like this is important - I just discovered we are using the same IRQ value for LiteEth and HDMI0 in the HDMI2USB-litex-firmware (before we changing the value). That now provides the helpful error message;
AssertionError: Interrupt vector conflict for IRQ 3, user defined hdmi_in0 conflicts with user defined ethmac

Copy link
Owner

@enjoy-digital enjoy-digital left a comment

Choose a reason for hiding this comment

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

seems fine

 * Reserve IRQ 0 to be used as a "non-maskable interrupt" (NMI) in the
   future.

 * Use IRQ 2 for the LiteX. This matches the standard mor1k config which
   connects the UART to IRQ 2.

This change is needed for Linux running on LiteX as it gets grumpy with
using IRQ 0 for anything other other than an NMI.
@mithro
Copy link
Collaborator Author

mithro commented Oct 30, 2017

Merging!

@mithro mithro merged commit 876f3d2 into enjoy-digital:master Oct 30, 2017
@mithro mithro deleted the uart-irq-change branch October 30, 2017 21:01
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.

None yet

2 participants