Skip to content

arm64: isr_wrapper.S: make GICv2 usable on SMP systems #93629

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+13 −5
Open

arm64: isr_wrapper.S: make GICv2 usable on SMP systems #93629

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 13 additions & 5 deletions arch/arm64/core/isr_wrapper.S
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,14 @@ SECTION_FUNC(TEXT, _isr_wrapper)
bl z_soc_irq_get_active
#endif /* !CONFIG_ARM_CUSTOM_INTERRUPT_CONTROLLER */

/* Preserve original IAR value */
str x0, [sp, #-16]!

#if CONFIG_GIC_VER == 2 && defined(CONFIG_SMP)
/* Mask out GICC_IAR.CPUID [12:10] */
bic x0, x0, #0x1c00
#endif

#if CONFIG_GIC_VER >= 3
/*
* Ignore Special INTIDs 1020..1023 see 2.2.1 of Arm Generic Interrupt Controller
Expand All @@ -82,8 +90,6 @@ oob:
cmp x0, x1
b.hi spurious_continue

stp x0, xzr, [sp, #-16]!

/* Retrieve the interrupt service routine */
ldr x1, =_sw_isr_table
add x1, x1, x0, lsl #4 /* table is 16-byte wide */
Expand All @@ -97,10 +103,12 @@ oob:
blr x3
msr daifset, #(DAIFSET_IRQ_BIT)

/* Signal end-of-interrupt */
ldp x0, xzr, [sp], #16

spurious_continue:

/* Retrieve original IAR value */
ldr x0, [sp], #16

/* Signal end-of-interrupt */
#if !defined(CONFIG_ARM_CUSTOM_INTERRUPT_CONTROLLER)
bl arm_gic_eoi
#else
Expand Down
Loading