Skip to content

drivers: disk: sdmmc_stm32: HAL return value handling #97277

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

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
+69 −39
Open

drivers: disk: sdmmc_stm32: HAL return value handling #97277

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ea3a26d
drivers: disk: sdmmc_stm32: don't mix HAL return values and error
etienne-lms Oct 9, 2025
70bd3e4
drivers: disk: sdmmc_stm32: don't assume HAL return value is an int
etienne-lms Oct 10, 2025
ddaa0c3
drivers: disk: sdmmc_stm32: test HAL init/deinit return values
etienne-lms Oct 9, 2025
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
108 changes: 69 additions & 39 deletions drivers/disk/sdmmc_stm32.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -300,15 +300,19 @@ static int stm32_sdmmc_dma_init(struct stm32_sdmmc_priv *priv)
return err;
}
__HAL_LINKDMA(&priv->hsd, hdmatx, priv->dma_tx_handle);
HAL_DMA_Init(&priv->dma_tx_handle);
if (HAL_DMA_Init(&priv->dma_tx_handle) != HAL_OK) {
return -EIO;
}

err = stm32_sdmmc_configure_dma(&priv->dma_rx_handle, &priv->dma_rx);
if (err) {
LOG_ERR("failed to init rx dma");
return err;
}
__HAL_LINKDMA(&priv->hsd, hdmarx, priv->dma_rx_handle);
HAL_DMA_Init(&priv->dma_rx_handle);
if (HAL_DMA_Init(&priv->dma_rx_handle) != HAL_OK) {
return -EIO;
}
#endif /* STM32_SDMMC_USE_DMA_SHARED */

return err;
Expand All @@ -332,14 +336,17 @@ static int stm32_sdmmc_dma_deinit(struct stm32_sdmmc_priv *priv)
#else
struct sdmmc_dma_stream *dma_tx = &priv->dma_tx;
struct sdmmc_dma_stream *dma_rx = &priv->dma_rx;
HAL_StatusTypeDef __maybe_unused hal_ret;

ret = dma_stop(dma_tx->dev, dma_tx->channel);
__ASSERT(ret == 0, "TX DMA channel index corrupted");
HAL_DMA_DeInit(&priv->dma_tx_handle);
hal_ret = HAL_DMA_DeInit(&priv->dma_tx_handle);
__ASSERT_NO_MSG(hal_ret == HAL_OK);

ret = dma_stop(dma_rx->dev, dma_rx->channel);
__ASSERT(ret == 0, "RX DMA channel index corrupted");
HAL_DMA_DeInit(&priv->dma_rx_handle);
hal_ret = HAL_DMA_DeInit(&priv->dma_rx_handle);
__ASSERT_NO_MSG(hal_ret == HAL_OK);
#endif
return 0;
}
Expand All @@ -361,6 +368,7 @@ static int stm32_sdmmc_access_init(struct disk_info *disk)
{
const struct device *dev = disk->dev;
struct stm32_sdmmc_priv *priv = dev->data;
HAL_StatusTypeDef hal_ret;
int err;

err = stm32_sdmmc_pwr_on(priv);
Expand Down Expand Up @@ -412,20 +420,20 @@ static int stm32_sdmmc_access_init(struct disk_info *disk)
}

