Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1408406 > unrolled thread
| Started by | Kefeng Wang <wangkefeng.wang@huawei.com> |
|---|---|
| First post | 2016-05-28 11:40 +0200 |
| Last post | 2016-05-31 10:30 +0200 |
| Articles | 2 — 2 participants |
Back to article view | Back to linux.kernel
This discussion starts older than the indexed window; earlier articles aren't shown. The article labeled Started by
below is the oldest one visible, not the original post.
[PATCH 2/4] clocksource: sp804: introduce helper sp804_load_mode_set() Kefeng Wang <wangkefeng.wang@huawei.com> - 2016-05-28 11:40 +0200
Re: [PATCH 2/4] clocksource: sp804: introduce helper sp804_load_mode_set() Daniel Lezcano <daniel.lezcano@linaro.org> - 2016-05-31 10:30 +0200
| From | Kefeng Wang <wangkefeng.wang@huawei.com> |
|---|---|
| Date | 2016-05-28 11:40 +0200 |
| Subject | [PATCH 2/4] clocksource: sp804: introduce helper sp804_load_mode_set() |
| Message-ID | <rDISR-7c7-1@gated-at.bofh.it> |
Introduce helper sp804_load_mode_set(), and use it, prepare for 64bit
mode timer support.
Signed-off-by: Kefeng Wang <wangkefeng.wang@huawei.com>
---
drivers/clocksource/timer-sp804.c | 27 +++++++++++++--------------
1 file changed, 13 insertions(+), 14 deletions(-)
diff --git a/drivers/clocksource/timer-sp804.c b/drivers/clocksource/timer-sp804.c
index 362e5d0..b8848e5 100644
--- a/drivers/clocksource/timer-sp804.c
+++ b/drivers/clocksource/timer-sp804.c
@@ -73,6 +73,15 @@ static long __init sp804_get_clock_rate(struct clk *clk, const char *name)
return rate;
}
+static inline void sp804_load_mode_set(void __iomem *base, unsigned long load, int mode)
+{
+ unsigned long ctrl = TIMER_CTRL_32BIT | TIMER_CTRL_IE |
+ mode | TIMER_CTRL_ENABLE;
+
+ writel(load, base + TIMER_LOAD);
+ writel(ctrl, base + TIMER_CTRL);
+}
+
static void __iomem *sched_clock_base;
static u64 notrace sp804_read(void)
@@ -97,10 +106,8 @@ void __init __sp804_clocksource_and_sched_clock_init(void __iomem *base,
/* setup timer 0 as free-running clocksource */
writel(0, base + TIMER_CTRL);
- writel(0xffffffff, base + TIMER_LOAD);
writel(0xffffffff, base + TIMER_VALUE);
- writel(TIMER_CTRL_32BIT | TIMER_CTRL_ENABLE | TIMER_CTRL_PERIODIC,
- base + TIMER_CTRL);
+ sp804_load_mode_set(base, 0xffffffff, TIMER_CTRL_PERIODIC & ~TIMER_CTRL_IE);
clocksource_mmio_init(base + TIMER_VALUE, name,
rate, 200, 32, clocksource_mmio_readl_down);
@@ -143,24 +150,16 @@ static int sp804_shutdown(struct clock_event_device *evt)
static int sp804_set_periodic(struct clock_event_device *evt)
{
- unsigned long ctrl = TIMER_CTRL_32BIT | TIMER_CTRL_IE |
- TIMER_CTRL_PERIODIC | TIMER_CTRL_ENABLE;
-
timer_shutdown(evt);
- writel(clkevt_reload, clkevt_base + TIMER_LOAD);
- writel(ctrl, clkevt_base + TIMER_CTRL);
+ sp804_load_mode_set(clkevt_base, clkevt_reload, TIMER_CTRL_PERIODIC);
return 0;
}
static int sp804_set_next_event(unsigned long next,
- struct clock_event_device *evt)
+ struct clock_event_device *evt)
{
- unsigned long ctrl = TIMER_CTRL_32BIT | TIMER_CTRL_IE |
- TIMER_CTRL_ONESHOT | TIMER_CTRL_ENABLE;
-
- writel(next, clkevt_base + TIMER_LOAD);
- writel(ctrl, clkevt_base + TIMER_CTRL);
+ sp804_load_mode_set(clkevt_base, next, TIMER_CTRL_ONESHOT);
return 0;
}
--
1.7.12.4
[toc] | [next] | [standalone]
| From | Daniel Lezcano <daniel.lezcano@linaro.org> |
|---|---|
| Date | 2016-05-31 10:30 +0200 |
| Subject | Re: [PATCH 2/4] clocksource: sp804: introduce helper sp804_load_mode_set() |
| Message-ID | <rENdM-eU-27@gated-at.bofh.it> |
| In reply to | #1408406 |
On 05/28/2016 11:33 AM, Kefeng Wang wrote:
> Introduce helper sp804_load_mode_set(), and use it, prepare for 64bit
> mode timer support.
More verbose please.
> Signed-off-by: Kefeng Wang <wangkefeng.wang@huawei.com>
> ---
> drivers/clocksource/timer-sp804.c | 27 +++++++++++++--------------
> 1 file changed, 13 insertions(+), 14 deletions(-)
>
> diff --git a/drivers/clocksource/timer-sp804.c b/drivers/clocksource/timer-sp804.c
> index 362e5d0..b8848e5 100644
> --- a/drivers/clocksource/timer-sp804.c
> +++ b/drivers/clocksource/timer-sp804.c
> @@ -73,6 +73,15 @@ static long __init sp804_get_clock_rate(struct clk *clk, const char *name)
> return rate;
> }
>
> +static inline void sp804_load_mode_set(void __iomem *base, unsigned long load, int mode)
> +{
> + unsigned long ctrl = TIMER_CTRL_32BIT | TIMER_CTRL_IE |
> + mode | TIMER_CTRL_ENABLE;
> +
> + writel(load, base + TIMER_LOAD);
> + writel(ctrl, base + TIMER_CTRL);
> +}
> +
> static void __iomem *sched_clock_base;
>
> static u64 notrace sp804_read(void)
> @@ -97,10 +106,8 @@ void __init __sp804_clocksource_and_sched_clock_init(void __iomem *base,
>
> /* setup timer 0 as free-running clocksource */
> writel(0, base + TIMER_CTRL);
> - writel(0xffffffff, base + TIMER_LOAD);
> writel(0xffffffff, base + TIMER_VALUE);
> - writel(TIMER_CTRL_32BIT | TIMER_CTRL_ENABLE | TIMER_CTRL_PERIODIC,
> - base + TIMER_CTRL);
> + sp804_load_mode_set(base, 0xffffffff, TIMER_CTRL_PERIODIC & ~TIMER_CTRL_IE);
Can you explain this change ?
> clocksource_mmio_init(base + TIMER_VALUE, name,
> rate, 200, 32, clocksource_mmio_readl_down);
> @@ -143,24 +150,16 @@ static int sp804_shutdown(struct clock_event_device *evt)
>
> static int sp804_set_periodic(struct clock_event_device *evt)
> {
> - unsigned long ctrl = TIMER_CTRL_32BIT | TIMER_CTRL_IE |
> - TIMER_CTRL_PERIODIC | TIMER_CTRL_ENABLE;
> -
> timer_shutdown(evt);
> - writel(clkevt_reload, clkevt_base + TIMER_LOAD);
> - writel(ctrl, clkevt_base + TIMER_CTRL);
> + sp804_load_mode_set(clkevt_base, clkevt_reload, TIMER_CTRL_PERIODIC);
> return 0;
> }
>
> static int sp804_set_next_event(unsigned long next,
> - struct clock_event_device *evt)
> + struct clock_event_device *evt)
> {
> - unsigned long ctrl = TIMER_CTRL_32BIT | TIMER_CTRL_IE |
> - TIMER_CTRL_ONESHOT | TIMER_CTRL_ENABLE;
> -
> - writel(next, clkevt_base + TIMER_LOAD);
> - writel(ctrl, clkevt_base + TIMER_CTRL);
>
> + sp804_load_mode_set(clkevt_base, next, TIMER_CTRL_ONESHOT);
> return 0;
> }
>
>
--
<http://www.linaro.org/> Linaro.org │ Open source software for ARM SoCs
Follow Linaro: <http://www.facebook.com/pages/Linaro> Facebook |
<http://twitter.com/#!/linaroorg> Twitter |
<http://www.linaro.org/linaro-blog/> Blog
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web