Skip to content

xtensa: properly compute irq number #98444

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

Merged
merged 1 commit into from
Oct 30, 2025
Merged

xtensa: properly compute irq number #98444

Show file tree
Hide file tree
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
16 changes: 8 additions & 8 deletions include/zephyr/arch/xtensa/irq.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,19 +199,19 @@ static ALWAYS_INLINE void xtensa_irq_enable(uint32_t irq)
#if XCHAL_NUM_INTERRUPTS > 32
switch (irq >> 5) {
case 0:
z_xt_ints_on(1 << irq);
z_xt_ints_on(1 << (irq & 0x1f));
break;
case 1:
z_xt_ints1_on(1 << irq);
z_xt_ints1_on(1 << (irq & 0x1f));
break;
#if XCHAL_NUM_INTERRUPTS > 64
case 2:
z_xt_ints2_on(1 << irq);
z_xt_ints2_on(1 << (irq & 0x1f));
break;
#endif
#if XCHAL_NUM_INTERRUPTS > 96
case 3:
z_xt_ints3_on(1 << irq);
z_xt_ints3_on(1 << (irq & 0x1f));
break;
#endif
default:
Expand All @@ -232,19 +232,19 @@ static ALWAYS_INLINE void xtensa_irq_disable(uint32_t irq)
#if XCHAL_NUM_INTERRUPTS > 32
switch (irq >> 5) {
case 0:
z_xt_ints_off(1 << irq);
z_xt_ints_off(1 << (irq & 0x1f));
break;
case 1:
z_xt_ints1_off(1 << irq);
z_xt_ints1_off(1 << (irq & 0x1f));
break;
#if XCHAL_NUM_INTERRUPTS > 64
case 2:
z_xt_ints2_off(1 << irq);
z_xt_ints2_off(1 << (irq & 0x1f));
break;
#endif
#if XCHAL_NUM_INTERRUPTS > 96
case 3:
z_xt_ints3_off(1 << irq);
z_xt_ints3_off(1 << (irq & 0x1f));
break;
#endif
default:
Expand Down
8 changes: 4 additions & 4 deletions subsys/testsuite/include/zephyr/interrupt_util.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,19 +194,19 @@ static inline void trigger_irq(int irq)
#if XCHAL_NUM_INTERRUPTS > 32
switch (irq >> 5) {
case 0:
z_xt_set_intset(1 << irq);
z_xt_set_intset(1 << (irq & 0x1f));
break;
case 1:
z_xt_set_intset1(1 << irq);
z_xt_set_intset1(1 << (irq & 0x1f));
break;
#if XCHAL_NUM_INTERRUPTS > 64
case 2:
z_xt_set_intset2(1 << irq);
z_xt_set_intset2(1 << (irq & 0x1f));
break;
#endif
#if XCHAL_NUM_INTERRUPTS > 96
case 3:
z_xt_set_intset3(1 << irq);
z_xt_set_intset3(1 << (irq & 0x1f));
break;
#endif
default:
Expand Down