Skip to content

sched/irq: Preserve handlers when extending IRQ chains. #20162

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
xiaoxiang781216 merged 1 commit into from
Sep 20, 2026
+32 −29
Merged

sched/irq: Preserve handlers when extending IRQ chains. #20162

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
61 changes: 32 additions & 29 deletions sched/irq/irq_chain.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,45 +158,47 @@ int irqchain_attach(int ndx, xcpt_t isr, FAR void *arg)
flags = spin_lock_irqsave(&g_irqchainlock);
if (isr != irq_unexpected_isr)
{
if (g_irqvector[ndx].handler != irqchain_dispatch)
node = (FAR struct irqchain_s *)
sq_remfirst(&g_irqchainfreelist);
if (node == NULL)
{
if (sq_count(&g_irqchainfreelist) < 2u)
{
ret = -ENOMEM;
}
else
{
node = (FAR struct irqchain_s *)
sq_remfirst(&g_irqchainfreelist);
DEBUGASSERT(node != NULL);

node->handler = g_irqvector[ndx].handler;
node->arg = g_irqvector[ndx].arg;
node->next = NULL;

g_irqvector[ndx].handler = irqchain_dispatch;
g_irqvector[ndx].arg = node;
ret = -ENOMEM;
}
else
{
node->handler = isr;
node->arg = arg;
node->next = NULL;

node = (FAR struct irqchain_s *)
if (g_irqvector[ndx].handler != irqchain_dispatch)
{
curr = (FAR struct irqchain_s *)
sq_remfirst(&g_irqchainfreelist);
if (node == NULL)
if (curr == NULL)
{
sq_addfirst((FAR struct sq_entry_s *)node,
&g_irqchainfreelist);
ret = -ENOMEM;
}
else
{
node->handler = isr;
node->arg = arg;
node->next = NULL;
curr->handler = g_irqvector[ndx].handler;
curr->arg = g_irqvector[ndx].arg;
curr->next = node;

curr = g_irqvector[ndx].arg;
while (curr->next != NULL)
{
curr = curr->next;
}

curr->next = node;
g_irqvector[ndx].handler = irqchain_dispatch;
g_irqvector[ndx].arg = curr;
}
}
else
{
curr = g_irqvector[ndx].arg;
while (curr->next != NULL)
{
curr = curr->next;
}

curr->next = node;
}
}
}
Expand All @@ -217,6 +219,7 @@ int irqchain_detach(int irq, xcpt_t isr, FAR void *arg)
FAR struct irqchain_s *curr;
FAR struct irqchain_s *first;
int ndx = IRQ_TO_NDX(irq);

if (ndx < 0)
{
ret = ndx;
Expand Down
Loading