Skip to content

hal_stm32: fix SDIO initialization failure when skipping card identification sequence. #281

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
merged 5 commits into from
Jun 6, 2025
Merged

hal_stm32: fix SDIO initialization failure when skipping card identification sequence. #281

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7b1bfee
stm32cube: stm32h7: sdio: fix SDIO_Init failure
ExaltZephyr May 18, 2025
5240b92
stm32cube: stm32u5: sdio: fix SDIO_Init failure
ExaltZephyr May 18, 2025
f0ac4fd
stm32cube: stm32h5: sdio: fix SDIO_Init failure
ExaltZephyr May 27, 2025
e3c878e
stm32cube: stm32h7rs: sdio: fix SDIO_Init failure
ExaltZephyr May 27, 2025
0351c5b
stm32cube: stm32n6: sdio: fix SDIO_Init failure
ExaltZephyr May 27, 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
6 changes: 6 additions & 0 deletions stm32cube/stm32h5xx/README
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,4 +61,10 @@ Patch List:
Impacted files:
drivers/include/Legacy/stm32_hal_legacy.h

*Fix SDIO initialization failure when skipping card identification sequence
Fixes an issue in the STM32H5 SDIO driver where HAL_SDIO_Init() fails if
the card identification sequence is skipped.
Impacted files:
stm32cube/stm32h5xx/drivers/src/stm32h5xx_hal_sdio.c

