From patchwork Wed Feb 20 05:53:16 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 158765 Delivered-To: patch@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp4530712jaa; Tue, 19 Feb 2019 21:55:35 -0800 (PST) X-Google-Smtp-Source: AHgI3IbT7DVxUoateQbTRbRnz1gh629KHcPcqXCpqANDNB4qIFjD1SWJkUdVnqyni6F635vrowiy X-Received: by 2002:a63:4384:: with SMTP id q126mr27322987pga.160.1550642135656; Tue, 19 Feb 2019 21:55:35 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1550642135; cv=none; d=google.com; s=arc-20160816; b=E6fA2aW+Jrs51DCnxyo4E6W+pNbQg72GAB/5drxe7YtXoqDOUH0KmHXB5uuTTb08hq JyoJTT5JXDjHHBjaYglrfFHlgQfBbAL1630O4KKr5Arzb7Gg4RiqaVVjLCBbGUpdPPWA B11zvBuZmlXDSLDQpWOO+C97Vlv9wAGe+6P+TTamY1RxZjODapry3wN55g/hkgUSlyzc hENJE7gDssr6EAiGAuR7OUD3sEeKUKUEaYViUaN2/I6N5AVwLq79Mvw5/XDqfpcSm2KP QkzRLpvgWY5q2oLVr6qVREcs1RW8imuFatuv/yLAlBBydNaR6pN2JlwXT6us4nApnCKZ Inyw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :dkim-signature:dkim-filter; bh=M9T99UD7d0hG0vhJOF+MhvleX4gWWftcBUcvHrbExrw=; b=yC51/V8yPE7Zf0adthPGVcMJaFalg8GIsp+TU507EvbSAdPUMrubzIWiMYLhb9+HKD djDdz70/n81ebc5qmuuGin2LtHbmS5AYy45u59NSV+5QbKmhcv/8V134igCVwuJ3YJ5e +Vv2IdpAsqcMUY+bF8F2p2KV7A39W7NBSKf4L5Oywmif4bneUm8/Brsu7kQhxcL2U7k7 bMf8cPYv7ashi2bs3RHc97xrxEaxzOZXCuLgCgR54kINeYM2Jj0EW0uC9TchyaagiLbD IWf+5MqMEg43zMtjwEeldc++nFAMf7IQL7gLvc3brww2+xJjU50TTMS7lIBZYMgAY/6g vL5w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=Wkh8KTR3; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id s20si12475261plr.14.2019.02.19.21.55.35; Tue, 19 Feb 2019 21:55:35 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=Wkh8KTR3; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727599AbfBTFzd (ORCPT + 32 others); Wed, 20 Feb 2019 00:55:33 -0500 Received: from conuserg-10.nifty.com ([210.131.2.77]:18196 "EHLO conuserg-10.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725922AbfBTFzc (ORCPT ); Wed, 20 Feb 2019 00:55:32 -0500 Received: from pug.e01.socionext.com (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-10.nifty.com with ESMTP id x1K5rbF9021052; Wed, 20 Feb 2019 14:53:38 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-10.nifty.com x1K5rbF9021052 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1550642018; bh=M9T99UD7d0hG0vhJOF+MhvleX4gWWftcBUcvHrbExrw=; h=From:To:Cc:Subject:Date:From; b=Wkh8KTR3owREVecRkKrn50Mam++XF80LAp39ZjTRkhlzqNGAiyCMqHczdI2bL3rJi 0kl2nAQet4prRct9b6AznLb/2Z5dClM+OB6nXJqX6TWybWu5yq+sNTgP3z8N7ogX3w 9xur7FRN8AyGTtzw2Ttz1hgL4l6ImSAFVrSqvaTu3zsQ2Qr5/ePAZO5IKBm537x2rb yKfFp80lWpooExjl69T01RQoBzgMJHt/giQc3J6MB2PYxMExejgOPf/q6lcWhzevDB NiPil3up4Y1RaG/PbHZaNEBQfyxmop18n9j9FPCXTkWEszxnyN7iY4YOP7xsKNVI+L DEFvHlotK6w6g== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: linux-kbuild@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, Michael Ellerman Cc: Masahiro Yamada , Benjamin Herrenschmidt , linux-kernel@vger.kernel.org, Paul Mackerras , Mathieu Malaterre , "Aneesh Kumar K.V" Subject: [PATCH v2] powerpc/prom_init: add __init markers to all functions Date: Wed, 20 Feb 2019 14:53:16 +0900 Message-Id: <1550641996-21937-1-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org It is fragile to rely on the compiler's optimization to avoid the section mismatch. Some functions may not be necessarily inlined when the compiler's inlining heuristic changes. Add __init markers consistently. As for prom_getprop() and prom_getproplen(), they are marked as 'inline', so inlining is guaranteed because PowerPC never enables CONFIG_OPTIMIZE_INLINING. However, it would be better to leave the inlining decision to the compiler. I replaced 'inline' with __init. I added __maybe_unused to prom_getproplen() because it is currently relying on the side-effect of 'inline'; GCC does not report -Wunused-function warnings for functions with 'inline' marker. Signed-off-by: Masahiro Yamada --- Changes in v2: - Add __maybe_unsed to prom_getproplen() - Add __init to enter_prom() as well arch/powerpc/kernel/prom_init.c | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) -- 2.7.4 diff --git a/arch/powerpc/kernel/prom_init.c b/arch/powerpc/kernel/prom_init.c index f33ff41..1bad0ac 100644 --- a/arch/powerpc/kernel/prom_init.c +++ b/arch/powerpc/kernel/prom_init.c @@ -138,9 +138,9 @@ extern void __start(unsigned long r3, unsigned long r4, unsigned long r5, unsigned long r9); #ifdef CONFIG_PPC64 -extern int enter_prom(struct prom_args *args, unsigned long entry); +extern int __init enter_prom(struct prom_args *args, unsigned long entry); #else -static inline int enter_prom(struct prom_args *args, unsigned long entry) +static int __init enter_prom(struct prom_args *args, unsigned long entry) { return ((int (*)(struct prom_args *))entry)(args); } @@ -501,19 +501,20 @@ static int __init prom_next_node(phandle *nodep) } } -static inline int prom_getprop(phandle node, const char *pname, +static int __init prom_getprop(phandle node, const char *pname, void *value, size_t valuelen) { return call_prom("getprop", 4, 1, node, ADDR(pname), (u32)(unsigned long) value, (u32) valuelen); } -static inline int prom_getproplen(phandle node, const char *pname) +static int __init __maybe_unused prom_getproplen(phandle node, + const char *pname) { return call_prom("getproplen", 2, 1, node, ADDR(pname)); } -static void add_string(char **str, const char *q) +static void __init add_string(char **str, const char *q) { char *p = *str; @@ -523,7 +524,7 @@ static void add_string(char **str, const char *q) *str = p; } -static char *tohex(unsigned int x) +static char __init *tohex(unsigned int x) { static const char digits[] __initconst = "0123456789abcdef"; static char result[9] __prombss; @@ -570,7 +571,7 @@ static int __init prom_setprop(phandle node, const char *nodename, #define islower(c) ('a' <= (c) && (c) <= 'z') #define toupper(c) (islower(c) ? ((c) - 'a' + 'A') : (c)) -static unsigned long prom_strtoul(const char *cp, const char **endp) +static unsigned long __init prom_strtoul(const char *cp, const char **endp) { unsigned long result = 0, base = 10, value; @@ -595,7 +596,7 @@ static unsigned long prom_strtoul(const char *cp, const char **endp) return result; } -static unsigned long prom_memparse(const char *ptr, const char **retptr) +static unsigned long __init prom_memparse(const char *ptr, const char **retptr) { unsigned long ret = prom_strtoul(ptr, retptr); int shift = 0; @@ -2924,7 +2925,7 @@ static void __init fixup_device_tree_pasemi(void) prom_setprop(iob, name, "device_type", "isa", sizeof("isa")); } #else /* !CONFIG_PPC_PASEMI_NEMO */ -static inline void fixup_device_tree_pasemi(void) { } +static void __init fixup_device_tree_pasemi(void) { } #endif static void __init fixup_device_tree(void) @@ -2986,15 +2987,15 @@ static void __init prom_check_initrd(unsigned long r3, unsigned long r4) #ifdef CONFIG_PPC64 #ifdef CONFIG_RELOCATABLE -static void reloc_toc(void) +static void __init reloc_toc(void) { } -static void unreloc_toc(void) +static void __init unreloc_toc(void) { } #else -static void __reloc_toc(unsigned long offset, unsigned long nr_entries) +static void __init __reloc_toc(unsigned long offset, unsigned long nr_entries) { unsigned long i; unsigned long *toc_entry; @@ -3008,7 +3009,7 @@ static void __reloc_toc(unsigned long offset, unsigned long nr_entries) } } -static void reloc_toc(void) +static void __init reloc_toc(void) { unsigned long offset = reloc_offset(); unsigned long nr_entries = @@ -3019,7 +3020,7 @@ static void reloc_toc(void) mb(); } -static void unreloc_toc(void) +static void __init unreloc_toc(void) { unsigned long offset = reloc_offset(); unsigned long nr_entries =