sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mmcsd_sdio:Fix performing read and write in irq

Browse Source 
In some usage scenarios, read and write tasks will be performed during interruptions. If sleep is used at this time, it will cause a timeout crash. Therefore, a macro is added to determine whether it is currently interrupted to select sleep/delay.

Signed-off-by: chenrun1 <chenrun1@xiaomi.com>
This commit is contained in:
chenrun1 2024-01-22 17:42:05 +08:00 committed by Xiang Xiao
parent 40ae660d30
commit 0e13ea9ed1
1 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
drivers/mmcsd/mmcsd_sdio.c
View File

@ -98,6 +98,19 @@
#define MMCSD_CAPACITY(b, s) ((s) >= 10 ? (b) << ((s) - 10) : (b) >> (10 - (s))) #define MMCSD_CAPACITY(b, s) ((s) >= 10 ? (b) << ((s) - 10) : (b) >> (10 - (s)))
#define MMCSD_USLEEP(usec) \
do \
{ \
if (up_interrupt_context()) \
{ \
up_udelay(usec); \
} \
else \
{ \
nxsig_usleep(usec); \
} \
} while (0)
/**************************************************************************** /****************************************************************************
* Private Types * Private Types
****************************************************************************/ ****************************************************************************/
@ -336,12 +349,12 @@ static inline int mmcsd_sendcmd4(FAR struct mmcsd_state_s *priv)
*/ */
mmcsd_sendcmdpoll(priv, MMCSD_CMD4, CONFIG_MMCSD_DSR << 16); mmcsd_sendcmdpoll(priv, MMCSD_CMD4, CONFIG_MMCSD_DSR << 16);
nxsig_usleep(MMCSD_DSR_DELAY); MMCSD_USLEEP(MMCSD_DSR_DELAY);
/* Send it again to have more confidence */ /* Send it again to have more confidence */
mmcsd_sendcmdpoll(priv, MMCSD_CMD4, CONFIG_MMCSD_DSR << 16); mmcsd_sendcmdpoll(priv, MMCSD_CMD4, CONFIG_MMCSD_DSR << 16);
nxsig_usleep(MMCSD_DSR_DELAY); MMCSD_USLEEP(MMCSD_DSR_DELAY);
} }
else else
{ {
@ -1305,7 +1318,7 @@ static int mmcsd_transferready(FAR struct mmcsd_state_s *priv)
sched_yield(); sched_yield();
#else #else
nxsig_usleep(1000); MMCSD_USLEEP(1000);
#endif #endif
/* We are still in the programming state. Calculate the elapsed /* We are still in the programming state. Calculate the elapsed
@ -2595,7 +2608,7 @@ static int mmcsd_widebus(FAR struct mmcsd_state_s *priv)
SDIO_WIDEBUS(priv->dev, false); SDIO_WIDEBUS(priv->dev, false);
priv->widebus = false; priv->widebus = false;
SDIO_CLOCK(priv->dev, CLOCK_SDIO_DISABLED); SDIO_CLOCK(priv->dev, CLOCK_SDIO_DISABLED);
nxsig_usleep(MMCSD_CLK_DELAY); MMCSD_USLEEP(MMCSD_CLK_DELAY);
return OK; return OK;
} }
@ -2656,7 +2669,7 @@ static int mmcsd_widebus(FAR struct mmcsd_state_s *priv)
} }
#endif /* #ifdef CONFIG_MMCSD_MMCSUPPORT */ #endif /* #ifdef CONFIG_MMCSD_MMCSUPPORT */
nxsig_usleep(MMCSD_CLK_DELAY); MMCSD_USLEEP(MMCSD_CLK_DELAY);
return OK; return OK;
} }
@ -3450,7 +3463,7 @@ static int mmcsd_sdinitialize(FAR struct mmcsd_state_s *priv)
/* Select high speed SD clocking (which may depend on the DSR setting) */ /* Select high speed SD clocking (which may depend on the DSR setting) */
SDIO_CLOCK(priv->dev, CLOCK_SD_TRANSFER_1BIT); SDIO_CLOCK(priv->dev, CLOCK_SD_TRANSFER_1BIT);
nxsig_usleep(MMCSD_CLK_DELAY); MMCSD_USLEEP(MMCSD_CLK_DELAY);
/* If the hardware only supports 4-bit transfer mode then we forced to /* If the hardware only supports 4-bit transfer mode then we forced to
* attempt to setup the card in this mode before checking the SCR register. * attempt to setup the card in this mode before checking the SCR register.
@ -3547,7 +3560,7 @@ static int mmcsd_cardidentify(FAR struct mmcsd_state_s *priv)
*/ */
mmcsd_sendcmdpoll(priv, MMCSD_CMD0, 0xf0f0f0f0); mmcsd_sendcmdpoll(priv, MMCSD_CMD0, 0xf0f0f0f0);
nxsig_usleep(MMCSD_IDLE_DELAY); MMCSD_USLEEP(MMCSD_IDLE_DELAY);
/* After power up at least 74 clock cycles are required prior to starting /* After power up at least 74 clock cycles are required prior to starting
* bus communication * bus communication
@ -3558,7 +3571,7 @@ static int mmcsd_cardidentify(FAR struct mmcsd_state_s *priv)
/* Then send CMD0 just once is standard procedure */ /* Then send CMD0 just once is standard procedure */
mmcsd_sendcmdpoll(priv, MMCSD_CMD0, 0); mmcsd_sendcmdpoll(priv, MMCSD_CMD0, 0);
nxsig_usleep(MMCSD_IDLE_DELAY); MMCSD_USLEEP(MMCSD_IDLE_DELAY);
#ifdef CONFIG_MMCSD_MMCSUPPORT #ifdef CONFIG_MMCSD_MMCSUPPORT
/* Send CMD1 which is supported only by MMC. if there is valid response /* Send CMD1 which is supported only by MMC. if there is valid response
@ -3580,7 +3593,7 @@ static int mmcsd_cardidentify(FAR struct mmcsd_state_s *priv)
*/ */
mmcsd_sendcmdpoll(priv, MMCSD_CMD0, 0); mmcsd_sendcmdpoll(priv, MMCSD_CMD0, 0);
nxsig_usleep(MMCSD_IDLE_DELAY); MMCSD_USLEEP(MMCSD_IDLE_DELAY);
} }
else else
{ {