From: Vineet Gupta <vgupta@kernel.org> To: Randy Dunlap <rdunlap@infradead.org>, linux-kernel@vger.kernel.org Cc: Vineet Gupta <vgupta@kernel.org>, linux-snps-arc@lists.infradead.org, Daniel Lezcano <daniel.lezcano@linaro.org>, Thomas Gleixner <tglx@linutronix.de>, Shahab Vahedi <Shahab.Vahedi@synopsys.com> Subject: Re: [PATCH v2] clocksource: arc_timer: eliminate redefined macro error Date: Thu, 23 Sep 2021 19:49:15 -0700 [thread overview] Message-ID: <1557caaa-9f90-7613-4627-5c5f59d047fa@kernel.org> (raw) In-Reply-To: <20210924020825.20317-1-rdunlap@infradead.org> On 9/23/21 7:08 PM, Randy Dunlap wrote: > In drivers/clocksource/, 3 drivers use "TIMER_CTRL_IE" with 3 different > values. Two of them (mps2-timer.c and timer-sp804.c/timer-sp.h) are > localized and left unmodifed. > > One of them uses a shared header file (<soc/arc/timers.h>), which is > what is causing the "redefined" warnings, so change the macro name in > that driver only. Also change the TIMER_CTRL_NH macro name. > Both macro names are prefixed with "ARC_" to reduce the likelihood > of future name collisions. > > In file included from ../drivers/clocksource/timer-sp804.c:24: > ../drivers/clocksource/timer-sp.h:25: error: "TIMER_CTRL_IE" redefined [-Werror] > 25 | #define TIMER_CTRL_IE (1 << 5) /* VR */ > ../include/soc/arc/timers.h:20: note: this is the location of the previous definition > 20 | #define TIMER_CTRL_IE (1 << 0) /* Interrupt when Count reaches limit */ > > Fixes: b26c2e3823ba ("ARC: breakout timer include code into separate header") > Signed-off-by: Randy Dunlap <rdunlap@infradead.org> > Cc: Vineet Gupta <vgupta@kernel.org> > Cc: linux-snps-arc@lists.infradead.org > Cc: Daniel Lezcano <daniel.lezcano@linaro.org> > Cc: Thomas Gleixner <tglx@linutronix.de> > Cc: Shahab Vahedi <Shahab.Vahedi@synopsys.com> Acked-by: Vineet Gupta <vgupta@kernel.org> Thx, -Vineet > --- > v2: prefix both TIMER_CTRL_xx macros with ARC_ (suggested by > Shahab Vahedi <Shahab.Vahedi@synopsys.com> > > drivers/clocksource/arc_timer.c | 6 +++--- > include/soc/arc/timers.h | 4 ++-- > 2 files changed, 5 insertions(+), 5 deletions(-) > > --- linux-next-20210917.orig/include/soc/arc/timers.h > +++ linux-next-20210917/include/soc/arc/timers.h > @@ -17,8 +17,8 @@ > #define ARC_REG_TIMER1_CNT 0x100 /* timer 1 count */ > > /* CTRL reg bits */ > -#define TIMER_CTRL_IE (1 << 0) /* Interrupt when Count reaches limit */ > -#define TIMER_CTRL_NH (1 << 1) /* Count only when CPU NOT halted */ > +#define ARC_TIMER_CTRL_IE (1 << 0) /* Interrupt when Count reaches limit */ > +#define ARC_TIMER_CTRL_NH (1 << 1) /* Count only when CPU NOT halted */ > > #define ARC_TIMERN_MAX 0xFFFFFFFF > > --- linux-next-20210917.orig/drivers/clocksource/arc_timer.c > +++ linux-next-20210917/drivers/clocksource/arc_timer.c > @@ -225,7 +225,7 @@ static int __init arc_cs_setup_timer1(st > > write_aux_reg(ARC_REG_TIMER1_LIMIT, ARC_TIMERN_MAX); > write_aux_reg(ARC_REG_TIMER1_CNT, 0); > - write_aux_reg(ARC_REG_TIMER1_CTRL, TIMER_CTRL_NH); > + write_aux_reg(ARC_REG_TIMER1_CTRL, ARC_TIMER_CTRL_NH); > > sched_clock_register(arc_timer1_clock_read, 32, arc_timer_freq); > > @@ -245,7 +245,7 @@ static void arc_timer_event_setup(unsign > write_aux_reg(ARC_REG_TIMER0_LIMIT, cycles); > write_aux_reg(ARC_REG_TIMER0_CNT, 0); /* start from 0 */ > > - write_aux_reg(ARC_REG_TIMER0_CTRL, TIMER_CTRL_IE | TIMER_CTRL_NH); > + write_aux_reg(ARC_REG_TIMER0_CTRL, ARC_TIMER_CTRL_IE | ARC_TIMER_CTRL_NH); > } > > > @@ -294,7 +294,7 @@ static irqreturn_t timer_irq_handler(int > * explicitly clears IP bit > * 2. Re-arm interrupt if periodic by writing to IE bit [0] > */ > - write_aux_reg(ARC_REG_TIMER0_CTRL, irq_reenable | TIMER_CTRL_NH); > + write_aux_reg(ARC_REG_TIMER0_CTRL, irq_reenable | ARC_TIMER_CTRL_NH); > > evt->event_handler(evt); >
WARNING: multiple messages have this Message-ID (diff)
From: Vineet Gupta <vgupta@kernel.org> To: Randy Dunlap <rdunlap@infradead.org>, linux-kernel@vger.kernel.org Cc: Vineet Gupta <vgupta@kernel.org>, linux-snps-arc@lists.infradead.org, Daniel Lezcano <daniel.lezcano@linaro.org>, Thomas Gleixner <tglx@linutronix.de>, Shahab Vahedi <Shahab.Vahedi@synopsys.com> Subject: Re: [PATCH v2] clocksource: arc_timer: eliminate redefined macro error Date: Thu, 23 Sep 2021 19:49:15 -0700 [thread overview] Message-ID: <1557caaa-9f90-7613-4627-5c5f59d047fa@kernel.org> (raw) In-Reply-To: <20210924020825.20317-1-rdunlap@infradead.org> On 9/23/21 7:08 PM, Randy Dunlap wrote: > In drivers/clocksource/, 3 drivers use "TIMER_CTRL_IE" with 3 different > values. Two of them (mps2-timer.c and timer-sp804.c/timer-sp.h) are > localized and left unmodifed. > > One of them uses a shared header file (<soc/arc/timers.h>), which is > what is causing the "redefined" warnings, so change the macro name in > that driver only. Also change the TIMER_CTRL_NH macro name. > Both macro names are prefixed with "ARC_" to reduce the likelihood > of future name collisions. > > In file included from ../drivers/clocksource/timer-sp804.c:24: > ../drivers/clocksource/timer-sp.h:25: error: "TIMER_CTRL_IE" redefined [-Werror] > 25 | #define TIMER_CTRL_IE (1 << 5) /* VR */ > ../include/soc/arc/timers.h:20: note: this is the location of the previous definition > 20 | #define TIMER_CTRL_IE (1 << 0) /* Interrupt when Count reaches limit */ > > Fixes: b26c2e3823ba ("ARC: breakout timer include code into separate header") > Signed-off-by: Randy Dunlap <rdunlap@infradead.org> > Cc: Vineet Gupta <vgupta@kernel.org> > Cc: linux-snps-arc@lists.infradead.org > Cc: Daniel Lezcano <daniel.lezcano@linaro.org> > Cc: Thomas Gleixner <tglx@linutronix.de> > Cc: Shahab Vahedi <Shahab.Vahedi@synopsys.com> Acked-by: Vineet Gupta <vgupta@kernel.org> Thx, -Vineet > --- > v2: prefix both TIMER_CTRL_xx macros with ARC_ (suggested by > Shahab Vahedi <Shahab.Vahedi@synopsys.com> > > drivers/clocksource/arc_timer.c | 6 +++--- > include/soc/arc/timers.h | 4 ++-- > 2 files changed, 5 insertions(+), 5 deletions(-) > > --- linux-next-20210917.orig/include/soc/arc/timers.h > +++ linux-next-20210917/include/soc/arc/timers.h > @@ -17,8 +17,8 @@ > #define ARC_REG_TIMER1_CNT 0x100 /* timer 1 count */ > > /* CTRL reg bits */ > -#define TIMER_CTRL_IE (1 << 0) /* Interrupt when Count reaches limit */ > -#define TIMER_CTRL_NH (1 << 1) /* Count only when CPU NOT halted */ > +#define ARC_TIMER_CTRL_IE (1 << 0) /* Interrupt when Count reaches limit */ > +#define ARC_TIMER_CTRL_NH (1 << 1) /* Count only when CPU NOT halted */ > > #define ARC_TIMERN_MAX 0xFFFFFFFF > > --- linux-next-20210917.orig/drivers/clocksource/arc_timer.c > +++ linux-next-20210917/drivers/clocksource/arc_timer.c > @@ -225,7 +225,7 @@ static int __init arc_cs_setup_timer1(st > > write_aux_reg(ARC_REG_TIMER1_LIMIT, ARC_TIMERN_MAX); > write_aux_reg(ARC_REG_TIMER1_CNT, 0); > - write_aux_reg(ARC_REG_TIMER1_CTRL, TIMER_CTRL_NH); > + write_aux_reg(ARC_REG_TIMER1_CTRL, ARC_TIMER_CTRL_NH); > > sched_clock_register(arc_timer1_clock_read, 32, arc_timer_freq); > > @@ -245,7 +245,7 @@ static void arc_timer_event_setup(unsign > write_aux_reg(ARC_REG_TIMER0_LIMIT, cycles); > write_aux_reg(ARC_REG_TIMER0_CNT, 0); /* start from 0 */ > > - write_aux_reg(ARC_REG_TIMER0_CTRL, TIMER_CTRL_IE | TIMER_CTRL_NH); > + write_aux_reg(ARC_REG_TIMER0_CTRL, ARC_TIMER_CTRL_IE | ARC_TIMER_CTRL_NH); > } > > > @@ -294,7 +294,7 @@ static irqreturn_t timer_irq_handler(int > * explicitly clears IP bit > * 2. Re-arm interrupt if periodic by writing to IE bit [0] > */ > - write_aux_reg(ARC_REG_TIMER0_CTRL, irq_reenable | TIMER_CTRL_NH); > + write_aux_reg(ARC_REG_TIMER0_CTRL, irq_reenable | ARC_TIMER_CTRL_NH); > > evt->event_handler(evt); > _______________________________________________ linux-snps-arc mailing list linux-snps-arc@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-snps-arc
next prev parent reply other threads:[~2021-09-24 2:49 UTC|newest] Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-09-24 2:08 [PATCH v2] clocksource: arc_timer: eliminate redefined macro error Randy Dunlap 2021-09-24 2:08 ` Randy Dunlap 2021-09-24 2:49 ` Vineet Gupta [this message] 2021-09-24 2:49 ` Vineet Gupta 2021-10-24 15:40 ` [tip: timers/core] clocksource/drivers/arc_timer: Eliminate " tip-bot2 for Randy Dunlap 2021-10-24 15:40 ` tip-bot2 for Randy Dunlap
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=1557caaa-9f90-7613-4627-5c5f59d047fa@kernel.org \ --to=vgupta@kernel.org \ --cc=Shahab.Vahedi@synopsys.com \ --cc=daniel.lezcano@linaro.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-snps-arc@lists.infradead.org \ --cc=rdunlap@infradead.org \ --cc=tglx@linutronix.de \ /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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.