From nobody Wed Dec 17 17:22:21 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id BFCCAC61D85 for ; Thu, 23 Nov 2023 10:48:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344822AbjKWKsM (ORCPT ); Thu, 23 Nov 2023 05:48:12 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38392 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344787AbjKWKsJ (ORCPT ); Thu, 23 Nov 2023 05:48:09 -0500 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4BBD41BD for ; Thu, 23 Nov 2023 02:48:15 -0800 (PST) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 54935C433C8; Thu, 23 Nov 2023 10:48:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1700736495; bh=C+pNMYVLFZEmoFSbcwLsLirku3hsdHnT0ZOPIncJ5go=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=iRG8lggdbvok32Jt1t2luxAHhXf4vpDXyQYUCywG0OpPWeBQRKMMXuvRbJcaLIoey FZ1gcHucb3rsW9yiPHTQKm3bdccnyCEAbJuAX+OoD8yy00Wg6ziFj/tiJ3BGlEJBd5 7nWYhp+sYVXFeZ3AJ9HVEzLvCKkdYbABk4ORpjfjSgArvEU6rtE3sNV6ME7SdtVHaU b6z4+SJYMdu7nUhBrj02zQA/CH/1gZmhV84bd0mp8PvtlXi7iETLVHTdxWuFUXIfF/ mwSihdNvMnJMeuorFxdmW93sUgIXg92TJwzBawfkX70Yf1KxpT7Gvnq47kAVKjtDn3 5VMKP+R09gD6g== From: Arnd Bergmann To: Michael Ellerman Cc: Arnd Bergmann , Nicholas Piggin , Christophe Leroy , linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org, Jakub Kicinski Subject: [PATCH v2 1/3] powerpc: ps3: move udbg_shutdown_ps3gelic prototype Date: Thu, 23 Nov 2023 11:47:59 +0100 Message-Id: <20231123104801.15537-2-arnd@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231123104801.15537-1-arnd@kernel.org> References: <20231123104801.15537-1-arnd@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Arnd Bergmann Allmodconfig kernels produce a missing-prototypes warning: arch/powerpc/platforms/ps3/gelic_udbg.c:239:6: error: no previous prototype= for 'udbg_shutdown_ps3gelic' [-Werror=3Dmissing-prototypes] Move the declaration from a local header to asm/ps3.h where it can be seen from both the caller and the definition. As suggested by Michael Ellerman, remove the CONFIG_PS3GELIC_UDBG option to prevent this from causing a build regression. Acked-by: Jakub Kicinski Signed-off-by: Arnd Bergmann --- arch/powerpc/Kconfig.debug | 1 - arch/powerpc/include/asm/ps3.h | 6 ++++++ arch/powerpc/platforms/ps3/Kconfig | 12 ------------ arch/powerpc/platforms/ps3/Makefile | 2 +- arch/powerpc/platforms/ps3/gelic_udbg.c | 1 + drivers/net/ethernet/toshiba/ps3_gelic_net.h | 6 ------ 6 files changed, 8 insertions(+), 20 deletions(-) diff --git a/arch/powerpc/Kconfig.debug b/arch/powerpc/Kconfig.debug index ea4033abc07d..8c80b154e814 100644 --- a/arch/powerpc/Kconfig.debug +++ b/arch/powerpc/Kconfig.debug @@ -271,7 +271,6 @@ config PPC_EARLY_DEBUG_USBGECKO config PPC_EARLY_DEBUG_PS3GELIC bool "Early debugging through the PS3 Ethernet port" depends on PPC_PS3 - select PS3GELIC_UDBG help Select this to enable early debugging for the PlayStation3 via UDP broadcasts sent out through the Ethernet port. diff --git a/arch/powerpc/include/asm/ps3.h b/arch/powerpc/include/asm/ps3.h index a5f36546a052..d13d8fdc3411 100644 --- a/arch/powerpc/include/asm/ps3.h +++ b/arch/powerpc/include/asm/ps3.h @@ -514,4 +514,10 @@ u64 ps3_get_spe_id(void *arg); =20 void ps3_early_mm_init(void); =20 +#ifdef CONFIG_PPC_EARLY_DEBUG_PS3GELIC +void udbg_shutdown_ps3gelic(void); +#else +static inline void udbg_shutdown_ps3gelic(void) {} +#endif + #endif diff --git a/arch/powerpc/platforms/ps3/Kconfig b/arch/powerpc/platforms/ps= 3/Kconfig index a44869e5ea70..e9c1087dd42e 100644 --- a/arch/powerpc/platforms/ps3/Kconfig +++ b/arch/powerpc/platforms/ps3/Kconfig @@ -167,16 +167,4 @@ config PS3_LPM profiling support of the Cell processor with programs like perfmon2, then say Y or M, otherwise say N. =20 -config PS3GELIC_UDBG - bool "PS3 udbg output via UDP broadcasts on Ethernet" - depends on PPC_PS3 - help - Enables udbg early debugging output by sending broadcast UDP - via the Ethernet port (UDP port number 18194). - - This driver uses a trivial implementation and is independent - from the main PS3 gelic network driver. - - If in doubt, say N here. - endmenu diff --git a/arch/powerpc/platforms/ps3/Makefile b/arch/powerpc/platforms/p= s3/Makefile index 86bf2967a8d4..bc79bb124d1e 100644 --- a/arch/powerpc/platforms/ps3/Makefile +++ b/arch/powerpc/platforms/ps3/Makefile @@ -3,7 +3,7 @@ obj-y +=3D setup.o mm.o time.o hvcall.o htab.o repository.o obj-y +=3D interrupt.o exports.o os-area.o obj-y +=3D system-bus.o =20 -obj-$(CONFIG_PS3GELIC_UDBG) +=3D gelic_udbg.o +obj-$(CONFIG_PPC_EARLY_DEBUG_PS3GELIC) +=3D gelic_udbg.o obj-$(CONFIG_SMP) +=3D smp.o obj-$(CONFIG_SPU_BASE) +=3D spu.o obj-y +=3D device-init.o diff --git a/arch/powerpc/platforms/ps3/gelic_udbg.c b/arch/powerpc/platfor= ms/ps3/gelic_udbg.c index 6b298010fd84..a5202c18c236 100644 --- a/arch/powerpc/platforms/ps3/gelic_udbg.c +++ b/arch/powerpc/platforms/ps3/gelic_udbg.c @@ -14,6 +14,7 @@ #include #include =20 +#include #include #include #include diff --git a/drivers/net/ethernet/toshiba/ps3_gelic_net.h b/drivers/net/eth= ernet/toshiba/ps3_gelic_net.h index 0d98defb011e..0ec7412febc7 100644 --- a/drivers/net/ethernet/toshiba/ps3_gelic_net.h +++ b/drivers/net/ethernet/toshiba/ps3_gelic_net.h @@ -346,12 +346,6 @@ static inline void *port_priv(struct gelic_port *port) return port->priv; } =20 -#ifdef CONFIG_PPC_EARLY_DEBUG_PS3GELIC -void udbg_shutdown_ps3gelic(void); -#else -static inline void udbg_shutdown_ps3gelic(void) {} -#endif - int gelic_card_set_irq_mask(struct gelic_card *card, u64 mask); /* shared netdev ops */ void gelic_card_up(struct gelic_card *card); --=20 2.39.2 From nobody Wed Dec 17 17:22:21 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id B1796C61D85 for ; Thu, 23 Nov 2023 10:48:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344852AbjKWKsQ (ORCPT ); Thu, 23 Nov 2023 05:48:16 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38408 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344808AbjKWKsL (ORCPT ); Thu, 23 Nov 2023 05:48:11 -0500 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2B86D1BE for ; Thu, 23 Nov 2023 02:48:17 -0800 (PST) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 65959C433C9; Thu, 23 Nov 2023 10:48:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1700736496; bh=XewRPhT99Y03FufuA1LV3jWgAM7RX4SOby0kMRaZJ00=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Jb28IYZuVzwcLrvrvdnukKAYmz06zPlRup1+ZlrHUkGDRNnKhK/LnDE6VdgbLpj+m 7nGH2w6Z1wEvV1o01yirEafTzIchxEfH4n2wh7+t8IoMcGHOFAP/SKIzyt37JchohU ib2t6BeZZQ86+vnPtZ+l1dn7dxrBqkZmLsRPiASWYcgVIFUmk5vGvqSqP1M1fKyprv WtPDeYK0T522Y3EVQc2uUKBE+AX0HUsdGJvTOEm3AvSFnWESX7NOSJgufEHOEpjU/O JVbzAaHZKimJUay/NoPr4L/SKxigHhRfZtozFHHOguviIMwsJd6aOJ0UukOcKdgPZy H1T4gcKWtWZTQ== From: Arnd Bergmann To: Michael Ellerman Cc: Arnd Bergmann , Nicholas Piggin , Christophe Leroy , linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 2/3] powerpc: pasemi: mark pas_shutdown() static Date: Thu, 23 Nov 2023 11:48:00 +0100 Message-Id: <20231123104801.15537-3-arnd@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231123104801.15537-1-arnd@kernel.org> References: <20231123104801.15537-1-arnd@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Arnd Bergmann Allmodconfig builds show a warning about one function that is accidentally marked global: arch/powerpc/platforms/pasemi/setup.c:67:6: error: no previous prototype fo= r 'pas_shutdown' [-Werror=3Dmissing-prototypes] Fixes: 656fdf3ad8e0 ("powerpc/pasemi: Add Nemo board device init code.") Signed-off-by: Arnd Bergmann --- arch/powerpc/platforms/pasemi/setup.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/powerpc/platforms/pasemi/setup.c b/arch/powerpc/platforms= /pasemi/setup.c index ef985ba2bf21..0761d98e5be3 100644 --- a/arch/powerpc/platforms/pasemi/setup.c +++ b/arch/powerpc/platforms/pasemi/setup.c @@ -64,7 +64,7 @@ static void __noreturn pas_restart(char *cmd) } =20 #ifdef CONFIG_PPC_PASEMI_NEMO -void pas_shutdown(void) +static void pas_shutdown(void) { /* Set the PLD bit that makes the SB600 think the power button is being p= ressed */ void __iomem *pld_map =3D ioremap(0xf5000000,4096); --=20 2.39.2 From nobody Wed Dec 17 17:22:21 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id BC0AEC5AD4C for ; Thu, 23 Nov 2023 10:48:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344828AbjKWKsT (ORCPT ); Thu, 23 Nov 2023 05:48:19 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54366 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344824AbjKWKsM (ORCPT ); Thu, 23 Nov 2023 05:48:12 -0500 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 09CD5D4A for ; Thu, 23 Nov 2023 02:48:19 -0800 (PST) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 456EDC433C8; Thu, 23 Nov 2023 10:48:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1700736498; bh=bnImJ/ObQ6B/nPGCBESa5sKS25GC8i0wwxIop7YcLiQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=UF/smYE6w5t3Qu/JkXRjWHikWmWDZmaBN5EAC0TUMncJwqfZpU4hZRIOLkZvfaEB7 mm+xLV+CyHdSJjMBRUaiN3Xb26CVJGT5Rbc6Iqsf8EioYjGQdfjA3bQn2Llibv7KcB wxDRkP+Skv7hD8WFmKTzR4O17Zr5+T4R9K1U3GIyPxAE57goc21d5V7iNvRg/HK01R M5JBj2jvncyqmoXhXTq2ovGGOOL+zKKWz/kuGzcn0L5WXG9DPX2lzz6jK5UlZGnEGZ LB1pRNtB2JwMDzAG9D/hc/+Q+YR1ZZ9kF9JeBFGGZND7JWtJzZ6UycYqQGDJVw7Clc 8MCN4mafoiABw== From: Arnd Bergmann To: Michael Ellerman Cc: Arnd Bergmann , Nicholas Piggin , Christophe Leroy , linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 3/3] powerpc: powermac: mark smp_psurge_{give,take}_timebase static Date: Thu, 23 Nov 2023 11:48:01 +0100 Message-Id: <20231123104801.15537-4-arnd@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231123104801.15537-1-arnd@kernel.org> References: <20231123104801.15537-1-arnd@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Arnd Bergmann These functions are only called locally and should be static like the other corresponding functions are: arch/powerpc/platforms/powermac/smp.c:416:13: error: no previous prototype = for 'smp_psurge_take_timebase' [-Werror=3Dmissing-prototypes] 416 | void __init smp_psurge_take_timebase(void) | ^~~~~~~~~~~~~~~~~~~~~~~~ arch/powerpc/platforms/powermac/smp.c:432:13: error: no previous prototype = for 'smp_psurge_give_timebase' [-Werror=3Dmissing-prototypes] 432 | void __init smp_psurge_give_timebase(void) | ^~~~~~~~~~~~~~~~~~~~~~~~ Signed-off-by: Arnd Bergmann --- arch/powerpc/platforms/powermac/smp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/powerpc/platforms/powermac/smp.c b/arch/powerpc/platforms= /powermac/smp.c index c83d1e14077e..15644be31990 100644 --- a/arch/powerpc/platforms/powermac/smp.c +++ b/arch/powerpc/platforms/powermac/smp.c @@ -413,7 +413,7 @@ static void __init smp_psurge_setup_cpu(int cpu_nr) printk(KERN_ERR "Couldn't get primary IPI interrupt"); } =20 -void __init smp_psurge_take_timebase(void) +static void __init smp_psurge_take_timebase(void) { if (psurge_type !=3D PSURGE_DUAL) return; @@ -429,7 +429,7 @@ void __init smp_psurge_take_timebase(void) set_dec(tb_ticks_per_jiffy/2); } =20 -void __init smp_psurge_give_timebase(void) +static void __init smp_psurge_give_timebase(void) { /* Nothing to do here */ } --=20 2.39.2