From nobody Tue Feb 10 22:17:52 2026 Received: from mail.loongson.cn (mail.loongson.cn [114.242.206.163]) by smtp.subspace.kernel.org (Postfix) with ESMTP id DCFE360B9D for ; Thu, 11 Apr 2024 01:05:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=114.242.206.163 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712797522; cv=none; b=aaAkKoOQEDSp4XEgf/zlZ2VCff9GoAbwXI2zwNSktG2fDjpRquKR6No/IyRL37LCDngGAecyKtTcP2leIBLLKrhuJCKK/n1i2w/jepctjJWHroWWnwxx8FYr1Y74g+tO4bHMHaGnUyWMDIYUoxSCWkoWS6J9xJo7oPAk24C8gbg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712797522; c=relaxed/simple; bh=uLjUWodJ/mW4SI5I2DSTZyWJ+aNR+7qDAvJxBsFdLtQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=HBb8qQXbplr2YaayKO5O70yG/X1S51VoK+Q/w4QqJkF63gpvL3CTcaxR3kdGaQA1wWDr6/2Hp28t9XMhjfyJrxnvsGHIghVGruTn5AgMl5GTkaMFr3i6KDnM/hCT0F7x4Ye2vblPgX/u1XZPJ4eoPMton8wjU08SP4w9r7sjfwM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=loongson.cn; spf=pass smtp.mailfrom=loongson.cn; arc=none smtp.client-ip=114.242.206.163 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=loongson.cn Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=loongson.cn Received: from loongson.cn (unknown [113.200.148.30]) by gateway (Coremail) with SMTP id _____8AxhrlMNxdm9pAlAA--.4979S3; Thu, 11 Apr 2024 09:05:16 +0800 (CST) Received: from linux.localdomain (unknown [113.200.148.30]) by localhost.localdomain (Coremail) with SMTP id AQAAf8AxhhFHNxdmnrx3AA--.22869S5; Thu, 11 Apr 2024 09:05:15 +0800 (CST) From: Tiezhu Yang To: Huacai Chen , Thomas Gleixner , Arnd Bergmann , Marc Zyngier Cc: loongarch@lists.linux.dev, linux-kernel@vger.kernel.org, loongson-kernel@lists.loongnix.cn Subject: [PATCH v3 3/4] LoongArch: Save and restore PERCPU_BASE_KS for ACPI S3 state Date: Thu, 11 Apr 2024 09:05:09 +0800 Message-ID: <20240411010510.22135-4-yangtiezhu@loongson.cn> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20240411010510.22135-1-yangtiezhu@loongson.cn> References: <20240411010510.22135-1-yangtiezhu@loongson.cn> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-CM-TRANSID: AQAAf8AxhhFHNxdmnrx3AA--.22869S5 X-CM-SenderInfo: p1dqw3xlh2x3gn0dqz5rrqw2lrqou0/ X-Coremail-Antispam: 1Uk129KBj93XoW7WFyxAF4UCw13tFW8JF43Arc_yoW8CrWUpr 9FyFWDKw48tFn7CF90qa1UXr1UZ39agrWIqF9Fk3yj9rnrXry8Wr4rK3Z8XF10qwn5ua10 v3ySya4avF1UGwcCm3ZEXasCq-sJn29KB7ZKAUJUUUUx529EdanIXcx71UUUUU7KY7ZEXa sCq-sGcSsGvfJ3Ic02F40EFcxC0VAKzVAqx4xG6I80ebIjqfuFe4nvWSU5nxnvy29KBjDU 0xBIdaVrnRJUUUBYb4IE77IF4wAFF20E14v26r1j6r4UM7CY07I20VC2zVCF04k26cxKx2 IYs7xG6rWj6s0DM7CIcVAFz4kK6r126r13M28lY4IEw2IIxxk0rwA2F7IY1VAKz4vEj48v e4kI8wA2z4x0Y4vE2Ix0cI8IcVAFwI0_Xr0_Ar1l84ACjcxK6xIIjxv20xvEc7CjxVAFwI 0_Gr0_Cr1l84ACjcxK6I8E87Iv67AKxVW8JVWxJwA2z4x0Y4vEx4A2jsIEc7CjxVAFwI0_ Gr0_Gr1UM2kKe7AKxVWUAVWUtwAS0I0E0xvYzxvE52x082IY62kv0487Mc804VCY07AIYI kI8VC2zVCFFI0UMc02F40EFcxC0VAKzVAqx4xG6I80ewAv7VC0I7IYx2IY67AKxVWUtVWr XwAv7VC2z280aVAFwI0_Gr0_Cr1lOx8S6xCaFVCjc4AY6r1j6r4UM4x0Y48IcxkI7VAKI4 8JMxkF7I0En4kS14v26r126r1DMxAIw28IcxkI7VAKI48JMxC20s026xCaFVCjc4AY6r1j 6r4UMxCIbckI1I0E14v26r126r1DMI8I3I0E5I8CrVAFwI0_Jr0_Jr4lx2IqxVCjr7xvwV AFwI0_JrI_JrWlx4CE17CEb7AF67AKxVWUAVWUtwCIc40Y0x0EwIxGrwCI42IY6xIIjxv2 0xvE14v26ryj6F1UMIIF0xvE2Ix0cI8IcVCY1x0267AKxVW8JVWxJwCI42IY6xAIw20EY4 v20xvaj40_Jr0_JF4lIxAIcVC2z280aVAFwI0_Gr0_Cr1lIxAIcVC2z280aVCY1x0267AK xVW8JVW8JrUvcSsGvfC2KfnxnUUI43ZEXa7IU8Gii3UUUUU== Content-Type: text/plain; charset="utf-8" Currently, per_cpu_offset(x) is defined as __per_cpu_offset[x]) only under CONFIG_SMP in include/asm-generic/percpu.h, that is to say, the implementation of loongarch_common_resume() which calls per_cpu_offset(0) is not suitable for the case of non-SMP, so do not write per_cpu_offset(0) to PERCPU_BASE_KS when resume, just save the value of PERCPU_BASE_KS when suspend and restore it when resume to make it work well for both SMP and non-SMP. Tested with the command "rtcwake -d rtc1 -s 20 -m mem -v", dmesg shows that "PM: suspend entry (deep)" and "PM: suspend exit". Signed-off-by: Tiezhu Yang --- arch/loongarch/power/suspend.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/arch/loongarch/power/suspend.c b/arch/loongarch/power/suspend.c index 166d9e06a64b..7a97949ddade 100644 --- a/arch/loongarch/power/suspend.c +++ b/arch/loongarch/power/suspend.c @@ -16,6 +16,7 @@ #include =20 u64 loongarch_suspend_addr; +static u64 saved_pcpu_base; =20 struct saved_registers { u32 ecfg; @@ -36,6 +37,7 @@ void loongarch_common_suspend(void) saved_regs.pwctl1 =3D csr_read32(LOONGARCH_CSR_PWCTL1); saved_regs.ecfg =3D csr_read32(LOONGARCH_CSR_ECFG); saved_regs.euen =3D csr_read32(LOONGARCH_CSR_EUEN); + saved_pcpu_base =3D csr_read64(PERCPU_BASE_KS); =20 loongarch_suspend_addr =3D loongson_sysconf.suspend_addr; } @@ -44,7 +46,7 @@ void loongarch_common_resume(void) { sync_counter(); local_flush_tlb_all(); - csr_write64(per_cpu_offset(0), PERCPU_BASE_KS); + csr_write64(saved_pcpu_base, PERCPU_BASE_KS); csr_write64(eentry, LOONGARCH_CSR_EENTRY); csr_write64(eentry, LOONGARCH_CSR_MERRENTRY); csr_write64(tlbrentry, LOONGARCH_CSR_TLBRENTRY); --=20 2.42.0