bsp: qemu-virt64-riscv: remove config RISCV_S_MODE #9887
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
RISCV_S_MODE configuration only affects the code in libcpu/risc-v/virt64, and the only bsp using this libcpu is qemu-virt64-riscv. Considering s-mode is the default mode RT-Thread running on virt64 machine, it seems unnecessary to make RISCV_S_MODE a Kconfig option. Solution: Remove RISCV_S_MODE from Kconfig and define it as a macro in the code in libcpu/risc-v/virt64. Plus, due to this macro is only related to virt64, rename RISCV_S_MODE to RISCV_VIRT64_S_MODE. Update the .config/rtconfig.h in this patch. Signed-off-by: Chen Wang <unicorn_wang@outlook.com>
10 tasks
Rbb666
reviewed
Jan 10, 2025
| @@ -30,7 +30,10 @@ extern size_t plic_base; | |||
| #define PLIC_ENABLE_STRIDE 0x80 | |||
| #define PLIC_CONTEXT_STRIDE 0x1000 | |||
|
|
|||
| #ifndef RISCV_S_MODE | |||
| /* RT-Thread runs in S-mode on virt64 by default */ | |||
| #define RISCV_VIRT64_S_MODE | |||
There was a problem hiding this comment.
单独定义在这里感觉不太合适，感觉还是建议将此配置转移到libcpu的kconfig下好些
There was a problem hiding this comment.
如果仅仅作用在/risc-v/virt64/下，我觉得此修改没问题
There was a problem hiding this comment.
原来是想保留做成个配置挪到 libcpu 下，但是进一步分析其实发现根本就没有配置的需要.
RISCV_S_MODE 这个宏，只有 libcpu/risc-v/virt64 才涉及，其实也就只有 qemu-virt64-riscv 这个 bsp 才会用到. 而对于 qemu，默认也只会工作在 S mode 下了，所以这个配置其实没有存在的必要，别的 bsp 不会用到 libcpu/risc-v/virt64 。目前保留这个宏，仅仅是为了保留 machine 下的一些宏值，其实最彻底的方法就是把 PLIC 的 machine 部分都删了。但想想还是先保留现有代码，所以就还是保留了那个宏 RISCV_S_MODE，只不过改了个名字 RISCV_VIRT64_S_MODE，因为只有 virt 的才用的上.
Rbb666
approved these changes
Jan 10, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixed #9670
RISCV_S_MODE configuration only affects the code in libcpu/risc-v/virt64, and the only bsp using this
libcpu is qemu-virt64-riscv.
Considering s-mode is the default mode RT-Thread
running on virt64 machine, it seems unnecessary to make RISCV_S_MODE a Kconfig option.
Solution: Remove RISCV_S_MODE from Kconfig and define it as a macro in the code in libcpu/risc-v/virt64.
Plus, due to this macro is only related to virt64, rename RISCV_S_MODE to RISCV_VIRT64_S_MODE.
Update the .config/rtconfig.h in this patch.
拉取/合并请求描述：(PR description)
[
为什么提交这份PR (why to submit this PR)
你的解决方案是什么 (what is your solution)
请提供验证的bsp和config (provide the config and bsp)
]
当前拉取/合并请求的状态 Intent for your PR
必须选择一项 Choose one (Mandatory):
代码质量 Code Quality：
我在这个拉取/合并请求中已经考虑了 As part of this pull request, I've considered the following:
#if 0代码，不包含已经被注释了的代码 All redundant code is removed and cleaned up