#ifdef CONFIG_SDMMC_STM32_EMMC
err = HAL_MMC_Init(&priv->hsd);
hal_ret = HAL_MMC_Init(&priv->hsd);
#else
err = HAL_SD_Init(&priv->hsd);
hal_ret = HAL_SD_Init(&priv->hsd);
#endif
if (err != HAL_OK) {
if (hal_ret != HAL_OK) {
LOG_ERR("failed to init stm32_sdmmc (ErrorCode 0x%X)", priv->hsd.ErrorCode);
err = -EIO;
goto error;
}

if (SDMMC_BUS_WIDTH != SDMMC_BUS_WIDE_1B) {
priv->hsd.Init.BusWide = SDMMC_BUS_WIDTH;
err = HAL_SD_ConfigWideBusOperation(&priv->hsd, priv->hsd.Init.BusWide);
if (err != HAL_OK) {
hal_ret = HAL_SD_ConfigWideBusOperation(&priv->hsd, priv->hsd.Init.BusWide);
if (hal_ret != HAL_OK) {
LOG_ERR("failed to configure wide bus operation (ErrorCode 0x%X)",
priv->hsd.ErrorCode);
err = -EIO;
Expand All @@ -449,6 +457,7 @@ static int stm32_sdmmc_access_init(struct disk_info *disk)

static int stm32_sdmmc_access_deinit(struct stm32_sdmmc_priv *priv)
{
HAL_StatusTypeDef hal_ret;
int err = 0;

#if STM32_SDMMC_USE_DMA
Expand All @@ -460,14 +469,14 @@ static int stm32_sdmmc_access_deinit(struct stm32_sdmmc_priv *priv)
#endif

#if defined(CONFIG_SDMMC_STM32_EMMC)
err = HAL_MMC_DeInit(&priv->hsd);
hal_ret = HAL_MMC_DeInit(&priv->hsd);
#else
err = HAL_SD_DeInit(&priv->hsd);
hal_ret = HAL_SD_DeInit(&priv->hsd);
stm32_sdmmc_clock_disable(priv);
#endif
if (err != HAL_OK) {
if (hal_ret != HAL_OK) {
LOG_ERR("failed to deinit stm32_sdmmc (ErrorCode 0x%X)", priv->hsd.ErrorCode);
return err;
return -EIO;
}

#if !defined(CONFIG_SDMMC_STM32_EMMC)
Expand Down Expand Up @@ -499,23 +508,32 @@ static int stm32_sdmmc_is_card_in_transfer(HandleTypeDef *hsd)
static int stm32_sdmmc_read_blocks(HandleTypeDef *hsd, uint8_t *data_buf,
uint32_t start_sector, uint32_t num_sector)
{
HAL_StatusTypeDef hal_ret;

#if STM32_SDMMC_USE_DMA || IS_ENABLED(DT_PROP(DT_DRV_INST(0), idma))

#ifdef CONFIG_SDMMC_STM32_EMMC
return HAL_MMC_ReadBlocks_DMA(hsd, data_buf, start_sector, num_sector);
hal_ret = HAL_MMC_ReadBlocks_DMA(hsd, data_buf, start_sector, num_sector);
#else
return HAL_SD_ReadBlocks_DMA(hsd, data_buf, start_sector, num_sector);
hal_ret = HAL_SD_ReadBlocks_DMA(hsd, data_buf, start_sector, num_sector);
#endif

#else
#else /* STM32_SDMMC_USE_DMA || IS_ENABLED(DT_PROP(DT_DRV_INST(0), idma)) */

#ifdef CONFIG_SDMMC_STM32_EMMC
return HAL_MMC_ReadBlocks_IT(hsd, data_buf, start_sector, num_sector);
hal_ret = HAL_MMC_ReadBlocks_IT(hsd, data_buf, start_sector, num_sector);
#else
return HAL_SD_ReadBlocks_IT(hsd, data_buf, start_sector, num_sector);
hal_ret = HAL_SD_ReadBlocks_IT(hsd, data_buf, start_sector, num_sector);
#endif

#endif
#endif /* STM32_SDMMC_USE_DMA || IS_ENABLED(DT_PROP(DT_DRV_INST(0), idma)) */

if (hal_ret != HAL_OK) {
LOG_ERR("sd read block failed %d", hal_ret);
return -EIO;
}

return 0;
}

static int stm32_sdmmc_access_read(struct disk_info *disk, uint8_t *data_buf,
Expand All @@ -537,16 +555,17 @@ static int stm32_sdmmc_access_read(struct disk_info *disk, uint8_t *data_buf,
#endif

err = stm32_sdmmc_read_blocks(&priv->hsd, data_buf, start_sector, num_sector);
if (err != HAL_OK) {
LOG_ERR("sd read block failed %d", err);
err = -EIO;
if (err != 0) {
goto end;
}

k_sem_take(&priv->sync, K_FOREVER);

#if STM32_SDMMC_USE_DMA_SHARED
HAL_DMA_DeInit(&priv->dma_txrx_handle);
if (HAL_DMA_DeInit(&priv->dma_txrx_handle) != HAL_OK) {
err = -EIO;
goto end;
}
#endif

if (priv->status != DISK_STATUS_OK) {
Expand All @@ -567,23 +586,32 @@ static int stm32_sdmmc_write_blocks(HandleTypeDef *hsd,
uint8_t *data_buf,
uint32_t start_sector, uint32_t num_sector)
{
HAL_StatusTypeDef hal_ret;

#if STM32_SDMMC_USE_DMA || IS_ENABLED(DT_PROP(DT_DRV_INST(0), idma))

#ifdef CONFIG_SDMMC_STM32_EMMC
return HAL_MMC_WriteBlocks_DMA(hsd, data_buf, start_sector, num_sector);
hal_ret = HAL_MMC_WriteBlocks_DMA(hsd, data_buf, start_sector, num_sector);
#else
return HAL_SD_WriteBlocks_DMA(hsd, data_buf, start_sector, num_sector);
hal_ret = HAL_SD_WriteBlocks_DMA(hsd, data_buf, start_sector, num_sector);
#endif

#else
#else /* STM32_SDMMC_USE_DMA || IS_ENABLED(DT_PROP(DT_DRV_INST(0), idma)) */

#ifdef CONFIG_SDMMC_STM32_EMMC
return HAL_MMC_WriteBlocks_IT(hsd, data_buf, start_sector, num_sector);
hal_ret = HAL_MMC_WriteBlocks_IT(hsd, data_buf, start_sector, num_sector);
#else
return HAL_SD_WriteBlocks_IT(hsd, data_buf, start_sector, num_sector);
hal_ret = HAL_SD_WriteBlocks_IT(hsd, data_buf, start_sector, num_sector);
#endif

#endif
#endif /* STM32_SDMMC_USE_DMA || IS_ENABLED(DT_PROP(DT_DRV_INST(0), idma)) */

if (hal_ret != HAL_OK) {
LOG_ERR("sd write block failed %d", hal_ret);
return -EIO;
}

return 0;
}

static int stm32_sdmmc_access_write(struct disk_info *disk,
Expand All @@ -606,16 +634,18 @@ static int stm32_sdmmc_access_write(struct disk_info *disk,
#endif

err = stm32_sdmmc_write_blocks(&priv->hsd, (uint8_t *)data_buf, start_sector, num_sector);
if (err != HAL_OK) {
LOG_ERR("sd write block failed %d", err);
err = -EIO;
if (err != 0) {
goto end;
}

k_sem_take(&priv->sync, K_FOREVER);

#if STM32_SDMMC_USE_DMA_SHARED
HAL_DMA_DeInit(&priv->dma_txrx_handle);
if (HAL_DMA_DeInit(&priv->dma_txrx_handle) != HAL_OK) {
LOG_ERR("DMA deinit error");
err = -EIO;
goto end;
}
#endif

if (priv->status != DISK_STATUS_OK) {
Expand All @@ -635,9 +665,9 @@ static int stm32_sdmmc_access_write(struct disk_info *disk,
static int stm32_sdmmc_get_card_info(HandleTypeDef *hsd, CardInfoTypeDef *info)
{
#ifdef CONFIG_SDMMC_STM32_EMMC
return HAL_MMC_GetCardInfo(hsd, info);
return (HAL_MMC_GetCardInfo(hsd, info) == HAL_OK) ? 0 : -EIO;
#else
return HAL_SD_GetCardInfo(hsd, info);
return (HAL_SD_GetCardInfo(hsd, info) == HAL_OK) ? 0 : -EIO;
#endif
}

Expand All @@ -652,15 +682,15 @@ static int stm32_sdmmc_access_ioctl(struct disk_info *disk, uint8_t cmd,
switch (cmd) {
case DISK_IOCTL_GET_SECTOR_COUNT:
err = stm32_sdmmc_get_card_info(&priv->hsd, &info);
if (err != HAL_OK) {
return -EIO;
if (err != 0) {
return err;
}
*(uint32_t *)buff = info.LogBlockNbr;
break;
case DISK_IOCTL_GET_SECTOR_SIZE:
err = stm32_sdmmc_get_card_info(&priv->hsd, &info);
if (err != HAL_OK) {
return -EIO;
if (err != 0) {
return err;
}
*(uint32_t *)buff = info.LogBlockSize;
break;
Expand Down
Loading