From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.3 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, USER_AGENT_SANE_1 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A4F4CC2BB1D for ; Thu, 12 Mar 2020 07:25:54 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 91AF2206F7 for ; Thu, 12 Mar 2020 07:25:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388112AbgCLHZx (ORCPT ); Thu, 12 Mar 2020 03:25:53 -0400 Received: from mail.loongson.cn ([114.242.206.163]:34638 "EHLO loongson.cn" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S2387930AbgCLHZx (ORCPT ); Thu, 12 Mar 2020 03:25:53 -0400 Received: from [10.130.0.70] (unknown [113.200.148.30]) by mail.loongson.cn (Coremail) with SMTP id AQAAf9DxL2ny42lePMQZAA--.26S3; Thu, 12 Mar 2020 15:25:40 +0800 (CST) Subject: Re: [PATCH] MIPS: Loongson: Add model name to /proc/cpuinfo To: YunQiang Su , Huacai Chen , Jiaxun Yang References: <1583908414-22858-1-git-send-email-yangtiezhu@loongson.cn> <8f0eaa0b-e95c-4612-f3a3-9efcd523ae66@loongson.cn> Cc: Thomas Bogendoerfer , linux-mips , linux-kernel@vger.kernel.org, Xuefeng Li From: Tiezhu Yang Message-ID: Date: Thu, 12 Mar 2020 15:25:38 +0800 User-Agent: Mozilla/5.0 (X11; Linux mips64; rv:45.0) Gecko/20100101 Thunderbird/45.4.0 MIME-Version: 1.0 In-Reply-To: <8f0eaa0b-e95c-4612-f3a3-9efcd523ae66@loongson.cn> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 8bit X-CM-TRANSID: AQAAf9DxL2ny42lePMQZAA--.26S3 X-Coremail-Antispam: 1UD129KBjvJXoW3JF4rXF18CFWkAF43tw1DWrg_yoWxKw18p3 ykAanxGr40gryDG34Sgr1qkryYvr13JF1kuayUtF1UXasYqF13J3srJF15CrZFvr1qkw1f ZFZ09rsxuFWqv3DanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUkK14x267AKxVW8JVW5JwAFc2x0x2IEx4CE42xK8VAvwI8IcIk0 rVWrJVCq3wAFIxvE14AKwVWUJVWUGwA2ocxC64kIII0Yj41l84x0c7CEw4AK67xGY2AK02 1l84ACjcxK6xIIjxv20xvE14v26r4j6ryUM28EF7xvwVC0I7IYx2IY6xkF7I0E14v26r4j 6F4UM28EF7xvwVC2z280aVAFwI0_Gr1j6F4UJwA2z4x0Y4vEx4A2jsIEc7CjxVAFwI0_Cr 1j6rxdM2AIxVAIcxkEcVAq07x20xvEncxIr21l5I8CrVACY4xI64kE6c02F40Ex7xfMcIj 6xIIjxv20xvE14v26r1j6r18McIj6I8E87Iv67AKxVWUJVW8JwAm72CE4IkC6x0Yz7v_Jr 0_Gr1lF7xvr2IY64vIr41lF7I21c0EjII2zVCS5cI20VAGYxC7Mxk0xIA0c2IEe2xFo4CE bIxvr21l42xK82IYc2Ij64vIr41l4I8I3I0E4IkC6x0Yz7v_Jr0_Gr1lx2IqxVAqx4xG67 AKxVWUJVWUGwC20s026x8GjcxK67AKxVWUGVWUWwC2zVAF1VAY17CE14v26r126r1DMIIY rxkI7VAKI48JMIIF0xvE2Ix0cI8IcVAFwI0_Jr0_JF4lIxAIcVC0I7IYx2IY6xkF7I0E14 v26r1j6r4UMIIF0xvE42xK8VAvwI8IcIk0rVWrZr1j6s0DMIIF0xvEx4A2jsIE14v26r1j 6r4UMIIF0xvEx4A2jsIEc7CjxVAFwI0_Jr0_GrUvcSsGvfC2KfnxnUUI43ZEXa7VUbXdbU UUUUU== X-CM-SenderInfo: p1dqw3xlh2x3gn0dqz5rrqw2lrqou0/ Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 03/11/2020 05:40 PM, Tiezhu Yang wrote: > On 03/11/2020 03:18 PM, YunQiang Su wrote: >> Tiezhu Yang 于2020年3月11日周三 下午2:33写道: >>> In the current code, when execute command "cat /proc/cpuinfo" or >>> "lscpu", >>> it can not get cpu type and frequency directly because the model >>> name is >>> not exist, so add it. >> You patch is almost the same with the previous Huacai's. >> How do you think about the copyright issue? >> >> FYI: GPL is copyleft instead of no-copyright-exists-at-all. >> I have no idea about whether Loongson has any consideration about >> copyright, >> while it is really quite important. > > Hi YunQiang & Jiaxun, > > Frankly, I don't know there exists a similar patch in 2018 > which has not been merged into the mainline tree, I just > want to fix the issue of model name when execute cmd > "cat /proc/cpuinfo" or "lscpu". > > How to avoid and solve this case? > Add a proper label in the patch? Hi YunQiang, Jiaxun & Huacai, Through discussion, I think it is better to resend the old patch by Huacai. I will not send a v2 patch. Thanks, Tiezhu Yang > > Thanks, > > Tiezhu Yang > >> >>> E.g. without this patch: >>> >>> [loongson@localhost ~]$ lscpu >>> Architecture: mips64 >>> Byte Order: Little Endian >>> CPU(s): 4 >>> On-line CPU(s) list: 0-3 >>> Thread(s) per core: 1 >>> Core(s) per socket: 4 >>> Socket(s): 1 >>> NUMA node(s): 1 >>> L1d cache: 64K >>> L1i cache: 64K >>> L2 cache: 2048K >>> NUMA node0 CPU(s): 0-3 >>> >>> With this patch: >>> >>> [loongson@localhost ~]$ lscpu >>> Architecture: mips64 >>> Byte Order: Little Endian >>> CPU(s): 4 >>> On-line CPU(s) list: 0-3 >>> Thread(s) per core: 1 >>> Core(s) per socket: 4 >>> Socket(s): 1 >>> NUMA node(s): 1 >>> Model name: Loongson-3A R3 (Loongson-3A3000) @ 1449MHz >>> L1d cache: 64K >>> L1i cache: 64K >>> L2 cache: 2048K >>> NUMA node0 CPU(s): 0-3 >>> >>> Signed-off-by: Tiezhu Yang >>> --- >>> arch/mips/include/asm/cpu-info.h | 1 + >>> arch/mips/kernel/cpu-probe.c | 27 +++++++++++++++++++++++---- >>> arch/mips/kernel/proc.c | 4 ++++ >>> 3 files changed, 28 insertions(+), 4 deletions(-) >>> >>> diff --git a/arch/mips/include/asm/cpu-info.h >>> b/arch/mips/include/asm/cpu-info.h >>> index ed7ffe4..50e924e 100644 >>> --- a/arch/mips/include/asm/cpu-info.h >>> +++ b/arch/mips/include/asm/cpu-info.h >>> @@ -115,6 +115,7 @@ extern struct cpuinfo_mips cpu_data[]; >>> extern void cpu_probe(void); >>> extern void cpu_report(void); >>> >>> +extern const char *__model_name[]; >>> extern const char *__cpu_name[]; >>> #define cpu_name_string() __cpu_name[raw_smp_processor_id()] >>> >>> diff --git a/arch/mips/kernel/cpu-probe.c >>> b/arch/mips/kernel/cpu-probe.c >>> index 6ab6b03..3ae40cc 100644 >>> --- a/arch/mips/kernel/cpu-probe.c >>> +++ b/arch/mips/kernel/cpu-probe.c >>> @@ -1548,6 +1548,7 @@ static inline void cpu_probe_legacy(struct >>> cpuinfo_mips *c, unsigned int cpu) >>> set_elf_platform(cpu, "loongson2e"); >>> set_isa(c, MIPS_CPU_ISA_III); >>> c->fpu_msk31 |= FPU_CSR_CONDX; >>> + __model_name[cpu] = "Loongson-2E"; >>> break; >>> case PRID_REV_LOONGSON2F: >>> c->cputype = CPU_LOONGSON2EF; >>> @@ -1555,23 +1556,37 @@ static inline void cpu_probe_legacy(struct >>> cpuinfo_mips *c, unsigned int cpu) >>> set_elf_platform(cpu, "loongson2f"); >>> set_isa(c, MIPS_CPU_ISA_III); >>> c->fpu_msk31 |= FPU_CSR_CONDX; >>> + __model_name[cpu] = "Loongson-2F"; >>> break; >>> case PRID_REV_LOONGSON3A_R1: >>> c->cputype = CPU_LOONGSON64; >>> __cpu_name[cpu] = "ICT Loongson-3"; >>> set_elf_platform(cpu, "loongson3a"); >>> set_isa(c, MIPS_CPU_ISA_M64R1); >>> - c->ases |= (MIPS_ASE_LOONGSON_MMI | >>> MIPS_ASE_LOONGSON_CAM | >>> - MIPS_ASE_LOONGSON_EXT); >>> + c->ases |= (MIPS_ASE_LOONGSON_MMI | >>> + MIPS_ASE_LOONGSON_CAM | >>> + MIPS_ASE_LOONGSON_EXT); >>> + __model_name[cpu] = "Loongson-3A R1 >>> (Loongson-3A1000)"; >>> break; >>> case PRID_REV_LOONGSON3B_R1: >>> + c->cputype = CPU_LOONGSON64; >>> + __cpu_name[cpu] = "ICT Loongson-3"; >>> + set_elf_platform(cpu, "loongson3b"); >>> + set_isa(c, MIPS_CPU_ISA_M64R1); >>> + c->ases |= (MIPS_ASE_LOONGSON_MMI | >>> + MIPS_ASE_LOONGSON_CAM | >>> + MIPS_ASE_LOONGSON_EXT); >>> + __model_name[cpu] = "Loongson-3B R1 >>> (Loongson-3B1000)"; >>> + break; >>> case PRID_REV_LOONGSON3B_R2: >>> c->cputype = CPU_LOONGSON64; >>> __cpu_name[cpu] = "ICT Loongson-3"; >>> set_elf_platform(cpu, "loongson3b"); >>> set_isa(c, MIPS_CPU_ISA_M64R1); >>> - c->ases |= (MIPS_ASE_LOONGSON_MMI | >>> MIPS_ASE_LOONGSON_CAM | >>> - MIPS_ASE_LOONGSON_EXT); >>> + c->ases |= (MIPS_ASE_LOONGSON_MMI | >>> + MIPS_ASE_LOONGSON_CAM | >>> + MIPS_ASE_LOONGSON_EXT); >>> + __model_name[cpu] = "Loongson-3B R2 >>> (Loongson-3B1500)"; >>> break; >>> } >>> >>> @@ -1926,6 +1941,7 @@ static inline void cpu_probe_loongson(struct >>> cpuinfo_mips *c, unsigned int cpu) >>> __cpu_name[cpu] = "ICT Loongson-3"; >>> set_elf_platform(cpu, "loongson3a"); >>> set_isa(c, MIPS_CPU_ISA_M64R2); >>> + __model_name[cpu] = "Loongson-3A R2 >>> (Loongson-3A2000)"; >>> break; >>> case PRID_REV_LOONGSON3A_R3_0: >>> case PRID_REV_LOONGSON3A_R3_1: >>> @@ -1933,6 +1949,7 @@ static inline void cpu_probe_loongson(struct >>> cpuinfo_mips *c, unsigned int cpu) >>> __cpu_name[cpu] = "ICT Loongson-3"; >>> set_elf_platform(cpu, "loongson3a"); >>> set_isa(c, MIPS_CPU_ISA_M64R2); >>> + __model_name[cpu] = "Loongson-3A R3 >>> (Loongson-3A3000)"; >>> break; >>> } >>> >>> @@ -1952,6 +1969,7 @@ static inline void cpu_probe_loongson(struct >>> cpuinfo_mips *c, unsigned int cpu) >>> c->writecombine = _CACHE_UNCACHED_ACCELERATED; >>> c->ases |= (MIPS_ASE_LOONGSON_MMI | >>> MIPS_ASE_LOONGSON_CAM | >>> MIPS_ASE_LOONGSON_EXT | >>> MIPS_ASE_LOONGSON_EXT2); >>> + __model_name[cpu] = "Loongson-3A R4 (Loongson-3A4000)"; >>> break; >>> default: >>> panic("Unknown Loongson Processor ID!"); >>> @@ -2111,6 +2129,7 @@ u64 __ua_limit; >>> EXPORT_SYMBOL(__ua_limit); >>> #endif >>> >>> +const char *__model_name[NR_CPUS]; >>> const char *__cpu_name[NR_CPUS]; >>> const char *__elf_platform; >>> >>> diff --git a/arch/mips/kernel/proc.c b/arch/mips/kernel/proc.c >>> index f8d3671..5fc74e6 100644 >>> --- a/arch/mips/kernel/proc.c >>> +++ b/arch/mips/kernel/proc.c >>> @@ -15,6 +15,7 @@ >>> #include >>> #include >>> #include >>> +#include >>> >>> unsigned int vced_count, vcei_count; >>> >>> @@ -63,6 +64,9 @@ static int show_cpuinfo(struct seq_file *m, void *v) >>> seq_printf(m, fmt, __cpu_name[n], >>> (version >> 4) & 0x0f, version & 0x0f, >>> (fp_vers >> 4) & 0x0f, fp_vers & 0x0f); >>> + if (__model_name[n]) >>> + seq_printf(m, "model name\t\t: %s @ %uMHz\n", >>> + __model_name[n], mips_hpt_frequency / 500000); >>> seq_printf(m, "BogoMIPS\t\t: %u.%02u\n", >>> cpu_data[n].udelay_val / (500000/HZ), >>> (cpu_data[n].udelay_val / (5000/HZ)) % 100); >>> -- >>> 2.1.0 >>> >>