From patchwork Tue Jan 2 02:48:35 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luming Yu X-Patchwork-Id: 1881522 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ozlabs.org (client-ip=2404:9400:2:0:216:3eff:fee1:b9f1; helo=lists.ozlabs.org; envelope-from=linuxppc-dev-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org; receiver=patchwork.ozlabs.org) Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2404:9400:2:0:216:3eff:fee1:b9f1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4T3y7Y3xhYz20Rq for ; Tue, 2 Jan 2024 13:52:23 +1100 (AEDT) Received: from boromir.ozlabs.org (localhost [IPv6:::1]) by lists.ozlabs.org (Postfix) with ESMTP id 4T3y7V01Wxz3blN for ; Tue, 2 Jan 2024 13:52:22 +1100 (AEDT) X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Authentication-Results: lists.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=shingroup.cn (client-ip=114.132.65.219; helo=bg1.exmail.qq.com; envelope-from=luming.yu@shingroup.cn; receiver=lists.ozlabs.org) Received: from bg1.exmail.qq.com (bg1.exmail.qq.com [114.132.65.219]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 4T3y7D4rHSz2xPZ for ; Tue, 2 Jan 2024 13:52:08 +1100 (AEDT) X-QQ-mid: bizesmtp86t1704163871tg2dwz8o Received: from HX09040029.powercore.com.cn ( [58.34.117.194]) by bizesmtp.qq.com (ESMTP) with id ; Tue, 02 Jan 2024 10:51:08 +0800 (CST) X-QQ-SSF: 01400000000000501000000A0000000 X-QQ-FEAT: rl11S5XfjRM+K3CqE9NA/KtuXDvLJOQfrtCOe0koMm/1vBAqueAkA7GnGVg2I dG1G/I7guyUw2o4+QG4+GhbeGQENG0yVmHDeLzIc8BRM12PyohldUKV6Zj8eGlvwgGxXWtL PBVxilW6Zml17i9A3deKmr1VsUtH/9FQjOw8y5Nw+aAo5SdwNWaKUGkfWfJuQ0KDaDlARaX v5258o8OlDsIsiiNKE4tXF27fnUSkh8ekcoxu+azBxF6NWtI0wPM2RDKiEo+n2GKMoauAQy nHU/djWhxOkqBX5sJf81axsHA+X5m+uBIfdehPO3azt3fbrKz8C1hSHFq+pn9q0a6haWMYy swpqgJBPLmAAdA37BQ5pwzgdMsNNFWPy2P1iuOSM7CnC7a0v124UE2Lt9CxxszHHZ3VhDj3 SxIKePjwiW8= X-QQ-GoodBg: 2 X-BIZMAIL-ID: 9632030453733915372 From: Luming Yu To: linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org, mpe@ellerman.id.au, npiggin@gmail.com, christophe.leroy@csgroup.eu Subject: [PATCH v1 1/1] powerpc/powernv: fix up kernel compile issues Date: Tue, 2 Jan 2024 10:48:35 +0800 Message-ID: <9D8FEE1731685D9B+20240102024834.1276-2-luming.yu@shingroup.cn> X-Mailer: git-send-email 2.42.0.windows.2 MIME-Version: 1.0 X-QQ-SENDSIZE: 520 Feedback-ID: bizesmtp:shingroup.cn:qybglogicsvrgz:qybglogicsvrgz5a-1 X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: shenghui.qu@shingroup.cn, Luming Yu , dawei.li@shingroup.cn, ke.zhao@shingroup.cn, luming.yu@gmail.com Errors-To: linuxppc-dev-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" up kernel is quite useful to silicon validation, despite it is rare to be found in server productions. the fixes are obvious. Not like IBM pSeries, it may be not necessary to have powernv SMP forced. It is difficult to compile a up kernel for pSerises as I've tried. Signed-off-by: Luming Yu --- v0->v1: solve powernv vas up kernel compile issues found by lkp bot. --- arch/powerpc/platforms/powernv/Kconfig | 1 - arch/powerpc/platforms/powernv/opal-imc.c | 1 + arch/powerpc/platforms/powernv/vas.c | 1 + arch/powerpc/platforms/powernv/vas.h | 1 + arch/powerpc/sysdev/xive/common.c | 2 ++ arch/powerpc/sysdev/xive/spapr.c | 5 ++++- 6 files changed, 9 insertions(+), 2 deletions(-) diff --git a/arch/powerpc/platforms/powernv/Kconfig b/arch/powerpc/platforms/powernv/Kconfig index 70a46acc70d6..40b1a49379de 100644 --- a/arch/powerpc/platforms/powernv/Kconfig +++ b/arch/powerpc/platforms/powernv/Kconfig @@ -15,7 +15,6 @@ config PPC_POWERNV select CPU_FREQ select PPC_DOORBELL select MMU_NOTIFIER - select FORCE_SMP select ARCH_SUPPORTS_PER_VMA_LOCK default y diff --git a/arch/powerpc/platforms/powernv/opal-imc.c b/arch/powerpc/platforms/powernv/opal-imc.c index 828fc4d88471..6e9e2b0a5bdc 100644 --- a/arch/powerpc/platforms/powernv/opal-imc.c +++ b/arch/powerpc/platforms/powernv/opal-imc.c @@ -13,6 +13,7 @@ #include #include #include +#include #include #include #include diff --git a/arch/powerpc/platforms/powernv/vas.c b/arch/powerpc/platforms/powernv/vas.c index b65256a63e87..c1759135aca5 100644 --- a/arch/powerpc/platforms/powernv/vas.c +++ b/arch/powerpc/platforms/powernv/vas.c @@ -18,6 +18,7 @@ #include #include #include +#include #include "vas.h" diff --git a/arch/powerpc/platforms/powernv/vas.h b/arch/powerpc/platforms/powernv/vas.h index 08d9d3d5a22b..313a8f2c8c7d 100644 --- a/arch/powerpc/platforms/powernv/vas.h +++ b/arch/powerpc/platforms/powernv/vas.h @@ -12,6 +12,7 @@ #include #include #include +#include /* * Overview of Virtual Accelerator Switchboard (VAS). diff --git a/arch/powerpc/sysdev/xive/common.c b/arch/powerpc/sysdev/xive/common.c index a289cb97c1d7..d49b12809c10 100644 --- a/arch/powerpc/sysdev/xive/common.c +++ b/arch/powerpc/sysdev/xive/common.c @@ -1497,7 +1497,9 @@ static int xive_prepare_cpu(unsigned int cpu) GFP_KERNEL, cpu_to_node(cpu)); if (!xc) return -ENOMEM; +#ifdef CONFIG_SMP xc->hw_ipi = XIVE_BAD_IRQ; +#endif xc->chip_id = XIVE_INVALID_CHIP_ID; if (xive_ops->prepare_cpu) xive_ops->prepare_cpu(cpu, xc); diff --git a/arch/powerpc/sysdev/xive/spapr.c b/arch/powerpc/sysdev/xive/spapr.c index e45419264391..7298f57f8416 100644 --- a/arch/powerpc/sysdev/xive/spapr.c +++ b/arch/powerpc/sysdev/xive/spapr.c @@ -81,6 +81,7 @@ static void xive_irq_bitmap_remove_all(void) } } +#ifdef CONFIG_SMP static int __xive_irq_bitmap_alloc(struct xive_irq_bitmap *xibm) { int irq; @@ -126,7 +127,7 @@ static void xive_irq_bitmap_free(int irq) } } } - +#endif /* Based on the similar routines in RTAS */ static unsigned int plpar_busy_delay_time(long rc) @@ -663,6 +664,7 @@ static void xive_spapr_sync_source(u32 hw_irq) plpar_int_sync(0, hw_irq); } +#ifdef CONFIG_SMP static int xive_spapr_debug_show(struct seq_file *m, void *private) { struct xive_irq_bitmap *xibm; @@ -680,6 +682,7 @@ static int xive_spapr_debug_show(struct seq_file *m, void *private) return 0; } +#endif static const struct xive_ops xive_spapr_ops = { .populate_irq_data = xive_spapr_populate_irq_data,