Skip to content

[bsp][c908] Added support for rt-smart, MMU sv39/48, and SMP to QEMU xiaohui c908, and added mmu_demo and smp_test for test. - #11775

Open
BadmintonMaster wants to merge 3 commits into
RT-Thread:masterfrom
BadmintonMaster:c908_rttsmart_mmu
Open

BadmintonMaster wants to merge 3 commits into
RT-Thread:masterfrom
BadmintonMaster:c908_rttsmart_mmu

Conversation

@BadmintonMaster

@BadmintonMaster BadmintonMaster commented Aug 31, 2026

Copy link
Copy Markdown
Contributor

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

[

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

在QEMU xiaohui平台上,增加c908对rt-smart支持,接入libcpu以支持mmu和smp。

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

1.修改原有libcpu中mmu框架,增加SV48/SV57支持,并提供测试mmu_demo
2.参考K230和Virt/C906实现方式,增加c908对rt-smart支持
3.参考Virt/C906实现方式,增加c908对smp支持,并针对副核拉起时机、TLB刷新、IPI初始化等方面进行了smp优化

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

  • BSP:bsp\xuantie\xiaohui\c908
  • .config:bsp\xuantie\xiaohui\c908.config
  • action:

]

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

@github-actions

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

  • Use workflow from 保持默认分支(通常为 master
    Keep the default branch (usually master) in Use workflow from
  • branch 输入框填写 PR 分支 c908_rttsmart_mmu
    Enter PR branch c908_rttsmart_mmu in the branch field
  • 设置需排除的文件/目录(目录请以"/"结尾)
    Set files/directories to exclude (directories should end with "/")
  1. 等待工作流完成 | Wait for the workflow to complete
    格式化后的代码将作为独立提交推送至你的分支。
    The formatting changes will be pushed to your branch as a separate commit.

完成后,提交将自动更新至 c908_rttsmart_mmu 分支,关联的 Pull Request 也会同步更新。
Once completed, commits will be pushed to the c908_rttsmart_mmu 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 Arch: RISC-V BSP related with risc-v libcpu labels Aug 31, 2026
@github-actions

github-actions Bot commented Aug 31, 2026

Copy link
Copy Markdown

📌 Code Review Assignment

🏷️ Tag: libcpu_riscv

Reviewers: @Yaochenger

Changed Files (Click to expand)
  • libcpu/risc-v/common64/cpuport.c
  • libcpu/risc-v/common64/cpuport.h
  • libcpu/risc-v/common64/mmu.c
  • libcpu/risc-v/common64/mmu.h
  • libcpu/risc-v/common64/tlb.h
  • libcpu/risc-v/t-head/c908/cache.h
  • libcpu/risc-v/t-head/c908/interrupt.c
  • libcpu/risc-v/t-head/c908/interrupt.h
  • libcpu/risc-v/t-head/c908/plic.c
  • libcpu/risc-v/t-head/c908/riscv_mmu.h

🏷️ Tag: workflow

Reviewers: @Rbb666 @kurisaW @supperthomas

Changed Files (Click to expand)
  • .github/ALL_BSP_COMPILE.json

📊 Current Review Status (Last Updated: 2026-09-14 10:00 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 31, 2026

Copy link
Copy Markdown

@github-actions github-actions Bot added the action github action yml imporve label Aug 31, 2026
@Rbb666

Rbb666 commented Sep 7, 2026

Copy link
Copy Markdown
Member

@rcitach 帮忙review下

Comment thread libcpu/risc-v/common64/mmu.h Outdated

/* Runtime level index extraction: get the page table index at given level (1-based) */
#define GET_LVL_INDEX(addr, level) \
(((rt_ubase_t)(addr) >> (ARCH_PAGE_SHIFT + (ARCH_PAGE_TBL_LEVELS - (level)) * ARCH_INDEX_WIDTH)) & VPN_MASK)

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.

对于通用页表级数,这里将 VPN_MASK 替换为 ((1UL << ARCH_INDEX_WIDTH) - 1)) 是否会好一些

Comment thread libcpu/risc-v/common64/mmu.h Outdated
#define PTE_BITS 10
#define VPN_BITS 9
#define VPN_MASK 0x1ffUL
#define PTE_BITS 10

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.

这个应该是和 PTE_PPN_SHIFT 表示的同一个意思吧,这里建议统一,不要维护两个名字

Comment on lines +175 to +180
void rt_hw_ipi_send(int ipi_vector, unsigned int cpu_mask)
{
int cpuid = __builtin_ctz(cpu_mask); // get the bit position of the lowest set bit
ipi_vectors[cpuid] |= (uint8_t)ipi_vector;
sbi_send_ipi((const unsigned long *)&cpu_mask);
}

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.

#define RT_SCHEDULE_IPI 0
RT_SCHEDULE_IPI 如果没有显式定义是被默认设置为0的

确认一下系统运行是否会涉及到 https://github.com/RT-Thread/rt-thread/blob/master/src/scheduler_mp.c 中的

rt_hw_ipi_send(RT_SCHEDULE_IPI, cpu_mask);

否则函数内部会出现一个这种场景:

ipi_vector == 0;
ipi_vectors[cpuid] |= 0;

导致 pending 位图没有任何一位被置为 1

Comment thread libcpu/risc-v/t-head/c908/interrupt.c Outdated
void rt_hw_ipi_send(int ipi_vector, unsigned int cpu_mask)
{
int cpuid = __builtin_ctz(cpu_mask); // get the bit position of the lowest set bit
ipi_vectors[cpuid] |= (uint8_t)ipi_vector;

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.

这里使用原子操作是否会更好一些

Comment thread libcpu/risc-v/t-head/c908/interrupt.c Outdated
ipi_vector &= ~(1U << bitpos);
if (bitpos < RT_MAX_IPI && ipi_desc[bitpos].handler != RT_NULL)
{
rt_hw_atomic_and((volatile rt_atomic_t *)&ipi_vectors[rt_cpu_get_id()], ~((rt_atomic_t)(1 << bitpos)));

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.

rt_hw_atomic_and 的实现最终使用的是 amoand.d,要求地址至少 8 字节对齐。此处强制转换成 rt_atomic_t * 可能会触发异常和越界读写

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

感谢指正!这一块的实现在这个版本中我只是简单迁移了rt-thread\libcpu\risc-v\virt64\interrupt.c中的相应实现,确实没有细看,稍后我一并修改

Comment thread libcpu/risc-v/t-head/c908/interrupt.c Outdated
{
int cpuid = __builtin_ctz(cpu_mask); // get the bit position of the lowest set bit
ipi_vectors[cpuid] |= (uint8_t)ipi_vector;
sbi_send_ipi((const unsigned long *)&cpu_mask);

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.

这里的强制转换数据长度有些问题,建议先构造一个真正的 unsigned long hart_mask

@rcitach

rcitach commented Sep 8, 2026

Copy link
Copy Markdown
Contributor

有关于SMP的部分应该是迁移了rt-thread\libcpu\risc-v\virt64\interrupt.c中的相应实现,但是RISCV中关于SMP的支持还不足够完善,仍有一些问题需要解决,并且 riscv 的调整也在进行中 #11246

对于这个PR的主要目的(rt-smart and mmu Sv39/48 )来说是没什么问题的,问题主要涉及到SMP的方面,并且Kconfig默认关闭了SMP。

建议拆分成两部分分开合入master:

  1. 关于MMU SV39/48
  2. 关于 SMART 支持,并添加 SMP 编译 #error, 等后续RISCV调整结束共同完善SMP支持

@BadmintonMaster @Rbb666

@github-actions github-actions Bot added the Kernel PR has src relate code label Sep 11, 2026
@BadmintonMaster BadmintonMaster changed the title [bsp][c908]Added support for rt-smart and mmu Sv39/48 to QEMU xiaohui c908, and added mmu_demo for test. [bsp][c908] Added support for rt-smart, MMU sv39/48, and SMP to QEMU xiaohui c908, and added mmu_demo and smp_test for test. Sep 11, 2026
@BadmintonMaster

BadmintonMaster commented Sep 11, 2026

Copy link
Copy Markdown
Contributor Author

目前已根据review意见完成修改,并参考 rcitach@01072c4 指出的问题和修改方式完善了SMP相关支持,并且在qemu xiaohui c908上进行了验证。

同时,我也进行了对于PR主题和描述的更新,因此目前对于拆分PR的第二点我认为可以不拆分,反而是针对副核拉起执行时机src/components.c上的修改可能要另外提PR,毕竟影响范围比较大。

@Rbb666 @rcitach

@Rbb666 Rbb666 closed this Sep 14, 2026
@Rbb666 Rbb666 reopened this Sep 14, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

action github action yml imporve Arch: RISC-V BSP related with risc-v BSP Kernel PR has src relate code libcpu

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants