Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix gicv3 Distributor register offset error #8984

Open
wants to merge 1 commit into
base: master
Choose a base branch
from

Conversation

gexueyuan
Copy link

@gexueyuan gexueyuan commented May 24, 2024

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

[

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

使用gicv3中的arm_gic_dump函数时,发现打印的版本号不对,同时发现下面一行定义的gicv3路由偏移也不对

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

根据gicv3手册 修改offset

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

  • BSP:

  • .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
  • 已经使用formatting 等源码格式化工具确保格式符合RT-Thread代码规范 This PR complies with RT-Thread code specification

@zmshahaha
Copy link
Contributor

@gexueyuan
Copy link
Author

@BernardXiong
Copy link
Member

https://developer.arm.com/documentation/ddi0601/2020-12/External-Registers/GICD-IROUTER-n---Interrupt-Routing-Registers
GICD_IROUTER偏移应该就是0x6000吧

奇怪,我用的gic500,GICD_IROUTER偏移就是0x6100 https://developer.arm.com/documentation/ddi0516/e/programmers-model/distributor-register-summary?lang=en

如果是这样,那就还需要区分版本的了,增加版本宏定义,或从寄存器中获得版本号,走不同的分支

@CLAassistant
Copy link

CLA assistant check
Thank you for your submission! We really appreciate it. Like many open source projects, we ask that you sign our Contributor License Agreement before we can accept your contribution.


gexueyuan seems not to be a GitHub user. You need a GitHub account to be able to sign the CLA. If you have already a GitHub account, please add the email address used for this commit to your account.
You have signed the CLA already but the status is still pending? Let us recheck it.

@GuEe-GUI
Copy link
Contributor

GuEe-GUI commented Jun 2, 2024

请详细参考 Arm® Generic Interrupt - Controller Architecture Specification GIC - architecture version 3 and version 4 编程手册进行分析。

在 GICv3 中,对于 GICD_IROUTER 的具体地址就是 0x6000 + 8 * n 但是在手册中有明确的前提:n = 32 - 1019

同时在 rt-thread 主仓库中,对于 GICD_IROUTER 的访问也遵循该规则:

#define GIC_DIST_IROUTER(hw_base, n) HWREG64((hw_base) + 0x6000U + (n) * 8U)

void arm_gic_set_router_cpu(rt_uint64_t index, int irq, rt_uint64_t aff)
{
RT_ASSERT(index < ARM_GIC_MAX_NR);
irq = irq - _gic_table[index].offset;
RT_ASSERT(irq >= 32);
GIC_DIST_IROUTER(_gic_table[index].dist_hw_base, irq) = aff & 0xff00ffffffULL;
}
rt_uint64_t arm_gic_get_router_cpu(rt_uint64_t index, int irq)
{
RT_ASSERT(index < ARM_GIC_MAX_NR);
irq = irq - _gic_table[index].offset;
RT_ASSERT(irq >= 32);
return GIC_DIST_IROUTER(_gic_table[index].dist_hw_base, irq);
}

/* Set all global interrupts to this CPU only. */
for (i = 32; i < _gic_max_irq; i++)
{
GIC_DIST_IROUTER(dist_base, i) = main_cpu_affinity_val | (GICV3_ROUTED_TO_SPEC << 31);
}

也就是说, GICD_IROUTER 的有效寄存器地址,确实是从 0x6100 开始,为了贴切 ARM 的手册说明,在使用了上述的方式。因此对于 GICD_IROUTER 不需要进行修改。

具体的版本号为什么不对,可能需要题主进一步分析。

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants