From nobody Sat Apr 11 09:19:10 2026 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 6354FC00140 for ; Mon, 15 Aug 2022 13:13:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242772AbiHONNn (ORCPT ); Mon, 15 Aug 2022 09:13:43 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52856 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242760AbiHONNh (ORCPT ); Mon, 15 Aug 2022 09:13:37 -0400 Received: from muru.com (muru.com [72.249.23.125]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id DA8B91901E; Mon, 15 Aug 2022 06:13:30 -0700 (PDT) Received: from hillo.muru.com (localhost [127.0.0.1]) by muru.com (Postfix) with ESMTP id 672F180FB; Mon, 15 Aug 2022 13:06:37 +0000 (UTC) From: Tony Lindgren To: Daniel Lezcano , Thomas Gleixner Cc: Aaro Koskinen , Grygorii Strashko , Janusz Krzysztofik , Keerthy , Ladislav Michl , Nishanth Menon , Suman Anna , Vignesh Raghavendra , linux-kernel@vger.kernel.org, linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH 4/9] clocksource/drivers/timer-ti-dm: Simplify register access further Date: Mon, 15 Aug 2022 16:12:45 +0300 Message-Id: <20220815131250.34603-5-tony@atomide.com> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20220815131250.34603-1-tony@atomide.com> References: <20220815131250.34603-1-tony@atomide.com> 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" Let's unify register access and use dmtimer_read() and dmtimer_write() also for the timer revision specific registers like we now do for the shread registers. Signed-off-by: Tony Lindgren --- drivers/clocksource/timer-ti-dm.c | 28 ++++++++++++++-------------- include/clocksource/timer-ti-dm.h | 6 +++--- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/drivers/clocksource/timer-ti-dm.c b/drivers/clocksource/timer-= ti-dm.c --- a/drivers/clocksource/timer-ti-dm.c +++ b/drivers/clocksource/timer-ti-dm.c @@ -101,16 +101,16 @@ static inline void __omap_dm_timer_init_regs(struct o= map_dm_timer *timer) tidr =3D readl_relaxed(timer->io_base); if (!(tidr >> 16)) { timer->revision =3D 1; - timer->irq_stat =3D timer->io_base + OMAP_TIMER_V1_STAT_OFFSET; - timer->irq_ena =3D timer->io_base + OMAP_TIMER_V1_INT_EN_OFFSET; - timer->irq_dis =3D timer->io_base + OMAP_TIMER_V1_INT_EN_OFFSET; + timer->irq_stat =3D OMAP_TIMER_V1_STAT_OFFSET; + timer->irq_ena =3D OMAP_TIMER_V1_INT_EN_OFFSET; + timer->irq_dis =3D OMAP_TIMER_V1_INT_EN_OFFSET; timer->pend =3D timer->io_base + _OMAP_TIMER_WRITE_PEND_OFFSET; timer->func_base =3D timer->io_base; } else { timer->revision =3D 2; - timer->irq_stat =3D timer->io_base + OMAP_TIMER_V2_IRQSTATUS; - timer->irq_ena =3D timer->io_base + OMAP_TIMER_V2_IRQENABLE_SET; - timer->irq_dis =3D timer->io_base + OMAP_TIMER_V2_IRQENABLE_CLR; + timer->irq_stat =3D OMAP_TIMER_V2_IRQSTATUS - OMAP_TIMER_V2_FUNC_OFFSET; + timer->irq_ena =3D OMAP_TIMER_V2_IRQENABLE_SET - OMAP_TIMER_V2_FUNC_OFFS= ET; + timer->irq_dis =3D OMAP_TIMER_V2_IRQENABLE_CLR - OMAP_TIMER_V2_FUNC_OFFS= ET; timer->pend =3D timer->io_base + _OMAP_TIMER_WRITE_PEND_OFFSET + OMAP_TIMER_V2_FUNC_OFFSET; @@ -165,13 +165,13 @@ static inline void __omap_dm_timer_stop(struct omap_d= m_timer *timer, } =20 /* Ack possibly pending interrupt */ - writel_relaxed(OMAP_TIMER_INT_OVERFLOW, timer->irq_stat); + dmtimer_write(timer, timer->irq_stat, OMAP_TIMER_INT_OVERFLOW); } =20 static inline void __omap_dm_timer_int_enable(struct omap_dm_timer *timer, unsigned int value) { - writel_relaxed(value, timer->irq_ena); + dmtimer_write(timer, timer->irq_ena, value); dmtimer_write(timer, OMAP_TIMER_WAKEUP_EN_REG, value); } =20 @@ -184,7 +184,7 @@ __omap_dm_timer_read_counter(struct omap_dm_timer *time= r) static inline void __omap_dm_timer_write_status(struct omap_dm_timer *time= r, unsigned int value) { - writel_relaxed(value, timer->irq_stat); + dmtimer_write(timer, timer->irq_stat, value); } =20 static void omap_timer_restore_context(struct omap_dm_timer *timer) @@ -196,7 +196,7 @@ static void omap_timer_restore_context(struct omap_dm_t= imer *timer) dmtimer_write(timer, OMAP_TIMER_LOAD_REG, timer->context.tldr); dmtimer_write(timer, OMAP_TIMER_MATCH_REG, timer->context.tmar); dmtimer_write(timer, OMAP_TIMER_IF_CTRL_REG, timer->context.tsicr); - writel_relaxed(timer->context.tier, timer->irq_ena); + dmtimer_write(timer, timer->irq_ena, timer->context.tier); dmtimer_write(timer, OMAP_TIMER_CTRL_REG, timer->context.tclr); } =20 @@ -208,7 +208,7 @@ static void omap_timer_save_context(struct omap_dm_time= r *timer) timer->context.twer =3D dmtimer_read(timer, OMAP_TIMER_WAKEUP_EN_REG); timer->context.tldr =3D dmtimer_read(timer, OMAP_TIMER_LOAD_REG); timer->context.tmar =3D dmtimer_read(timer, OMAP_TIMER_MATCH_REG); - timer->context.tier =3D readl_relaxed(timer->irq_ena); + timer->context.tier =3D dmtimer_read(timer, timer->irq_ena); timer->context.tsicr =3D dmtimer_read(timer, OMAP_TIMER_IF_CTRL_REG); } =20 @@ -722,9 +722,9 @@ static int omap_dm_timer_set_int_disable(struct omap_dm= _timer *timer, u32 mask) omap_dm_timer_enable(timer); =20 if (timer->revision =3D=3D 1) - l =3D readl_relaxed(timer->irq_ena) & ~mask; + l =3D dmtimer_read(timer, timer->irq_ena) & ~mask; =20 - writel_relaxed(l, timer->irq_dis); + dmtimer_write(timer, timer->irq_dis, l); l =3D dmtimer_read(timer, OMAP_TIMER_WAKEUP_EN_REG) & ~mask; dmtimer_write(timer, OMAP_TIMER_WAKEUP_EN_REG, l); =20 @@ -741,7 +741,7 @@ static unsigned int omap_dm_timer_read_status(struct om= ap_dm_timer *timer) return 0; } =20 - l =3D readl_relaxed(timer->irq_stat); + l =3D dmtimer_read(timer, timer->irq_stat); =20 return l; } diff --git a/include/clocksource/timer-ti-dm.h b/include/clocksource/timer-= ti-dm.h --- a/include/clocksource/timer-ti-dm.h +++ b/include/clocksource/timer-ti-dm.h @@ -100,9 +100,9 @@ struct omap_dm_timer { struct clk *fclk; =20 void __iomem *io_base; - void __iomem *irq_stat; /* TISR/IRQSTATUS interrupt status */ - void __iomem *irq_ena; /* irq enable */ - void __iomem *irq_dis; /* irq disable, only on v2 ip */ + int irq_stat; /* TISR/IRQSTATUS interrupt status */ + int irq_ena; /* irq enable */ + int irq_dis; /* irq disable, only on v2 ip */ void __iomem *pend; /* write pending */ void __iomem *func_base; /* function register base */ =20 --=20 2.37.1