Received: by 2002:a05:6359:c8b:b0:c7:702f:21d4 with SMTP id go11csp1809946rwb; Thu, 29 Sep 2022 02:31:43 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7Sah0DHpCFamoHhP/K0TTC+izoAo74gCkgpV8PwMEJIc6CgalyJvkvyDLeG+72H+aqAcLF X-Received: by 2002:a17:906:4fcf:b0:781:cb5a:dfa5 with SMTP id i15-20020a1709064fcf00b00781cb5adfa5mr1875670ejw.213.1664443903359; Thu, 29 Sep 2022 02:31:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1664443903; cv=none; d=google.com; s=arc-20160816; b=v9hQSwohSNwZMir9EXf5n8sE8+8CJlAERNEPvw2eT5eyrSfBnYnHOuvANw6rCytS77 w7ZYjWXGzjG3KD5TAt5H35kUV0zMUNgT79fWOmO2sYsT/DKXDN7F1FNEsP4wJN1RSx27 dLztC5/BnVBd/pB4jzWWx0VeSJWncc0/xVBzjk6Ic7pzXWGeRU6kvwOcSW6jQlI/p40B 0NmnQvuudND9fCZaH0MzdrsLS82uD0/penDkCPVQ7sEmmAGT6DeLOgk72/a3WYNFLbFE GlzmBu4cxu6eVS3ikb5GciUt5b19YSzY7UIg+ARZqbmkylSGUct0Wh8dYHHYQTemg3qW TAgQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from; bh=d5j9PX5Fx0xYOnJeWBU/6hlDrWeEwjCZA6YVYtSG+Rg=; b=RRG/qU5SWJuCGUFiTo7sLyD4wD9QuG/PE2RjdSa8JuxiONErx+ol1yBi0TIlT9dpbv JLXTbzQ9mLLZWjbM41yNY8aGKqEdLiYQn1fHarqIf8md00NwOO2QQltAxk6VXj7vEF5f l481hYxVDMCOCQYY23lU8oysEpompAxNEPmjU1stGuqjHegpFiY/ilAXgPLwf/K8psOM ogFLZ/El/Ne1cpyHnKErWDyQG51xfxvTVqPZAF0J7HcdwBsNfC2e1sMFRZFR3PWRK79w 9rv6IH1WoM3V9lz8hwaaLEZzqex+tqeYaESSxCwRO+R/PGhWUZ1rf+0UByLovsqPuYJr oyCw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id d1-20020aa7d681000000b00453b9f11b56si5660806edr.261.2022.09.29.02.31.17; Thu, 29 Sep 2022 02:31:43 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234815AbiI2JPp (ORCPT + 99 others); Thu, 29 Sep 2022 05:15:45 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50140 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234687AbiI2JPl (ORCPT ); Thu, 29 Sep 2022 05:15:41 -0400 Received: from loongson.cn (mail.loongson.cn [114.242.206.163]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 6F6A930566 for ; Thu, 29 Sep 2022 02:15:40 -0700 (PDT) Received: from loongson-pc.loongson.cn (unknown [10.20.42.32]) by localhost.localdomain (Coremail) with SMTP id AQAAf8CxT+A6YjVjBbUjAA--.3282S2; Thu, 29 Sep 2022 17:15:38 +0800 (CST) From: Jianmin Lv To: Huacai Chen , WANG Xuerui Cc: linux-kernel@vger.kernel.org, loongarch@lists.linux.dev Subject: [PATCH V4] LoongArch: Fix cpu name after s3/s4 Date: Thu, 29 Sep 2022 17:15:38 +0800 Message-Id: <20220929091538.9104-1-lvjianmin@loongson.cn> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CM-TRANSID: AQAAf8CxT+A6YjVjBbUjAA--.3282S2 X-Coremail-Antispam: 1UD129KBjvdXoW7JrW8Gw45uFWUZw43CrWfZrb_yoWfJFX_Ga n293ZrGFn3Ga40va4DWa48Ww45Aa18XFyav3y7ArZxCr43Cw15JrsrKw15AryayF1rWrZ8 uw4SganF9F4jyjkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUIcSsGvfJTRUUUbcAYjsxI4VWkKwAYFVCjjxCrM7CY07I20VC2zVCF04k26cxKx2IY s7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M28lY4IEw2IIxxk0rwA2F7IY1VAKz4vEj48ve4 kI8wA2z4x0Y4vE2Ix0cI8IcVAFwI0_Ar0_tr1l84ACjcxK6xIIjxv20xvEc7CjxVAFwI0_ Gr1j6F4UJwA2z4x0Y4vEx4A2jsIE14v26F4UJVW0owA2z4x0Y4vEx4A2jsIEc7CjxVAFwI 0_GcCE3s1le2I262IYc4CY6c8Ij28IcVAaY2xG8wAqx4xG64xvF2IEw4CE5I8CrVC2j2Wl Yx0E2Ix0cI8IcVAFwI0_JrI_JrylYx0Ex4A2jsIE14v26r1j6r4UMcvjeVCFs4IE7xkEbV WUJVW8JwACjcxG0xvY0x0EwIxGrwCY02Avz4vE-syl42xK82IYc2Ij64vIr41l42xK82IY 6x8ErcxFaVAv8VW5Wr1UJr1l4I8I3I0E4IkC6x0Yz7v_Jr0_Gr1lx2IqxVAqx4xG67AKxV WUJVWUGwC20s026x8GjcxK67AKxVWUGVWUWwC2zVAF1VAY17CE14v26r126r1DMIIYrxkI 7VAKI48JMIIF0xvE2Ix0cI8IcVAFwI0_Jr0_JF4lIxAIcVC0I7IYx2IY6xkF7I0E14v26r 1j6r4UMIIF0xvE42xK8VAvwI8IcIk0rVWUJVWUCwCI42IY6I8E87Iv67AKxVWUJVW8JwCI 42IY6I8E87Iv6xkF7I0E14v26r4j6r4UJbIYCTnIWIevJa73UjIFyTuYvjxUqs2-DUUUU X-CM-SenderInfo: 5oymxthqpl0qxorr0wxvrqhubq/ X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,SPF_HELO_PASS, SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Don't overwrite the CPU name on coming back from S3/S4 if it is already initialized. Signed-off-by: Jianmin Lv 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