From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3A22CC433C1 for ; Wed, 24 Mar 2021 09:29:44 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id E706361A05 for ; Wed, 24 Mar 2021 09:29:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234830AbhCXJ3L (ORCPT ); Wed, 24 Mar 2021 05:29:11 -0400 Received: from relay2-d.mail.gandi.net ([217.70.183.194]:59139 "EHLO relay2-d.mail.gandi.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234834AbhCXJ3J (ORCPT ); Wed, 24 Mar 2021 05:29:09 -0400 X-Originating-IP: 90.65.108.55 Received: from localhost (lfbn-lyo-1-1676-55.w90-65.abo.wanadoo.fr [90.65.108.55]) (Authenticated sender: alexandre.belloni@bootlin.com) by relay2-d.mail.gandi.net (Postfix) with ESMTPSA id B4B024000A; Wed, 24 Mar 2021 09:29:06 +0000 (UTC) Date: Wed, 24 Mar 2021 10:29:06 +0100 From: Alexandre Belloni To: He Ying Cc: mpe@ellerman.id.au, benh@kernel.crashing.org, paulus@samba.org, a.zummo@towertech.it, christophe.leroy@csgroup.eu, npiggin@gmail.com, msuchanek@suse.de, tglx@linutronix.de, peterz@infradead.org, geert@linux-m68k.org, geert+renesas@glider.be, kernelfans@gmail.com, frederic@kernel.org, linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org, linux-rtc@vger.kernel.org Subject: Re: [PATCH V3 -next] powerpc: kernel/time.c - cleanup warnings Message-ID: References: <20210324090939.143477-1-heying24@huawei.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20210324090939.143477-1-heying24@huawei.com> Precedence: bulk List-ID: X-Mailing-List: linux-rtc@vger.kernel.org On 24/03/2021 05:09:39-0400, He Ying wrote: > We found these warnings in arch/powerpc/kernel/time.c as follows: > warning: symbol 'decrementer_max' was not declared. Should it be static? > warning: symbol 'rtc_lock' was not declared. Should it be static? > warning: symbol 'dtl_consumer' was not declared. Should it be static? > > Declare 'decrementer_max' in powerpc asm/time.h. > Include linux/mc146818rtc.h in powerpc kernel/time.c where 'rtc_lock' > is declared. And remove duplicated declaration of 'rtc_lock' in powerpc > platforms/chrp/time.c because it has included linux/mc146818rtc.h. > Move 'dtl_consumer' definition behind "include " because it > is declared there. > > Reported-by: Hulk Robot > Signed-off-by: He Ying > --- > V2: > - Instead of including linux/mc146818rtc.h in powerpc kernel/time.c, declare > rtc_lock in powerpc asm/time.h. > V3: > - Recover to V1, that is including linux/mc146818rtc.h in powerpc > kernel/time.c. And remove duplicated declaration of 'rtc_lock' in powerpc > platforms/chrp/time.c because it has included linux/mc146818rtc.h. > > arch/powerpc/include/asm/time.h | 1 + > arch/powerpc/kernel/time.c | 9 ++++----- > arch/powerpc/platforms/chrp/time.c | 2 -- > 3 files changed, 5 insertions(+), 7 deletions(-) > > diff --git a/arch/powerpc/include/asm/time.h b/arch/powerpc/include/asm/time.h > index 8dd3cdb25338..2cd2b50bedda 100644 > --- a/arch/powerpc/include/asm/time.h > +++ b/arch/powerpc/include/asm/time.h > @@ -22,6 +22,7 @@ extern unsigned long tb_ticks_per_jiffy; > extern unsigned long tb_ticks_per_usec; > extern unsigned long tb_ticks_per_sec; > extern struct clock_event_device decrementer_clockevent; > +extern u64 decrementer_max; > > > extern void generic_calibrate_decr(void); > diff --git a/arch/powerpc/kernel/time.c b/arch/powerpc/kernel/time.c > index b67d93a609a2..ac81f043bf49 100644 > --- a/arch/powerpc/kernel/time.c > +++ b/arch/powerpc/kernel/time.c > @@ -55,8 +55,9 @@ > #include > #include > #include > -#include > +#include I'm fine with that but I really think my suggestion to make the rtc_lock local to the platforms was better because it is only used to synchronize between concurrent invocations of chrp_set_rtc_time or maple_set_rtc_time. The rtc core will never do that and the only case would be concurrent calls to rtc_ops.set_time and update_persistent_clock64 (which should also be removed at some point). > > +#include > #include > #include > #include > @@ -150,10 +151,6 @@ bool tb_invalid; > u64 __cputime_usec_factor; > EXPORT_SYMBOL(__cputime_usec_factor); > > -#ifdef CONFIG_PPC_SPLPAR > -void (*dtl_consumer)(struct dtl_entry *, u64); > -#endif > - > static void calc_cputime_factors(void) > { > struct div_result res; > @@ -179,6 +176,8 @@ static inline unsigned long read_spurr(unsigned long tb) > > #include > > +void (*dtl_consumer)(struct dtl_entry *, u64); > + > /* > * Scan the dispatch trace log and count up the stolen time. > * Should be called with interrupts disabled. > diff --git a/arch/powerpc/platforms/chrp/time.c b/arch/powerpc/platforms/chrp/time.c > index acde7bbe0716..b94dfd5090d8 100644 > --- a/arch/powerpc/platforms/chrp/time.c > +++ b/arch/powerpc/platforms/chrp/time.c > @@ -30,8 +30,6 @@ > > #include > > -extern spinlock_t rtc_lock; > - > #define NVRAM_AS0 0x74 > #define NVRAM_AS1 0x75 > #define NVRAM_DATA 0x77 > -- > 2.17.1 > -- Alexandre Belloni, co-owner and COO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com