Skip to content

[device][mmcsd] Fix Arm Compiler 5 build compatibility - #11690

Open
CYFS3 wants to merge 2 commits into
RT-Thread:masterfrom
CYFS3:fix/mmcsd-card-ac5
Open

[device][mmcsd] Fix Arm Compiler 5 build compatibility#11690
CYFS3 wants to merge 2 commits into
RT-Thread:masterfrom
CYFS3:fix/mmcsd-card-ac5

Conversation

@CYFS3

@CYFS3 CYFS3 commented Aug 10, 2026 •
edited
Loading

Copy link
Copy Markdown
Contributor

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

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

Arm Compiler 5 编译 MMC/SD 与块设备代码时存在多处兼容性问题：通用的 SWITCH 名称会与部分芯片寄存器宏冲突，匿名结构体和依赖 typeof 的链表遍历无法稳定编译，DFS 关闭时缺少分区结构定义，部分代码还使用了 void * 指针运算。这些问题会导致相关 BSP 在 AC5 下出现编译错误。

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

  • 将 MMC 命令名调整为 MMC_SWITCH，并同步修改 Phytium SDIF 调用点，避免与芯片头文件冲突。
  • 为 ARMCC5 提供具名的 SD 状态字段访问方式，其他编译器继续使用原匿名字段接口。
  • 使用显式 rt_list_entry 替代依赖 typeof 的块设备链表遍历。
  • 为未启用 DFS 的块设备构建补充分区结构定义，并修正 DFS 块读写中的字节指针运算。
  • 统一 SD/MMC 扇区大小常量和内存释放接口，同时移除 EFI 分区代码中依赖 rt_min_t 的写法。

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

  • BSP: bsp/n32/n32hxxx/n32h760zil7-stb、bsp/qemu-vexpress-a9

当前拉取/合并请求的状态 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自查

@CYFS3
CYFS3 marked this pull request as ready for review August 10, 2026 04:01
@github-actions

github-actions Bot commented Aug 10, 2026

Copy link
Copy Markdown

📌 Code Review Assignment

🏷️ Tag: components

Reviewers: @Maihuanyi

Changed Files (Click to expand)
  • components/drivers/block/blk.c
  • components/drivers/block/blk_dfs.c
  • components/drivers/block/partitions/efi.c
  • components/drivers/include/drivers/blk.h
  • components/drivers/include/drivers/mmcsd_card.h
  • components/drivers/include/drivers/mmcsd_cmd.h
  • components/drivers/sdio/dev_block.c
  • components/drivers/sdio/dev_mmc.c
  • components/drivers/sdio/dev_mmcsd_core.c
  • components/drivers/sdio/dev_sd.c

📊 Current Review Status (Last Updated: 2026-08-10 12:01 CST)

📝 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.

@github-actions

github-actions Bot commented Aug 10, 2026

Copy link
Copy Markdown

👋 感谢您对 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：fix/mmcsd-card-ac5
  • 设置PR number为 \ Set the PR number to：11690
  1. 等待工作流完成 | Wait for the workflow to complete
    格式化后的代码将自动推送至你的分支。
    The formatted code will be automatically pushed to your branch.

完成后，提交将自动更新至 fix/mmcsd-card-ac5 分支，关联的 Pull Request 也会同步更新。
Once completed, commits will be pushed to the fix/mmcsd-card-ac5 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 commented Aug 10, 2026

Copy link
Copy Markdown

MemBrowse Memory Report

k230

  • SRAM: .eh_frame +8 B (+0.0%, 1,122,811 B / 268,300,288 B, total: 0% used)

nuvoton-m487

  • CODE: .text -8 B (-0.0%, 356,008 B / 524,288 B, total: 68% used)

qemu-virt64-aarch64

@CYFS3 CYFS3 mentioned this pull request Aug 10, 2026
Merged
10 tasks
@Rbb666
Rbb666 requested a lite review from Copilot August 12, 2026 03:09
Copilot AI reviewed Aug 12, 2026
View reviewed changes

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Pull request overview

Warning

Copilot couldn't run its full agentic review because it didn't start before the timeout. Make sure your repository has a runner available, or add a copilot-code-review.yml file specifying one with the runs-on attribute. See the docs for more details.

Fixes Arm Compiler 5 (ARMCC5) build compatibility issues in MMC/SD, block layer, and partition parsing by removing non‑portable constructs and resolving naming/macro conflicts.

Changes:

  • Renamed MMC command SWITCH to MMC_SWITCH and updated affected call sites.
  • Removed/avoided ARMCC5-incompatible language features (anonymous structs, typeof-based list traversal, void* pointer arithmetic).
  • Added fallback partition struct when DFS is disabled and normalized sector-size usage / memory free API.

Reviewed changes

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

Show a summary per file
File Description
components/drivers/sdio/dev_sd.c Uses a compiler-safe accessor macro for SD status bitfields
components/drivers/sdio/dev_mmcsd_core.c Adjusts struct initialization for ARMCC compatibility (but introduces uninitialized locals)
components/drivers/sdio/dev_mmc.c Switches MMC command macro to MMC_SWITCH
components/drivers/sdio/dev_block.c Introduces MMCSD_SECTOR_SIZE, removes rt_min_t usage, fixes pointer arithmetic, switches to rt_free
components/drivers/include/drivers/mmcsd_cmd.h Renames SWITCH macro to MMC_SWITCH
components/drivers/include/drivers/mmcsd_card.h Adds named fields for ARMCC5 and accessor macro RT_SD_STATUS_FIELD
components/drivers/include/drivers/blk.h Adds dfs_partition fallback definition when DFS is disabled
components/drivers/block/partitions/efi.c Replaces rt_min_t usage with explicit clamping for disk size
components/drivers/block/blk_dfs.c Fixes void* pointer arithmetic by using byte pointers; adjusts DFS header inclusion
components/drivers/block/blk.c Replaces typeof list iteration macros; adds DFS-optional mounted path helper
bsp/phytium/libraries/drivers/drv_sdif_msg.c Updates command switch-case to use MMC_SWITCH

💡 Add a code-review agent skill or configure MCP servers for context-aware, tailored reviews. Learn more in the docs.

Comment thread components/drivers/sdio/dev_mmcsd_core.c
Comment on lines +724 to +726
struct rt_mmcsd_req req;
struct rt_mmcsd_cmd cmd;
struct rt_mmcsd_data data;
Comment thread components/drivers/block/partitions/efi.c
Comment on lines +96 to +101
rt_uint32_t sz = 0;
rt_uint32_t disk_size;
int part = 0, ret = 0; /* invalid by default */

disk_size = total_sectors - 1 > RT_UINT32_MAX ?
RT_UINT32_MAX : (rt_uint32_t)(total_sectors - 1);
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

Copilot code review Copilot
Copilot review effort
Applies to this pull request for everyone.Learn more about Copilot code review.
Copilot left review comments

At least 1 approving review is required to merge this pull request.

Assignees

No one assigned

Labels

BSP: Phytium BSP related with Phytium BSP component: drivers/sdio component: drivers Component

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@CYFS3