Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 2cf4e52e27dc719941cd3727205ca62b742f2746

Authored by Chen Gang
Committed by Greg Kroah-Hartman
1 parent 8a1861d997
Exists in smarc-l5.0.0_1.0.0-ga and in 5 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga

drivers/char: for hpet, add count checking, and ~0UL instead of -1 

use ~0UL for unsigned long variable initialization, instead of -1.

  add check for hdp->hd_nirqs within 32 (HPET_MAX_TIMERS).
    the type of irqp->interrupt_count is u8.
    the git diff not display the relative lines below.
      hdp->hd_irq[hdp->hd_nirqs] = irq;
      hdp->hd_nirqs++;
    please check source code to get more information.

Signed-off-by: Chen Gang <gang.chen@asianux.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Showing 1 changed file with 4 additions and 1 deletions Inline Diff

1 /* 1 /*
2 * Intel & MS High Precision Event Timer Implementation. 2 * Intel & MS High Precision Event Timer Implementation.
3 * 3 *
4 * Copyright (C) 2003 Intel Corporation 4 * Copyright (C) 2003 Intel Corporation
5 * Venki Pallipadi 5 * Venki Pallipadi
6 * (c) Copyright 2004 Hewlett-Packard Development Company, L.P. 6 * (c) Copyright 2004 Hewlett-Packard Development Company, L.P.
7 * Bob Picco <robert.picco@hp.com> 7 * Bob Picco <robert.picco@hp.com>
8 * 8 *
9 * This program is free software; you can redistribute it and/or modify 9 * This program is free software; you can redistribute it and/or modify
10 * it under the terms of the GNU General Public License version 2 as 10 * it under the terms of the GNU General Public License version 2 as
11 * published by the Free Software Foundation. 11 * published by the Free Software Foundation.
12 */ 12 */
13 13
14 #include <linux/interrupt.h> 14 #include <linux/interrupt.h>
15 #include <linux/module.h> 15 #include <linux/module.h>
16 #include <linux/kernel.h> 16 #include <linux/kernel.h>
17 #include <linux/types.h> 17 #include <linux/types.h>
18 #include <linux/miscdevice.h> 18 #include <linux/miscdevice.h>
19 #include <linux/major.h> 19 #include <linux/major.h>
20 #include <linux/ioport.h> 20 #include <linux/ioport.h>
21 #include <linux/fcntl.h> 21 #include <linux/fcntl.h>
22 #include <linux/init.h> 22 #include <linux/init.h>
23 #include <linux/poll.h> 23 #include <linux/poll.h>
24 #include <linux/mm.h> 24 #include <linux/mm.h>
25 #include <linux/proc_fs.h> 25 #include <linux/proc_fs.h>
26 #include <linux/spinlock.h> 26 #include <linux/spinlock.h>
27 #include <linux/sysctl.h> 27 #include <linux/sysctl.h>
28 #include <linux/wait.h> 28 #include <linux/wait.h>
29 #include <linux/bcd.h> 29 #include <linux/bcd.h>
30 #include <linux/seq_file.h> 30 #include <linux/seq_file.h>
31 #include <linux/bitops.h> 31 #include <linux/bitops.h>
32 #include <linux/compat.h> 32 #include <linux/compat.h>
33 #include <linux/clocksource.h> 33 #include <linux/clocksource.h>
34 #include <linux/uaccess.h> 34 #include <linux/uaccess.h>
35 #include <linux/slab.h> 35 #include <linux/slab.h>
36 #include <linux/io.h> 36 #include <linux/io.h>
37 37
38 #include <asm/current.h> 38 #include <asm/current.h>
39 #include <asm/irq.h> 39 #include <asm/irq.h>
40 #include <asm/div64.h> 40 #include <asm/div64.h>
41 41
42 #include <linux/acpi.h> 42 #include <linux/acpi.h>
43 #include <acpi/acpi_bus.h> 43 #include <acpi/acpi_bus.h>
44 #include <linux/hpet.h> 44 #include <linux/hpet.h>
45 45
46 /* 46 /*
47 * The High Precision Event Timer driver. 47 * The High Precision Event Timer driver.
48 * This driver is closely modelled after the rtc.c driver. 48 * This driver is closely modelled after the rtc.c driver.
49 * http://www.intel.com/hardwaredesign/hpetspec_1.pdf 49 * http://www.intel.com/hardwaredesign/hpetspec_1.pdf
50 */ 50 */
51 #define HPET_USER_FREQ (64) 51 #define HPET_USER_FREQ (64)
52 #define HPET_DRIFT (500) 52 #define HPET_DRIFT (500)
53 53
54 #define HPET_RANGE_SIZE 1024 /* from HPET spec */ 54 #define HPET_RANGE_SIZE 1024 /* from HPET spec */
55 55
56 56
57 /* WARNING -- don't get confused. These macros are never used 57 /* WARNING -- don't get confused. These macros are never used
58 * to write the (single) counter, and rarely to read it. 58 * to write the (single) counter, and rarely to read it.
59 * They're badly named; to fix, someday. 59 * They're badly named; to fix, someday.
60 */ 60 */
61 #if BITS_PER_LONG == 64 61 #if BITS_PER_LONG == 64
62 #define write_counter(V, MC) writeq(V, MC) 62 #define write_counter(V, MC) writeq(V, MC)
63 #define read_counter(MC) readq(MC) 63 #define read_counter(MC) readq(MC)
64 #else 64 #else
65 #define write_counter(V, MC) writel(V, MC) 65 #define write_counter(V, MC) writel(V, MC)
66 #define read_counter(MC) readl(MC) 66 #define read_counter(MC) readl(MC)
67 #endif 67 #endif
68 68
69 static DEFINE_MUTEX(hpet_mutex); /* replaces BKL */ 69 static DEFINE_MUTEX(hpet_mutex); /* replaces BKL */
70 static u32 hpet_nhpet, hpet_max_freq = HPET_USER_FREQ; 70 static u32 hpet_nhpet, hpet_max_freq = HPET_USER_FREQ;
71 71
72 /* This clocksource driver currently only works on ia64 */ 72 /* This clocksource driver currently only works on ia64 */
73 #ifdef CONFIG_IA64 73 #ifdef CONFIG_IA64
74 static void __iomem *hpet_mctr; 74 static void __iomem *hpet_mctr;
75 75
76 static cycle_t read_hpet(struct clocksource *cs) 76 static cycle_t read_hpet(struct clocksource *cs)
77 { 77 {
78 return (cycle_t)read_counter((void __iomem *)hpet_mctr); 78 return (cycle_t)read_counter((void __iomem *)hpet_mctr);
79 } 79 }
80 80
81 static struct clocksource clocksource_hpet = { 81 static struct clocksource clocksource_hpet = {
82 .name = "hpet", 82 .name = "hpet",
83 .rating = 250, 83 .rating = 250,
84 .read = read_hpet, 84 .read = read_hpet,
85 .mask = CLOCKSOURCE_MASK(64), 85 .mask = CLOCKSOURCE_MASK(64),
86 .flags = CLOCK_SOURCE_IS_CONTINUOUS, 86 .flags = CLOCK_SOURCE_IS_CONTINUOUS,
87 }; 87 };
88 static struct clocksource *hpet_clocksource; 88 static struct clocksource *hpet_clocksource;
89 #endif 89 #endif
90 90
91 /* A lock for concurrent access by app and isr hpet activity. */ 91 /* A lock for concurrent access by app and isr hpet activity. */
92 static DEFINE_SPINLOCK(hpet_lock); 92 static DEFINE_SPINLOCK(hpet_lock);
93 93
94 #define HPET_DEV_NAME (7) 94 #define HPET_DEV_NAME (7)
95 95
96 struct hpet_dev { 96 struct hpet_dev {
97 struct hpets *hd_hpets; 97 struct hpets *hd_hpets;
98 struct hpet __iomem *hd_hpet; 98 struct hpet __iomem *hd_hpet;
99 struct hpet_timer __iomem *hd_timer; 99 struct hpet_timer __iomem *hd_timer;
100 unsigned long hd_ireqfreq; 100 unsigned long hd_ireqfreq;
101 unsigned long hd_irqdata; 101 unsigned long hd_irqdata;
102 wait_queue_head_t hd_waitqueue; 102 wait_queue_head_t hd_waitqueue;
103 struct fasync_struct *hd_async_queue; 103 struct fasync_struct *hd_async_queue;
104 unsigned int hd_flags; 104 unsigned int hd_flags;
105 unsigned int hd_irq; 105 unsigned int hd_irq;
106 unsigned int hd_hdwirq; 106 unsigned int hd_hdwirq;
107 char hd_name[HPET_DEV_NAME]; 107 char hd_name[HPET_DEV_NAME];
108 }; 108 };
109 109
110 struct hpets { 110 struct hpets {
111 struct hpets *hp_next; 111 struct hpets *hp_next;
112 struct hpet __iomem *hp_hpet; 112 struct hpet __iomem *hp_hpet;
113 unsigned long hp_hpet_phys; 113 unsigned long hp_hpet_phys;
114 struct clocksource *hp_clocksource; 114 struct clocksource *hp_clocksource;
115 unsigned long long hp_tick_freq; 115 unsigned long long hp_tick_freq;
116 unsigned long hp_delta; 116 unsigned long hp_delta;
117 unsigned int hp_ntimer; 117 unsigned int hp_ntimer;
118 unsigned int hp_which; 118 unsigned int hp_which;
119 struct hpet_dev hp_dev[1]; 119 struct hpet_dev hp_dev[1];
120 }; 120 };
121 121
122 static struct hpets *hpets; 122 static struct hpets *hpets;
123 123
124 #define HPET_OPEN 0x0001 124 #define HPET_OPEN 0x0001
125 #define HPET_IE 0x0002 /* interrupt enabled */ 125 #define HPET_IE 0x0002 /* interrupt enabled */
126 #define HPET_PERIODIC 0x0004 126 #define HPET_PERIODIC 0x0004
127 #define HPET_SHARED_IRQ 0x0008 127 #define HPET_SHARED_IRQ 0x0008
128 128
129 129
130 #ifndef readq 130 #ifndef readq
131 static inline unsigned long long readq(void __iomem *addr) 131 static inline unsigned long long readq(void __iomem *addr)
132 { 132 {
133 return readl(addr) | (((unsigned long long)readl(addr + 4)) << 32LL); 133 return readl(addr) | (((unsigned long long)readl(addr + 4)) << 32LL);
134 } 134 }
135 #endif 135 #endif
136 136
137 #ifndef writeq 137 #ifndef writeq
138 static inline void writeq(unsigned long long v, void __iomem *addr) 138 static inline void writeq(unsigned long long v, void __iomem *addr)
139 { 139 {
140 writel(v & 0xffffffff, addr); 140 writel(v & 0xffffffff, addr);
141 writel(v >> 32, addr + 4); 141 writel(v >> 32, addr + 4);
142 } 142 }
143 #endif 143 #endif
144 144
145 static irqreturn_t hpet_interrupt(int irq, void *data) 145 static irqreturn_t hpet_interrupt(int irq, void *data)
146 { 146 {
147 struct hpet_dev *devp; 147 struct hpet_dev *devp;
148 unsigned long isr; 148 unsigned long isr;
149 149
150 devp = data; 150 devp = data;
151 isr = 1 << (devp - devp->hd_hpets->hp_dev); 151 isr = 1 << (devp - devp->hd_hpets->hp_dev);
152 152
153 if ((devp->hd_flags & HPET_SHARED_IRQ) && 153 if ((devp->hd_flags & HPET_SHARED_IRQ) &&
154 !(isr & readl(&devp->hd_hpet->hpet_isr))) 154 !(isr & readl(&devp->hd_hpet->hpet_isr)))
155 return IRQ_NONE; 155 return IRQ_NONE;
156 156
157 spin_lock(&hpet_lock); 157 spin_lock(&hpet_lock);
158 devp->hd_irqdata++; 158 devp->hd_irqdata++;
159 159
160 /* 160 /*
161 * For non-periodic timers, increment the accumulator. 161 * For non-periodic timers, increment the accumulator.
162 * This has the effect of treating non-periodic like periodic. 162 * This has the effect of treating non-periodic like periodic.
163 */ 163 */
164 if ((devp->hd_flags & (HPET_IE | HPET_PERIODIC)) == HPET_IE) { 164 if ((devp->hd_flags & (HPET_IE | HPET_PERIODIC)) == HPET_IE) {
165 unsigned long m, t, mc, base, k; 165 unsigned long m, t, mc, base, k;
166 struct hpet __iomem *hpet = devp->hd_hpet; 166 struct hpet __iomem *hpet = devp->hd_hpet;
167 struct hpets *hpetp = devp->hd_hpets; 167 struct hpets *hpetp = devp->hd_hpets;
168 168
169 t = devp->hd_ireqfreq; 169 t = devp->hd_ireqfreq;
170 m = read_counter(&devp->hd_timer->hpet_compare); 170 m = read_counter(&devp->hd_timer->hpet_compare);
171 mc = read_counter(&hpet->hpet_mc); 171 mc = read_counter(&hpet->hpet_mc);
172 /* The time for the next interrupt would logically be t + m, 172 /* The time for the next interrupt would logically be t + m,
173 * however, if we are very unlucky and the interrupt is delayed 173 * however, if we are very unlucky and the interrupt is delayed
174 * for longer than t then we will completely miss the next 174 * for longer than t then we will completely miss the next
175 * interrupt if we set t + m and an application will hang. 175 * interrupt if we set t + m and an application will hang.
176 * Therefore we need to make a more complex computation assuming 176 * Therefore we need to make a more complex computation assuming
177 * that there exists a k for which the following is true: 177 * that there exists a k for which the following is true:
178 * k * t + base < mc + delta 178 * k * t + base < mc + delta
179 * (k + 1) * t + base > mc + delta 179 * (k + 1) * t + base > mc + delta
180 * where t is the interval in hpet ticks for the given freq, 180 * where t is the interval in hpet ticks for the given freq,
181 * base is the theoretical start value 0 < base < t, 181 * base is the theoretical start value 0 < base < t,
182 * mc is the main counter value at the time of the interrupt, 182 * mc is the main counter value at the time of the interrupt,
183 * delta is the time it takes to write the a value to the 183 * delta is the time it takes to write the a value to the
184 * comparator. 184 * comparator.
185 * k may then be computed as (mc - base + delta) / t . 185 * k may then be computed as (mc - base + delta) / t .
186 */ 186 */
187 base = mc % t; 187 base = mc % t;
188 k = (mc - base + hpetp->hp_delta) / t; 188 k = (mc - base + hpetp->hp_delta) / t;
189 write_counter(t * (k + 1) + base, 189 write_counter(t * (k + 1) + base,
190 &devp->hd_timer->hpet_compare); 190 &devp->hd_timer->hpet_compare);
191 } 191 }
192 192
193 if (devp->hd_flags & HPET_SHARED_IRQ) 193 if (devp->hd_flags & HPET_SHARED_IRQ)
194 writel(isr, &devp->hd_hpet->hpet_isr); 194 writel(isr, &devp->hd_hpet->hpet_isr);
195 spin_unlock(&hpet_lock); 195 spin_unlock(&hpet_lock);
196 196
197 wake_up_interruptible(&devp->hd_waitqueue); 197 wake_up_interruptible(&devp->hd_waitqueue);
198 198
199 kill_fasync(&devp->hd_async_queue, SIGIO, POLL_IN); 199 kill_fasync(&devp->hd_async_queue, SIGIO, POLL_IN);
200 200
201 return IRQ_HANDLED; 201 return IRQ_HANDLED;
202 } 202 }
203 203
204 static void hpet_timer_set_irq(struct hpet_dev *devp) 204 static void hpet_timer_set_irq(struct hpet_dev *devp)
205 { 205 {
206 unsigned long v; 206 unsigned long v;
207 int irq, gsi; 207 int irq, gsi;
208 struct hpet_timer __iomem *timer; 208 struct hpet_timer __iomem *timer;
209 209
210 spin_lock_irq(&hpet_lock); 210 spin_lock_irq(&hpet_lock);
211 if (devp->hd_hdwirq) { 211 if (devp->hd_hdwirq) {
212 spin_unlock_irq(&hpet_lock); 212 spin_unlock_irq(&hpet_lock);
213 return; 213 return;
214 } 214 }
215 215
216 timer = devp->hd_timer; 216 timer = devp->hd_timer;
217 217
218 /* we prefer level triggered mode */ 218 /* we prefer level triggered mode */
219 v = readl(&timer->hpet_config); 219 v = readl(&timer->hpet_config);
220 if (!(v & Tn_INT_TYPE_CNF_MASK)) { 220 if (!(v & Tn_INT_TYPE_CNF_MASK)) {
221 v |= Tn_INT_TYPE_CNF_MASK; 221 v |= Tn_INT_TYPE_CNF_MASK;
222 writel(v, &timer->hpet_config); 222 writel(v, &timer->hpet_config);
223 } 223 }
224 spin_unlock_irq(&hpet_lock); 224 spin_unlock_irq(&hpet_lock);
225 225
226 v = (readq(&timer->hpet_config) & Tn_INT_ROUTE_CAP_MASK) >> 226 v = (readq(&timer->hpet_config) & Tn_INT_ROUTE_CAP_MASK) >>
227 Tn_INT_ROUTE_CAP_SHIFT; 227 Tn_INT_ROUTE_CAP_SHIFT;
228 228
229 /* 229 /*
230 * In PIC mode, skip IRQ0-4, IRQ6-9, IRQ12-15 which is always used by 230 * In PIC mode, skip IRQ0-4, IRQ6-9, IRQ12-15 which is always used by
231 * legacy device. In IO APIC mode, we skip all the legacy IRQS. 231 * legacy device. In IO APIC mode, we skip all the legacy IRQS.
232 */ 232 */
233 if (acpi_irq_model == ACPI_IRQ_MODEL_PIC) 233 if (acpi_irq_model == ACPI_IRQ_MODEL_PIC)
234 v &= ~0xf3df; 234 v &= ~0xf3df;
235 else 235 else
236 v &= ~0xffff; 236 v &= ~0xffff;
237 237
238 for_each_set_bit(irq, &v, HPET_MAX_IRQ) { 238 for_each_set_bit(irq, &v, HPET_MAX_IRQ) {
239 if (irq >= nr_irqs) { 239 if (irq >= nr_irqs) {
240 irq = HPET_MAX_IRQ; 240 irq = HPET_MAX_IRQ;
241 break; 241 break;
242 } 242 }
243 243
244 gsi = acpi_register_gsi(NULL, irq, ACPI_LEVEL_SENSITIVE, 244 gsi = acpi_register_gsi(NULL, irq, ACPI_LEVEL_SENSITIVE,
245 ACPI_ACTIVE_LOW); 245 ACPI_ACTIVE_LOW);
246 if (gsi > 0) 246 if (gsi > 0)
247 break; 247 break;
248 248
249 /* FIXME: Setup interrupt source table */ 249 /* FIXME: Setup interrupt source table */
250 } 250 }
251 251
252 if (irq < HPET_MAX_IRQ) { 252 if (irq < HPET_MAX_IRQ) {
253 spin_lock_irq(&hpet_lock); 253 spin_lock_irq(&hpet_lock);
254 v = readl(&timer->hpet_config); 254 v = readl(&timer->hpet_config);
255 v |= irq << Tn_INT_ROUTE_CNF_SHIFT; 255 v |= irq << Tn_INT_ROUTE_CNF_SHIFT;
256 writel(v, &timer->hpet_config); 256 writel(v, &timer->hpet_config);
257 devp->hd_hdwirq = gsi; 257 devp->hd_hdwirq = gsi;
258 spin_unlock_irq(&hpet_lock); 258 spin_unlock_irq(&hpet_lock);
259 } 259 }
260 return; 260 return;
261 } 261 }
262 262
263 static int hpet_open(struct inode *inode, struct file *file) 263 static int hpet_open(struct inode *inode, struct file *file)
264 { 264 {
265 struct hpet_dev *devp; 265 struct hpet_dev *devp;
266 struct hpets *hpetp; 266 struct hpets *hpetp;
267 int i; 267 int i;
268 268
269 if (file->f_mode & FMODE_WRITE) 269 if (file->f_mode & FMODE_WRITE)
270 return -EINVAL; 270 return -EINVAL;
271 271
272 mutex_lock(&hpet_mutex); 272 mutex_lock(&hpet_mutex);
273 spin_lock_irq(&hpet_lock); 273 spin_lock_irq(&hpet_lock);
274 274
275 for (devp = NULL, hpetp = hpets; hpetp && !devp; hpetp = hpetp->hp_next) 275 for (devp = NULL, hpetp = hpets; hpetp && !devp; hpetp = hpetp->hp_next)
276 for (i = 0; i < hpetp->hp_ntimer; i++) 276 for (i = 0; i < hpetp->hp_ntimer; i++)
277 if (hpetp->hp_dev[i].hd_flags & HPET_OPEN) 277 if (hpetp->hp_dev[i].hd_flags & HPET_OPEN)
278 continue; 278 continue;
279 else { 279 else {
280 devp = &hpetp->hp_dev[i]; 280 devp = &hpetp->hp_dev[i];
281 break; 281 break;
282 } 282 }
283 283
284 if (!devp) { 284 if (!devp) {
285 spin_unlock_irq(&hpet_lock); 285 spin_unlock_irq(&hpet_lock);
286 mutex_unlock(&hpet_mutex); 286 mutex_unlock(&hpet_mutex);
287 return -EBUSY; 287 return -EBUSY;
288 } 288 }
289 289
290 file->private_data = devp; 290 file->private_data = devp;
291 devp->hd_irqdata = 0; 291 devp->hd_irqdata = 0;
292 devp->hd_flags |= HPET_OPEN; 292 devp->hd_flags |= HPET_OPEN;
293 spin_unlock_irq(&hpet_lock); 293 spin_unlock_irq(&hpet_lock);
294 mutex_unlock(&hpet_mutex); 294 mutex_unlock(&hpet_mutex);
295 295
296 hpet_timer_set_irq(devp); 296 hpet_timer_set_irq(devp);
297 297
298 return 0; 298 return 0;
299 } 299 }
300 300
301 static ssize_t 301 static ssize_t
302 hpet_read(struct file *file, char __user *buf, size_t count, loff_t * ppos) 302 hpet_read(struct file *file, char __user *buf, size_t count, loff_t * ppos)
303 { 303 {
304 DECLARE_WAITQUEUE(wait, current); 304 DECLARE_WAITQUEUE(wait, current);
305 unsigned long data; 305 unsigned long data;
306 ssize_t retval; 306 ssize_t retval;
307 struct hpet_dev *devp; 307 struct hpet_dev *devp;
308 308
309 devp = file->private_data; 309 devp = file->private_data;
310 if (!devp->hd_ireqfreq) 310 if (!devp->hd_ireqfreq)
311 return -EIO; 311 return -EIO;
312 312
313 if (count < sizeof(unsigned long)) 313 if (count < sizeof(unsigned long))
314 return -EINVAL; 314 return -EINVAL;
315 315
316 add_wait_queue(&devp->hd_waitqueue, &wait); 316 add_wait_queue(&devp->hd_waitqueue, &wait);
317 317
318 for ( ; ; ) { 318 for ( ; ; ) {
319 set_current_state(TASK_INTERRUPTIBLE); 319 set_current_state(TASK_INTERRUPTIBLE);
320 320
321 spin_lock_irq(&hpet_lock); 321 spin_lock_irq(&hpet_lock);
322 data = devp->hd_irqdata; 322 data = devp->hd_irqdata;
323 devp->hd_irqdata = 0; 323 devp->hd_irqdata = 0;
324 spin_unlock_irq(&hpet_lock); 324 spin_unlock_irq(&hpet_lock);
325 325
326 if (data) 326 if (data)
327 break; 327 break;
328 else if (file->f_flags & O_NONBLOCK) { 328 else if (file->f_flags & O_NONBLOCK) {
329 retval = -EAGAIN; 329 retval = -EAGAIN;
330 goto out; 330 goto out;
331 } else if (signal_pending(current)) { 331 } else if (signal_pending(current)) {
332 retval = -ERESTARTSYS; 332 retval = -ERESTARTSYS;
333 goto out; 333 goto out;
334 } 334 }
335 schedule(); 335 schedule();
336 } 336 }
337 337
338 retval = put_user(data, (unsigned long __user *)buf); 338 retval = put_user(data, (unsigned long __user *)buf);
339 if (!retval) 339 if (!retval)
340 retval = sizeof(unsigned long); 340 retval = sizeof(unsigned long);
341 out: 341 out:
342 __set_current_state(TASK_RUNNING); 342 __set_current_state(TASK_RUNNING);
343 remove_wait_queue(&devp->hd_waitqueue, &wait); 343 remove_wait_queue(&devp->hd_waitqueue, &wait);
344 344
345 return retval; 345 return retval;
346 } 346 }
347 347
348 static unsigned int hpet_poll(struct file *file, poll_table * wait) 348 static unsigned int hpet_poll(struct file *file, poll_table * wait)
349 { 349 {
350 unsigned long v; 350 unsigned long v;
351 struct hpet_dev *devp; 351 struct hpet_dev *devp;
352 352
353 devp = file->private_data; 353 devp = file->private_data;
354 354
355 if (!devp->hd_ireqfreq) 355 if (!devp->hd_ireqfreq)
356 return 0; 356 return 0;
357 357
358 poll_wait(file, &devp->hd_waitqueue, wait); 358 poll_wait(file, &devp->hd_waitqueue, wait);
359 359
360 spin_lock_irq(&hpet_lock); 360 spin_lock_irq(&hpet_lock);
361 v = devp->hd_irqdata; 361 v = devp->hd_irqdata;
362 spin_unlock_irq(&hpet_lock); 362 spin_unlock_irq(&hpet_lock);
363 363
364 if (v != 0) 364 if (v != 0)
365 return POLLIN | POLLRDNORM; 365 return POLLIN | POLLRDNORM;
366 366
367 return 0; 367 return 0;
368 } 368 }
369 369
370 static int hpet_mmap(struct file *file, struct vm_area_struct *vma) 370 static int hpet_mmap(struct file *file, struct vm_area_struct *vma)
371 { 371 {
372 #ifdef CONFIG_HPET_MMAP 372 #ifdef CONFIG_HPET_MMAP
373 struct hpet_dev *devp; 373 struct hpet_dev *devp;
374 unsigned long addr; 374 unsigned long addr;
375 375
376 if (((vma->vm_end - vma->vm_start) != PAGE_SIZE) || vma->vm_pgoff) 376 if (((vma->vm_end - vma->vm_start) != PAGE_SIZE) || vma->vm_pgoff)
377 return -EINVAL; 377 return -EINVAL;
378 378
379 devp = file->private_data; 379 devp = file->private_data;
380 addr = devp->hd_hpets->hp_hpet_phys; 380 addr = devp->hd_hpets->hp_hpet_phys;
381 381
382 if (addr & (PAGE_SIZE - 1)) 382 if (addr & (PAGE_SIZE - 1))
383 return -ENOSYS; 383 return -ENOSYS;
384 384
385 vma->vm_flags |= VM_IO; 385 vma->vm_flags |= VM_IO;
386 vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot); 386 vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot);
387 387
388 if (io_remap_pfn_range(vma, vma->vm_start, addr >> PAGE_SHIFT, 388 if (io_remap_pfn_range(vma, vma->vm_start, addr >> PAGE_SHIFT,
389 PAGE_SIZE, vma->vm_page_prot)) { 389 PAGE_SIZE, vma->vm_page_prot)) {
390 printk(KERN_ERR "%s: io_remap_pfn_range failed\n", 390 printk(KERN_ERR "%s: io_remap_pfn_range failed\n",
391 __func__); 391 __func__);
392 return -EAGAIN; 392 return -EAGAIN;
393 } 393 }
394 394
395 return 0; 395 return 0;
396 #else 396 #else
397 return -ENOSYS; 397 return -ENOSYS;
398 #endif 398 #endif
399 } 399 }
400 400
401 static int hpet_fasync(int fd, struct file *file, int on) 401 static int hpet_fasync(int fd, struct file *file, int on)
402 { 402 {
403 struct hpet_dev *devp; 403 struct hpet_dev *devp;
404 404
405 devp = file->private_data; 405 devp = file->private_data;
406 406
407 if (fasync_helper(fd, file, on, &devp->hd_async_queue) >= 0) 407 if (fasync_helper(fd, file, on, &devp->hd_async_queue) >= 0)
408 return 0; 408 return 0;
409 else 409 else
410 return -EIO; 410 return -EIO;
411 } 411 }
412 412
413 static int hpet_release(struct inode *inode, struct file *file) 413 static int hpet_release(struct inode *inode, struct file *file)
414 { 414 {
415 struct hpet_dev *devp; 415 struct hpet_dev *devp;
416 struct hpet_timer __iomem *timer; 416 struct hpet_timer __iomem *timer;
417 int irq = 0; 417 int irq = 0;
418 418
419 devp = file->private_data; 419 devp = file->private_data;
420 timer = devp->hd_timer; 420 timer = devp->hd_timer;
421 421
422 spin_lock_irq(&hpet_lock); 422 spin_lock_irq(&hpet_lock);
423 423
424 writeq((readq(&timer->hpet_config) & ~Tn_INT_ENB_CNF_MASK), 424 writeq((readq(&timer->hpet_config) & ~Tn_INT_ENB_CNF_MASK),
425 &timer->hpet_config); 425 &timer->hpet_config);
426 426
427 irq = devp->hd_irq; 427 irq = devp->hd_irq;
428 devp->hd_irq = 0; 428 devp->hd_irq = 0;
429 429
430 devp->hd_ireqfreq = 0; 430 devp->hd_ireqfreq = 0;
431 431
432 if (devp->hd_flags & HPET_PERIODIC 432 if (devp->hd_flags & HPET_PERIODIC
433 && readq(&timer->hpet_config) & Tn_TYPE_CNF_MASK) { 433 && readq(&timer->hpet_config) & Tn_TYPE_CNF_MASK) {
434 unsigned long v; 434 unsigned long v;
435 435
436 v = readq(&timer->hpet_config); 436 v = readq(&timer->hpet_config);
437 v ^= Tn_TYPE_CNF_MASK; 437 v ^= Tn_TYPE_CNF_MASK;
438 writeq(v, &timer->hpet_config); 438 writeq(v, &timer->hpet_config);
439 } 439 }
440 440
441 devp->hd_flags &= ~(HPET_OPEN | HPET_IE | HPET_PERIODIC); 441 devp->hd_flags &= ~(HPET_OPEN | HPET_IE | HPET_PERIODIC);
442 spin_unlock_irq(&hpet_lock); 442 spin_unlock_irq(&hpet_lock);
443 443
444 if (irq) 444 if (irq)
445 free_irq(irq, devp); 445 free_irq(irq, devp);
446 446
447 file->private_data = NULL; 447 file->private_data = NULL;
448 return 0; 448 return 0;
449 } 449 }
450 450
451 static int hpet_ioctl_ieon(struct hpet_dev *devp) 451 static int hpet_ioctl_ieon(struct hpet_dev *devp)
452 { 452 {
453 struct hpet_timer __iomem *timer; 453 struct hpet_timer __iomem *timer;
454 struct hpet __iomem *hpet; 454 struct hpet __iomem *hpet;
455 struct hpets *hpetp; 455 struct hpets *hpetp;
456 int irq; 456 int irq;
457 unsigned long g, v, t, m; 457 unsigned long g, v, t, m;
458 unsigned long flags, isr; 458 unsigned long flags, isr;
459 459
460 timer = devp->hd_timer; 460 timer = devp->hd_timer;
461 hpet = devp->hd_hpet; 461 hpet = devp->hd_hpet;
462 hpetp = devp->hd_hpets; 462 hpetp = devp->hd_hpets;
463 463
464 if (!devp->hd_ireqfreq) 464 if (!devp->hd_ireqfreq)
465 return -EIO; 465 return -EIO;
466 466
467 spin_lock_irq(&hpet_lock); 467 spin_lock_irq(&hpet_lock);
468 468
469 if (devp->hd_flags & HPET_IE) { 469 if (devp->hd_flags & HPET_IE) {
470 spin_unlock_irq(&hpet_lock); 470 spin_unlock_irq(&hpet_lock);
471 return -EBUSY; 471 return -EBUSY;
472 } 472 }
473 473
474 devp->hd_flags |= HPET_IE; 474 devp->hd_flags |= HPET_IE;
475 475
476 if (readl(&timer->hpet_config) & Tn_INT_TYPE_CNF_MASK) 476 if (readl(&timer->hpet_config) & Tn_INT_TYPE_CNF_MASK)
477 devp->hd_flags |= HPET_SHARED_IRQ; 477 devp->hd_flags |= HPET_SHARED_IRQ;
478 spin_unlock_irq(&hpet_lock); 478 spin_unlock_irq(&hpet_lock);
479 479
480 irq = devp->hd_hdwirq; 480 irq = devp->hd_hdwirq;
481 481
482 if (irq) { 482 if (irq) {
483 unsigned long irq_flags; 483 unsigned long irq_flags;
484 484
485 if (devp->hd_flags & HPET_SHARED_IRQ) { 485 if (devp->hd_flags & HPET_SHARED_IRQ) {
486 /* 486 /*
487 * To prevent the interrupt handler from seeing an 487 * To prevent the interrupt handler from seeing an
488 * unwanted interrupt status bit, program the timer 488 * unwanted interrupt status bit, program the timer
489 * so that it will not fire in the near future ... 489 * so that it will not fire in the near future ...
490 */ 490 */
491 writel(readl(&timer->hpet_config) & ~Tn_TYPE_CNF_MASK, 491 writel(readl(&timer->hpet_config) & ~Tn_TYPE_CNF_MASK,
492 &timer->hpet_config); 492 &timer->hpet_config);
493 write_counter(read_counter(&hpet->hpet_mc), 493 write_counter(read_counter(&hpet->hpet_mc),
494 &timer->hpet_compare); 494 &timer->hpet_compare);
495 /* ... and clear any left-over status. */ 495 /* ... and clear any left-over status. */
496 isr = 1 << (devp - devp->hd_hpets->hp_dev); 496 isr = 1 << (devp - devp->hd_hpets->hp_dev);
497 writel(isr, &hpet->hpet_isr); 497 writel(isr, &hpet->hpet_isr);
498 } 498 }
499 499
500 sprintf(devp->hd_name, "hpet%d", (int)(devp - hpetp->hp_dev)); 500 sprintf(devp->hd_name, "hpet%d", (int)(devp - hpetp->hp_dev));
501 irq_flags = devp->hd_flags & HPET_SHARED_IRQ 501 irq_flags = devp->hd_flags & HPET_SHARED_IRQ
502 ? IRQF_SHARED : IRQF_DISABLED; 502 ? IRQF_SHARED : IRQF_DISABLED;
503 if (request_irq(irq, hpet_interrupt, irq_flags, 503 if (request_irq(irq, hpet_interrupt, irq_flags,
504 devp->hd_name, (void *)devp)) { 504 devp->hd_name, (void *)devp)) {
505 printk(KERN_ERR "hpet: IRQ %d is not free\n", irq); 505 printk(KERN_ERR "hpet: IRQ %d is not free\n", irq);
506 irq = 0; 506 irq = 0;
507 } 507 }
508 } 508 }
509 509
510 if (irq == 0) { 510 if (irq == 0) {
511 spin_lock_irq(&hpet_lock); 511 spin_lock_irq(&hpet_lock);
512 devp->hd_flags ^= HPET_IE; 512 devp->hd_flags ^= HPET_IE;
513 spin_unlock_irq(&hpet_lock); 513 spin_unlock_irq(&hpet_lock);
514 return -EIO; 514 return -EIO;
515 } 515 }
516 516
517 devp->hd_irq = irq; 517 devp->hd_irq = irq;
518 t = devp->hd_ireqfreq; 518 t = devp->hd_ireqfreq;
519 v = readq(&timer->hpet_config); 519 v = readq(&timer->hpet_config);
520 520
521 /* 64-bit comparators are not yet supported through the ioctls, 521 /* 64-bit comparators are not yet supported through the ioctls,
522 * so force this into 32-bit mode if it supports both modes 522 * so force this into 32-bit mode if it supports both modes
523 */ 523 */
524 g = v | Tn_32MODE_CNF_MASK | Tn_INT_ENB_CNF_MASK; 524 g = v | Tn_32MODE_CNF_MASK | Tn_INT_ENB_CNF_MASK;
525 525
526 if (devp->hd_flags & HPET_PERIODIC) { 526 if (devp->hd_flags & HPET_PERIODIC) {
527 g |= Tn_TYPE_CNF_MASK; 527 g |= Tn_TYPE_CNF_MASK;
528 v |= Tn_TYPE_CNF_MASK | Tn_VAL_SET_CNF_MASK; 528 v |= Tn_TYPE_CNF_MASK | Tn_VAL_SET_CNF_MASK;
529 writeq(v, &timer->hpet_config); 529 writeq(v, &timer->hpet_config);
530 local_irq_save(flags); 530 local_irq_save(flags);
531 531
532 /* 532 /*
533 * NOTE: First we modify the hidden accumulator 533 * NOTE: First we modify the hidden accumulator
534 * register supported by periodic-capable comparators. 534 * register supported by periodic-capable comparators.
535 * We never want to modify the (single) counter; that 535 * We never want to modify the (single) counter; that
536 * would affect all the comparators. The value written 536 * would affect all the comparators. The value written
537 * is the counter value when the first interrupt is due. 537 * is the counter value when the first interrupt is due.
538 */ 538 */
539 m = read_counter(&hpet->hpet_mc); 539 m = read_counter(&hpet->hpet_mc);
540 write_counter(t + m + hpetp->hp_delta, &timer->hpet_compare); 540 write_counter(t + m + hpetp->hp_delta, &timer->hpet_compare);
541 /* 541 /*
542 * Then we modify the comparator, indicating the period 542 * Then we modify the comparator, indicating the period
543 * for subsequent interrupt. 543 * for subsequent interrupt.
544 */ 544 */
545 write_counter(t, &timer->hpet_compare); 545 write_counter(t, &timer->hpet_compare);
546 } else { 546 } else {
547 local_irq_save(flags); 547 local_irq_save(flags);
548 m = read_counter(&hpet->hpet_mc); 548 m = read_counter(&hpet->hpet_mc);
549 write_counter(t + m + hpetp->hp_delta, &timer->hpet_compare); 549 write_counter(t + m + hpetp->hp_delta, &timer->hpet_compare);
550 } 550 }
551 551
552 if (devp->hd_flags & HPET_SHARED_IRQ) { 552 if (devp->hd_flags & HPET_SHARED_IRQ) {
553 isr = 1 << (devp - devp->hd_hpets->hp_dev); 553 isr = 1 << (devp - devp->hd_hpets->hp_dev);
554 writel(isr, &hpet->hpet_isr); 554 writel(isr, &hpet->hpet_isr);
555 } 555 }
556 writeq(g, &timer->hpet_config); 556 writeq(g, &timer->hpet_config);
557 local_irq_restore(flags); 557 local_irq_restore(flags);
558 558
559 return 0; 559 return 0;
560 } 560 }
561 561
562 /* converts Hz to number of timer ticks */ 562 /* converts Hz to number of timer ticks */
563 static inline unsigned long hpet_time_div(struct hpets *hpets, 563 static inline unsigned long hpet_time_div(struct hpets *hpets,
564 unsigned long dis) 564 unsigned long dis)
565 { 565 {
566 unsigned long long m; 566 unsigned long long m;
567 567
568 m = hpets->hp_tick_freq + (dis >> 1); 568 m = hpets->hp_tick_freq + (dis >> 1);
569 do_div(m, dis); 569 do_div(m, dis);
570 return (unsigned long)m; 570 return (unsigned long)m;
571 } 571 }
572 572
573 static int 573 static int
574 hpet_ioctl_common(struct hpet_dev *devp, int cmd, unsigned long arg, 574 hpet_ioctl_common(struct hpet_dev *devp, int cmd, unsigned long arg,
575 struct hpet_info *info) 575 struct hpet_info *info)
576 { 576 {
577 struct hpet_timer __iomem *timer; 577 struct hpet_timer __iomem *timer;
578 struct hpet __iomem *hpet; 578 struct hpet __iomem *hpet;
579 struct hpets *hpetp; 579 struct hpets *hpetp;
580 int err; 580 int err;
581 unsigned long v; 581 unsigned long v;
582 582
583 switch (cmd) { 583 switch (cmd) {
584 case HPET_IE_OFF: 584 case HPET_IE_OFF:
585 case HPET_INFO: 585 case HPET_INFO:
586 case HPET_EPI: 586 case HPET_EPI:
587 case HPET_DPI: 587 case HPET_DPI:
588 case HPET_IRQFREQ: 588 case HPET_IRQFREQ:
589 timer = devp->hd_timer; 589 timer = devp->hd_timer;
590 hpet = devp->hd_hpet; 590 hpet = devp->hd_hpet;
591 hpetp = devp->hd_hpets; 591 hpetp = devp->hd_hpets;
592 break; 592 break;
593 case HPET_IE_ON: 593 case HPET_IE_ON:
594 return hpet_ioctl_ieon(devp); 594 return hpet_ioctl_ieon(devp);
595 default: 595 default:
596 return -EINVAL; 596 return -EINVAL;
597 } 597 }
598 598
599 err = 0; 599 err = 0;
600 600
601 switch (cmd) { 601 switch (cmd) {
602 case HPET_IE_OFF: 602 case HPET_IE_OFF:
603 if ((devp->hd_flags & HPET_IE) == 0) 603 if ((devp->hd_flags & HPET_IE) == 0)
604 break; 604 break;
605 v = readq(&timer->hpet_config); 605 v = readq(&timer->hpet_config);
606 v &= ~Tn_INT_ENB_CNF_MASK; 606 v &= ~Tn_INT_ENB_CNF_MASK;
607 writeq(v, &timer->hpet_config); 607 writeq(v, &timer->hpet_config);
608 if (devp->hd_irq) { 608 if (devp->hd_irq) {
609 free_irq(devp->hd_irq, devp); 609 free_irq(devp->hd_irq, devp);
610 devp->hd_irq = 0; 610 devp->hd_irq = 0;
611 } 611 }
612 devp->hd_flags ^= HPET_IE; 612 devp->hd_flags ^= HPET_IE;
613 break; 613 break;
614 case HPET_INFO: 614 case HPET_INFO:
615 { 615 {
616 memset(info, 0, sizeof(*info)); 616 memset(info, 0, sizeof(*info));
617 if (devp->hd_ireqfreq) 617 if (devp->hd_ireqfreq)
618 info->hi_ireqfreq = 618 info->hi_ireqfreq =
619 hpet_time_div(hpetp, devp->hd_ireqfreq); 619 hpet_time_div(hpetp, devp->hd_ireqfreq);
620 info->hi_flags = 620 info->hi_flags =
621 readq(&timer->hpet_config) & Tn_PER_INT_CAP_MASK; 621 readq(&timer->hpet_config) & Tn_PER_INT_CAP_MASK;
622 info->hi_hpet = hpetp->hp_which; 622 info->hi_hpet = hpetp->hp_which;
623 info->hi_timer = devp - hpetp->hp_dev; 623 info->hi_timer = devp - hpetp->hp_dev;
624 break; 624 break;
625 } 625 }
626 case HPET_EPI: 626 case HPET_EPI:
627 v = readq(&timer->hpet_config); 627 v = readq(&timer->hpet_config);
628 if ((v & Tn_PER_INT_CAP_MASK) == 0) { 628 if ((v & Tn_PER_INT_CAP_MASK) == 0) {
629 err = -ENXIO; 629 err = -ENXIO;
630 break; 630 break;
631 } 631 }
632 devp->hd_flags |= HPET_PERIODIC; 632 devp->hd_flags |= HPET_PERIODIC;
633 break; 633 break;
634 case HPET_DPI: 634 case HPET_DPI:
635 v = readq(&timer->hpet_config); 635 v = readq(&timer->hpet_config);
636 if ((v & Tn_PER_INT_CAP_MASK) == 0) { 636 if ((v & Tn_PER_INT_CAP_MASK) == 0) {
637 err = -ENXIO; 637 err = -ENXIO;
638 break; 638 break;
639 } 639 }
640 if (devp->hd_flags & HPET_PERIODIC && 640 if (devp->hd_flags & HPET_PERIODIC &&
641 readq(&timer->hpet_config) & Tn_TYPE_CNF_MASK) { 641 readq(&timer->hpet_config) & Tn_TYPE_CNF_MASK) {
642 v = readq(&timer->hpet_config); 642 v = readq(&timer->hpet_config);
643 v ^= Tn_TYPE_CNF_MASK; 643 v ^= Tn_TYPE_CNF_MASK;
644 writeq(v, &timer->hpet_config); 644 writeq(v, &timer->hpet_config);
645 } 645 }
646 devp->hd_flags &= ~HPET_PERIODIC; 646 devp->hd_flags &= ~HPET_PERIODIC;
647 break; 647 break;
648 case HPET_IRQFREQ: 648 case HPET_IRQFREQ:
649 if ((arg > hpet_max_freq) && 649 if ((arg > hpet_max_freq) &&
650 !capable(CAP_SYS_RESOURCE)) { 650 !capable(CAP_SYS_RESOURCE)) {
651 err = -EACCES; 651 err = -EACCES;
652 break; 652 break;
653 } 653 }
654 654
655 if (!arg) { 655 if (!arg) {
656 err = -EINVAL; 656 err = -EINVAL;
657 break; 657 break;
658 } 658 }
659 659
660 devp->hd_ireqfreq = hpet_time_div(hpetp, arg); 660 devp->hd_ireqfreq = hpet_time_div(hpetp, arg);
661 } 661 }
662 662
663 return err; 663 return err;
664 } 664 }
665 665
666 static long 666 static long
667 hpet_ioctl(struct file *file, unsigned int cmd, unsigned long arg) 667 hpet_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
668 { 668 {
669 struct hpet_info info; 669 struct hpet_info info;
670 int err; 670 int err;
671 671
672 mutex_lock(&hpet_mutex); 672 mutex_lock(&hpet_mutex);
673 err = hpet_ioctl_common(file->private_data, cmd, arg, &info); 673 err = hpet_ioctl_common(file->private_data, cmd, arg, &info);
674 mutex_unlock(&hpet_mutex); 674 mutex_unlock(&hpet_mutex);
675 675
676 if ((cmd == HPET_INFO) && !err && 676 if ((cmd == HPET_INFO) && !err &&
677 (copy_to_user((void __user *)arg, &info, sizeof(info)))) 677 (copy_to_user((void __user *)arg, &info, sizeof(info))))
678 err = -EFAULT; 678 err = -EFAULT;
679 679
680 return err; 680 return err;
681 } 681 }
682 682
683 #ifdef CONFIG_COMPAT 683 #ifdef CONFIG_COMPAT
684 struct compat_hpet_info { 684 struct compat_hpet_info {
685 compat_ulong_t hi_ireqfreq; /* Hz */ 685 compat_ulong_t hi_ireqfreq; /* Hz */
686 compat_ulong_t hi_flags; /* information */ 686 compat_ulong_t hi_flags; /* information */
687 unsigned short hi_hpet; 687 unsigned short hi_hpet;
688 unsigned short hi_timer; 688 unsigned short hi_timer;
689 }; 689 };
690 690
691 static long 691 static long
692 hpet_compat_ioctl(struct file *file, unsigned int cmd, unsigned long arg) 692 hpet_compat_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
693 { 693 {
694 struct hpet_info info; 694 struct hpet_info info;
695 int err; 695 int err;
696 696
697 mutex_lock(&hpet_mutex); 697 mutex_lock(&hpet_mutex);
698 err = hpet_ioctl_common(file->private_data, cmd, arg, &info); 698 err = hpet_ioctl_common(file->private_data, cmd, arg, &info);
699 mutex_unlock(&hpet_mutex); 699 mutex_unlock(&hpet_mutex);
700 700
701 if ((cmd == HPET_INFO) && !err) { 701 if ((cmd == HPET_INFO) && !err) {
702 struct compat_hpet_info __user *u = compat_ptr(arg); 702 struct compat_hpet_info __user *u = compat_ptr(arg);
703 if (put_user(info.hi_ireqfreq, &u->hi_ireqfreq) || 703 if (put_user(info.hi_ireqfreq, &u->hi_ireqfreq) ||
704 put_user(info.hi_flags, &u->hi_flags) || 704 put_user(info.hi_flags, &u->hi_flags) ||
705 put_user(info.hi_hpet, &u->hi_hpet) || 705 put_user(info.hi_hpet, &u->hi_hpet) ||
706 put_user(info.hi_timer, &u->hi_timer)) 706 put_user(info.hi_timer, &u->hi_timer))
707 err = -EFAULT; 707 err = -EFAULT;
708 } 708 }
709 709
710 return err; 710 return err;
711 } 711 }
712 #endif 712 #endif
713 713
714 static const struct file_operations hpet_fops = { 714 static const struct file_operations hpet_fops = {
715 .owner = THIS_MODULE, 715 .owner = THIS_MODULE,
716 .llseek = no_llseek, 716 .llseek = no_llseek,
717 .read = hpet_read, 717 .read = hpet_read,
718 .poll = hpet_poll, 718 .poll = hpet_poll,
719 .unlocked_ioctl = hpet_ioctl, 719 .unlocked_ioctl = hpet_ioctl,
720 #ifdef CONFIG_COMPAT 720 #ifdef CONFIG_COMPAT
721 .compat_ioctl = hpet_compat_ioctl, 721 .compat_ioctl = hpet_compat_ioctl,
722 #endif 722 #endif
723 .open = hpet_open, 723 .open = hpet_open,
724 .release = hpet_release, 724 .release = hpet_release,
725 .fasync = hpet_fasync, 725 .fasync = hpet_fasync,
726 .mmap = hpet_mmap, 726 .mmap = hpet_mmap,
727 }; 727 };
728 728
729 static int hpet_is_known(struct hpet_data *hdp) 729 static int hpet_is_known(struct hpet_data *hdp)
730 { 730 {
731 struct hpets *hpetp; 731 struct hpets *hpetp;
732 732
733 for (hpetp = hpets; hpetp; hpetp = hpetp->hp_next) 733 for (hpetp = hpets; hpetp; hpetp = hpetp->hp_next)
734 if (hpetp->hp_hpet_phys == hdp->hd_phys_address) 734 if (hpetp->hp_hpet_phys == hdp->hd_phys_address)
735 return 1; 735 return 1;
736 736
737 return 0; 737 return 0;
738 } 738 }
739 739
740 static ctl_table hpet_table[] = { 740 static ctl_table hpet_table[] = {
741 { 741 {
742 .procname = "max-user-freq", 742 .procname = "max-user-freq",
743 .data = &hpet_max_freq, 743 .data = &hpet_max_freq,
744 .maxlen = sizeof(int), 744 .maxlen = sizeof(int),
745 .mode = 0644, 745 .mode = 0644,
746 .proc_handler = proc_dointvec, 746 .proc_handler = proc_dointvec,
747 }, 747 },
748 {} 748 {}
749 }; 749 };
750 750
751 static ctl_table hpet_root[] = { 751 static ctl_table hpet_root[] = {
752 { 752 {
753 .procname = "hpet", 753 .procname = "hpet",
754 .maxlen = 0, 754 .maxlen = 0,
755 .mode = 0555, 755 .mode = 0555,
756 .child = hpet_table, 756 .child = hpet_table,
757 }, 757 },
758 {} 758 {}
759 }; 759 };
760 760
761 static ctl_table dev_root[] = { 761 static ctl_table dev_root[] = {
762 { 762 {
763 .procname = "dev", 763 .procname = "dev",
764 .maxlen = 0, 764 .maxlen = 0,
765 .mode = 0555, 765 .mode = 0555,
766 .child = hpet_root, 766 .child = hpet_root,
767 }, 767 },
768 {} 768 {}
769 }; 769 };
770 770
771 static struct ctl_table_header *sysctl_header; 771 static struct ctl_table_header *sysctl_header;
772 772
773 /* 773 /*
774 * Adjustment for when arming the timer with 774 * Adjustment for when arming the timer with
775 * initial conditions. That is, main counter 775 * initial conditions. That is, main counter
776 * ticks expired before interrupts are enabled. 776 * ticks expired before interrupts are enabled.
777 */ 777 */
778 #define TICK_CALIBRATE (1000UL) 778 #define TICK_CALIBRATE (1000UL)
779 779
780 static unsigned long __hpet_calibrate(struct hpets *hpetp) 780 static unsigned long __hpet_calibrate(struct hpets *hpetp)
781 { 781 {
782 struct hpet_timer __iomem *timer = NULL; 782 struct hpet_timer __iomem *timer = NULL;
783 unsigned long t, m, count, i, flags, start; 783 unsigned long t, m, count, i, flags, start;
784 struct hpet_dev *devp; 784 struct hpet_dev *devp;
785 int j; 785 int j;
786 struct hpet __iomem *hpet; 786 struct hpet __iomem *hpet;
787 787
788 for (j = 0, devp = hpetp->hp_dev; j < hpetp->hp_ntimer; j++, devp++) 788 for (j = 0, devp = hpetp->hp_dev; j < hpetp->hp_ntimer; j++, devp++)
789 if ((devp->hd_flags & HPET_OPEN) == 0) { 789 if ((devp->hd_flags & HPET_OPEN) == 0) {
790 timer = devp->hd_timer; 790 timer = devp->hd_timer;
791 break; 791 break;
792 } 792 }
793 793
794 if (!timer) 794 if (!timer)
795 return 0; 795 return 0;
796 796
797 hpet = hpetp->hp_hpet; 797 hpet = hpetp->hp_hpet;
798 t = read_counter(&timer->hpet_compare); 798 t = read_counter(&timer->hpet_compare);
799 799
800 i = 0; 800 i = 0;
801 count = hpet_time_div(hpetp, TICK_CALIBRATE); 801 count = hpet_time_div(hpetp, TICK_CALIBRATE);
802 802
803 local_irq_save(flags); 803 local_irq_save(flags);
804 804
805 start = read_counter(&hpet->hpet_mc); 805 start = read_counter(&hpet->hpet_mc);
806 806
807 do { 807 do {
808 m = read_counter(&hpet->hpet_mc); 808 m = read_counter(&hpet->hpet_mc);
809 write_counter(t + m + hpetp->hp_delta, &timer->hpet_compare); 809 write_counter(t + m + hpetp->hp_delta, &timer->hpet_compare);
810 } while (i++, (m - start) < count); 810 } while (i++, (m - start) < count);
811 811
812 local_irq_restore(flags); 812 local_irq_restore(flags);
813 813
814 return (m - start) / i; 814 return (m - start) / i;
815 } 815 }
816 816
817 static unsigned long hpet_calibrate(struct hpets *hpetp) 817 static unsigned long hpet_calibrate(struct hpets *hpetp)
818 { 818 {
819 unsigned long ret = -1; 819 unsigned long ret = ~0UL;
820 unsigned long tmp; 820 unsigned long tmp;
821 821
822 /* 822 /*
823 * Try to calibrate until return value becomes stable small value. 823 * Try to calibrate until return value becomes stable small value.
824 * If SMI interruption occurs in calibration loop, the return value 824 * If SMI interruption occurs in calibration loop, the return value
825 * will be big. This avoids its impact. 825 * will be big. This avoids its impact.
826 */ 826 */
827 for ( ; ; ) { 827 for ( ; ; ) {
828 tmp = __hpet_calibrate(hpetp); 828 tmp = __hpet_calibrate(hpetp);
829 if (ret <= tmp) 829 if (ret <= tmp)
830 break; 830 break;
831 ret = tmp; 831 ret = tmp;
832 } 832 }
833 833
834 return ret; 834 return ret;
835 } 835 }
836 836
837 int hpet_alloc(struct hpet_data *hdp) 837 int hpet_alloc(struct hpet_data *hdp)
838 { 838 {
839 u64 cap, mcfg; 839 u64 cap, mcfg;
840 struct hpet_dev *devp; 840 struct hpet_dev *devp;
841 u32 i, ntimer; 841 u32 i, ntimer;
842 struct hpets *hpetp; 842 struct hpets *hpetp;
843 size_t siz; 843 size_t siz;
844 struct hpet __iomem *hpet; 844 struct hpet __iomem *hpet;
845 static struct hpets *last; 845 static struct hpets *last;
846 unsigned long period; 846 unsigned long period;
847 unsigned long long temp; 847 unsigned long long temp;
848 u32 remainder; 848 u32 remainder;
849 849
850 /* 850 /*
851 * hpet_alloc can be called by platform dependent code. 851 * hpet_alloc can be called by platform dependent code.
852 * If platform dependent code has allocated the hpet that 852 * If platform dependent code has allocated the hpet that
853 * ACPI has also reported, then we catch it here. 853 * ACPI has also reported, then we catch it here.
854 */ 854 */
855 if (hpet_is_known(hdp)) { 855 if (hpet_is_known(hdp)) {
856 printk(KERN_DEBUG "%s: duplicate HPET ignored\n", 856 printk(KERN_DEBUG "%s: duplicate HPET ignored\n",
857 __func__); 857 __func__);
858 return 0; 858 return 0;
859 } 859 }
860 860
861 siz = sizeof(struct hpets) + ((hdp->hd_nirqs - 1) * 861 siz = sizeof(struct hpets) + ((hdp->hd_nirqs - 1) *
862 sizeof(struct hpet_dev)); 862 sizeof(struct hpet_dev));
863 863
864 hpetp = kzalloc(siz, GFP_KERNEL); 864 hpetp = kzalloc(siz, GFP_KERNEL);
865 865
866 if (!hpetp) 866 if (!hpetp)
867 return -ENOMEM; 867 return -ENOMEM;
868 868
869 hpetp->hp_which = hpet_nhpet++; 869 hpetp->hp_which = hpet_nhpet++;
870 hpetp->hp_hpet = hdp->hd_address; 870 hpetp->hp_hpet = hdp->hd_address;
871 hpetp->hp_hpet_phys = hdp->hd_phys_address; 871 hpetp->hp_hpet_phys = hdp->hd_phys_address;
872 872
873 hpetp->hp_ntimer = hdp->hd_nirqs; 873 hpetp->hp_ntimer = hdp->hd_nirqs;
874 874
875 for (i = 0; i < hdp->hd_nirqs; i++) 875 for (i = 0; i < hdp->hd_nirqs; i++)
876 hpetp->hp_dev[i].hd_hdwirq = hdp->hd_irq[i]; 876 hpetp->hp_dev[i].hd_hdwirq = hdp->hd_irq[i];
877 877
878 hpet = hpetp->hp_hpet; 878 hpet = hpetp->hp_hpet;
879 879
880 cap = readq(&hpet->hpet_cap); 880 cap = readq(&hpet->hpet_cap);
881 881
882 ntimer = ((cap & HPET_NUM_TIM_CAP_MASK) >> HPET_NUM_TIM_CAP_SHIFT) + 1; 882 ntimer = ((cap & HPET_NUM_TIM_CAP_MASK) >> HPET_NUM_TIM_CAP_SHIFT) + 1;
883 883
884 if (hpetp->hp_ntimer != ntimer) { 884 if (hpetp->hp_ntimer != ntimer) {
885 printk(KERN_WARNING "hpet: number irqs doesn't agree" 885 printk(KERN_WARNING "hpet: number irqs doesn't agree"
886 " with number of timers\n"); 886 " with number of timers\n");
887 kfree(hpetp); 887 kfree(hpetp);
888 return -ENODEV; 888 return -ENODEV;
889 } 889 }
890 890
891 if (last) 891 if (last)
892 last->hp_next = hpetp; 892 last->hp_next = hpetp;
893 else 893 else
894 hpets = hpetp; 894 hpets = hpetp;
895 895
896 last = hpetp; 896 last = hpetp;
897 897
898 period = (cap & HPET_COUNTER_CLK_PERIOD_MASK) >> 898 period = (cap & HPET_COUNTER_CLK_PERIOD_MASK) >>
899 HPET_COUNTER_CLK_PERIOD_SHIFT; /* fs, 10^-15 */ 899 HPET_COUNTER_CLK_PERIOD_SHIFT; /* fs, 10^-15 */
900 temp = 1000000000000000uLL; /* 10^15 femtoseconds per second */ 900 temp = 1000000000000000uLL; /* 10^15 femtoseconds per second */
901 temp += period >> 1; /* round */ 901 temp += period >> 1; /* round */
902 do_div(temp, period); 902 do_div(temp, period);
903 hpetp->hp_tick_freq = temp; /* ticks per second */ 903 hpetp->hp_tick_freq = temp; /* ticks per second */
904 904
905 printk(KERN_INFO "hpet%d: at MMIO 0x%lx, IRQ%s", 905 printk(KERN_INFO "hpet%d: at MMIO 0x%lx, IRQ%s",
906 hpetp->hp_which, hdp->hd_phys_address, 906 hpetp->hp_which, hdp->hd_phys_address,
907 hpetp->hp_ntimer > 1 ? "s" : ""); 907 hpetp->hp_ntimer > 1 ? "s" : "");
908 for (i = 0; i < hpetp->hp_ntimer; i++) 908 for (i = 0; i < hpetp->hp_ntimer; i++)
909 printk(KERN_CONT "%s %d", i > 0 ? "," : "", hdp->hd_irq[i]); 909 printk(KERN_CONT "%s %d", i > 0 ? "," : "", hdp->hd_irq[i]);
910 printk(KERN_CONT "\n"); 910 printk(KERN_CONT "\n");
911 911
912 temp = hpetp->hp_tick_freq; 912 temp = hpetp->hp_tick_freq;
913 remainder = do_div(temp, 1000000); 913 remainder = do_div(temp, 1000000);
914 printk(KERN_INFO 914 printk(KERN_INFO
915 "hpet%u: %u comparators, %d-bit %u.%06u MHz counter\n", 915 "hpet%u: %u comparators, %d-bit %u.%06u MHz counter\n",
916 hpetp->hp_which, hpetp->hp_ntimer, 916 hpetp->hp_which, hpetp->hp_ntimer,
917 cap & HPET_COUNTER_SIZE_MASK ? 64 : 32, 917 cap & HPET_COUNTER_SIZE_MASK ? 64 : 32,
918 (unsigned) temp, remainder); 918 (unsigned) temp, remainder);
919 919
920 mcfg = readq(&hpet->hpet_config); 920 mcfg = readq(&hpet->hpet_config);
921 if ((mcfg & HPET_ENABLE_CNF_MASK) == 0) { 921 if ((mcfg & HPET_ENABLE_CNF_MASK) == 0) {
922 write_counter(0L, &hpet->hpet_mc); 922 write_counter(0L, &hpet->hpet_mc);
923 mcfg |= HPET_ENABLE_CNF_MASK; 923 mcfg |= HPET_ENABLE_CNF_MASK;
924 writeq(mcfg, &hpet->hpet_config); 924 writeq(mcfg, &hpet->hpet_config);
925 } 925 }
926 926
927 for (i = 0, devp = hpetp->hp_dev; i < hpetp->hp_ntimer; i++, devp++) { 927 for (i = 0, devp = hpetp->hp_dev; i < hpetp->hp_ntimer; i++, devp++) {
928 struct hpet_timer __iomem *timer; 928 struct hpet_timer __iomem *timer;
929 929
930 timer = &hpet->hpet_timers[devp - hpetp->hp_dev]; 930 timer = &hpet->hpet_timers[devp - hpetp->hp_dev];
931 931
932 devp->hd_hpets = hpetp; 932 devp->hd_hpets = hpetp;
933 devp->hd_hpet = hpet; 933 devp->hd_hpet = hpet;
934 devp->hd_timer = timer; 934 devp->hd_timer = timer;
935 935
936 /* 936 /*
937 * If the timer was reserved by platform code, 937 * If the timer was reserved by platform code,
938 * then make timer unavailable for opens. 938 * then make timer unavailable for opens.
939 */ 939 */
940 if (hdp->hd_state & (1 << i)) { 940 if (hdp->hd_state & (1 << i)) {
941 devp->hd_flags = HPET_OPEN; 941 devp->hd_flags = HPET_OPEN;
942 continue; 942 continue;
943 } 943 }
944 944
945 init_waitqueue_head(&devp->hd_waitqueue); 945 init_waitqueue_head(&devp->hd_waitqueue);
946 } 946 }
947 947
948 hpetp->hp_delta = hpet_calibrate(hpetp); 948 hpetp->hp_delta = hpet_calibrate(hpetp);
949 949
950 /* This clocksource driver currently only works on ia64 */ 950 /* This clocksource driver currently only works on ia64 */
951 #ifdef CONFIG_IA64 951 #ifdef CONFIG_IA64
952 if (!hpet_clocksource) { 952 if (!hpet_clocksource) {
953 hpet_mctr = (void __iomem *)&hpetp->hp_hpet->hpet_mc; 953 hpet_mctr = (void __iomem *)&hpetp->hp_hpet->hpet_mc;
954 clocksource_hpet.archdata.fsys_mmio = hpet_mctr; 954 clocksource_hpet.archdata.fsys_mmio = hpet_mctr;
955 clocksource_register_hz(&clocksource_hpet, hpetp->hp_tick_freq); 955 clocksource_register_hz(&clocksource_hpet, hpetp->hp_tick_freq);
956 hpetp->hp_clocksource = &clocksource_hpet; 956 hpetp->hp_clocksource = &clocksource_hpet;
957 hpet_clocksource = &clocksource_hpet; 957 hpet_clocksource = &clocksource_hpet;
958 } 958 }
959 #endif 959 #endif
960 960
961 return 0; 961 return 0;
962 } 962 }
963 963
964 static acpi_status hpet_resources(struct acpi_resource *res, void *data) 964 static acpi_status hpet_resources(struct acpi_resource *res, void *data)
965 { 965 {
966 struct hpet_data *hdp; 966 struct hpet_data *hdp;
967 acpi_status status; 967 acpi_status status;
968 struct acpi_resource_address64 addr; 968 struct acpi_resource_address64 addr;
969 969
970 hdp = data; 970 hdp = data;
971 971
972 status = acpi_resource_to_address64(res, &addr); 972 status = acpi_resource_to_address64(res, &addr);
973 973
974 if (ACPI_SUCCESS(status)) { 974 if (ACPI_SUCCESS(status)) {
975 hdp->hd_phys_address = addr.minimum; 975 hdp->hd_phys_address = addr.minimum;
976 hdp->hd_address = ioremap(addr.minimum, addr.address_length); 976 hdp->hd_address = ioremap(addr.minimum, addr.address_length);
977 977
978 if (hpet_is_known(hdp)) { 978 if (hpet_is_known(hdp)) {
979 iounmap(hdp->hd_address); 979 iounmap(hdp->hd_address);
980 return AE_ALREADY_EXISTS; 980 return AE_ALREADY_EXISTS;
981 } 981 }
982 } else if (res->type == ACPI_RESOURCE_TYPE_FIXED_MEMORY32) { 982 } else if (res->type == ACPI_RESOURCE_TYPE_FIXED_MEMORY32) {
983 struct acpi_resource_fixed_memory32 *fixmem32; 983 struct acpi_resource_fixed_memory32 *fixmem32;
984 984
985 fixmem32 = &res->data.fixed_memory32; 985 fixmem32 = &res->data.fixed_memory32;
986 if (!fixmem32) 986 if (!fixmem32)
987 return AE_NO_MEMORY; 987 return AE_NO_MEMORY;
988 988
989 hdp->hd_phys_address = fixmem32->address; 989 hdp->hd_phys_address = fixmem32->address;
990 hdp->hd_address = ioremap(fixmem32->address, 990 hdp->hd_address = ioremap(fixmem32->address,
991 HPET_RANGE_SIZE); 991 HPET_RANGE_SIZE);
992 992
993 if (hpet_is_known(hdp)) { 993 if (hpet_is_known(hdp)) {
994 iounmap(hdp->hd_address); 994 iounmap(hdp->hd_address);
995 return AE_ALREADY_EXISTS; 995 return AE_ALREADY_EXISTS;
996 } 996 }
997 } else if (res->type == ACPI_RESOURCE_TYPE_EXTENDED_IRQ) { 997 } else if (res->type == ACPI_RESOURCE_TYPE_EXTENDED_IRQ) {
998 struct acpi_resource_extended_irq *irqp; 998 struct acpi_resource_extended_irq *irqp;
999 int i, irq; 999 int i, irq;
1000 1000
1001 irqp = &res->data.extended_irq; 1001 irqp = &res->data.extended_irq;
1002 1002
1003 for (i = 0; i < irqp->interrupt_count; i++) { 1003 for (i = 0; i < irqp->interrupt_count; i++) {
1004 if (hdp->hd_nirqs >= HPET_MAX_TIMERS)
1005 break;
1006
1004 irq = acpi_register_gsi(NULL, irqp->interrupts[i], 1007 irq = acpi_register_gsi(NULL, irqp->interrupts[i],
1005 irqp->triggering, irqp->polarity); 1008 irqp->triggering, irqp->polarity);
1006 if (irq < 0) 1009 if (irq < 0)
1007 return AE_ERROR; 1010 return AE_ERROR;
1008 1011
1009 hdp->hd_irq[hdp->hd_nirqs] = irq; 1012 hdp->hd_irq[hdp->hd_nirqs] = irq;
1010 hdp->hd_nirqs++; 1013 hdp->hd_nirqs++;
1011 } 1014 }
1012 } 1015 }
1013 1016
1014 return AE_OK; 1017 return AE_OK;
1015 } 1018 }
1016 1019
1017 static int hpet_acpi_add(struct acpi_device *device) 1020 static int hpet_acpi_add(struct acpi_device *device)
1018 { 1021 {
1019 acpi_status result; 1022 acpi_status result;
1020 struct hpet_data data; 1023 struct hpet_data data;
1021 1024
1022 memset(&data, 0, sizeof(data)); 1025 memset(&data, 0, sizeof(data));
1023 1026
1024 result = 1027 result =
1025 acpi_walk_resources(device->handle, METHOD_NAME__CRS, 1028 acpi_walk_resources(device->handle, METHOD_NAME__CRS,
1026 hpet_resources, &data); 1029 hpet_resources, &data);
1027 1030
1028 if (ACPI_FAILURE(result)) 1031 if (ACPI_FAILURE(result))
1029 return -ENODEV; 1032 return -ENODEV;
1030 1033
1031 if (!data.hd_address || !data.hd_nirqs) { 1034 if (!data.hd_address || !data.hd_nirqs) {
1032 if (data.hd_address) 1035 if (data.hd_address)
1033 iounmap(data.hd_address); 1036 iounmap(data.hd_address);
1034 printk("%s: no address or irqs in _CRS\n", __func__); 1037 printk("%s: no address or irqs in _CRS\n", __func__);
1035 return -ENODEV; 1038 return -ENODEV;
1036 } 1039 }
1037 1040
1038 return hpet_alloc(&data); 1041 return hpet_alloc(&data);
1039 } 1042 }
1040 1043
1041 static int hpet_acpi_remove(struct acpi_device *device, int type) 1044 static int hpet_acpi_remove(struct acpi_device *device, int type)
1042 { 1045 {
1043 /* XXX need to unregister clocksource, dealloc mem, etc */ 1046 /* XXX need to unregister clocksource, dealloc mem, etc */
1044 return -EINVAL; 1047 return -EINVAL;
1045 } 1048 }
1046 1049
1047 static const struct acpi_device_id hpet_device_ids[] = { 1050 static const struct acpi_device_id hpet_device_ids[] = {
1048 {"PNP0103", 0}, 1051 {"PNP0103", 0},
1049 {"", 0}, 1052 {"", 0},
1050 }; 1053 };
1051 MODULE_DEVICE_TABLE(acpi, hpet_device_ids); 1054 MODULE_DEVICE_TABLE(acpi, hpet_device_ids);
1052 1055
1053 static struct acpi_driver hpet_acpi_driver = { 1056 static struct acpi_driver hpet_acpi_driver = {
1054 .name = "hpet", 1057 .name = "hpet",
1055 .ids = hpet_device_ids, 1058 .ids = hpet_device_ids,
1056 .ops = { 1059 .ops = {
1057 .add = hpet_acpi_add, 1060 .add = hpet_acpi_add,
1058 .remove = hpet_acpi_remove, 1061 .remove = hpet_acpi_remove,
1059 }, 1062 },
1060 }; 1063 };
1061 1064
1062 static struct miscdevice hpet_misc = { HPET_MINOR, "hpet", &hpet_fops }; 1065 static struct miscdevice hpet_misc = { HPET_MINOR, "hpet", &hpet_fops };
1063 1066
1064 static int __init hpet_init(void) 1067 static int __init hpet_init(void)
1065 { 1068 {
1066 int result; 1069 int result;
1067 1070
1068 result = misc_register(&hpet_misc); 1071 result = misc_register(&hpet_misc);
1069 if (result < 0) 1072 if (result < 0)
1070 return -ENODEV; 1073 return -ENODEV;
1071 1074
1072 sysctl_header = register_sysctl_table(dev_root); 1075 sysctl_header = register_sysctl_table(dev_root);
1073 1076
1074 result = acpi_bus_register_driver(&hpet_acpi_driver); 1077 result = acpi_bus_register_driver(&hpet_acpi_driver);
1075 if (result < 0) { 1078 if (result < 0) {
1076 if (sysctl_header) 1079 if (sysctl_header)
1077 unregister_sysctl_table(sysctl_header); 1080 unregister_sysctl_table(sysctl_header);
1078 misc_deregister(&hpet_misc); 1081 misc_deregister(&hpet_misc);
1079 return result; 1082 return result;
1080 } 1083 }
1081 1084
1082 return 0; 1085 return 0;
1083 } 1086 }
1084 1087
1085 static void __exit hpet_exit(void) 1088 static void __exit hpet_exit(void)
1086 { 1089 {
1087 acpi_bus_unregister_driver(&hpet_acpi_driver); 1090 acpi_bus_unregister_driver(&hpet_acpi_driver);
1088 1091
1089 if (sysctl_header) 1092 if (sysctl_header)
1090 unregister_sysctl_table(sysctl_header); 1093 unregister_sysctl_table(sysctl_header);
1091 misc_deregister(&hpet_misc); 1094 misc_deregister(&hpet_misc);
1092 1095
1093 return; 1096 return;
1094 } 1097 }
1095 1098
1096 module_init(hpet_init); 1099 module_init(hpet_init);
1097 module_exit(hpet_exit); 1100 module_exit(hpet_exit);
1098 MODULE_AUTHOR("Bob Picco <Robert.Picco@hp.com>"); 1101 MODULE_AUTHOR("Bob Picco <Robert.Picco@hp.com>");
1099 MODULE_LICENSE("GPL"); 1102 MODULE_LICENSE("GPL");
1100 1103