aboutsummaryrefslogtreecommitdiffstats
path: root/arch/um
diff options
context:
space:
mode:
Diffstat (limited to 'arch/um')
-rw-r--r--arch/um/Kconfig4
-rw-r--r--arch/um/defconfig3
-rw-r--r--arch/um/kernel/time.c101
-rw-r--r--arch/um/os-Linux/time.c4
4 files changed, 55 insertions, 57 deletions
diff --git a/arch/um/Kconfig b/arch/um/Kconfig
index 53597bbcd7b0..64fe8d5c067a 100644
--- a/arch/um/Kconfig
+++ b/arch/um/Kconfig
@@ -59,6 +59,10 @@ config GENERIC_TIME
59 bool 59 bool
60 default y 60 default y
61 61
62config GENERIC_CLOCKEVENTS
63 bool
64 default y
65
62# Used in kernel/irq/manage.c and include/linux/irq.h 66# Used in kernel/irq/manage.c and include/linux/irq.h
63config IRQ_RELEASE_METHOD 67config IRQ_RELEASE_METHOD
64 bool 68 bool
diff --git a/arch/um/defconfig b/arch/um/defconfig
index 658f65446c56..9f105c87fcc4 100644
--- a/arch/um/defconfig
+++ b/arch/um/defconfig
@@ -73,6 +73,9 @@ CONFIG_FLATMEM=y
73CONFIG_FLAT_NODE_MEM_MAP=y 73CONFIG_FLAT_NODE_MEM_MAP=y
74# CONFIG_SPARSEMEM_STATIC is not set 74# CONFIG_SPARSEMEM_STATIC is not set
75CONFIG_SPLIT_PTLOCK_CPUS=4 75CONFIG_SPLIT_PTLOCK_CPUS=4
76# CONFIG_TICK_ONESHOT is not set
77# CONFIG_NO_HZ is not set
78CONFIG_HIGH_RES_TIMERS=y
76CONFIG_LD_SCRIPT_DYN=y 79CONFIG_LD_SCRIPT_DYN=y
77CONFIG_NET=y 80CONFIG_NET=y
78CONFIG_BINFMT_ELF=y 81CONFIG_BINFMT_ELF=y
diff --git a/arch/um/kernel/time.c b/arch/um/kernel/time.c
index 7678bcf830ba..01678487b999 100644
--- a/arch/um/kernel/time.c
+++ b/arch/um/kernel/time.c
@@ -3,6 +3,7 @@
3 * Licensed under the GPL 3 * Licensed under the GPL
4 */ 4 */
5 5
6#include "linux/clockchips.h"
6#include "linux/interrupt.h" 7#include "linux/interrupt.h"
7#include "linux/jiffies.h" 8#include "linux/jiffies.h"
8#include "linux/threads.h" 9#include "linux/threads.h"
@@ -24,9 +25,10 @@ static unsigned long long prev_nsecs[NR_CPUS];
24static long long delta[NR_CPUS]; /* Deviation per interval */ 25static long long delta[NR_CPUS]; /* Deviation per interval */
25#endif 26#endif
26 27
27void timer_irq(struct uml_pt_regs *regs) 28void timer_handler(int sig, struct uml_pt_regs *regs)
28{ 29{
29 unsigned long long ticks = 0; 30 unsigned long long ticks = 0;
31 unsigned long flags;
30#ifdef CONFIG_UML_REAL_TIME_CLOCK 32#ifdef CONFIG_UML_REAL_TIME_CLOCK
31 int c = cpu(); 33 int c = cpu();
32 if (prev_nsecs[c]) { 34 if (prev_nsecs[c]) {
@@ -47,89 +49,82 @@ void timer_irq(struct uml_pt_regs *regs)
47#else 49#else
48 ticks = 1; 50 ticks = 1;
49#endif 51#endif
52
53 local_irq_save(flags);
50 while (ticks > 0) { 54 while (ticks > 0) {
51 do_IRQ(TIMER_IRQ, regs); 55 do_IRQ(TIMER_IRQ, regs);
52 ticks--; 56 ticks--;
53 } 57 }
58 local_irq_restore(flags);
54} 59}
55 60
56/* Protects local_offset */ 61static void itimer_set_mode(enum clock_event_mode mode,
57static DEFINE_SPINLOCK(timer_spinlock); 62 struct clock_event_device *evt)
58static unsigned long long local_offset = 0;
59
60static inline unsigned long long get_time(void)
61{ 63{
62 unsigned long long nsecs; 64 switch(mode) {
63 unsigned long flags; 65 case CLOCK_EVT_MODE_PERIODIC:
64 66 set_interval();
65 spin_lock_irqsave(&timer_spinlock, flags); 67 break;
66 nsecs = os_nsecs(); 68
67 nsecs += local_offset; 69 case CLOCK_EVT_MODE_SHUTDOWN:
68 spin_unlock_irqrestore(&timer_spinlock, flags); 70 case CLOCK_EVT_MODE_UNUSED:
69 71 disable_timer();
70 return nsecs; 72 break;
73 case CLOCK_EVT_MODE_ONESHOT:
74 BUG();
75 break;
76
77 case CLOCK_EVT_MODE_RESUME:
78 break;
79 }
71} 80}
72 81
73irqreturn_t um_timer(int irq, void *dev) 82static struct clock_event_device itimer_clockevent = {
83 .name = "itimer",
84 .rating = 250,
85 .cpumask = CPU_MASK_ALL,
86 .features = CLOCK_EVT_FEAT_PERIODIC,
87 .set_mode = itimer_set_mode,
88 .set_next_event = NULL,
89 .shift = 32,
90 .irq = 0,
91};
92
93static irqreturn_t um_timer(int irq, void *dev)
74{ 94{
75 unsigned long long nsecs; 95 (*itimer_clockevent.event_handler)(&itimer_clockevent);
76 unsigned long flags;
77
78 write_seqlock_irqsave(&xtime_lock, flags);
79
80 do_timer(1);
81
82#ifdef CONFIG_UML_REAL_TIME_CLOCK
83 nsecs = get_time();
84#else
85 nsecs = (unsigned long long) xtime.tv_sec * BILLION + xtime.tv_nsec +
86 BILLION / HZ;
87#endif
88 xtime.tv_sec = nsecs / NSEC_PER_SEC;
89 xtime.tv_nsec = nsecs - xtime.tv_sec * NSEC_PER_SEC;
90
91 write_sequnlock_irqrestore(&xtime_lock, flags);
92 96
93 return IRQ_HANDLED; 97 return IRQ_HANDLED;
94} 98}
95 99
96static void register_timer(void) 100static void __init setup_itimer(void)
97{ 101{
98 int err; 102 int err;
99 103
100 timer_init();
101
102 err = request_irq(TIMER_IRQ, um_timer, IRQF_DISABLED, "timer", NULL); 104 err = request_irq(TIMER_IRQ, um_timer, IRQF_DISABLED, "timer", NULL);
103 if (err != 0) 105 if (err != 0)
104 printk(KERN_ERR "register_timer : request_irq failed - " 106 printk(KERN_ERR "register_timer : request_irq failed - "
105 "errno = %d\n", -err); 107 "errno = %d\n", -err);
106 108
107 err = set_interval(); 109 itimer_clockevent.mult = div_sc(HZ, NSEC_PER_SEC, 32);
108 if (err != 0) 110 itimer_clockevent.max_delta_ns =
109 printk(KERN_ERR "register_timer : set_interval failed - " 111 clockevent_delta2ns(60 * HZ, &itimer_clockevent);
110 "errno = %d\n", -err); 112 itimer_clockevent.min_delta_ns =
113 clockevent_delta2ns(1, &itimer_clockevent);
114 clockevents_register_device(&itimer_clockevent);
111} 115}
112 116
113extern void (*late_time_init)(void); 117extern void (*late_time_init)(void);
114 118
115void time_init(void) 119void __init time_init(void)
116{ 120{
117 long long nsecs; 121 long long nsecs;
118 122
123 timer_init();
124
119 nsecs = os_nsecs(); 125 nsecs = os_nsecs();
120 set_normalized_timespec(&wall_to_monotonic, -nsecs / BILLION, 126 set_normalized_timespec(&wall_to_monotonic, -nsecs / BILLION,
121 -nsecs % BILLION); 127 -nsecs % BILLION);
122 set_normalized_timespec(&xtime, nsecs / BILLION, nsecs % BILLION); 128 set_normalized_timespec(&xtime, nsecs / BILLION, nsecs % BILLION);
123 late_time_init = register_timer; 129 late_time_init = setup_itimer;
124}
125
126void timer_handler(int sig, struct uml_pt_regs *regs)
127{
128 if (current_thread->cpu == 0)
129 timer_irq(regs);
130 local_irq_disable();
131 irq_enter();
132 update_process_times(regs->is_user);
133 irq_exit();
134 local_irq_enable();
135} 130}
diff --git a/arch/um/os-Linux/time.c b/arch/um/os-Linux/time.c
index b156f03e1713..6ff3d98281ba 100644
--- a/arch/um/os-Linux/time.c
+++ b/arch/um/os-Linux/time.c
@@ -34,10 +34,6 @@ void disable_timer(void)
34 (setitimer(ITIMER_REAL, &disable, NULL) < 0)) 34 (setitimer(ITIMER_REAL, &disable, NULL) < 0))
35 printk(UM_KERN_ERR "disable_timer - setitimer failed, " 35 printk(UM_KERN_ERR "disable_timer - setitimer failed, "
36 "errno = %d\n", errno); 36 "errno = %d\n", errno);
37
38 /* If there are signals already queued, after unblocking ignore them */
39 signal(SIGALRM, SIG_IGN);
40 signal(SIGVTALRM, SIG_IGN);
41} 37}
42 38
43int switch_timers(int to_real) 39int switch_timers(int to_real)