1. Patchew
  2. QEMU
  3. View series

[PATCH] target/loongarch: Add CSR_CPUID reg in cpu_env

Tianrui Zhao posted 1 patch 1 year ago
Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/qemu tags/patchew/20230418122045.2808212-1-zhaotianrui@loongson.cn
Maintainers: Song Gao <gaosong@loongson.cn>, Xiaojuan Yang <yangxiaojuan@loongson.cn>
target/loongarch/cpu.c                             | 1 +
target/loongarch/cpu.h                             | 1 +
target/loongarch/insn_trans/trans_privileged.c.inc | 8 +-------
3 files changed, 3 insertions(+), 7 deletions(-)
[PATCH] target/loongarch: Add CSR_CPUID reg in cpu_env
Posted by Tianrui Zhao 1 year ago 
Add CSR_CPUID register in cpu_env to save the cpu_index
value.

Signed-off-by: Tianrui Zhao <zhaotianrui@loongson.cn>
---
 target/loongarch/cpu.c                             | 1 +
 target/loongarch/cpu.h                             | 1 +
 target/loongarch/insn_trans/trans_privileged.c.inc | 8 +-------
 3 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/target/loongarch/cpu.c b/target/loongarch/cpu.c
index 97e6579f6a..bee5949ed2 100644
--- a/target/loongarch/cpu.c
+++ b/target/loongarch/cpu.c
@@ -486,6 +486,7 @@ static void loongarch_cpu_reset_hold(Object *obj)
 
     env->CSR_ESTAT = env->CSR_ESTAT & (~MAKE_64BIT_MASK(0, 2));
     env->CSR_RVACFG = FIELD_DP64(env->CSR_RVACFG, CSR_RVACFG, RBITS, 0);
+    env->CSR_CPUID = cs->cpu_index;
     env->CSR_TCFG = FIELD_DP64(env->CSR_TCFG, CSR_TCFG, EN, 0);
     env->CSR_LLBCTL = FIELD_DP64(env->CSR_LLBCTL, CSR_LLBCTL, KLO, 0);
     env->CSR_TLBRERA = FIELD_DP64(env->CSR_TLBRERA, CSR_TLBRERA, ISTLBR, 0);
