diff options
author | Mark Rutland <mark.rutland@arm.com> | 2012-11-20 05:06:00 -0500 |
---|---|---|
committer | Mark Rutland <mark.rutland@arm.com> | 2013-01-31 10:51:59 -0500 |
commit | 1aee5d7a8120cbe3eca9180ef9276d75a4f51dd2 (patch) | |
tree | ac02d4cdc545251cb9197456c7fbd41a64a4dbe0 | |
parent | 1dac0dd71cdda2bd7395dd47a6b617ed296d4901 (diff) |
arm64: move from arm_generic to arm_arch_timer
The arch_timer driver supports a superset of the functionality of the
arm_generic driver, and is not tied to a particular arch.
This patch moves arm64 to use the arch_timer driver, gaining additional
functionality in doing so, and removes the (now unused) arm_generic
driver. Timer-related hooks specific to arm64 are moved into
arch/arm64/kernel/time.c.
Signed-off-by: Mark Rutland <mark.rutland@arm.com>
Acked-by: Catalin Marinas <catalin.marinas@arm.com>
Acked-by: Marc Zyngier <marc.zyngier@arm.com>
Acked-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
-rw-r--r-- | arch/arm64/Kconfig | 1 | ||||
-rw-r--r-- | arch/arm64/include/asm/arch_timer.h | 133 | ||||
-rw-r--r-- | arch/arm64/include/asm/arm_generic.h | 102 | ||||
-rw-r--r-- | arch/arm64/kernel/time.c | 29 | ||||
-rw-r--r-- | drivers/clocksource/Kconfig | 5 | ||||
-rw-r--r-- | drivers/clocksource/Makefile | 1 | ||||
-rw-r--r-- | drivers/clocksource/arm_arch_timer.c | 1 | ||||
-rw-r--r-- | drivers/clocksource/arm_generic.c | 232 | ||||
-rw-r--r-- | include/clocksource/arm_generic.h | 21 |
9 files changed, 162 insertions, 363 deletions
diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig index f8f362aafee9..2b6cef6ad17f 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig | |||
@@ -3,6 +3,7 @@ config ARM64 | |||
3 | select ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE | 3 | select ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE |
4 | select ARCH_WANT_COMPAT_IPC_PARSE_VERSION | 4 | select ARCH_WANT_COMPAT_IPC_PARSE_VERSION |
5 | select ARM_AMBA | 5 | select ARM_AMBA |
6 | select ARM_ARCH_TIMER | ||
6 | select CLONE_BACKWARDS | 7 | select CLONE_BACKWARDS |
7 | select COMMON_CLK | 8 | select COMMON_CLK |
8 | select GENERIC_CLOCKEVENTS | 9 | select GENERIC_CLOCKEVENTS |
diff --git a/arch/arm64/include/asm/arch_timer.h b/arch/arm64/include/asm/arch_timer.h new file mode 100644 index 000000000000..91e2a6a6fcd4 --- /dev/null +++ b/arch/arm64/include/asm/arch_timer.h | |||
@@ -0,0 +1,133 @@ | |||
1 | /* | ||
2 | * arch/arm64/include/asm/arch_timer.h | ||
3 | * | ||
4 | * Copyright (C) 2012 ARM Ltd. | ||
5 | * Author: Marc Zyngier <marc.zyngier@arm.com> | ||
6 | * | ||
7 | * This program is free software: you can redistribute it and/or modify | ||
8 | * it under the terms of the GNU General Public License version 2 as | ||
9 | * published by the Free Software Foundation. | ||
10 | * | ||
11 | * This program is distributed in the hope that it will be useful, | ||
12 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
13 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
14 | * GNU General Public License for more details. | ||
15 | * | ||
16 | * You should have received a copy of the GNU General Public License | ||
17 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
18 | */ | ||
19 | #ifndef __ASM_ARCH_TIMER_H | ||
20 | #define __ASM_ARCH_TIMER_H | ||
21 | |||
22 | #include <asm/barrier.h> | ||
23 | |||
24 | #include <linux/init.h> | ||
25 | #include <linux/types.h> | ||
26 | |||
27 | #include <clocksource/arm_arch_timer.h> | ||
28 | |||
29 | static inline void arch_timer_reg_write(int access, int reg, u32 val) | ||
30 | { | ||
31 | if (access == ARCH_TIMER_PHYS_ACCESS) { | ||
32 | switch (reg) { | ||
33 | case ARCH_TIMER_REG_CTRL: | ||
34 | asm volatile("msr cntp_ctl_el0, %0" : : "r" (val)); | ||
35 | break; | ||
36 | case ARCH_TIMER_REG_TVAL: | ||
37 | asm volatile("msr cntp_tval_el0, %0" : : "r" (val)); | ||
38 | break; | ||
39 | default: | ||
40 | BUILD_BUG(); | ||
41 | } | ||
42 | } else if (access == ARCH_TIMER_VIRT_ACCESS) { | ||
43 | switch (reg) { | ||
44 | case ARCH_TIMER_REG_CTRL: | ||
45 | asm volatile("msr cntv_ctl_el0, %0" : : "r" (val)); | ||
46 | break; | ||
47 | case ARCH_TIMER_REG_TVAL: | ||
48 | asm volatile("msr cntv_tval_el0, %0" : : "r" (val)); | ||
49 | break; | ||
50 | default: | ||
51 | BUILD_BUG(); | ||
52 | } | ||
53 | } else { | ||
54 | BUILD_BUG(); | ||
55 | } | ||
56 | |||
57 | isb(); | ||
58 | } | ||
59 | |||
60 | static inline u32 arch_timer_reg_read(int access, int reg) | ||
61 | { | ||
62 | u32 val; | ||
63 | |||
64 | if (access == ARCH_TIMER_PHYS_ACCESS) { | ||
65 | switch (reg) { | ||
66 | case ARCH_TIMER_REG_CTRL: | ||
67 | asm volatile("mrs %0, cntp_ctl_el0" : "=r" (val)); | ||
68 | break; | ||
69 | case ARCH_TIMER_REG_TVAL: | ||
70 | asm volatile("mrs %0, cntp_tval_el0" : "=r" (val)); | ||
71 | break; | ||
72 | default: | ||
73 | BUILD_BUG(); | ||
74 | } | ||
75 | } else if (access == ARCH_TIMER_VIRT_ACCESS) { | ||
76 | switch (reg) { | ||
77 | case ARCH_TIMER_REG_CTRL: | ||
78 | asm volatile("mrs %0, cntv_ctl_el0" : "=r" (val)); | ||
79 | break; | ||
80 | case ARCH_TIMER_REG_TVAL: | ||
81 | asm volatile("mrs %0, cntv_tval_el0" : "=r" (val)); | ||
82 | break; | ||
83 | default: | ||
84 | BUILD_BUG(); | ||
85 | } | ||
86 | } else { | ||
87 | BUILD_BUG(); | ||
88 | } | ||
89 | |||
90 | return val; | ||
91 | } | ||
92 | |||
93 | static inline u32 arch_timer_get_cntfrq(void) | ||
94 | { | ||
95 | u32 val; | ||
96 | asm volatile("mrs %0, cntfrq_el0" : "=r" (val)); | ||
97 | return val; | ||
98 | } | ||
99 | |||
100 | static inline void __cpuinit arch_counter_set_user_access(void) | ||
101 | { | ||
102 | u32 cntkctl; | ||
103 | |||
104 | /* Disable user access to the timers and the physical counter. */ | ||
105 | asm volatile("mrs %0, cntkctl_el1" : "=r" (cntkctl)); | ||
106 | cntkctl &= ~((3 << 8) | (1 << 0)); | ||
107 | |||
108 | /* Enable user access to the virtual counter and frequency. */ | ||
109 | cntkctl |= (1 << 1); | ||
110 | asm volatile("msr cntkctl_el1, %0" : : "r" (cntkctl)); | ||
111 | } | ||
112 | |||
113 | static inline u64 arch_counter_get_cntpct(void) | ||
114 | { | ||
115 | u64 cval; | ||
116 | |||
117 | isb(); | ||
118 | asm volatile("mrs %0, cntpct_el0" : "=r" (cval)); | ||
119 | |||
120 | return cval; | ||
121 | } | ||
122 | |||
123 | static inline u64 arch_counter_get_cntvct(void) | ||
124 | { | ||
125 | u64 cval; | ||
126 | |||
127 | isb(); | ||
128 | asm volatile("mrs %0, cntvct_el0" : "=r" (cval)); | ||
129 | |||
130 | return cval; | ||
131 | } | ||
132 | |||
133 | #endif | ||
diff --git a/arch/arm64/include/asm/arm_generic.h b/arch/arm64/include/asm/arm_generic.h deleted file mode 100644 index 6ece2f107fa0..000000000000 --- a/arch/arm64/include/asm/arm_generic.h +++ /dev/null | |||
@@ -1,102 +0,0 @@ | |||
1 | /* | ||
2 | * arch/arm64/include/asm/arm_generic.h | ||
3 | * | ||
4 | * Copyright (C) 2012 ARM Ltd. | ||
5 | * Author: Marc Zyngier <marc.zyngier@arm.com> | ||
6 | * | ||
7 | * This program is free software: you can redistribute it and/or modify | ||
8 | * it under the terms of the GNU General Public License version 2 as | ||
9 | * published by the Free Software Foundation. | ||
10 | * | ||
11 | * This program is distributed in the hope that it will be useful, | ||
12 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
13 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
14 | * GNU General Public License for more details. | ||
15 | * | ||
16 | * You should have received a copy of the GNU General Public License | ||
17 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
18 | */ | ||
19 | #ifndef __ASM_ARM_GENERIC_H | ||
20 | #define __ASM_ARM_GENERIC_H | ||
21 | |||
22 | #include <linux/clocksource.h> | ||
23 | |||
24 | #define ARCH_TIMER_CTRL_ENABLE (1 << 0) | ||
25 | #define ARCH_TIMER_CTRL_IMASK (1 << 1) | ||
26 | #define ARCH_TIMER_CTRL_ISTATUS (1 << 2) | ||
27 | |||
28 | #define ARCH_TIMER_REG_CTRL 0 | ||
29 | #define ARCH_TIMER_REG_FREQ 1 | ||
30 | #define ARCH_TIMER_REG_TVAL 2 | ||
31 | |||
32 | static inline void arch_timer_reg_write(int reg, u32 val) | ||
33 | { | ||
34 | switch (reg) { | ||
35 | case ARCH_TIMER_REG_CTRL: | ||
36 | asm volatile("msr cntp_ctl_el0, %0" : : "r" (val)); | ||
37 | break; | ||
38 | case ARCH_TIMER_REG_TVAL: | ||
39 | asm volatile("msr cntp_tval_el0, %0" : : "r" (val)); | ||
40 | break; | ||
41 | default: | ||
42 | BUILD_BUG(); | ||
43 | } | ||
44 | |||
45 | isb(); | ||
46 | } | ||
47 | |||
48 | static inline u32 arch_timer_reg_read(int reg) | ||
49 | { | ||
50 | u32 val; | ||
51 | |||
52 | switch (reg) { | ||
53 | case ARCH_TIMER_REG_CTRL: | ||
54 | asm volatile("mrs %0, cntp_ctl_el0" : "=r" (val)); | ||
55 | break; | ||
56 | case ARCH_TIMER_REG_FREQ: | ||
57 | asm volatile("mrs %0, cntfrq_el0" : "=r" (val)); | ||
58 | break; | ||
59 | case ARCH_TIMER_REG_TVAL: | ||
60 | asm volatile("mrs %0, cntp_tval_el0" : "=r" (val)); | ||
61 | break; | ||
62 | default: | ||
63 | BUILD_BUG(); | ||
64 | } | ||
65 | |||
66 | return val; | ||
67 | } | ||
68 | |||
69 | static inline void __cpuinit arch_counter_enable_user_access(void) | ||
70 | { | ||
71 | u32 cntkctl; | ||
72 | |||
73 | /* Disable user access to the timers and the physical counter. */ | ||
74 | asm volatile("mrs %0, cntkctl_el1" : "=r" (cntkctl)); | ||
75 | cntkctl &= ~((3 << 8) | (1 << 0)); | ||
76 | |||
77 | /* Enable user access to the virtual counter and frequency. */ | ||
78 | cntkctl |= (1 << 1); | ||
79 | asm volatile("msr cntkctl_el1, %0" : : "r" (cntkctl)); | ||
80 | } | ||
81 | |||
82 | static inline cycle_t arch_counter_get_cntpct(void) | ||
83 | { | ||
84 | cycle_t cval; | ||
85 | |||
86 | isb(); | ||
87 | asm volatile("mrs %0, cntpct_el0" : "=r" (cval)); | ||
88 | |||
89 | return cval; | ||
90 | } | ||
91 | |||
92 | static inline cycle_t arch_counter_get_cntvct(void) | ||
93 | { | ||
94 | cycle_t cval; | ||
95 | |||
96 | isb(); | ||
97 | asm volatile("mrs %0, cntvct_el0" : "=r" (cval)); | ||
98 | |||
99 | return cval; | ||
100 | } | ||
101 | |||
102 | #endif | ||
diff --git a/arch/arm64/kernel/time.c b/arch/arm64/kernel/time.c index 3b4b7258f492..b0ef18d14c3b 100644 --- a/arch/arm64/kernel/time.c +++ b/arch/arm64/kernel/time.c | |||
@@ -31,8 +31,9 @@ | |||
31 | #include <linux/syscore_ops.h> | 31 | #include <linux/syscore_ops.h> |
32 | #include <linux/timer.h> | 32 | #include <linux/timer.h> |
33 | #include <linux/irq.h> | 33 | #include <linux/irq.h> |
34 | #include <linux/delay.h> | ||
34 | 35 | ||
35 | #include <clocksource/arm_generic.h> | 36 | #include <clocksource/arm_arch_timer.h> |
36 | 37 | ||
37 | #include <asm/thread_info.h> | 38 | #include <asm/thread_info.h> |
38 | #include <asm/stacktrace.h> | 39 | #include <asm/stacktrace.h> |
@@ -59,7 +60,31 @@ unsigned long profile_pc(struct pt_regs *regs) | |||
59 | EXPORT_SYMBOL(profile_pc); | 60 | EXPORT_SYMBOL(profile_pc); |
60 | #endif | 61 | #endif |
61 | 62 | ||
63 | static u64 sched_clock_mult __read_mostly; | ||
64 | |||
65 | unsigned long long notrace sched_clock(void) | ||
66 | { | ||
67 | return arch_timer_read_counter() * sched_clock_mult; | ||
68 | } | ||
69 | |||
70 | int read_current_timer(unsigned long *timer_value) | ||
71 | { | ||
72 | *timer_value = arch_timer_read_counter(); | ||
73 | return 0; | ||
74 | } | ||
75 | |||
62 | void __init time_init(void) | 76 | void __init time_init(void) |
63 | { | 77 | { |
64 | arm_generic_timer_init(); | 78 | u32 arch_timer_rate; |
79 | |||
80 | if (arch_timer_init()) | ||
81 | panic("Unable to initialise architected timer.\n"); | ||
82 | |||
83 | arch_timer_rate = arch_timer_get_rate(); | ||
84 | |||
85 | /* Cache the sched_clock multiplier to save a divide in the hot path. */ | ||
86 | sched_clock_mult = NSEC_PER_SEC / arch_timer_rate; | ||
87 | |||
88 | /* Calibrate the delay loop directly */ | ||
89 | lpj_fine = arch_timer_rate / HZ; | ||
65 | } | 90 | } |
diff --git a/drivers/clocksource/Kconfig b/drivers/clocksource/Kconfig index dbb085ac64d4..64798424b6cb 100644 --- a/drivers/clocksource/Kconfig +++ b/drivers/clocksource/Kconfig | |||
@@ -54,10 +54,5 @@ config CLKSRC_DBX500_PRCMU_SCHED_CLOCK | |||
54 | help | 54 | help |
55 | Use the always on PRCMU Timer as sched_clock | 55 | Use the always on PRCMU Timer as sched_clock |
56 | 56 | ||
57 | config CLKSRC_ARM_GENERIC | ||
58 | def_bool y if ARM64 | ||
59 | help | ||
60 | This option enables support for the ARM generic timer. | ||
61 | |||
62 | config ARM_ARCH_TIMER | 57 | config ARM_ARCH_TIMER |
63 | bool | 58 | bool |
diff --git a/drivers/clocksource/Makefile b/drivers/clocksource/Makefile index 32f858c8eecc..e69511c4c66e 100644 --- a/drivers/clocksource/Makefile +++ b/drivers/clocksource/Makefile | |||
@@ -17,5 +17,4 @@ obj-$(CONFIG_ARMADA_370_XP_TIMER) += time-armada-370-xp.o | |||
17 | obj-$(CONFIG_ARCH_BCM2835) += bcm2835_timer.o | 17 | obj-$(CONFIG_ARCH_BCM2835) += bcm2835_timer.o |
18 | obj-$(CONFIG_SUNXI_TIMER) += sunxi_timer.o | 18 | obj-$(CONFIG_SUNXI_TIMER) += sunxi_timer.o |
19 | 19 | ||
20 | obj-$(CONFIG_CLKSRC_ARM_GENERIC) += arm_generic.o | ||
21 | obj-$(CONFIG_ARM_ARCH_TIMER) += arm_arch_timer.o | 20 | obj-$(CONFIG_ARM_ARCH_TIMER) += arm_arch_timer.o |
diff --git a/drivers/clocksource/arm_arch_timer.c b/drivers/clocksource/arm_arch_timer.c index 3e4739df0e82..ec30a7331587 100644 --- a/drivers/clocksource/arm_arch_timer.c +++ b/drivers/clocksource/arm_arch_timer.c | |||
@@ -338,6 +338,7 @@ out: | |||
338 | 338 | ||
339 | static const struct of_device_id arch_timer_of_match[] __initconst = { | 339 | static const struct of_device_id arch_timer_of_match[] __initconst = { |
340 | { .compatible = "arm,armv7-timer", }, | 340 | { .compatible = "arm,armv7-timer", }, |
341 | { .compatible = "arm,armv8-timer", }, | ||
341 | {}, | 342 | {}, |
342 | }; | 343 | }; |
343 | 344 | ||
diff --git a/drivers/clocksource/arm_generic.c b/drivers/clocksource/arm_generic.c deleted file mode 100644 index 8ae1a61523ff..000000000000 --- a/drivers/clocksource/arm_generic.c +++ /dev/null | |||
@@ -1,232 +0,0 @@ | |||
1 | /* | ||
2 | * Generic timers support | ||
3 | * | ||
4 | * Copyright (C) 2012 ARM Ltd. | ||
5 | * Author: Marc Zyngier <marc.zyngier@arm.com> | ||
6 | * | ||
7 | * This program is free software; you can redistribute it and/or modify | ||
8 | * it under the terms of the GNU General Public License version 2 as | ||
9 | * published by the Free Software Foundation. | ||
10 | * | ||
11 | * This program is distributed in the hope that it will be useful, | ||
12 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
13 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
14 | * GNU General Public License for more details. | ||
15 | * | ||
16 | * You should have received a copy of the GNU General Public License | ||
17 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
18 | */ | ||
19 | |||
20 | #include <linux/init.h> | ||
21 | #include <linux/kernel.h> | ||
22 | #include <linux/delay.h> | ||
23 | #include <linux/device.h> | ||
24 | #include <linux/smp.h> | ||
25 | #include <linux/cpu.h> | ||
26 | #include <linux/jiffies.h> | ||
27 | #include <linux/interrupt.h> | ||
28 | #include <linux/clockchips.h> | ||
29 | #include <linux/of_irq.h> | ||
30 | #include <linux/io.h> | ||
31 | |||
32 | #include <clocksource/arm_generic.h> | ||
33 | |||
34 | #include <asm/arm_generic.h> | ||
35 | |||
36 | static u32 arch_timer_rate; | ||
37 | static u64 sched_clock_mult __read_mostly; | ||
38 | static DEFINE_PER_CPU(struct clock_event_device, arch_timer_evt); | ||
39 | static int arch_timer_ppi; | ||
40 | |||
41 | static irqreturn_t arch_timer_handle_irq(int irq, void *dev_id) | ||
42 | { | ||
43 | struct clock_event_device *evt = dev_id; | ||
44 | unsigned long ctrl; | ||
45 | |||
46 | ctrl = arch_timer_reg_read(ARCH_TIMER_REG_CTRL); | ||
47 | if (ctrl & ARCH_TIMER_CTRL_ISTATUS) { | ||
48 | ctrl |= ARCH_TIMER_CTRL_IMASK; | ||
49 | arch_timer_reg_write(ARCH_TIMER_REG_CTRL, ctrl); | ||
50 | evt->event_handler(evt); | ||
51 | return IRQ_HANDLED; | ||
52 | } | ||
53 | |||
54 | return IRQ_NONE; | ||
55 | } | ||
56 | |||
57 | static void arch_timer_stop(void) | ||
58 | { | ||
59 | unsigned long ctrl; | ||
60 | |||
61 | ctrl = arch_timer_reg_read(ARCH_TIMER_REG_CTRL); | ||
62 | ctrl &= ~ARCH_TIMER_CTRL_ENABLE; | ||
63 | arch_timer_reg_write(ARCH_TIMER_REG_CTRL, ctrl); | ||
64 | } | ||
65 | |||
66 | static void arch_timer_set_mode(enum clock_event_mode mode, | ||
67 | struct clock_event_device *clk) | ||
68 | { | ||
69 | switch (mode) { | ||
70 | case CLOCK_EVT_MODE_UNUSED: | ||
71 | case CLOCK_EVT_MODE_SHUTDOWN: | ||
72 | arch_timer_stop(); | ||
73 | break; | ||
74 | default: | ||
75 | break; | ||
76 | } | ||
77 | } | ||
78 | |||
79 | static int arch_timer_set_next_event(unsigned long evt, | ||
80 | struct clock_event_device *unused) | ||
81 | { | ||
82 | unsigned long ctrl; | ||
83 | |||
84 | ctrl = arch_timer_reg_read(ARCH_TIMER_REG_CTRL); | ||
85 | ctrl |= ARCH_TIMER_CTRL_ENABLE; | ||
86 | ctrl &= ~ARCH_TIMER_CTRL_IMASK; | ||
87 | |||
88 | arch_timer_reg_write(ARCH_TIMER_REG_TVAL, evt); | ||
89 | arch_timer_reg_write(ARCH_TIMER_REG_CTRL, ctrl); | ||
90 | |||
91 | return 0; | ||
92 | } | ||
93 | |||
94 | static void __cpuinit arch_timer_setup(struct clock_event_device *clk) | ||
95 | { | ||
96 | /* Let's make sure the timer is off before doing anything else */ | ||
97 | arch_timer_stop(); | ||
98 | |||
99 | clk->features = CLOCK_EVT_FEAT_ONESHOT | CLOCK_EVT_FEAT_C3STOP; | ||
100 | clk->name = "arch_sys_timer"; | ||
101 | clk->rating = 400; | ||
102 | clk->set_mode = arch_timer_set_mode; | ||
103 | clk->set_next_event = arch_timer_set_next_event; | ||
104 | clk->irq = arch_timer_ppi; | ||
105 | clk->cpumask = cpumask_of(smp_processor_id()); | ||
106 | |||
107 | clockevents_config_and_register(clk, arch_timer_rate, | ||
108 | 0xf, 0x7fffffff); | ||
109 | |||
110 | enable_percpu_irq(clk->irq, 0); | ||
111 | |||
112 | /* Ensure the virtual counter is visible to userspace for the vDSO. */ | ||
113 | arch_counter_enable_user_access(); | ||
114 | } | ||
115 | |||
116 | static void __init arch_timer_calibrate(void) | ||
117 | { | ||
118 | if (arch_timer_rate == 0) { | ||
119 | arch_timer_reg_write(ARCH_TIMER_REG_CTRL, 0); | ||
120 | arch_timer_rate = arch_timer_reg_read(ARCH_TIMER_REG_FREQ); | ||
121 | |||
122 | /* Check the timer frequency. */ | ||
123 | if (arch_timer_rate == 0) | ||
124 | panic("Architected timer frequency is set to zero.\n" | ||
125 | "You must set this in your .dts file\n"); | ||
126 | } | ||
127 | |||
128 | /* Cache the sched_clock multiplier to save a divide in the hot path. */ | ||
129 | |||
130 | sched_clock_mult = DIV_ROUND_CLOSEST(NSEC_PER_SEC, arch_timer_rate); | ||
131 | |||
132 | pr_info("Architected local timer running at %u.%02uMHz.\n", | ||
133 | arch_timer_rate / 1000000, (arch_timer_rate / 10000) % 100); | ||
134 | } | ||
135 | |||
136 | static cycle_t arch_counter_read(struct clocksource *cs) | ||
137 | { | ||
138 | return arch_counter_get_cntpct(); | ||
139 | } | ||
140 | |||
141 | static struct clocksource clocksource_counter = { | ||
142 | .name = "arch_sys_counter", | ||
143 | .rating = 400, | ||
144 | .read = arch_counter_read, | ||
145 | .mask = CLOCKSOURCE_MASK(56), | ||
146 | .flags = (CLOCK_SOURCE_IS_CONTINUOUS | CLOCK_SOURCE_VALID_FOR_HRES), | ||
147 | }; | ||
148 | |||
149 | int read_current_timer(unsigned long *timer_value) | ||
150 | { | ||
151 | *timer_value = arch_counter_get_cntpct(); | ||
152 | return 0; | ||
153 | } | ||
154 | |||
155 | unsigned long long notrace sched_clock(void) | ||
156 | { | ||
157 | return arch_counter_get_cntvct() * sched_clock_mult; | ||
158 | } | ||
159 | |||
160 | static int __cpuinit arch_timer_cpu_notify(struct notifier_block *self, | ||
161 | unsigned long action, void *hcpu) | ||
162 | { | ||
163 | int cpu = (long)hcpu; | ||
164 | struct clock_event_device *clk = per_cpu_ptr(&arch_timer_evt, cpu); | ||
165 | |||
166 | switch(action) { | ||
167 | case CPU_STARTING: | ||
168 | case CPU_STARTING_FROZEN: | ||
169 | arch_timer_setup(clk); | ||
170 | break; | ||
171 | |||
172 | case CPU_DYING: | ||
173 | case CPU_DYING_FROZEN: | ||
174 | pr_debug("arch_timer_teardown disable IRQ%d cpu #%d\n", | ||
175 | clk->irq, cpu); | ||
176 | disable_percpu_irq(clk->irq); | ||
177 | arch_timer_set_mode(CLOCK_EVT_MODE_UNUSED, clk); | ||
178 | break; | ||
179 | } | ||
180 | |||
181 | return NOTIFY_OK; | ||
182 | } | ||
183 | |||
184 | static struct notifier_block __cpuinitdata arch_timer_cpu_nb = { | ||
185 | .notifier_call = arch_timer_cpu_notify, | ||
186 | }; | ||
187 | |||
188 | static const struct of_device_id arch_timer_of_match[] __initconst = { | ||
189 | { .compatible = "arm,armv8-timer" }, | ||
190 | {}, | ||
191 | }; | ||
192 | |||
193 | int __init arm_generic_timer_init(void) | ||
194 | { | ||
195 | struct device_node *np; | ||
196 | int err; | ||
197 | u32 freq; | ||
198 | |||
199 | np = of_find_matching_node(NULL, arch_timer_of_match); | ||
200 | if (!np) { | ||
201 | pr_err("arch_timer: can't find DT node\n"); | ||
202 | return -ENODEV; | ||
203 | } | ||
204 | |||
205 | /* Try to determine the frequency from the device tree or CNTFRQ */ | ||
206 | if (!of_property_read_u32(np, "clock-frequency", &freq)) | ||
207 | arch_timer_rate = freq; | ||
208 | arch_timer_calibrate(); | ||
209 | |||
210 | arch_timer_ppi = irq_of_parse_and_map(np, 0); | ||
211 | pr_info("arch_timer: found %s irq %d\n", np->name, arch_timer_ppi); | ||
212 | |||
213 | err = request_percpu_irq(arch_timer_ppi, arch_timer_handle_irq, | ||
214 | np->name, &arch_timer_evt); | ||
215 | if (err) { | ||
216 | pr_err("arch_timer: can't register interrupt %d (%d)\n", | ||
217 | arch_timer_ppi, err); | ||
218 | return err; | ||
219 | } | ||
220 | |||
221 | clocksource_register_hz(&clocksource_counter, arch_timer_rate); | ||
222 | |||
223 | /* Calibrate the delay loop directly */ | ||
224 | lpj_fine = DIV_ROUND_CLOSEST(arch_timer_rate, HZ); | ||
225 | |||
226 | /* Immediately configure the timer on the boot CPU */ | ||
227 | arch_timer_setup(this_cpu_ptr(&arch_timer_evt)); | ||
228 | |||
229 | register_cpu_notifier(&arch_timer_cpu_nb); | ||
230 | |||
231 | return 0; | ||
232 | } | ||
diff --git a/include/clocksource/arm_generic.h b/include/clocksource/arm_generic.h deleted file mode 100644 index 5b41b0d27f0f..000000000000 --- a/include/clocksource/arm_generic.h +++ /dev/null | |||
@@ -1,21 +0,0 @@ | |||
1 | /* | ||
2 | * Copyright (C) 2012 ARM Ltd. | ||
3 | * | ||
4 | * This program is free software; you can redistribute it and/or modify | ||
5 | * it under the terms of the GNU General Public License version 2 as | ||
6 | * published by the Free Software Foundation. | ||
7 | * | ||
8 | * This program is distributed in the hope that it will be useful, | ||
9 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
10 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
11 | * GNU General Public License for more details. | ||
12 | * | ||
13 | * You should have received a copy of the GNU General Public License | ||
14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
15 | */ | ||
16 | #ifndef __CLKSOURCE_ARM_GENERIC_H | ||
17 | #define __CLKSOURCE_ARM_GENERIC_H | ||
18 | |||
19 | extern int arm_generic_timer_init(void); | ||
20 | |||
21 | #endif | ||