See release_note.html from STM32Cube
14 changes: 7 additions & 7 deletions stm32cube/stm32h5xx/drivers/src/stm32h5xx_hal_sdio.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -314,7 +314,6 @@ HAL_StatusTypeDef HAL_SDIO_Init(SDIO_HandleTypeDef *hsdio)
{
SDIO_InitTypeDef Init;
uint32_t sdmmc_clk = 0U;
uint8_t data;

/* Check the parameters */
assert_param(hsdio != NULL);
Expand Down Expand Up @@ -407,12 +406,6 @@ HAL_StatusTypeDef HAL_SDIO_Init(SDIO_HandleTypeDef *hsdio)
Init.ClockDiv = hsdio->Init.ClockDiv;
(void)SDMMC_Init(hsdio->Instance, Init);

data = (hsdio->Init.BusWide == HAL_SDIO_4_WIRES_MODE) ? 2U : 0U;
if (SDIO_WriteDirect(hsdio, SDMMC_SDIO_CCCR4_SD_BYTE3, HAL_SDIO_WRITE_ONLY, SDIO_FUNCTION_0, &data) != HAL_OK)
{
return HAL_ERROR;
}

hsdio->Context = SDIO_CONTEXT_NONE;
hsdio->State = HAL_SDIO_STATE_READY;

Expand Down Expand Up @@ -2507,6 +2500,7 @@ HAL_StatusTypeDef HAL_SDIO_RegisterIOFunctionCallback(SDIO_HandleTypeDef *hsdio,
*/
static HAL_StatusTypeDef SDIO_InitCard(SDIO_HandleTypeDef *hsdio)
{
uint8_t data;
uint32_t errorstate;
uint32_t timeout = 0U;
uint16_t sdio_rca = 1U;
Expand Down Expand Up @@ -2581,6 +2575,12 @@ static HAL_StatusTypeDef SDIO_InitCard(SDIO_HandleTypeDef *hsdio)
return HAL_ERROR;
}

data = (hsdio->Init.BusWide == HAL_SDIO_4_WIRES_MODE) ? 2U : 0U;
if (SDIO_WriteDirect(hsdio, SDMMC_SDIO_CCCR4_SD_BYTE3, HAL_SDIO_WRITE_ONLY, SDIO_FUNCTION_0, &data) != HAL_OK)
{
return HAL_ERROR;
}

return HAL_OK;
}

Expand Down
6 changes: 6 additions & 0 deletions stm32cube/stm32h7rsxx/README
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,4 +48,10 @@ Patch List:
Impacted files:
drivers/include/Legacy/stm32_hal_legacy.h

*Fix SDIO initialization failure when skipping card identification sequence
Fixes an issue in the STM32H7RS SDIO driver where HAL_SDIO_Init() fails if
the card identification sequence is skipped.
Impacted files:
stm32cube/stm32h7rsxx/drivers/src/stm32h7rsxx_hal_sdio.c

See release_note.html from STM32Cube
14 changes: 7 additions & 7 deletions stm32cube/stm32h7rsxx/drivers/src/stm32h7rsxx_hal_sdio.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -314,7 +314,6 @@ HAL_StatusTypeDef HAL_SDIO_Init(SDIO_HandleTypeDef *hsdio)
{
SDIO_InitTypeDef Init = {0U};
uint32_t sdmmc_clk;
uint8_t data;

/* Check the parameters */
assert_param(hsdio != NULL);
Expand Down Expand Up @@ -405,12 +404,6 @@ HAL_StatusTypeDef HAL_SDIO_Init(SDIO_HandleTypeDef *hsdio)
Init.ClockDiv = hsdio->Init.ClockDiv;
(void)SDMMC_Init(hsdio->Instance, Init);

data = (hsdio->Init.BusWide == HAL_SDIO_4_WIRES_MODE) ? 2U : 0U;
if (SDIO_WriteDirect(hsdio, SDMMC_SDIO_CCCR4_SD_BYTE3, HAL_SDIO_WRITE_ONLY, SDIO_FUNCTION_0, &data) != HAL_OK)
{
return HAL_ERROR;
}

hsdio->Context = SDIO_CONTEXT_NONE;
hsdio->State = HAL_SDIO_STATE_READY;

Expand Down Expand Up @@ -2494,6 +2487,7 @@ HAL_StatusTypeDef HAL_SDIO_RegisterIOFunctionCallback(SDIO_HandleTypeDef *hsdio,
*/
static HAL_StatusTypeDef SDIO_InitCard(SDIO_HandleTypeDef *hsdio)
{
uint8_t data;
uint32_t errorstate;
uint32_t timeout = 0U;
uint16_t sdio_rca = 1U;
Expand Down Expand Up @@ -2568,6 +2562,12 @@ static HAL_StatusTypeDef SDIO_InitCard(SDIO_HandleTypeDef *hsdio)
return HAL_ERROR;
}

data = (hsdio->Init.BusWide == HAL_SDIO_4_WIRES_MODE) ? 2U : 0U;
if (SDIO_WriteDirect(hsdio, SDMMC_SDIO_CCCR4_SD_BYTE3, HAL_SDIO_WRITE_ONLY, SDIO_FUNCTION_0, &data) != HAL_OK)
{
return HAL_ERROR;
}

return HAL_OK;
}

Expand Down
6 changes: 6 additions & 0 deletions stm32cube/stm32h7xx/README
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,4 +62,10 @@ Patch List:
Impacted files:
drivers/include/Legacy/stm32_hal_legacy.h

*Fix SDIO initialization failure when skipping card identification sequence
Fixes an issue in the STM32H7 SDIO driver where HAL_SDIO_Init() fails if
the card identification sequence is skipped.
Impacted files:
stm32cube/stm32h7xx/drivers/src/stm32h7xx_hal_sdio.c

See release_note.html from STM32Cube
14 changes: 7 additions & 7 deletions stm32cube/stm32h7xx/drivers/src/stm32h7xx_hal_sdio.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -314,7 +314,6 @@ HAL_StatusTypeDef HAL_SDIO_Init(SDIO_HandleTypeDef *hsdio)
{
SDIO_InitTypeDef Init;
uint32_t sdmmc_clk;
uint8_t data;

/* Check the parameters */
assert_param(hsdio != NULL);
Expand Down Expand Up @@ -398,12 +397,6 @@ HAL_StatusTypeDef HAL_SDIO_Init(SDIO_HandleTypeDef *hsdio)
Init.ClockDiv = hsdio->Init.ClockDiv;
(void)SDMMC_Init(hsdio->Instance, Init);

data = (hsdio->Init.BusWide == HAL_SDIO_4_WIRES_MODE) ? 2U : 0U;
if (SDIO_WriteDirect(hsdio, SDMMC_SDIO_CCCR4_SD_BYTE3, HAL_SDIO_WRITE_ONLY, SDIO_FUNCTION_0, &data) != HAL_OK)
{
return HAL_ERROR;
}

hsdio->Context = SDIO_CONTEXT_NONE;
hsdio->State = HAL_SDIO_STATE_READY;

Expand Down Expand Up @@ -2486,6 +2479,7 @@ HAL_StatusTypeDef HAL_SDIO_RegisterIOFunctionCallback(SDIO_HandleTypeDef *hsdio,
*/
static HAL_StatusTypeDef SDIO_InitCard(SDIO_HandleTypeDef *hsdio)
{
uint8_t data;
uint32_t errorstate;
uint32_t timeout = 0U;
uint16_t sdio_rca = 1U;
Expand Down Expand Up @@ -2560,6 +2554,12 @@ static HAL_StatusTypeDef SDIO_InitCard(SDIO_HandleTypeDef *hsdio)
return HAL_ERROR;
}

data = (hsdio->Init.BusWide == HAL_SDIO_4_WIRES_MODE) ? 2U : 0U;
if (SDIO_WriteDirect(hsdio, SDMMC_SDIO_CCCR4_SD_BYTE3, HAL_SDIO_WRITE_ONLY, SDIO_FUNCTION_0, &data) != HAL_OK)
{
return HAL_ERROR;
}

return HAL_OK;
}

Expand Down
6 changes: 6 additions & 0 deletions stm32cube/stm32n6xx/README
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,4 +53,10 @@ Patch List:
Impacted files:
-soc/system_stm32n6xx_fsbl.c

*Fix SDIO initialization failure when skipping card identification sequence
Fixes an issue in the STM32HN6 SDIO driver where HAL_SDIO_Init() fails if
the card identification sequence is skipped.
Impacted files:
stm32cube/stm32n6xx/drivers/src/stm32n6xx_hal_sdio.c

See release_note.html from STM32Cube
14 changes: 7 additions & 7 deletions stm32cube/stm32n6xx/drivers/src/stm32n6xx_hal_sdio.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -314,7 +314,6 @@ HAL_StatusTypeDef HAL_SDIO_Init(SDIO_HandleTypeDef *hsdio)
{
SDIO_InitTypeDef Init;
uint32_t sdmmc_clk;
uint8_t data;

/* Check the parameters */
assert_param(hsdio != NULL);
Expand Down Expand Up @@ -398,12 +397,6 @@ HAL_StatusTypeDef HAL_SDIO_Init(SDIO_HandleTypeDef *hsdio)
Init.ClockDiv = hsdio->Init.ClockDiv;
(void)SDMMC_Init(hsdio->Instance, Init);

data = (hsdio->Init.BusWide == HAL_SDIO_4_WIRES_MODE) ? 2U : 0U;
if (SDIO_WriteDirect(hsdio, SDMMC_SDIO_CCCR4_SD_BYTE3, HAL_SDIO_WRITE_ONLY, SDIO_FUNCTION_0, &data) != HAL_OK)
{
return HAL_ERROR;
}

hsdio->Context = SDIO_CONTEXT_NONE;
hsdio->State = HAL_SDIO_STATE_READY;

Expand Down Expand Up @@ -2486,6 +2479,7 @@ HAL_StatusTypeDef HAL_SDIO_RegisterIOFunctionCallback(SDIO_HandleTypeDef *hsdio,
*/
static HAL_StatusTypeDef SDIO_InitCard(SDIO_HandleTypeDef *hsdio)
{
uint8_t data;
uint32_t errorstate;
uint32_t timeout = 0U;
uint16_t sdio_rca = 1U;
Expand Down Expand Up @@ -2560,6 +2554,12 @@ static HAL_StatusTypeDef SDIO_InitCard(SDIO_HandleTypeDef *hsdio)
return HAL_ERROR;
}

data = (hsdio->Init.BusWide == HAL_SDIO_4_WIRES_MODE) ? 2U : 0U;
if (SDIO_WriteDirect(hsdio, SDMMC_SDIO_CCCR4_SD_BYTE3, HAL_SDIO_WRITE_ONLY, SDIO_FUNCTION_0, &data) != HAL_OK)
{
return HAL_ERROR;
}

return HAL_OK;
}

Expand Down
6 changes: 6 additions & 0 deletions stm32cube/stm32u5xx/README
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,4 +48,10 @@ Patch List:
Impacted files:
drivers/include/Legacy/stm32_hal_legacy.h

*Fix SDIO initialization failure when skipping card identification sequence
Fixes an issue in the STM32U5 SDIO driver where HAL_SDIO_Init() fails if
the card identification sequence is skipped.
Impacted files:
stm32cube/stm32u5xx/drivers/src/stm32u5xx_hal_sdio.c

See release_note.html from STM32Cube
13 changes: 6 additions & 7 deletions stm32cube/stm32u5xx/drivers/src/stm32u5xx_hal_sdio.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -314,7 +314,6 @@ HAL_StatusTypeDef HAL_SDIO_Init(SDIO_HandleTypeDef *hsdio)
{
SDIO_InitTypeDef Init;
uint32_t sdmmc_clk;
uint8_t data;

/* Check the parameters */
assert_param(hsdio != NULL);
Expand Down Expand Up @@ -398,12 +397,6 @@ HAL_StatusTypeDef HAL_SDIO_Init(SDIO_HandleTypeDef *hsdio)
Init.ClockDiv = hsdio->Init.ClockDiv;
(void)SDMMC_Init(hsdio->Instance, Init);

data = (hsdio->Init.BusWide == HAL_SDIO_4_WIRES_MODE) ? 2U : 0U;
if (SDIO_WriteDirect(hsdio, SDMMC_SDIO_CCCR4_SD_BYTE3, HAL_SDIO_WRITE_ONLY, SDIO_FUNCTION_0, &data) != HAL_OK)
{
return HAL_ERROR;
}

hsdio->Context = SDIO_CONTEXT_NONE;
hsdio->State = HAL_SDIO_STATE_READY;

Expand Down Expand Up @@ -2560,6 +2553,12 @@ static HAL_StatusTypeDef SDIO_InitCard(SDIO_HandleTypeDef *hsdio)
return HAL_ERROR;
}

uint8_t data = (hsdio->Init.BusWide == HAL_SDIO_4_WIRES_MODE) ? 2U : 0U;
if (SDIO_WriteDirect(hsdio, SDMMC_SDIO_CCCR4_SD_BYTE3, HAL_SDIO_WRITE_ONLY, SDIO_FUNCTION_0, &data) != HAL_OK)
{
return HAL_ERROR;
}

return HAL_OK;
}

Expand Down