diff --git a/target/loongarch/cpu.h b/target/loongarch/cpu.h
index e11c875188..1d9a4009b9 100644
--- a/target/loongarch/cpu.h
+++ b/target/loongarch/cpu.h
@@ -288,6 +288,7 @@ typedef struct CPUArchState {
     uint64_t CSR_PWCH;
     uint64_t CSR_STLBPS;
     uint64_t CSR_RVACFG;
+    uint64_t CSR_CPUID;
     uint64_t CSR_PRCFG1;
     uint64_t CSR_PRCFG2;
     uint64_t CSR_PRCFG3;
diff --git a/target/loongarch/insn_trans/trans_privileged.c.inc b/target/loongarch/insn_trans/trans_privileged.c.inc
index 5a04352b01..d1d98c6e9e 100644
--- a/target/loongarch/insn_trans/trans_privileged.c.inc
+++ b/target/loongarch/insn_trans/trans_privileged.c.inc
@@ -99,13 +99,7 @@ static const CSRInfo csr_info[] = {
     CSR_OFF(PWCH),
     CSR_OFF(STLBPS),
     CSR_OFF(RVACFG),
-    [LOONGARCH_CSR_CPUID] = {
-        .offset = (int)offsetof(CPUState, cpu_index)
-                  - (int)offsetof(LoongArchCPU, env),
-        .flags = CSRFL_READONLY,
-        .readfn = NULL,
-        .writefn = NULL
-    },
+    CSR_OFF_FLAGS(CPUID, CSRFL_READONLY),
     CSR_OFF_FLAGS(PRCFG1, CSRFL_READONLY),
     CSR_OFF_FLAGS(PRCFG2, CSRFL_READONLY),
     CSR_OFF_FLAGS(PRCFG3, CSRFL_READONLY),
-- 
2.31.1
Re: [PATCH] target/loongarch: Add CSR_CPUID reg in cpu_env
Posted by Song Gao 1 year ago 
Hi,  Tianrui

在 2023/4/18 下午8:20, Tianrui Zhao 写道:
> Add CSR_CPUID register in cpu_env to save the cpu_index
> value.
Why do we need to do this?

For tcg mode, it is enough to use cpu_index. You need to explain the reason.

Thank.
Song Gao
> Signed-off-by: Tianrui Zhao <zhaotianrui@loongson.cn>
> ---
>   target/loongarch/cpu.c                             | 1 +
>   target/loongarch/cpu.h                             | 1 +
>   target/loongarch/insn_trans/trans_privileged.c.inc | 8 +-------
>   3 files changed, 3 insertions(+), 7 deletions(-)
>
> diff --git a/target/loongarch/cpu.c b/target/loongarch/cpu.c
> index 97e6579f6a..bee5949ed2 100644
> --- a/target/loongarch/cpu.c
> +++ b/target/loongarch/cpu.c
> @@ -486,6 +486,7 @@ static void loongarch_cpu_reset_hold(Object *obj)
>   
>       env->CSR_ESTAT = env->CSR_ESTAT & (~MAKE_64BIT_MASK(0, 2));
>       env->CSR_RVACFG = FIELD_DP64(env->CSR_RVACFG, CSR_RVACFG, RBITS, 0);
> +    env->CSR_CPUID = cs->cpu_index;
>       env->CSR_TCFG = FIELD_DP64(env->CSR_TCFG, CSR_TCFG, EN, 0);
>       env->CSR_LLBCTL = FIELD_DP64(env->CSR_LLBCTL, CSR_LLBCTL, KLO, 0);
>       env->CSR_TLBRERA = FIELD_DP64(env->CSR_TLBRERA, CSR_TLBRERA, ISTLBR, 0);
> diff --git a/target/loongarch/cpu.h b/target/loongarch/cpu.h
> index e11c875188..1d9a4009b9 100644
> --- a/target/loongarch/cpu.h
> +++ b/target/loongarch/cpu.h
> @@ -288,6 +288,7 @@ typedef struct CPUArchState {
>       uint64_t CSR_PWCH;
>       uint64_t CSR_STLBPS;
>       uint64_t CSR_RVACFG;
> +    uint64_t CSR_CPUID;
>       uint64_t CSR_PRCFG1;
>       uint64_t CSR_PRCFG2;
>       uint64_t CSR_PRCFG3;
> diff --git a/target/loongarch/insn_trans/trans_privileged.c.inc b/target/loongarch/insn_trans/trans_privileged.c.inc
> index 5a04352b01..d1d98c6e9e 100644
> --- a/target/loongarch/insn_trans/trans_privileged.c.inc
> +++ b/target/loongarch/insn_trans/trans_privileged.c.inc
> @@ -99,13 +99,7 @@ static const CSRInfo csr_info[] = {
>       CSR_OFF(PWCH),
>       CSR_OFF(STLBPS),
>       CSR_OFF(RVACFG),
> -    [LOONGARCH_CSR_CPUID] = {
> -        .offset = (int)offsetof(CPUState, cpu_index)
> -                  - (int)offsetof(LoongArchCPU, env),
> -        .flags = CSRFL_READONLY,
> -        .readfn = NULL,
> -        .writefn = NULL
> -    },
> +    CSR_OFF_FLAGS(CPUID, CSRFL_READONLY),
>       CSR_OFF_FLAGS(PRCFG1, CSRFL_READONLY),
>       CSR_OFF_FLAGS(PRCFG2, CSRFL_READONLY),
>       CSR_OFF_FLAGS(PRCFG3, CSRFL_READONLY),
Re: [PATCH] target/loongarch: Add CSR_CPUID reg in cpu_env
Posted by Tianrui Zhao 1 year ago 

在 2023年04月18日 20:40, Song Gao 写道:
> Hi,  Tianrui
>
> 在 2023/4/18 下午8:20, Tianrui Zhao 写道:
>> Add CSR_CPUID register in cpu_env to save the cpu_index
>> value.
> Why do we need to do this?
>
> For tcg mode, it is enough to use cpu_index. You need to explain the 
> reason.
>
> Thank.
> Song Gao
We prepare to add kvm for loongarch, so we want to add CSR_CPUID reg for 
get/put_registers ioctl.

Thanks
Tianrui Zhao

>> Signed-off-by: Tianrui Zhao <zhaotianrui@loongson.cn>
>> ---
>>   target/loongarch/cpu.c                             | 1 +
>>   target/loongarch/cpu.h                             | 1 +
>>   target/loongarch/insn_trans/trans_privileged.c.inc | 8 +-------
>>   3 files changed, 3 insertions(+), 7 deletions(-)
>>
>> diff --git a/target/loongarch/cpu.c b/target/loongarch/cpu.c
>> index 97e6579f6a..bee5949ed2 100644
>> --- a/target/loongarch/cpu.c
>> +++ b/target/loongarch/cpu.c
>> @@ -486,6 +486,7 @@ static void loongarch_cpu_reset_hold(Object *obj)
>>         env->CSR_ESTAT = env->CSR_ESTAT & (~MAKE_64BIT_MASK(0, 2));
>>       env->CSR_RVACFG = FIELD_DP64(env->CSR_RVACFG, CSR_RVACFG, 
>> RBITS, 0);
>> +    env->CSR_CPUID = cs->cpu_index;
>>       env->CSR_TCFG = FIELD_DP64(env->CSR_TCFG, CSR_TCFG, EN, 0);
>>       env->CSR_LLBCTL = FIELD_DP64(env->CSR_LLBCTL, CSR_LLBCTL, KLO, 0);
>>       env->CSR_TLBRERA = FIELD_DP64(env->CSR_TLBRERA, CSR_TLBRERA, 
>> ISTLBR, 0);
>> diff --git a/target/loongarch/cpu.h b/target/loongarch/cpu.h
>> index e11c875188..1d9a4009b9 100644
>> --- a/target/loongarch/cpu.h
>> +++ b/target/loongarch/cpu.h
>> @@ -288,6 +288,7 @@ typedef struct CPUArchState {
>>       uint64_t CSR_PWCH;
>>       uint64_t CSR_STLBPS;
>>       uint64_t CSR_RVACFG;
>> +    uint64_t CSR_CPUID;
>>       uint64_t CSR_PRCFG1;
>>       uint64_t CSR_PRCFG2;
>>       uint64_t CSR_PRCFG3;
>> diff --git a/target/loongarch/insn_trans/trans_privileged.c.inc 
>> b/target/loongarch/insn_trans/trans_privileged.c.inc
>> index 5a04352b01..d1d98c6e9e 100644
>> --- a/target/loongarch/insn_trans/trans_privileged.c.inc
>> +++ b/target/loongarch/insn_trans/trans_privileged.c.inc
>> @@ -99,13 +99,7 @@ static const CSRInfo csr_info[] = {
>>       CSR_OFF(PWCH),
>>       CSR_OFF(STLBPS),
>>       CSR_OFF(RVACFG),
>> -    [LOONGARCH_CSR_CPUID] = {
>> -        .offset = (int)offsetof(CPUState, cpu_index)
>> -                  - (int)offsetof(LoongArchCPU, env),
>> -        .flags = CSRFL_READONLY,
>> -        .readfn = NULL,
>> -        .writefn = NULL
>> -    },
>> +    CSR_OFF_FLAGS(CPUID, CSRFL_READONLY),
>>       CSR_OFF_FLAGS(PRCFG1, CSRFL_READONLY),
>>       CSR_OFF_FLAGS(PRCFG2, CSRFL_READONLY),
>>       CSR_OFF_FLAGS(PRCFG3, CSRFL_READONLY),
Re: [PATCH] target/loongarch: Add CSR_CPUID reg in cpu_env
Posted by Tianrui Zhao 1 year ago 

在 2023年04月18日 20:45, Tianrui Zhao 写道:
>
>
> 在 2023年04月18日 20:40, Song Gao 写道:
>> Hi,  Tianrui
>>
>> 在 2023/4/18 下午8:20, Tianrui Zhao 写道:
>>> Add CSR_CPUID register in cpu_env to save the cpu_index
>>> value.
>> Why do we need to do this?
>>
>> For tcg mode, it is enough to use cpu_index. You need to explain the 
>> reason.
>>
>> Thank.
>> Song Gao
> We prepare to add kvm for loongarch, so we want to add CSR_CPUID reg 
> for get/put_registers ioctl.
>
> Thanks
> Tianrui Zhao
We want to use the CSR_CPUID in get/put_register kvm ioctl, like this:
kvm_loongarch_put_csr(cpustate *cs)
{
KVM_PUT_ONEREG(cs,  &env->CSR_CRMD); //put CSR_CRMD val into kvm
KVM_PUT_ONEREG(cs,  &env->CSR_PRMD); // put CSR_PRMD val into kvm
...
KVM_PUT_ONEREG(cs,  &env->CSR_CPUID); // put CSR_CPUID val into kvm
...
}

And use the CSR_CPUID reg could keep the consistent format with other 
regs in the put_registers function.

Thanks
Tianrui Zhao
>
>>> Signed-off-by: Tianrui Zhao <zhaotianrui@loongson.cn>
>>> ---
>>>   target/loongarch/cpu.c                             | 1 +
>>>   target/loongarch/cpu.h                             | 1 +
>>>   target/loongarch/insn_trans/trans_privileged.c.inc | 8 +-------
>>>   3 files changed, 3 insertions(+), 7 deletions(-)
>>>
>>> diff --git a/target/loongarch/cpu.c b/target/loongarch/cpu.c
>>> index 97e6579f6a..bee5949ed2 100644
>>> --- a/target/loongarch/cpu.c
>>> +++ b/target/loongarch/cpu.c
>>> @@ -486,6 +486,7 @@ static void loongarch_cpu_reset_hold(Object *obj)
>>>         env->CSR_ESTAT = env->CSR_ESTAT & (~MAKE_64BIT_MASK(0, 2));
>>>       env->CSR_RVACFG = FIELD_DP64(env->CSR_RVACFG, CSR_RVACFG, 
>>> RBITS, 0);
>>> +    env->CSR_CPUID = cs->cpu_index;
>>>       env->CSR_TCFG = FIELD_DP64(env->CSR_TCFG, CSR_TCFG, EN, 0);
>>>       env->CSR_LLBCTL = FIELD_DP64(env->CSR_LLBCTL, CSR_LLBCTL, KLO, 
>>> 0);
>>>       env->CSR_TLBRERA = FIELD_DP64(env->CSR_TLBRERA, CSR_TLBRERA, 
>>> ISTLBR, 0);
>>> diff --git a/target/loongarch/cpu.h b/target/loongarch/cpu.h
>>> index e11c875188..1d9a4009b9 100644
>>> --- a/target/loongarch/cpu.h
>>> +++ b/target/loongarch/cpu.h
>>> @@ -288,6 +288,7 @@ typedef struct CPUArchState {
>>>       uint64_t CSR_PWCH;
>>>       uint64_t CSR_STLBPS;
>>>       uint64_t CSR_RVACFG;
>>> +    uint64_t CSR_CPUID;
>>>       uint64_t CSR_PRCFG1;
>>>       uint64_t CSR_PRCFG2;
>>>       uint64_t CSR_PRCFG3;
>>> diff --git a/target/loongarch/insn_trans/trans_privileged.c.inc 
>>> b/target/loongarch/insn_trans/trans_privileged.c.inc
>>> index 5a04352b01..d1d98c6e9e 100644
>>> --- a/target/loongarch/insn_trans/trans_privileged.c.inc
>>> +++ b/target/loongarch/insn_trans/trans_privileged.c.inc
>>> @@ -99,13 +99,7 @@ static const CSRInfo csr_info[] = {
>>>       CSR_OFF(PWCH),
>>>       CSR_OFF(STLBPS),
>>>       CSR_OFF(RVACFG),
>>> -    [LOONGARCH_CSR_CPUID] = {
>>> -        .offset = (int)offsetof(CPUState, cpu_index)
>>> -                  - (int)offsetof(LoongArchCPU, env),
>>> -        .flags = CSRFL_READONLY,
>>> -        .readfn = NULL,
>>> -        .writefn = NULL
>>> -    },
>>> +    CSR_OFF_FLAGS(CPUID, CSRFL_READONLY),
>>>       CSR_OFF_FLAGS(PRCFG1, CSRFL_READONLY),
>>>       CSR_OFF_FLAGS(PRCFG2, CSRFL_READONLY),
>>>       CSR_OFF_FLAGS(PRCFG3, CSRFL_READONLY),
>

Patchew 2.1-devel-0870f84

© 2016 - 2024 Red Hat, Inc.