[sdio] set block size after block configuration by BernardXiong · Pull Request #11886 · RT-Thread/rt-thread

BernardXiong · 2026-10-18T11:35:36Z

拉取/合并请求描述：(PR description)

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

rt_mmcsd_blk_probe() stores card->card_blksize in the block device geometry before the block size is applied to the card. Partition probing can then observe a stale block size.

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

assign geometry.block_size after rt_mmcsd_set_blksize() succeeds
expose the sector size used by the block layer as block_size
keep sector_count based on the card capacity

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

BSP: bsp/k230 (SDIO)
.config: CONFIG_RT_USING_SDIO=y, CONFIG_BSP_USING_SDIO=y
action: local build not run; the RISC-V musleabi toolchain is not available in this environment, CI will verify the build

当前拉取/合并请求的状态 Intent for your PR

必须选择一项 Choose one (Mandatory):

本拉取/合并请求是一个草稿版本 This PR is for a code-review and is intended to get feedback
本拉取/合并请求是一个成熟版本 This PR is mature, and ready to be integrated into the repo

代码质量 Code Quality：

我在这个拉取/合并请求中已经考虑了 As part of this pull request, I've considered the following:

已经仔细查看过代码改动的对比 Already check the difference between PR and old code
代码风格正确，包括缩进空格，命名及其他风格 Style guide is adhered to, including spacing, naming and other styles
没有垃圾代码，代码尽量精简，不包含#if 0代码，不包含已经被注释了的代码 All redundant code is removed and cleaned up
所有变更均有原因及合理的，并且不会影响到其他软件组件代码或BSP All modifications are justified and not affect other components or BSP
对难懂代码均提供对应的注释 I've commented appropriately where code is tricky
代码是高质量的 Code in this PR is of high quality
已经使用clang-format 源码格式化工具确保格式符合RT-Thread代码规范 This PR has been formatted with clang-format and complies with RT-Thread code specification
如果是新增bsp, 已经添加ci检查到.github/ALL_BSP_COMPILE.json 详细请参考链接BSP自查

- initialize block_size only after the host block size is applied - avoid exposing card_blksize before it is configured on the device - keep sector-based geometry consistent for partition probing

github-actions · 2026-10-18T11:36:03Z

👋 感谢您对 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

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

Use workflow from 保持默认分支（通常为 master）
Keep the default branch (usually master) in Use workflow from
在 branch 输入框填写 PR 分支 pr/sdio-block-size
Enter PR branch pr/sdio-block-size in the branch field
设置需排除的文件/目录（目录请以"/"结尾）
Set files/directories to exclude (directories should end with "/")

等待工作流完成 | Wait for the workflow to complete
格式化后的代码将作为独立提交推送至你的分支。
The formatting changes will be pushed to your branch as a separate commit.

完成后，提交将自动更新至 pr/sdio-block-size 分支，关联的 Pull Request 也会同步更新。
Once completed, commits will be pushed to the pr/sdio-block-size 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 · 2026-10-18T11:37:13Z

📌 Code Review Assignment

🏷️ Tag: components

Reviewers: @Maihuanyi

Changed Files (Click to expand)

components/drivers/sdio/dev_block.c

📊 Current Review Status (Last Updated: 2026-11-01 00:06 CST)

⌛ @Maihuanyi Pending Review

📝 Review Instructions

维护者可以通过单击此处来刷新审查状态: 🔄 刷新状态
Maintainers can refresh the review status by clicking here: 🔄 Refresh Status
确认审核通过后评论 LGTM/lgtm
Comment LGTM/lgtm after confirming approval
PR合并前需至少一位维护者确认
PR must be confirmed by at least one maintainer before merging

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

- initialize the block counter before the SEND_NUM_WR_BLKS request - fix the cppcheck uninitvar warning in mmcsd_num_wr_blocks()

github-actions · 2026-10-18T15:55:12Z

MemBrowse Memory Report · Explore what changed →

esp32-c3

dram0_0_seg: .dram0.bss +9,208 B, .dram0.data +168 B, .dram0.dummy -22,016 B (-5.7%, 208,608 B / 325,120 B, total: 64% used)
drom0_0_seg: .eh_frame +78,544 B, .eh_frame_hdr +12,376 B, .flash.rodata +27,368 B, .flash_rodata_dummy +196,608 B (+76.6%, 725,908 B / 8,388,576 B, total: 9% used)
iram0_0_seg: .iram0.text -21,766 B, .iram0.text_end -250 B (-29.3%, 53,248 B / 325,120 B, total: 16% used)
iram0_2_seg: .flash.text +199,784 B, .text +474 B (+87.2%, 429,852 B / 8,388,576 B, total: 5% used)
rtc_iram_seg: .rtc.text +8 B (+60.0%, 64 B / 8,192 B, total: 1% used)

k230

