Skip to content

Conversation

@laidene
Copy link
Contributor

@laidene laidene commented Dec 26, 2025

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

[

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

rt_hw_mem_setup_early() 函数中,用于对齐 _reset 符号起始虚拟地址的代码存在错误。原代码使用 va &= (0x1000000 - 1); 执行的是取模运算(保留低24位),而不是向下对齐到16MB边界。这会导致虚拟地址对齐错误,影响早期MMU内存映射的正确设置,可能导致系统启动失败或内存映射异常。

In the rt_hw_mem_setup_early() function, the code used to align the starting virtual address of the _reset symbol is incorrect. The original code va &= (0x1000000 - 1); performs a modulo operation (keeping the lower 24 bits) instead of aligning down to the 16MB boundary. This causes incorrect virtual address alignment, which affects the correct setup of early MMU memory mapping and may lead to system boot failure or memory mapping exceptions.

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

将错误的取模运算 va &= (0x1000000 - 1); 修正为正确的向下对齐操作 va &= ~(0x1000000 - 1);

Change the incorrect modulo operation va &= (0x1000000 - 1); to the correct alignment-down operation va &= ~(0x1000000 - 1);.

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

  • BSP: bsp/stm32/stm32l496-st-nucleo
  • .config: none
  • action: none

]

当前拉取/合并请求的状态 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
  • 已经使用formatting 等源码格式化工具确保格式符合RT-Thread代码规范 This PR complies with RT-Thread code specification
  • 如果是新增bsp, 已经添加ci检查到.github/ALL_BSP_COMPILE.json 详细请参考链接BSP自查

改动说明

在原来的代码中,虚拟地址va是_reset对16M的取模运算。此时 va < 16M, 这样会导致mmu要映射的空间非常大。
以qemu-vexpress-a9为例:
mmu

mmu_1
# 要映射的空间起始地址和大小
va = 0x3d8a0
size = 0x600c2760 # 简单理解为 __bss_end 向上对齐 - _reset_向下对齐

#这个空间远远大于 _reset 到 __bss_end 的空间

# 以section(1M)格式映射的话 要循环1536次

修复以后
mmu2

# 要映射的空间起始地址和大小
va = 0x6000_0000
size = 0x10_0000 
# 这个空间是最小的符合对齐的 包含 _reset 到 __bss_end 的空间

# 以section(1M)格式映射的话 只循环2次

测试

早期mmu映射不会影响后续功能。修复也只是减少映射空间的循环时间。
image

	Correct the starting virtual address of _reset alignment to 16MB
@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:fix/libcpu/arm/cortex-a
  • 设置PR number为 \ Set the PR number to:11094
  1. 等待工作流完成 | Wait for the workflow to complete
    格式化后的代码将自动推送至你的分支。
    The formatted code will be automatically pushed to your branch.

完成后,提交将自动更新至 fix/libcpu/arm/cortex-a 分支,关联的 Pull Request 也会同步更新。
Once completed, commits will be pushed to the fix/libcpu/arm/cortex-a 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!

@CLAassistant
Copy link

CLAassistant commented Dec 26, 2025

CLA assistant check
All committers have signed the CLA.

@laidene laidene force-pushed the fix/libcpu/arm/cortex-a branch from fe6cbd7 to 4b2ed0e Compare December 26, 2025 03:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants