Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-06-07 01:05:54 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into timerfixes

Browse Source
This commit is contained in:
Sebastien Lorquet
2016-11-18 15:29:44 +01:00
parent ddba6de8bc 8602e8a8a9
commit d6813b0e2d
1 changed files with 23 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sched/irq/irq_csection.c
+23 -8
View File
@@ -129,7 +129,7 @@ irqstate_t enter_critical_section(void)
/* We are in an interrupt handler. How can this happen?
*
* 1. We were not in a critical section when the interrupt
* occurred. In this case:
* occurred. In this case, the interrupt was entered with:
*
* g_cpu_irqlock = SP_UNLOCKED.
* g_cpu_nestcount = 0
@@ -152,6 +152,11 @@ irqstate_t enter_critical_section(void)
* g_cpu_irqlock = SP_LOCKED.
* g_cpu_nestcount > 0
* The bit in g_cpu_irqset for this CPU hould be zero
*
* NOTE: However, the interrupt entry conditions can change due
* to previous processing by the interrupt handler that may
* instantiate a new thread that has irqcount > 0 and may then
* set the bit in g_cpu_irqset and g_cpu_irqlock = SP_LOCKED
*/
/* Handle nested calls to enter_critical_section() from the same
@@ -165,19 +170,29 @@ irqstate_t enter_critical_section(void)
g_cpu_nestcount[cpu] < UINT8_MAX);
g_cpu_nestcount[cpu]++;
}
/* This is the first call to enter_critical_section from the
* interrupt handler.
*/
else
{
/* First call to enter_critical_section. Test assumptions, then
* wait until we have the lock.
/* Make sure that the g_cpu_irqlock() was not already set
* by previous logic on this CPU that was executed by the
* interrupt handler.
*/
DEBUGASSERT((g_cpu_irqset & (1 << cpu)) == 0);
if ((g_cpu_irqset & (1 << cpu)) == 0)
{
/* Wait until we can get the spinlock (meaning that we are
* no longer in the critical section).
*/
/* Wait until we can get the spinlock (meaning that we are no
* longer in the critical section).
*/
spin_lock(&g_cpu_irqlock);
}
/* In any event, the nesting count is now one */
spin_lock(&g_cpu_irqlock);
g_cpu_nestcount[cpu] = 1;
}
}