linux-toradex.git/drivers/clocksource/arm_arch_timer.c, branch v4.13-rc7

clocksource/drivers/arm_arch_timer: Fix mem frame loop initialization

2017-08-10T12:48:17+00:00

The loop to find the best memory frame in arch_timer_mem_acpi_init()
initializes the loop counter with itself ('i = i'), which is suspicious
in the first place and pointed out by clang. The loop condition is
'i < timer_count' and a prior for loop exits when 'i' reaches
'timer_count', therefore the second loop is never executed.

Initialize the loop counter with 0 to iterate over all timers, which
supposedly was the intention before the typo monster attacked.

Fixes: c2743a36765d3 ("clocksource: arm_arch_timer: add GTDT support for memory-mapped timer")
Signed-off-by: Matthias Kaehlcke 
Reported-by: Ard Biesheuvel 
Acked-by: Mark Rutland 
Signed-off-by: Daniel Lezcano

Merge branch 'timers/urgent' into timers/core

2017-06-21T07:07:52+00:00

Pick up dependent changes.

clocksource/drivers: Rename CLOCKSOURCE_ACPI_DECLARE to TIMER_ACPI_DECLARE

2017-06-14T09:59:53+00:00

The macro name is now renamed to 'TIMER_ACPI_DECLARE' for consistency
with the CLOCKSOURCE_OF_DECLARE => TIMER_OF_DECLARE change.

Signed-off-by: Daniel Lezcano 
Reviewed-by: Linus Walleij

clocksource/drivers: Rename CLOCKSOURCE_OF_DECLARE to TIMER_OF_DECLARE

2017-06-14T09:58:45+00:00

The CLOCKSOURCE_OF_DECLARE macro is used widely for the timers to declare the
clocksource at early stage. However, this macro is also used to initialize
the clockevent if any, or the clockevent only.

It was originally suggested to declare another macro to initialize a
clockevent, so in order to separate the two entities even they belong to the
same IP. This was not accepted because of the impact on the DT where splitting
a clocksource/clockevent definition does not make sense as it is a Linux
concept not a hardware description.

On the other side, the clocksource has not interrupt declared while the
clockevent has, so it is easy from the driver to know if the description is
for a clockevent or a clocksource, IOW it could be implemented at the driver
level.

So instead of dealing with a named clocksource macro, let's use a more generic
one: TIMER_OF_DECLARE.

The patch has not functional changes.

Signed-off-by: Daniel Lezcano 
Acked-by: Heiko Stuebner 
Acked-by: Neil Armstrong 
Acked-by: Arnd Bergmann 
Acked-by: Matthias Brugger 
Reviewed-by: Linus Walleij

clocksource/drivers/arm_arch_timer: Fix read and iounmap of incorrect variable

2017-06-12T13:00:23+00:00

Fix boot warning 'Trying to vfree() nonexistent vm area'
from arch_timer_mem_of_init().

Refactored code attempts to read and iounmap using address frame
instead of address ioremap(frame->cntbase).

Fixes: c389d701dfb70 ("clocksource: arm_arch_timer: split MMIO timer probing.")

Signed-off-by: Frank Rowand 
Reviewed-by: Fu Wei 
Acked-by: Marc Zyngier 
Signed-off-by: Daniel Lezcano

clocksource/arm_arch_timer: Fix arch_timer_mem_find_best_frame()

2017-05-09T06:56:41+00:00

arch_timer_mem_find_best_frame() looks through ARCH_TIMER_MEM_MAX_FRAMES
frames even after finding matches to ensure the best frame is chosen,
which means the variable frame will point to the last valid frame but
not necessarily the best frame.

On Juno, we get the following error as the wrong frame is returned as the
best frame from arch_timer_mem_find_best_frame():

  arch_timer: Unable to map frame @ 0x0000000000000000
  arch_timer: Frame missing phys irq.
  Failed to initialize '/timer@2a810000': -22

Fix the issue by correctly returning the best frame from
arch_timer_mem_find_best_frame().

Fixes: c389d701dfb7 ("clocksource: arm_arch_timer: split MMIO timer probing.")
Signed-off-by: Sudeep Holla 
Acked-by: Mark Rutland 
Cc: Marc Zyngier 
Cc: Daniel Lezcano 
Cc: linux-arm-kernel@lists.infradead.org
Link: http://lkml.kernel.org/r/1494246747-17267-1-git-send-email-sudeep.holla@arm.com
Signed-off-by: Thomas Gleixner

arm64/arch_timer: Mark errata handlers as __maybe_unused

2017-04-20T12:56:59+00:00

In some rare randconfig builds, we end up with two functions being entirely
unused:

drivers/clocksource/arm_arch_timer.c:342:12: error: 'erratum_set_next_event_tval_phys' defined but not used [-Werror=unused-function]
 static int erratum_set_next_event_tval_phys(unsigned long evt,
drivers/clocksource/arm_arch_timer.c:335:12: error: 'erratum_set_next_event_tval_virt' defined but not used [-Werror=unused-function]
 static int erratum_set_next_event_tval_virt(unsigned long evt,

We could add an #ifdef around them, but we would already have to check for
several symbols there and there is a chance this would get more complicated
over time, so marking them as __maybe_unused is the simplest way to avoid the
harmless warnings.

Fixes: 01d3e3ff2608 ("arm64: arch_timer: Rework the set_next_event workarounds")
Signed-off-by: Arnd Bergmann 
Acked-by: Marc Zyngier 
Acked-by: Daniel Lezcano 
Cc: Mark Rutland 
Cc: Will Deacon 
Cc: linux-arm-kernel@lists.infradead.org
Cc: Christoffer Dall 
Link: http://lkml.kernel.org/r/20170419173737.3846098-1-arnd@arndb.de
Signed-off-by: Thomas Gleixner

clocksource: arm_arch_timer: add GTDT support for memory-mapped timer

2017-04-19T16:00:15+00:00

The patch add memory-mapped timer register support by using the
information provided by the new GTDT driver of ACPI.

Signed-off-by: Fu Wei 
Reviewed-by: Hanjun Guo 
[Mark: verify CNTFRQ, only register the first frame]
Signed-off-by: Mark Rutland

clocksource: arm_arch_timer: simplify ACPI support code.

2017-04-19T15:11:49+00:00

The patch update arm_arch_timer driver to use the function
provided by the new GTDT driver of ACPI.
By this way, arm_arch_timer.c can be simplified, and separate
all the ACPI GTDT knowledge from this timer driver.

Signed-off-by: Fu Wei 
Signed-off-by: Hanjun Guo 
Tested-by: Xiongfeng Wang 
Reviewed-by: Hanjun Guo 
Tested-by: Hanjun Guo 
Signed-off-by: Mark Rutland

clocksource: arm_arch_timer: split MMIO timer probing.

2017-04-19T15:11:48+00:00

Currently the code to probe MMIO architected timers mixes DT parsing with
actual poking of hardware. This makes the code harder than necessary to
understand, and makes it difficult to add support for probing via ACPI.

This patch splits the DT parsing from HW probing. The DT parsing now
lives in arch_timer_mem_of_init(), which fills in an arch_timer_mem
structure that it hands to probing functions that can be reused for ACPI
support.

Since the rate detection logic will be slight different when using ACPI,
the probing is performed as a number of steps. This results in more code
for the moment, and some arguably redundant work, but simplifies matters
considerably when ACPI support is added.

Signed-off-by: Fu Wei 
[Mark: refactor the probing split]
Signed-off-by: Mark Rutland