lupyuen/local-nuttx-update
1
0
Fork 0
forked from nuttx/nuttx-update
Code Pull requests Activity

arch/risc-v/litex/litex_sdio: Address race condition in eventwait.

Browse source 
Wraps litex_eventwait in a critical section to handle the case that an event can occur before it's waited on.
This commit is contained in:
Stuart Ianna 2023-09-05 16:33:30 +10:00 committed by Xiang Xiao
parent a9efeeeebc
commit 99d630b18d
1 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
arch/risc-v/src/litex/litex_sdio.c
View file

@ -1168,8 +1168,15 @@ static sdio_eventset_t litex_eventwait(struct sdio_dev_s *dev)
{
struct litex_dev_s *priv = (struct litex_dev_s *)dev;
sdio_eventset_t wkupevent = 0;
irqstate_t flags;
int ret;
/* Use critical section to attempt to handle the case that the event
* may have completed before it's waited on.
*/
flags = enter_critical_section();
DEBUGASSERT((priv->waitevents != 0 && priv->wkupevent == 0) ||
(priv->waitevents == 0 && priv->wkupevent != 0));
for (; ; )
@ -1177,9 +1184,9 @@ static sdio_eventset_t litex_eventwait(struct sdio_dev_s *dev)
ret = nxsem_wait_uninterruptible(&priv->waitsem);
if (ret < 0)
{
litex_configwaitints(priv, 0, 0, 0);
wd_cancel(&priv->waitwdog);
return SDIOWAIT_ERROR;
wkupevent = SDIOWAIT_ERROR;
goto errout_with_waitints;
}
wkupevent = priv->wkupevent;
@ -1189,7 +1196,9 @@ static sdio_eventset_t litex_eventwait(struct sdio_dev_s *dev)
}
}
errout_with_waitints:
litex_configwaitints(priv, 0, 0, 0);
leave_critical_section(flags);
return wkupevent;
}