From nobody Mon Feb 9 02:42:50 2026 Received: from mail.loongson.cn (mail.loongson.cn [114.242.206.163]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 4298C137766 for ; Wed, 17 Apr 2024 09:59:56 +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=1713347999; cv=none; b=j3NDj9XSmRYj4xE6ZsqwP1Gyll/5dkcxNhKomlxL/iWdLJrHoQS9kusQBe0v3DE/VTcC4JXsdD4TgvJi6d0qB40hM328EjXReElZjR7XcpDzU0UcBaHNXVohh+sBggn5Fk+kaANUd3tKrxHzqNEmI0ruyKLzPFaHd2VezBO9ejA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713347999; c=relaxed/simple; bh=QdgGWV9RX7cxuOd0TYtBwlJs6ULCACWNNmp/JLLF8lI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=V/mQ2hyAgrBXLuSVUjc2tHRtTFMosYFUdz0oZWEFwB3YMfYdpECepOEE794CX40StzQmrAO3H/py43zosyDDnEHuiG5gFp4CdLNxHMX8VAUJddHfPDzCVfXepLuY/yGZA2QFYYE/xOM9Jn501UHyaK1y8ejA7EpZ8Gd76DzPvH0= 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 _____8DxbOmbnR9mHLgoAA--.16564S3; Wed, 17 Apr 2024 17:59:55 +0800 (CST) Received: from linux.localdomain (unknown [113.200.148.30]) by localhost.localdomain (Coremail) with SMTP id AQAAf8CxKBKYnR9muOR9AA--.32535S3; Wed, 17 Apr 2024 17:59:53 +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 v4 1/3] LoongArch: Modify acpi_parse_processor() for non-SMP Date: Wed, 17 Apr 2024 17:59:49 +0800 Message-ID: <20240417095951.2635-2-yangtiezhu@loongson.cn> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20240417095951.2635-1-yangtiezhu@loongson.cn> References: <20240417095951.2635-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: AQAAf8CxKBKYnR9muOR9AA--.32535S3 X-CM-SenderInfo: p1dqw3xlh2x3gn0dqz5rrqw2lrqou0/ X-Coremail-Antispam: 1Uk129KBj9xXoW7GrykAw4xKF1kZFWkGw17Arc_yoWkAFg_CF nxJw18GrWrAFykur1UKayrur1jg34IgFyFkF1qv347C34rXryDXFZrJwn3uwsxJrWkKFZx J3yUWas7ur4YyosvyTuYvTs0mTUanT9S1TB71UUUUj7qnTZGkaVYY2UrUUUUj1kv1TuYvT s0mT0YCTnIWjqI5I8CrVACY4xI64kE6c02F40Ex7xfYxn0WfASr-VFAUDa7-sFnT9fnUUI cSsGvfJTRUUUbS8YFVCjjxCrM7AC8VAFwI0_Jr0_Gr1l1xkIjI8I6I8E6xAIw20EY4v20x vaj40_Wr0E3s1l1IIY67AEw4v_JF0_JFyl8cAvFVAK0II2c7xJM28CjxkF64kEwVA0rcxS w2x7M28EF7xvwVC0I7IYx2IY67AKxVW8JVW5JwA2z4x0Y4vE2Ix0cI8IcVCY1x0267AKxV W8JVWxJwA2z4x0Y4vEx4A2jsIE14v26r4UJVWxJr1l84ACjcxK6I8E87Iv6xkF7I0E14v2 6F4UJVW0owAaw2AFwI0_JF0_Jw1le2I262IYc4CY6c8Ij28IcVAaY2xG8wAqjxCEc2xF0c Ia020Ex4CE44I27wAqx4xG64xvF2IEw4CE5I8CrVC2j2WlYx0E2Ix0cI8IcVAFwI0_Jw0_ WrylYx0Ex4A2jsIE14v26r4j6F4UMcvjeVCFs4IE7xkEbVWUJVW8JwACjcxG0xvY0x0EwI xGrwCY1x0262kKe7AKxVWUAVWUtwCF04k20xvY0x0EwIxGrwCFx2IqxVCFs4IE7xkEbVWU JVW8JwCFI7km07C267AKxVWUAVWUtwC20s026c02F40E14v26r1j6r18MI8I3I0E7480Y4 vE14v26r106r1rMI8E67AF67kF1VAFwI0_JF0_Jw1lIxkGc2Ij64vIr41lIxAIcVC0I7IY x2IY67AKxVW8JVW5JwCI42IY6xIIjxv20xvEc7CjxVAFwI0_Gr0_Cr1lIxAIcVCF04k26c xKx2IYs7xG6r1j6r1xMIIF0xvEx4A2jsIE14v26r4j6F4UMIIF0xvEx4A2jsIEc7CjxVAF wI0_Gr0_Gr1UYxBIdaVFxhVjvjDU0xZFpf9x07jr6p9UUUUU= Content-Type: text/plain; charset="utf-8" When CONFIG_SMP is disabled, mapping won't be created for all cpus. CPUs more than num_possible_cpus will be ignored. This is preparation for later patch. Signed-off-by: Tiezhu Yang --- arch/loongarch/kernel/acpi.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/arch/loongarch/kernel/acpi.c b/arch/loongarch/kernel/acpi.c index 5cf59c617126..ccfa90faf0ea 100644 --- a/arch/loongarch/kernel/acpi.c +++ b/arch/loongarch/kernel/acpi.c @@ -98,8 +98,15 @@ acpi_parse_processor(union acpi_subtable_headers *header= , const unsigned long en return -EINVAL; =20 acpi_table_print_madt_entry(&header->common); + + /* + * When CONFIG_SMP is disabled, mapping won't be created for all cpus. + * CPUs more than num_possible_cpus will be ignored. + */ + if (processor->core_id >=3D 0 && processor->core_id < num_possible_cpus()) + acpi_core_pic[processor->core_id] =3D *processor; + #ifdef CONFIG_SMP - acpi_core_pic[processor->core_id] =3D *processor; set_processor_mask(processor->core_id, processor->flags); #endif =20 --=20 2.42.0 From nobody Mon Feb 9 02:42:50 2026 Received: from mail.loongson.cn (mail.loongson.cn [114.242.206.163]) by smtp.subspace.kernel.org (Postfix) with ESMTP id C2543127B45 for ; Wed, 17 Apr 2024 09:59:57 +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=1713347999; cv=none; b=oohh7D9EfpIAOukaM7UcrUbxKitriIim+QLOMnnjOBOsjPI37N20Yyr3h9YSKsIZ6WLf5QFHVoG5x3gAKB9ShvA5NNnwmp1FK6fF4uhODWrwvlVc7AQpPtUEeFl7pwu3sIMk6Mv1dDYPNVRU1kEqFQF2oZ/5tLm7I4tkuG5mwpk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713347999; c=relaxed/simple; bh=4OHXa+TBQH27mQewJxobd0zpOvxg3J/Dc9Jj/i9H0L0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=kou4CPlbZz5KX2OQaekS6x9g5sKpl2UTWPj0AWGfT1HsADrslqjPbEdZv2dLcFA2FTNHZMPY1Ir17G6qeIxjeGjW3HTjVWwnpmtHrqq76Ef3oWy43xXl4CgdB0C3liwOlHMU7S04w5hJA99h8lp5zKMmqoVPTqefCMmpHCkp+2I= 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 _____8DxmfCbnR9mIrgoAA--.27331S3; Wed, 17 Apr 2024 17:59:55 +0800 (CST) Received: from linux.localdomain (unknown [113.200.148.30]) by localhost.localdomain (Coremail) with SMTP id AQAAf8CxKBKYnR9muOR9AA--.32535S4; Wed, 17 Apr 2024 17:59:54 +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 v4 2/3] LoongArch: Modify ACPI S3 state function for non-SMP Date: Wed, 17 Apr 2024 17:59:50 +0800 Message-ID: <20240417095951.2635-3-yangtiezhu@loongson.cn> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20240417095951.2635-1-yangtiezhu@loongson.cn> References: <20240417095951.2635-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: AQAAf8CxKBKYnR9muOR9AA--.32535S4 X-CM-SenderInfo: p1dqw3xlh2x3gn0dqz5rrqw2lrqou0/ X-Coremail-Antispam: 1Uk129KBj93XoW7WFyxAF4UCw13tFW8JF43Arc_yoW8Cw4kp3 sFyayUtw48trn7CFn0qa1UWr4UZ393KrWIvFZFy3yj9rnxXFyIgr4Yg3Z8WF1Fqwn5uF40 v3yFka4avF1UGwcCm3ZEXasCq-sJn29KB7ZKAUJUUUUx529EdanIXcx71UUUUU7KY7ZEXa sCq-sGcSsGvfJ3Ic02F40EFcxC0VAKzVAqx4xG6I80ebIjqfuFe4nvWSU5nxnvy29KBjDU 0xBIdaVrnRJUUUB2b4IE77IF4wAFF20E14v26r1j6r4UM7CY07I20VC2zVCF04k26cxKx2 IYs7xG6rWj6s0DM7CIcVAFz4kK6r1Y6r17M28lY4IEw2IIxxk0rwA2F7IY1VAKz4vEj48v e4kI8wA2z4x0Y4vE2Ix0cI8IcVAFwI0_Xr0_Ar1l84ACjcxK6xIIjxv20xvEc7CjxVAFwI 0_Gr0_Cr1l84ACjcxK6I8E87Iv67AKxVW8Jr0_Cr1UM28EF7xvwVC2z280aVCY1x0267AK xVWxJr0_GcWln4kS14v26r126r1DM2AIxVAIcxkEcVAq07x20xvEncxIr21l57IF6xkI12 xvs2x26I8E6xACxx1l5I8CrVACY4xI64kE6c02F40Ex7xfMcIj6xIIjxv20xvE14v26r1q 6rW5McIj6I8E87Iv67AKxVW8JVWxJwAm72CE4IkC6x0Yz7v_Jr0_Gr1lF7xvr2IYc2Ij64 vIr41lc7CjxVAaw2AFwI0_JF0_Jw1l42xK82IYc2Ij64vIr41l4I8I3I0E4IkC6x0Yz7v_ Jr0_Gr1l4IxYO2xFxVAFwI0_JF0_Jw1lx2IqxVAqx4xG67AKxVWUJVWUGwC20s026x8Gjc xK67AKxVWUGVWUWwC2zVAF1VAY17CE14v26r126r1DMIIYrxkI7VAKI48JMIIF0xvE2Ix0 cI8IcVAFwI0_Gr0_Xr1lIxAIcVC0I7IYx2IY6xkF7I0E14v26r4j6F4UMIIF0xvE42xK8V AvwI8IcIk0rVWUJVWUCwCI42IY6I8E87Iv67AKxVW8JVWxJwCI42IY6I8E87Iv6xkF7I0E 14v26r4j6r4UJbIYCTnIWIevJa73UjIFyTuYvjxU4Xo7DUUUU 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 avoid compiling error for non-SMP and make it work well for both SMP and non-SMP. This is preparation for later patch. Tested with the command "rtcwake -d rtc1 -s 20 -m mem", 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..8571818b93dc 100644 --- a/arch/loongarch/power/suspend.c +++ b/arch/loongarch/power/suspend.c @@ -24,6 +24,7 @@ struct saved_registers { u64 kpgd; u32 pwctl0; u32 pwctl1; + u64 pcpu_base; }; static struct saved_registers saved_regs; =20 @@ -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_regs.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_regs.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 From nobody Mon Feb 9 02:42:50 2026 Received: from mail.loongson.cn (mail.loongson.cn [114.242.206.163]) by smtp.subspace.kernel.org (Postfix) with ESMTP id A71F61384BE for ; Wed, 17 Apr 2024 10:00:00 +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=1713348002; cv=none; b=W6kveR1TM7Ikwg0Ih5skwVdsuzGA3wp2rj9XaVTKI9zBUevfd/c0cUB7BZCb4a8nNia+8FEUMGmUNVW+9gbzc1avmOLQsGGBqR2mxu5krbcMR1PT5gojG8WQPmBwgMTCbrOuAcTmaxdgeo8/dK2mUsXon/q4205zXJi1QXOAjiM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713348002; c=relaxed/simple; bh=rMIGJPABiUx/JzOU1tipvLJoClZxBCmg32YBGN0wawg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ZBGeSJtUpDU9l2D4Dr4oCbwpmiyVIejoimtD51RZ9v4WG9/IvMvsQBs4ERdMLzsW3bRNKrswHqCDrRKkzF4PobPvyV4Bj5ijw0o1ConfAj6HgMG48u3CCWSfqOFYk4f+71Ux3iqBFVvol2RfitbsLcSkSK6j86/Xy63Ze28vQ04= 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 _____8AxirqdnR9mKbgoAA--.11144S3; Wed, 17 Apr 2024 17:59:57 +0800 (CST) Received: from linux.localdomain (unknown [113.200.148.30]) by localhost.localdomain (Coremail) with SMTP id AQAAf8CxKBKYnR9muOR9AA--.32535S5; Wed, 17 Apr 2024 17:59:55 +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 v4 3/3] LoongArch: Give chance to build under !CONFIG_SMP Date: Wed, 17 Apr 2024 17:59:51 +0800 Message-ID: <20240417095951.2635-4-yangtiezhu@loongson.cn> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20240417095951.2635-1-yangtiezhu@loongson.cn> References: <20240417095951.2635-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: AQAAf8CxKBKYnR9muOR9AA--.32535S5 X-CM-SenderInfo: p1dqw3xlh2x3gn0dqz5rrqw2lrqou0/ X-Coremail-Antispam: 1Uk129KBj93XoW3Jr4UKFWDJw4kZF13Xw4DZFc_yoW7uF4UpF WDAr4DJr4rWr1vyryqy3yfWry5Jr1kG3y2qF17Cay8JFsrX34UXr1vgwnFqFyUKwsYgFWI qFn3W3WaqF45AwbCm3ZEXasCq-sJn29KB7ZKAUJUUUUx529EdanIXcx71UUUUU7KY7ZEXa sCq-sGcSsGvfJ3Ic02F40EFcxC0VAKzVAqx4xG6I80ebIjqfuFe4nvWSU5nxnvy29KBjDU 0xBIdaVrnRJUUUB2b4IE77IF4wAFF20E14v26r1j6r4UM7CY07I20VC2zVCF04k26cxKx2 IYs7xG6rWj6s0DM7CIcVAFz4kK6r1Y6r17M28lY4IEw2IIxxk0rwA2F7IY1VAKz4vEj48v e4kI8wA2z4x0Y4vE2Ix0cI8IcVAFwI0_Xr0_Ar1l84ACjcxK6xIIjxv20xvEc7CjxVAFwI 0_Gr0_Cr1l84ACjcxK6I8E87Iv67AKxVW8Jr0_Cr1UM28EF7xvwVC2z280aVCY1x0267AK xVWxJr0_GcWln4kS14v26r126r1DM2AIxVAIcxkEcVAq07x20xvEncxIr21l57IF6xkI12 xvs2x26I8E6xACxx1l5I8CrVACY4xI64kE6c02F40Ex7xfMcIj6xIIjxv20xvE14v26r1q 6rW5McIj6I8E87Iv67AKxVW8JVWxJwAm72CE4IkC6x0Yz7v_Jr0_Gr1lF7xvr2IYc2Ij64 vIr41lc7CjxVAaw2AFwI0_JF0_Jw1l42xK82IYc2Ij64vIr41l4I8I3I0E4IkC6x0Yz7v_ Jr0_Gr1l4IxYO2xFxVAFwI0_JF0_Jw1lx2IqxVAqx4xG67AKxVWUJVWUGwC20s026x8Gjc xK67AKxVWUGVWUWwC2zVAF1VAY17CE14v26r126r1DMIIYrxkI7VAKI48JMIIF0xvE2Ix0 cI8IcVAFwI0_Xr0_Ar1lIxAIcVC0I7IYx2IY6xkF7I0E14v26r4j6F4UMIIF0xvE42xK8V AvwI8IcIk0rVWUJVWUCwCI42IY6I8E87Iv67AKxVW8JVWxJwCI42IY6I8E87Iv6xkF7I0E 14v26r4j6r4UJbIYCTnIWIevJa73UjIFyTuYvjxU4Xo7DUUUU Content-Type: text/plain; charset="utf-8" In the current code, SMP is selected in Kconfig for LoongArch, the users can not unset it, this is reasonable for a multiprocessor machine. But as the help info of config SMP said, if you have a system with only one CPU, say N. On a uniprocessor machine, the kernel will run faster if you say N here. The Loongson-2K0500 is a single-core CPU for applications like industrial control, printing terminals, and BMC (Baseboard Management Controller), there are many development boards, products and solutions on the market, so it is better and necessary to give a chance to build under !CONFIG_SMP for a uniprocessor machine. First of all, do not select SMP for config LOONGARCH in Kconfig to make it possible to unset CONFIG_SMP. Then, do some changes to fix the warnings and errors if CONFIG_SMP is not set. (1) Define get_ipi_irq() only if CONFIG_SMP is set to fix the warning: arch/loongarch/kernel/irq.c:90:19: warning: 'get_ipi_irq' defined but not u= sed [-Wunused-function] (2) Add "#ifdef CONFIG_SMP" in asm/smp.h to fix the warning: ./arch/loongarch/include/asm/smp.h:49:9: warning: "raw_smp_processor_id" re= defined 49 | #define raw_smp_processor_id raw_smp_processor_id | ^~~~~~~~~~~~~~~~~~~~ ./include/linux/smp.h:198:9: note: this is the location of the previous def= inition 198 | #define raw_smp_processor_id() 0 (3) Define machine_shutdown() as empty under !CONFIG_SMP to fix the error: arch/loongarch/kernel/machine_kexec.c: In function 'machine_shutdown': arch/loongarch/kernel/machine_kexec.c:233:25: error: implicit declaration o= f function 'cpu_device_up'; did you mean 'put_device'? [-Wimplicit-function= -declaration] (4) Make config SCHED_SMT depends on SMP to fix many errors such as: kernel/sched/core.c: In function 'sched_core_find': kernel/sched/core.c:310:43: error: 'struct rq' has no member named 'cpu' (5) Define cpu_logical_map(cpu) as read_csr_cpuid() under !CONFIG_SMP in asm/smp.h and then include asm/smp.h in asm/acpi.h (because acpi.h is included in linux/irq.h indirectly) to fix many build errors under drivers/irqchip such as: drivers/irqchip/irq-loongson-eiointc.c: In function 'cpu_to_eio_node': drivers/irqchip/irq-loongson-eiointc.c:59:16: error: implicit declaration o= f function 'cpu_logical_map' [-Wimplicit-function-declaration] When running the UnixBench tests with "-c 1" single-streamed pass, the improvement in performance is about 9 percent with this patch. By the way, it is helpful to debug and analysis the kernel issue of multi-core system under !CONFIG_SMP. Signed-off-by: Tiezhu Yang --- arch/loongarch/Kconfig | 2 +- arch/loongarch/include/asm/acpi.h | 1 + arch/loongarch/include/asm/smp.h | 5 +++++ arch/loongarch/kernel/irq.c | 2 ++ arch/loongarch/kernel/machine_kexec.c | 2 +- 5 files changed, 10 insertions(+), 2 deletions(-) diff --git a/arch/loongarch/Kconfig b/arch/loongarch/Kconfig index a5f300ec6f28..8d892de0b7a8 100644 --- a/arch/loongarch/Kconfig +++ b/arch/loongarch/Kconfig @@ -174,7 +174,6 @@ config LOONGARCH select PCI_QUIRKS select PERF_USE_VMALLOC select RTC_LIB - select SMP select SPARSE_IRQ select SYSCTL_ARCH_UNALIGN_ALLOW select SYSCTL_ARCH_UNALIGN_NO_WARN @@ -420,6 +419,7 @@ config EFI_STUB =20 config SCHED_SMT bool "SMT scheduler support" + depends on SMP default y help Improves scheduler's performance when there are multiple diff --git a/arch/loongarch/include/asm/acpi.h b/arch/loongarch/include/asm= /acpi.h index 49e29b29996f..313f66f7913a 100644 --- a/arch/loongarch/include/asm/acpi.h +++ b/arch/loongarch/include/asm/acpi.h @@ -8,6 +8,7 @@ #ifndef _ASM_LOONGARCH_ACPI_H #define _ASM_LOONGARCH_ACPI_H =20 +#include #include =20 #ifdef CONFIG_ACPI diff --git a/arch/loongarch/include/asm/smp.h b/arch/loongarch/include/asm/= smp.h index f81e5f01d619..1ec11b57e60c 100644 --- a/arch/loongarch/include/asm/smp.h +++ b/arch/loongarch/include/asm/smp.h @@ -6,6 +6,7 @@ #ifndef __ASM_SMP_H #define __ASM_SMP_H =20 +#ifdef CONFIG_SMP #include #include #include @@ -101,4 +102,8 @@ static inline void __cpu_die(unsigned int cpu) } #endif =20 +#else /* !CONFIG_SMP */ +#define cpu_logical_map(cpu) read_csr_cpuid() +#endif /* CONFIG_SMP */ + #endif /* __ASM_SMP_H */ diff --git a/arch/loongarch/kernel/irq.c b/arch/loongarch/kernel/irq.c index 883e5066ae44..e791fa275ec5 100644 --- a/arch/loongarch/kernel/irq.c +++ b/arch/loongarch/kernel/irq.c @@ -87,6 +87,7 @@ static void __init init_vec_parent_group(void) acpi_table_parse(ACPI_SIG_MCFG, early_pci_mcfg_parse); } =20 +#ifdef CONFIG_SMP static int __init get_ipi_irq(void) { struct irq_domain *d =3D irq_find_matching_fwnode(cpuintc_handle, DOMAIN_= BUS_ANY); @@ -96,6 +97,7 @@ static int __init get_ipi_irq(void) =20 return -EINVAL; } +#endif =20 void __init init_IRQ(void) { diff --git a/arch/loongarch/kernel/machine_kexec.c b/arch/loongarch/kernel/= machine_kexec.c index 2dcb9e003657..8ae641dc53bb 100644 --- a/arch/loongarch/kernel/machine_kexec.c +++ b/arch/loongarch/kernel/machine_kexec.c @@ -225,6 +225,7 @@ void crash_smp_send_stop(void) =20 void machine_shutdown(void) { +#ifdef CONFIG_SMP int cpu; =20 /* All CPUs go to reboot_code_buffer */ @@ -232,7 +233,6 @@ void machine_shutdown(void) if (!cpu_online(cpu)) cpu_device_up(get_cpu_device(cpu)); =20 -#ifdef CONFIG_SMP smp_call_function(kexec_shutdown_secondary, NULL, 0); #endif } --=20 2.42.0