SRAM: .bss +4,096 B, .data +8 B, .eh_frame +13,744 B, .sbss +120 B, .srodata.cst8 +16 B, .stack -8 B, .text +62,648 B (+7.1%, 1,209,172 B / 268,300,288 B, total: 0% used)

nordic-nrf51822

FLASH: .text -8 B (-0.0%, 52,028 B / 262,144 B, total: 20% used)

nuvoton-m487

CODE: .text +24 B (+0.0%, 356,200 B / 524,288 B, total: 68% used)

qemu-virt64-aarch64

Code: .eh_frame -15,064 B, .text -52,624 B (-6.3%, 1,010,124 B)
Data: .bss +597,200 B, .data -47,560 B (+106.2%, 1,067,160 B)

raspberry-pico-rp2040

FLASH: .text -8 B (-0.0%, 114,160 B / 2,097,152 B, total: 5% used)

simulator

Code: .eh_frame +4 B, .rela.dyn -216 B, .rodata -23 B, .text +5 B (-0.0%, 2,672,790 B)
Data: .data -256 B (-0.0%, 1,609,028 B)

No memory changes detected for:

_{Catch memory regressions in CI with MemBrowse. Free for open source.}

rcitach · 2026-10-28T07:22:34Z

    {
        goto _fail;
    }
+    blk_dev->geometry.block_size = blk_dev->geometry.bytes_per_sector;


此处语义感觉有些奇怪，

rt-thread/components/drivers/include/drivers/classes/block.h

Line 30 in ff82e23

rt_uint32_t block_size; /**< number of bytes to erase one block */

此处是要保存设置成功的 blksize ? 感觉和注释有些冲突，并且如果记录设置成功的blksize 使用 MMCSD_SECTOR_SIZE 会不会明确一些

已按建议修改（commit 1821504）：改为显式使用 MMCSD_SECTOR_SIZE 赋值，并补充注释说明语义：

mmcsd_set_blksize() 会把卡配置为 MMCSD_SECTOR_SIZE 传输，这里记录的是配置成功后块层实际使用的块大小；

card->card_blksize 是 CSD 里的读块长度，不是块层传输的块大小，所以在配置成功前不能上报；

geometry.block_size 在 block.h 里注释为擦除块大小，SD 卡没有可靠且统一的擦除块信息，这里沿用块层的传输粒度 MMCSD_SECTOR_SIZE，与原实现保持一致，只是把赋值时机移到配置成功之后并显式化。

Use MMCSD_SECTOR_SIZE explicitly and document that mmcsd_set_blksize() configured the card for that transfer size. card->card_blksize is the CSD read block length, not the block size used by the block layer, so it must not be reported before the card is configured. Co-Authored-By: Claude Code <noreply@anthropic.com>

[sdio] set block size after block configuration

fe5a278

- initialize block_size only after the host block size is applied - avoid exposing card_blksize before it is configured on the device - keep sector-based geometry consistent for partition probing

github-actions Bot added component: drivers/sdio Component component: drivers labels Oct 18, 2026

BernardXiong marked this pull request as ready for review October 18, 2026 11:42

[sdio] initialize write block counter

6124d26

- initialize the block counter before the SEND_NUM_WR_BLKS request - fix the cppcheck uninitvar warning in mmcsd_num_wr_blocks()

rcitach reviewed Oct 28, 2026

View reviewed changes

Navigation Menu

Repository navigation

[sdio] set block size after block configuration - #11886

[sdio] set block size after block configuration#11886
BernardXiong wants to merge 3 commits into
RT-Thread:masterfrom
BernardXiong:pr/sdio-block-size

BernardXiong commented Oct 18, 2026 •

edited

Loading

Uh oh!

github-actions Bot commented Oct 18, 2026

Uh oh!

github-actions Bot commented Oct 18, 2026 •

edited

Loading

Uh oh!

github-actions Bot commented Oct 18, 2026 •

edited

Loading

Uh oh!

rcitach Oct 28, 2026

Uh oh!

BernardXiong Oct 31, 2026

Uh oh!

This branch has not been deployed

Reviewers

Uh oh!

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Conversation

BernardXiong commented Oct 18, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

拉取/合并请求描述：(PR description)

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

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

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

当前拉取/合并请求的状态 Intent for your PR

代码质量 Code Quality：

Uh oh!

github-actions Bot commented Oct 18, 2026

🛠 操作步骤 | Steps

Uh oh!

github-actions Bot commented Oct 18, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

📌 Code Review Assignment

🏷️ Tag: components

📊 Current Review Status (Last Updated: 2026-11-01 00:06 CST)

📝 Review Instructions

Uh oh!

github-actions Bot commented Oct 18, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

MemBrowse Memory Report · Explore what changed →

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

This branch has not been deployed

Reviewers

Uh oh!

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

BernardXiong commented Oct 18, 2026 •

edited

Loading

github-actions Bot commented Oct 18, 2026 •

edited

Loading

github-actions Bot commented Oct 18, 2026 •

edited

Loading