diff options
| author | Andreas Larsson <andreas@gaisler.com> | 2013-06-10 08:53:28 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-06-19 02:10:29 -0700 |
| commit | 1ffbc51a0d00e52983c70aa7c8dbc7b621d6287d (patch) | |
| tree | 3b5e0a1a91a2dfde1b93d2d3295d1170ffe2bae3 /arch/sparc/include/asm/leon_amba.h | |
| parent | 117a0c5fc9c2d06045bd217385b2b39ea426b5a6 (diff) | |
sparc32, leon: Remove separate "ticker" timer for SMP
This reduces the need from two timers to one timer.
Moreover, without this patch, when the "ticker" timer triggers timer_cs_read via
tick_periodic it reads the value of the usual timer it can get an wrapped timer
value without timer_cs_internal_counter having been updated leading to the clock
going backwards. This effectively hangs one cpu that gets stuck in
update_wall_time with an offset slightly smaller than 0xffffffffffffffff.
Signed-off-by: Andreas Larsson <andreas@gaisler.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/sparc/include/asm/leon_amba.h')
| -rw-r--r-- | arch/sparc/include/asm/leon_amba.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/sparc/include/asm/leon_amba.h b/arch/sparc/include/asm/leon_amba.h index f3034eddf46..24ec48c3ff9 100644 --- a/arch/sparc/include/asm/leon_amba.h +++ b/arch/sparc/include/asm/leon_amba.h @@ -47,6 +47,7 @@ struct amba_prom_registers { #define LEON3_GPTIMER_LD 4 #define LEON3_GPTIMER_IRQEN 8 #define LEON3_GPTIMER_SEPIRQ 8 +#define LEON3_GPTIMER_TIMERS 0x7 #define LEON23_REG_TIMER_CONTROL_EN 0x00000001 /* 1 = enable counting */ /* 0 = hold scalar and counter */ |