-
-
Notifications
You must be signed in to change notification settings - Fork 176
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
Use interrupt_controller
in interrupts::aarch64
#972
Merged
kevinaboos
merged 11 commits into
theseus-os:theseus_main
from
NathanRoyer:intc-interrupts
Aug 1, 2023
Merged
Use interrupt_controller
in interrupts::aarch64
#972
kevinaboos
merged 11 commits into
theseus-os:theseus_main
from
NathanRoyer:intc-interrupts
Aug 1, 2023
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This comment was marked as outdated.
This comment was marked as outdated.
This comment was marked as resolved.
This comment was marked as resolved.
This comment was marked as outdated.
This comment was marked as outdated.
kevinaboos
requested changes
Jul 19, 2023
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
looks decent, i left a few small comments. Also there is a conflict that needs to be resolved.
36 tasks
kevinaboos
approved these changes
Aug 1, 2023
Merged
github-actions bot
pushed a commit
that referenced
this pull request
Aug 1, 2023
* Implements the basic set of two interrupt controller abstractions for aarch64: 1. `LocalInterruptController`: an interrupt controller local to each CPU. 2. `SystemWideInterruptController`: the system-wide interrupt controller that is responsible for redirecting interrupts to local CPUs. * These are not yet used, since they haven't been implemented for x86_64. * Make `BOARD_CONFIG` const so that it can be used in other const contexts. * Add board-specific fixed interrupt numbers to `BOARD_CONFIG`. * Temporarily remove the aarch64-specific distinction between various types of interrupt numbers, e.g., local, IPI, shared peripheral, etc. * `InterruptDestination` correspondingly no longer uses a local number. * Once we determine an appropriate abstraction for this that is also compatible with x86, we will restore the `InterruptNumber` type with its constructor-checked correctness conditions. * Device specific: for the PL011 UART device, we no longer enable timer interrupts in `interrupts::init()` because they are better off enabled later. * Remove the `get_int_ctlr` macro in favor of regular accessor code. This will be updated again once we redesign the interrupt controller structs to contain actual owned MMIO objects that offer access to the interrupt chip device. 5c351a2
github-actions bot
pushed a commit
to tsoutsman/Theseus
that referenced
this pull request
Aug 1, 2023
) * Implements the basic set of two interrupt controller abstractions for aarch64: 1. `LocalInterruptController`: an interrupt controller local to each CPU. 2. `SystemWideInterruptController`: the system-wide interrupt controller that is responsible for redirecting interrupts to local CPUs. * These are not yet used, since they haven't been implemented for x86_64. * Make `BOARD_CONFIG` const so that it can be used in other const contexts. * Add board-specific fixed interrupt numbers to `BOARD_CONFIG`. * Temporarily remove the aarch64-specific distinction between various types of interrupt numbers, e.g., local, IPI, shared peripheral, etc. * `InterruptDestination` correspondingly no longer uses a local number. * Once we determine an appropriate abstraction for this that is also compatible with x86, we will restore the `InterruptNumber` type with its constructor-checked correctness conditions. * Device specific: for the PL011 UART device, we no longer enable timer interrupts in `interrupts::init()` because they are better off enabled later. * Remove the `get_int_ctlr` macro in favor of regular accessor code. This will be updated again once we redesign the interrupt controller structs to contain actual owned MMIO objects that offer access to the interrupt chip device. 5c351a2
tsoutsman
pushed a commit
to tsoutsman/Theseus
that referenced
this pull request
Sep 6, 2023
) * Implements the basic set of two interrupt controller abstractions for aarch64: 1. `LocalInterruptController`: an interrupt controller local to each CPU. 2. `SystemWideInterruptController`: the system-wide interrupt controller that is responsible for redirecting interrupts to local CPUs. * These are not yet used, since they haven't been implemented for x86_64. * Make `BOARD_CONFIG` const so that it can be used in other const contexts. * Add board-specific fixed interrupt numbers to `BOARD_CONFIG`. * Temporarily remove the aarch64-specific distinction between various types of interrupt numbers, e.g., local, IPI, shared peripheral, etc. * `InterruptDestination` correspondingly no longer uses a local number. * Once we determine an appropriate abstraction for this that is also compatible with x86, we will restore the `InterruptNumber` type with its constructor-checked correctness conditions. * Device specific: for the PL011 UART device, we no longer enable timer interrupts in `interrupts::init()` because they are better off enabled later. * Remove the `get_int_ctlr` macro in favor of regular accessor code. This will be updated again once we redesign the interrupt controller structs to contain actual owned MMIO objects that offer access to the interrupt chip device.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Changes:
BOARD_CONFIG
becomes const so that I can reference it in other constsBOARD_CONFIG
now contains board-specific interrupt numbersinterrupt_controller
's initializer is called from captaininterrupt_controller::InterruptDestination
no longer contains a local_number on aarch64interrupt_controller::send_ipi
allows sending to AllButMeinterrupt_controller::InterruptNumber
type, wrapping au8
on all platformsinterrupt_controller::init_secondary_cpu_interface
; panics on x86_64 (documented)interrupts::init
as they're enabled later