On 2025/10/21 10:53, Zenghui Yu wrote:

On 2025/10/20 19:01, Jinqian Yang wrote:

...

diff --git a/arch/arm64/kvm/hisilicon/hisi_virt.h b/arch/arm64/kvm/hisilicon/hisi_virt.h index 85dccafde8a6..395500bcf546 100644 --- a/arch/arm64/kvm/hisilicon/hisi_virt.h +++ b/arch/arm64/kvm/hisilicon/hisi_virt.h @@ -69,12 +69,23 @@ enum hisi_cpu_type {

#define DVMBM_MAX_DIES 32

-/* HIP12 */ +/* + * MPIDR_EL1 layout on HIP12 + * + * Aff3[4:3] - socket ID [0-3] + * Aff3[2:0] - vdie ID [0,1] + * Aff2[2:0] - cluster ID [0-5] + * Aff1[3:0] - core ID [0-15] + * Aff0[0] - thread ID [0,1] + */ + #define DVMBM_DIE1_VDIE_SHIFT_HIP12 57 ^^^ ^^^^

...

#define DVMBM_DIE2_VDIE_SHIFT_HIP12 53 #define DVMBM_DIE1_CLUSTER_SHIFT_HIP12 6 #define DVMBM_DIE2_CLUSTER_SHIFT_HIP12 0 -#define DVMBM_MAX_DIES_HIP12 8 +#define DVMBM_MAX_DIES_HIP12 8 ^^^ die还是vdie？如果在代码里混用这两个名字的话，需要在注释（或者commit message）中定义清楚die和vdie，什么时候用die，什么时候用vdie。

对软件来说，vdie是个新概念。

950上叫vdie，其实就是cpu die的意思。感觉可以都叫vdie，这样和手册可以 对上，但是说明下vdie就是一般说的cpu die的意思。

...

+#define MPIDR_AFF3_VDIE_ID_MASK GENMASK(2, 0) +#define MPIDR_AFF3_SOCKET_ID_MASK GENMASK(4, 3) .