* [PATCH V3] LoongArch: Fix cpu name after s3/s4
@ 2022-09-29 8:55 Jianmin Lv
2022-09-29 9:06 ` WANG Xuerui
0 siblings, 1 reply; 3+ messages in thread
From: Jianmin Lv @ 2022-09-29 8:55 UTC (permalink / raw)
To: Huacai Chen, WANG Xuerui; +Cc: linux-kernel, loongarch
On coming back from s3/s4, the cpu name will be overwritten
in cpu_probe path of seconary cpu, so we don't overwrite it
if it has been initialized.
Signed-off-by: Jianmin Lv <lvjianmin@loongson.cn>
diff --git a/arch/loongarch/kernel/cpu-probe.c b/arch/loongarch/kernel/cpu-probe.c
index 529ab8f44ec6..255a09876ef2 100644
--- a/arch/loongarch/kernel/cpu-probe.c
+++ b/arch/loongarch/kernel/cpu-probe.c
@@ -187,7 +187,9 @@ static inline void cpu_probe_loongson(struct cpuinfo_loongarch *c, unsigned int
uint64_t *vendor = (void *)(&cpu_full_name[VENDOR_OFFSET]);
uint64_t *cpuname = (void *)(&cpu_full_name[CPUNAME_OFFSET]);
- __cpu_full_name[cpu] = cpu_full_name;
+ if (!__cpu_full_name[cpu])
+ __cpu_full_name[cpu] = cpu_full_name;
+
*vendor = iocsr_read64(LOONGARCH_IOCSR_VENDOR);
*cpuname = iocsr_read64(LOONGARCH_IOCSR_CPUNAME);
--
2.31.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH V3] LoongArch: Fix cpu name after s3/s4
2022-09-29 8:55 [PATCH V3] LoongArch: Fix cpu name after s3/s4 Jianmin Lv
@ 2022-09-29 9:06 ` WANG Xuerui
2022-09-29 9:14 ` Jianmin Lv
0 siblings, 1 reply; 3+ messages in thread
From: WANG Xuerui @ 2022-09-29 9:06 UTC (permalink / raw)
To: Jianmin Lv, Huacai Chen; +Cc: linux-kernel, loongarch
On 9/29/22 16:55, Jianmin Lv wrote:
> On coming back from s3/s4, the cpu name will be overwritten
> in cpu_probe path of seconary cpu, so we don't overwrite it
> if it has been initialized.
The sentences are confusing, first "the CPU name will be overwritten"
then "don't overwrite it if initialized" -- seems the CPU name will get
overwritten despite the patch's clear intent.
Better to keep it simple: "Don't overwrite the CPU name on coming back
from S3/S4 if it is already initialized."
>
> Signed-off-by: Jianmin Lv <lvjianmin@loongson.cn>
>
> diff --git a/arch/loongarch/kernel/cpu-probe.c b/arch/loongarch/kernel/cpu-probe.c
> index 529ab8f44ec6..255a09876ef2 100644
> --- a/arch/loongarch/kernel/cpu-probe.c
> +++ b/arch/loongarch/kernel/cpu-probe.c
> @@ -187,7 +187,9 @@ static inline void cpu_probe_loongson(struct cpuinfo_loongarch *c, unsigned int
> uint64_t *vendor = (void *)(&cpu_full_name[VENDOR_OFFSET]);
> uint64_t *cpuname = (void *)(&cpu_full_name[CPUNAME_OFFSET]);
>
> - __cpu_full_name[cpu] = cpu_full_name;
> + if (!__cpu_full_name[cpu])
> + __cpu_full_name[cpu] = cpu_full_name;
> +
> *vendor = iocsr_read64(LOONGARCH_IOCSR_VENDOR);
> *cpuname = iocsr_read64(LOONGARCH_IOCSR_CPUNAME);
>
Otherwise LGTM.
Reviewed-by: WANG Xuerui <git@xen0n.name>
--
WANG "xen0n" Xuerui
Linux/LoongArch mailing list: https://lore.kernel.org/loongarch/
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH V3] LoongArch: Fix cpu name after s3/s4
2022-09-29 9:06 ` WANG Xuerui
@ 2022-09-29 9:14 ` Jianmin Lv
0 siblings, 0 replies; 3+ messages in thread
From: Jianmin Lv @ 2022-09-29 9:14 UTC (permalink / raw)
To: WANG Xuerui, Huacai Chen; +Cc: linux-kernel, loongarch
On 2022/9/29 下午5:06, WANG Xuerui wrote:
> On 9/29/22 16:55, Jianmin Lv wrote:
>> On coming back from s3/s4, the cpu name will be overwritten
>> in cpu_probe path of seconary cpu, so we don't overwrite it
>> if it has been initialized.
>
> The sentences are confusing, first "the CPU name will be overwritten"
> then "don't overwrite it if initialized" -- seems the CPU name will get
> overwritten despite the patch's clear intent.
>
> Better to keep it simple: "Don't overwrite the CPU name on coming back
> from S3/S4 if it is already initialized."
>
Thanks, Xuerui, let me change it.
>>
>> Signed-off-by: Jianmin Lv <lvjianmin@loongson.cn>
>>
>> diff --git a/arch/loongarch/kernel/cpu-probe.c
>> b/arch/loongarch/kernel/cpu-probe.c
>> index 529ab8f44ec6..255a09876ef2 100644
>> --- a/arch/loongarch/kernel/cpu-probe.c
>> +++ b/arch/loongarch/kernel/cpu-probe.c
>> @@ -187,7 +187,9 @@ static inline void cpu_probe_loongson(struct
>> cpuinfo_loongarch *c, unsigned int
>> uint64_t *vendor = (void *)(&cpu_full_name[VENDOR_OFFSET]);
>> uint64_t *cpuname = (void *)(&cpu_full_name[CPUNAME_OFFSET]);
>> - __cpu_full_name[cpu] = cpu_full_name;
>> + if (!__cpu_full_name[cpu])
>> + __cpu_full_name[cpu] = cpu_full_name;
>> +
>> *vendor = iocsr_read64(LOONGARCH_IOCSR_VENDOR);
>> *cpuname = iocsr_read64(LOONGARCH_IOCSR_CPUNAME);
>
> Otherwise LGTM.
>
> Reviewed-by: WANG Xuerui <git@xen0n.name>
>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-09-29 9:14 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-09-29 8:55 [PATCH V3] LoongArch: Fix cpu name after s3/s4 Jianmin Lv
2022-09-29 9:06 ` WANG Xuerui
2022-09-29 9:14 ` Jianmin Lv
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.