arm/gic: disable interrupt before modifying GICD_ICFGRn - #18
Closed
kent-mcleod wants to merge 1 commit into
Closed
Conversation
Per the ARM GIC specification, modifying a programmable Int_config field while the corresponding interrupt is enabled results in UNPREDICTABLE behavior. setIRQTrigger currently modifies GICD_ICFGRn (GICv2) and GICD_ICFGR/GICR_ICFGR (GICv3) without first disabling the interrupt. Fix both GICv2 and GICv3 implementations to: 1. Check if the interrupt is currently enabled by reading the GICD_ISENABLER / GICR_ISENABLER register. 2. Disable the interrupt if it was enabled. 3. Modify the configuration register. 4. Re-enable the interrupt if it was previously enabled. While the current sole call site (Arch_invokeIRQControl) configures interrupts before they are enabled, this fix makes setIRQTrigger safe for any future callers that may reconfigure already-enabled interrupts. Resolves seL4#290 Signed-off-by: Kent McLeod <kent.mcleod@kry10.com> Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This file contains hidden or 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
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.
Per the ARM GIC specification, modifying a programmable Int_config field while the corresponding interrupt is enabled results in UNPREDICTABLE behavior. setIRQTrigger currently modifies GICD_ICFGRn (GICv2) and GICD_ICFGR/GICR_ICFGR (GICv3) without first disabling the interrupt.
Fix both GICv2 and GICv3 implementations to:
While the current sole call site (Arch_invokeIRQControl) configures interrupts before they are enabled, this fix makes setIRQTrigger safe for any future callers that may reconfigure already-enabled interrupts.
Resolves seL4#290