Skip to content

fix[stm32[SDMMC]: Optimize SDMMC timeout handling and clock divider#11251

Open
wdfk-prog wants to merge 1 commit intoRT-Thread:masterfrom
wdfk-prog:pr/03-stm32_sdmmc
Open

fix[stm32[SDMMC]: Optimize SDMMC timeout handling and clock divider#11251
wdfk-prog wants to merge 1 commit intoRT-Thread:masterfrom
wdfk-prog:pr/03-stm32_sdmmc

Conversation

@wdfk-prog
Copy link
Contributor

为什么提交这份PR (why to submit this PR)

STM32 SDMMC driver still has several issues in data transfer and clock configuration:

  1. Data transfer completion waits by loop count, which is not robust for different transfer sizes and clock settings, and may lead to timeout or unstable behavior.
  2. Cache maintenance uses global clean/invalidate operations, which is inefficient and may introduce unnecessary overhead.
  3. Clock divider handling is not clear enough in different timing modes, and the initialization / normal-speed / high-speed switching logic needs improvement.
  4. Some error logs are malformed and do not provide valid diagnostic information.
  5. The default clock getter is not assigned when clk_get is not provided.

This PR improves the SDMMC driver behavior and makes the logic more robust and maintainable.

你的解决方案是什么 (what is your solution)

This PR mainly includes the following changes:

  1. Add a default SDMMC clock getter (stm32_sdio_clk_get) and use it when board-specific clk_get is not provided.
  2. Replace the fixed loop-based data transfer wait with a tick-based timeout calculation (stm32_sdmmc_calc_timeout) based on transfer size, improving timeout robustness.
  3. Replace global D-Cache clean/invalidate operations with range-based cache operations to improve execution efficiency.
  4. Refine SDMMC power-mode handling in rthw_sdio_iocfg() and avoid unnecessary reconfiguration when the controller should remain stopped.
  5. Optimize clock divider selection logic for initialization, legacy mode, normal speed, and high speed timing.
  6. Remove redundant checks and unused global object definitions.
  7. Fix malformed log messages and improve code readability.
  8. Update related header definitions so frequency-related macros are more consistent.

请提供验证的bsp和config (provide the config and bsp)

  • BSP:

    • bsp/stm32/[please fill in your verified board path]
  • .config:

    • CONFIG_BSP_USING_SDIO
    • CONFIG_RT_USING_SDIO
    • [please fill in other changed configs if applicable]
  • action:

    • [please provide your fork action link]

@github-actions
Copy link

👋 感谢您对 RT-Thread 的贡献!Thank you for your contribution to RT-Thread!

为确保代码符合 RT-Thread 的编码规范,请在你的仓库中执行以下步骤运行代码格式化工作流(如果格式化CI运行失败)。
To ensure your code complies with RT-Thread's coding style, please run the code formatting workflow by following the steps below (If the formatting of CI fails to run).


🛠 操作步骤 | Steps

  1. 前往 Actions 页面 | Go to the Actions page
    点击进入工作流 → | Click to open workflow →

  2. 点击 Run workflow | Click Run workflow

  • 设置需排除的文件/目录(目录请以"/"结尾)
    Set files/directories to exclude (directories should end with "/")
  • 将目标分支设置为 \ Set the target branch to:pr/03-stm32_sdmmc
  • 设置PR number为 \ Set the PR number to:11251
  1. 等待工作流完成 | Wait for the workflow to complete
    格式化后的代码将自动推送至你的分支。
    The formatted code will be automatically pushed to your branch.

完成后,提交将自动更新至 pr/03-stm32_sdmmc 分支,关联的 Pull Request 也会同步更新。
Once completed, commits will be pushed to the pr/03-stm32_sdmmc branch automatically, and the related Pull Request will be updated.

如有问题欢迎联系我们,再次感谢您的贡献!💐
If you have any questions, feel free to reach out. Thanks again for your contribution!

@github-actions github-actions bot added BSP: STM32 BSP related with ST/STM32 BSP labels Mar 14, 2026
@github-actions
Copy link

github-actions bot commented Mar 14, 2026

📌 Code Review Assignment

🏷️ Tag: bsp_stm32

Reviewers: Liang1795 hamburger-os wdfk-prog

Changed Files (Click to expand)
  • bsp/stm32/libraries/HAL_Drivers/drivers/drv_sdmmc.c
  • bsp/stm32/libraries/HAL_Drivers/drivers/drv_sdmmc.h

📊 Current Review Status (Last Updated: 2026-03-16 16:11 CST)

  • Liang1795 Pending Review
  • hamburger-os Pending Review
  • wdfk-prog Pending Review

📝 Review Instructions

  1. 维护者可以通过单击此处来刷新审查状态: 🔄 刷新状态
    Maintainers can refresh the review status by clicking here: 🔄 Refresh Status

  2. 确认审核通过后评论 LGTM/lgtm
    Comment LGTM/lgtm after confirming approval

  3. PR合并前需至少一位维护者确认
    PR must be confirmed by at least one maintainer before merging

ℹ️ 刷新CI状态操作需要具备仓库写入权限。
ℹ️ Refresh CI status operation requires repository Write permission.

@wdfk-prog
Copy link
Contributor Author

Copy link
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

This PR targets the STM32 SDMMC driver to make data transfers and clock configuration more robust, replacing fragile loop-based waits and improving cache maintenance and clock/power handling.

Changes:

  • Adds a default clk_get fallback and refines SDMMC clock divider selection across timing modes.
  • Replaces loop-count-based data transfer completion waits with a tick-based timeout calculation.
  • Switches from global D-Cache clean/invalidate to range-based cache operations and fixes malformed log messages.

Reviewed changes

Copilot reviewed 2 out of 2 changed files in this pull request and generated 6 comments.

File Description
bsp/stm32/libraries/HAL_Drivers/drivers/drv_sdmmc.h Updates SDIO/SDMMC frequency-related macros and defaults used by the driver.
bsp/stm32/libraries/HAL_Drivers/drivers/drv_sdmmc.c Implements timeout calculation, cache range ops, power-mode handling changes, clock divider logic updates, and error/log fixes.
Comments suppressed due to low confidence (1)

bsp/stm32/libraries/HAL_Drivers/drivers/drv_sdmmc.c:304

  • [performance/性能]: Cache operation uses FLUSH for both read/write; read path should prefer INVALIDATE / Cache 操作对读写都用 FLUSH,读方向建议用 INVALIDATE

English: rt_hw_cpu_dcache_ops(RT_HW_CACHE_FLUSH, ...) is executed for any data transfer. For read transfers, flushing can unnecessarily write back dirty lines and increases bus traffic; typically you only need to invalidate the DMA buffer before/after a DMA read. Consider selecting the cache op based on data->flags (WRITE: FLUSH/CLEAN, READ: INVALIDATE).
中文:当前无论读写都执行 rt_hw_cpu_dcache_ops(RT_HW_CACHE_FLUSH, ...)。对读方向(DMA 写内存)而言,FLUSH 可能会产生不必要的写回,增加总线开销;通常只需要在 DMA 读操作前/后对 DMA 缓冲区做 invalidate。建议根据 data->flags 区分:写使用 FLUSH/CLEAN,读使用 INVALIDATE。

    /* data pre configuration */
    if (data != RT_NULL)
    {
        rt_hw_cpu_dcache_ops(RT_HW_CACHE_FLUSH, cache_buf, data->blks * data->blksize);

        reg_cmd |= SDMMC_CMD_CMDTRANS;
        __HAL_SD_DISABLE_IT(&sdio->sdio_des.hw_sdio, SDMMC_MASK_CMDRENDIE | SDMMC_MASK_CMDSENTIE);
        hsd->DTIMER = HW_SDIO_DATATIMEOUT;
        hsd->DLEN = data->blks * data->blksize;
        hsd->DCTRL = (get_order(data->blksize) << 4) | (data->flags & DATA_DIR_READ ? SDMMC_DCTRL_DTDIR : 0);

You can also share your feedback on Copilot code review. Take the survey.

@wdfk-prog wdfk-prog changed the title fix(stm32): Optimize SDMMC timeout handling and clock divider fix[stm32[SDMMC]: Optimize SDMMC timeout handling and clock divider Mar 16, 2026
@Rbb666
Copy link
Member

Rbb666 commented Mar 16, 2026

还有个格式化的问题:

image

@wdfk-prog
Copy link
Contributor Author

还有个格式化的问题:

image
  • 已修改

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

BSP: STM32 BSP related with ST/STM32 BSP

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants