From: Nathan Chancellor <nathan@kernel.org>
To: Andrew Morton <akpm@linux-foundation.org>
Cc: Nick Desaulniers <ndesaulniers@google.com>,
linux-hexagon@vger.kernel.org, linux-kernel@vger.kernel.org,
clang-built-linux@googlegroups.com,
Sid Manning <sidneym@quicinc.com>,
Brian Cain <bcain@codeaurora.org>
Subject: Re: [PATCH] hexagon: Clean up timer-regs.h
Date: Wed, 4 Aug 2021 11:31:13 -0700 [thread overview]
Message-ID: <YQrc8SE+T7++BLaG@Ryzen-9-3900X.localdomain> (raw)
In-Reply-To: <03bc01d783c2$52e6f200$f8b4d600$@codeaurora.org>
On Wed, Jul 28, 2021 at 10:07:45AM -0500, Brian Cain wrote:
> > -----Original Message-----
> > From: Nathan Chancellor <nathan@kernel.org>
> ...
> > When building allmodconfig, there is a warning about TIMER_ENABLE being
> > redefined:
> >
> > drivers/clocksource/timer-oxnas-rps.c:39:9: warning: 'TIMER_ENABLE'
> > macro redefined [-Wmacro-redefined]
> > #define TIMER_ENABLE BIT(7)
> > ^
> > arch/hexagon/include/asm/timer-regs.h:13:9: note: previous definition
> > is here
> > #define TIMER_ENABLE 0
> > ^
> > 1 warning generated.
> >
> > The values in this header are only used in one file each, if they are
> > used at all. Remove the header and sink all of the constants into their
> > respective files.
> >
> > TCX0_CLK_RATE is only used in arch/hexagon/include/asm/timex.h
> >
> > TIMER_ENABLE, RTOS_TIMER_INT, RTOS_TIMER_REGS_ADDR are only used in
> > arch/hexagon/kernel/time.c.
> >
> > SLEEP_CLK_RATE and TIMER_CLR_ON_MATCH have both been unused since
> > the
> > file's introduction in commit 71e4a47f32f4 ("Hexagon: Add time and timer
> > functions").
> >
> > TIMER_ENABLE is redefined as BIT(0) so the shift is moved into the
> > definition, rather than its use.
> >
> > Signed-off-by: Nathan Chancellor <nathan@kernel.org>
> > ---
> > arch/hexagon/include/asm/timer-regs.h | 26 --------------------------
> > arch/hexagon/include/asm/timex.h | 3 +--
> > arch/hexagon/kernel/time.c | 12 ++++++++++--
> > 3 files changed, 11 insertions(+), 30 deletions(-)
> > delete mode 100644 arch/hexagon/include/asm/timer-regs.h
> >
> > diff --git a/arch/hexagon/include/asm/timer-regs.h
> > b/arch/hexagon/include/asm/timer-regs.h
> > deleted file mode 100644
> > index ee6c61423a05..000000000000
> > --- a/arch/hexagon/include/asm/timer-regs.h
> > +++ /dev/null
> > @@ -1,26 +0,0 @@
> > -/* SPDX-License-Identifier: GPL-2.0-only */
> > -/*
> > - * Timer support for Hexagon
> > - *
> > - * Copyright (c) 2010-2011, The Linux Foundation. All rights reserved.
> > - */
> > -
> > -#ifndef _ASM_TIMER_REGS_H
> > -#define _ASM_TIMER_REGS_H
> > -
> > -/* This stuff should go into a platform specific file */
> > -#define TCX0_CLK_RATE 19200
> > -#define TIMER_ENABLE 0
> > -#define TIMER_CLR_ON_MATCH 1
> > -
> > -/*
> > - * 8x50 HDD Specs 5-8. Simulator co-sim not fixed until
> > - * release 1.1, and then it's "adjustable" and probably not defaulted.
> > - */
> > -#define RTOS_TIMER_INT 3
> > -#ifdef CONFIG_HEXAGON_COMET
> > -#define RTOS_TIMER_REGS_ADDR 0xAB000000UL
> > -#endif
> > -#define SLEEP_CLK_RATE 32000
> > -
> > -#endif
> > diff --git a/arch/hexagon/include/asm/timex.h
> > b/arch/hexagon/include/asm/timex.h
> > index 8d4ec76fceb4..dfe69e118b2b 100644
> > --- a/arch/hexagon/include/asm/timex.h
> > +++ b/arch/hexagon/include/asm/timex.h
> > @@ -7,11 +7,10 @@
> > #define _ASM_TIMEX_H
> >
> > #include <asm-generic/timex.h>
> > -#include <asm/timer-regs.h>
> > #include <asm/hexagon_vm.h>
> >
> > /* Using TCX0 as our clock. CLOCK_TICK_RATE scheduled to be removed. */
> > -#define CLOCK_TICK_RATE TCX0_CLK_RATE
> > +#define CLOCK_TICK_RATE 19200
> >
> > #define ARCH_HAS_READ_CURRENT_TIMER
> >
> > diff --git a/arch/hexagon/kernel/time.c b/arch/hexagon/kernel/time.c
> > index feffe527ac92..febc95714d75 100644
> > --- a/arch/hexagon/kernel/time.c
> > +++ b/arch/hexagon/kernel/time.c
> > @@ -17,9 +17,10 @@
> > #include <linux/of_irq.h>
> > #include <linux/module.h>
> >
> > -#include <asm/timer-regs.h>
> > #include <asm/hexagon_vm.h>
> >
> > +#define TIMER_ENABLE BIT(0)
> > +
> > /*
> > * For the clocksource we need:
> > * pcycle frequency (600MHz)
> > @@ -33,6 +34,13 @@ cycles_t pcycle_freq_mhz;
> > cycles_t thread_freq_mhz;
> > cycles_t sleep_clk_freq;
> >
> > +/*
> > + * 8x50 HDD Specs 5-8. Simulator co-sim not fixed until
> > + * release 1.1, and then it's "adjustable" and probably not defaulted.
> > + */
> > +#define RTOS_TIMER_INT 3
> > +#define RTOS_TIMER_REGS_ADDR 0xAB000000UL
> > +
> > static struct resource rtos_timer_resources[] = {
> > {
> > .start = RTOS_TIMER_REGS_ADDR,
> > @@ -80,7 +88,7 @@ static int set_next_event(unsigned long delta, struct
> > clock_event_device *evt)
> > iowrite32(0, &rtos_timer->clear);
> >
> > iowrite32(delta, &rtos_timer->match);
> > - iowrite32(1 << TIMER_ENABLE, &rtos_timer->enable);
> > + iowrite32(TIMER_ENABLE, &rtos_timer->enable);
> > return 0;
> > }
> >
> >
> > base-commit: 7d549995d4e0d99b68e8a7793a0d23da6fc40fe8
>
> Acked-by: Brian Cain <bcain@codeaurora.org>
Thanks Brian. Andrew, if you would not mind picking this up, I would
appreciate it!
Cheers,
Nathan
prev parent reply other threads:[~2021-08-04 18:31 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-28 0:17 [PATCH] hexagon: Clean up timer-regs.h Nathan Chancellor
2021-07-28 15:07 ` Brian Cain
2021-08-04 18:31 ` Nathan Chancellor [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=YQrc8SE+T7++BLaG@Ryzen-9-3900X.localdomain \
--to=nathan@kernel.org \
--cc=akpm@linux-foundation.org \
--cc=bcain@codeaurora.org \
--cc=clang-built-linux@googlegroups.com \
--cc=linux-hexagon@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=ndesaulniers@google.com \
--cc=sidneym@quicinc.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).