diff options
Diffstat (limited to 'drivers/sh/maple/maple.c')
-rw-r--r-- | drivers/sh/maple/maple.c | 981 |
1 files changed, 497 insertions, 484 deletions
diff --git a/drivers/sh/maple/maple.c b/drivers/sh/maple/maple.c index e52a6296ca46..9cfcfd8dad5e 100644 --- a/drivers/sh/maple/maple.c +++ b/drivers/sh/maple/maple.c | |||
@@ -31,6 +31,7 @@ | |||
31 | #include <asm/mach/dma.h> | 31 | #include <asm/mach/dma.h> |
32 | #include <asm/mach/sysasic.h> | 32 | #include <asm/mach/sysasic.h> |
33 | #include <asm/mach/maple.h> | 33 | #include <asm/mach/maple.h> |
34 | #include <linux/delay.h> | ||
34 | 35 | ||
35 | MODULE_AUTHOR("Yaegshi Takeshi, Paul Mundt, M.R. Brown, Adrian McMenamin"); | 36 | MODULE_AUTHOR("Yaegshi Takeshi, Paul Mundt, M.R. Brown, Adrian McMenamin"); |
36 | MODULE_DESCRIPTION("Maple bus driver for Dreamcast"); | 37 | MODULE_DESCRIPTION("Maple bus driver for Dreamcast"); |
@@ -53,12 +54,12 @@ static struct device maple_bus; | |||
53 | static int subdevice_map[MAPLE_PORTS]; | 54 | static int subdevice_map[MAPLE_PORTS]; |
54 | static unsigned long *maple_sendbuf, *maple_sendptr, *maple_lastptr; | 55 | static unsigned long *maple_sendbuf, *maple_sendptr, *maple_lastptr; |
55 | static unsigned long maple_pnp_time; | 56 | static unsigned long maple_pnp_time; |
56 | static int started, scanning, liststatus; | 57 | static int started, scanning, liststatus, realscan; |
57 | static struct kmem_cache *maple_queue_cache; | 58 | static struct kmem_cache *maple_queue_cache; |
58 | 59 | ||
59 | struct maple_device_specify { | 60 | struct maple_device_specify { |
60 | int port; | 61 | int port; |
61 | int unit; | 62 | int unit; |
62 | }; | 63 | }; |
63 | 64 | ||
64 | /** | 65 | /** |
@@ -68,22 +69,22 @@ struct maple_device_specify { | |||
68 | */ | 69 | */ |
69 | int maple_driver_register(struct device_driver *drv) | 70 | int maple_driver_register(struct device_driver *drv) |
70 | { | 71 | { |
71 | if (!drv) | 72 | if (!drv) |
72 | return -EINVAL; | 73 | return -EINVAL; |
73 | drv->bus = &maple_bus_type; | 74 | drv->bus = &maple_bus_type; |
74 | return driver_register(drv); | 75 | return driver_register(drv); |
75 | } | 76 | } |
76 | EXPORT_SYMBOL_GPL(maple_driver_register); | 77 | EXPORT_SYMBOL_GPL(maple_driver_register); |
77 | 78 | ||
78 | /* set hardware registers to enable next round of dma */ | 79 | /* set hardware registers to enable next round of dma */ |
79 | static void maplebus_dma_reset(void) | 80 | static void maplebus_dma_reset(void) |
80 | { | 81 | { |
81 | ctrl_outl(MAPLE_MAGIC, MAPLE_RESET); | 82 | ctrl_outl(MAPLE_MAGIC, MAPLE_RESET); |
82 | /* set trig type to 0 for software trigger, 1 for hardware (VBLANK) */ | 83 | /* set trig type to 0 for software trigger, 1 for hardware (VBLANK) */ |
83 | ctrl_outl(1, MAPLE_TRIGTYPE); | 84 | ctrl_outl(1, MAPLE_TRIGTYPE); |
84 | ctrl_outl(MAPLE_2MBPS | MAPLE_TIMEOUT(50000), MAPLE_SPEED); | 85 | ctrl_outl(MAPLE_2MBPS | MAPLE_TIMEOUT(50000), MAPLE_SPEED); |
85 | ctrl_outl(PHYSADDR(maple_sendbuf), MAPLE_DMAADDR); | 86 | ctrl_outl(PHYSADDR(maple_sendbuf), MAPLE_DMAADDR); |
86 | ctrl_outl(1, MAPLE_ENABLE); | 87 | ctrl_outl(1, MAPLE_ENABLE); |
87 | } | 88 | } |
88 | 89 | ||
89 | /** | 90 | /** |
@@ -94,27 +95,36 @@ static void maplebus_dma_reset(void) | |||
94 | * @function: the function code for the device | 95 | * @function: the function code for the device |
95 | */ | 96 | */ |
96 | void maple_getcond_callback(struct maple_device *dev, | 97 | void maple_getcond_callback(struct maple_device *dev, |
97 | void (*callback) (struct mapleq * mq), | 98 | void (*callback) (struct mapleq *mq), |
98 | unsigned long interval, unsigned long function) | 99 | unsigned long interval, unsigned long function) |
99 | { | 100 | { |
100 | dev->callback = callback; | 101 | dev->callback = callback; |
101 | dev->interval = interval; | 102 | dev->interval = interval; |
102 | dev->function = cpu_to_be32(function); | 103 | dev->function = cpu_to_be32(function); |
103 | dev->when = jiffies; | 104 | dev->when = jiffies; |
104 | } | 105 | } |
105 | EXPORT_SYMBOL_GPL(maple_getcond_callback); | 106 | EXPORT_SYMBOL_GPL(maple_getcond_callback); |
106 | 107 | ||
107 | static int maple_dma_done(void) | 108 | static int maple_dma_done(void) |
108 | { | 109 | { |
109 | return (ctrl_inl(MAPLE_STATE) & 1) == 0; | 110 | return (ctrl_inl(MAPLE_STATE) & 1) == 0; |
110 | } | 111 | } |
111 | 112 | ||
112 | static void maple_release_device(struct device *dev) | 113 | static void maple_release_device(struct device *dev) |
113 | { | 114 | { |
114 | if (dev->type) { | 115 | struct maple_device *mdev; |
115 | kfree(dev->type->name); | 116 | struct mapleq *mq; |
116 | kfree(dev->type); | 117 | if (!dev) |
117 | } | 118 | return; |
119 | mdev = to_maple_dev(dev); | ||
120 | mq = mdev->mq; | ||
121 | if (mq) { | ||
122 | if (mq->recvbufdcsp) | ||
123 | kmem_cache_free(maple_queue_cache, mq->recvbufdcsp); | ||
124 | kfree(mq); | ||
125 | mq = NULL; | ||
126 | } | ||
127 | kfree(mdev); | ||
118 | } | 128 | } |
119 | 129 | ||
120 | /** | 130 | /** |
@@ -123,60 +133,64 @@ static void maple_release_device(struct device *dev) | |||
123 | */ | 133 | */ |
124 | void maple_add_packet(struct mapleq *mq) | 134 | void maple_add_packet(struct mapleq *mq) |
125 | { | 135 | { |
126 | mutex_lock(&maple_list_lock); | 136 | mutex_lock(&maple_list_lock); |
127 | list_add(&mq->list, &maple_waitq); | 137 | list_add(&mq->list, &maple_waitq); |
128 | mutex_unlock(&maple_list_lock); | 138 | mutex_unlock(&maple_list_lock); |
129 | } | 139 | } |
130 | EXPORT_SYMBOL_GPL(maple_add_packet); | 140 | EXPORT_SYMBOL_GPL(maple_add_packet); |
131 | 141 | ||
132 | static struct mapleq *maple_allocq(struct maple_device *dev) | 142 | static struct mapleq *maple_allocq(struct maple_device *mdev) |
133 | { | 143 | { |
134 | struct mapleq *mq; | 144 | struct mapleq *mq; |
135 | 145 | ||
136 | mq = kmalloc(sizeof(*mq), GFP_KERNEL); | 146 | mq = kmalloc(sizeof(*mq), GFP_KERNEL); |
137 | if (!mq) | 147 | if (!mq) |
138 | return NULL; | 148 | return NULL; |
139 | 149 | ||
140 | mq->dev = dev; | 150 | mq->dev = mdev; |
141 | mq->recvbufdcsp = kmem_cache_zalloc(maple_queue_cache, GFP_KERNEL); | 151 | mq->recvbufdcsp = kmem_cache_zalloc(maple_queue_cache, GFP_KERNEL); |
142 | mq->recvbuf = (void *) P2SEGADDR(mq->recvbufdcsp); | 152 | mq->recvbuf = (void *) P2SEGADDR(mq->recvbufdcsp); |
143 | if (!mq->recvbuf) { | 153 | if (!mq->recvbuf) { |
144 | kfree(mq); | 154 | kfree(mq); |
145 | return NULL; | 155 | return NULL; |
146 | } | 156 | } |
147 | 157 | ||
148 | return mq; | 158 | return mq; |
149 | } | 159 | } |
150 | 160 | ||
151 | static struct maple_device *maple_alloc_dev(int port, int unit) | 161 | static struct maple_device *maple_alloc_dev(int port, int unit) |
152 | { | 162 | { |
153 | struct maple_device *dev; | 163 | struct maple_device *mdev; |
154 | 164 | ||
155 | dev = kzalloc(sizeof(*dev), GFP_KERNEL); | 165 | mdev = kzalloc(sizeof(*mdev), GFP_KERNEL); |
156 | if (!dev) | 166 | if (!mdev) |
157 | return NULL; | 167 | return NULL; |
158 | 168 | ||
159 | dev->port = port; | 169 | mdev->port = port; |
160 | dev->unit = unit; | 170 | mdev->unit = unit; |
161 | dev->mq = maple_allocq(dev); | 171 | mdev->mq = maple_allocq(mdev); |
162 | 172 | ||
163 | if (!dev->mq) { | 173 | if (!mdev->mq) { |
164 | kfree(dev); | 174 | kfree(mdev); |
165 | return NULL; | 175 | return NULL; |
166 | } | 176 | } |
167 | 177 | mdev->dev.bus = &maple_bus_type; | |
168 | return dev; | 178 | mdev->dev.parent = &maple_bus; |
179 | mdev->function = 0; | ||
180 | return mdev; | ||
169 | } | 181 | } |
170 | 182 | ||
171 | static void maple_free_dev(struct maple_device *mdev) | 183 | static void maple_free_dev(struct maple_device *mdev) |
172 | { | 184 | { |
173 | if (!mdev) | 185 | if (!mdev) |
174 | return; | 186 | return; |
175 | if (mdev->mq) { | 187 | if (mdev->mq) { |
176 | kmem_cache_free(maple_queue_cache, mdev->mq->recvbufdcsp); | 188 | if (mdev->mq->recvbufdcsp) |
177 | kfree(mdev->mq); | 189 | kmem_cache_free(maple_queue_cache, |
178 | } | 190 | mdev->mq->recvbufdcsp); |
179 | kfree(mdev); | 191 | kfree(mdev->mq); |
192 | } | ||
193 | kfree(mdev); | ||
180 | } | 194 | } |
181 | 195 | ||
182 | /* process the command queue into a maple command block | 196 | /* process the command queue into a maple command block |
@@ -184,153 +198,162 @@ static void maple_free_dev(struct maple_device *mdev) | |||
184 | */ | 198 | */ |
185 | static void maple_build_block(struct mapleq *mq) | 199 | static void maple_build_block(struct mapleq *mq) |
186 | { | 200 | { |
187 | int port, unit, from, to, len; | 201 | int port, unit, from, to, len; |
188 | unsigned long *lsendbuf = mq->sendbuf; | 202 | unsigned long *lsendbuf = mq->sendbuf; |
189 | 203 | ||
190 | port = mq->dev->port & 3; | 204 | port = mq->dev->port & 3; |
191 | unit = mq->dev->unit; | 205 | unit = mq->dev->unit; |
192 | len = mq->length; | 206 | len = mq->length; |
193 | from = port << 6; | 207 | from = port << 6; |
194 | to = (port << 6) | (unit > 0 ? (1 << (unit - 1)) & 0x1f : 0x20); | 208 | to = (port << 6) | (unit > 0 ? (1 << (unit - 1)) & 0x1f : 0x20); |
195 | 209 | ||
196 | *maple_lastptr &= 0x7fffffff; | 210 | *maple_lastptr &= 0x7fffffff; |
197 | maple_lastptr = maple_sendptr; | 211 | maple_lastptr = maple_sendptr; |
198 | 212 | ||
199 | *maple_sendptr++ = (port << 16) | len | 0x80000000; | 213 | *maple_sendptr++ = (port << 16) | len | 0x80000000; |
200 | *maple_sendptr++ = PHYSADDR(mq->recvbuf); | 214 | *maple_sendptr++ = PHYSADDR(mq->recvbuf); |
201 | *maple_sendptr++ = | 215 | *maple_sendptr++ = |
202 | mq->command | (to << 8) | (from << 16) | (len << 24); | 216 | mq->command | (to << 8) | (from << 16) | (len << 24); |
203 | 217 | ||
204 | while (len-- > 0) | 218 | while (len-- > 0) |
205 | *maple_sendptr++ = *lsendbuf++; | 219 | *maple_sendptr++ = *lsendbuf++; |
206 | } | 220 | } |
207 | 221 | ||
208 | /* build up command queue */ | 222 | /* build up command queue */ |
209 | static void maple_send(void) | 223 | static void maple_send(void) |
210 | { | 224 | { |
211 | int i; | 225 | int i; |
212 | int maple_packets; | 226 | int maple_packets; |
213 | struct mapleq *mq, *nmq; | 227 | struct mapleq *mq, *nmq; |
214 | 228 | ||
215 | if (!list_empty(&maple_sentq)) | 229 | if (!list_empty(&maple_sentq)) |
216 | return; | 230 | return; |
217 | if (list_empty(&maple_waitq) || !maple_dma_done()) | 231 | if (list_empty(&maple_waitq) || !maple_dma_done()) |
218 | return; | 232 | return; |
219 | maple_packets = 0; | 233 | maple_packets = 0; |
220 | maple_sendptr = maple_lastptr = maple_sendbuf; | 234 | maple_sendptr = maple_lastptr = maple_sendbuf; |
221 | list_for_each_entry_safe(mq, nmq, &maple_waitq, list) { | 235 | list_for_each_entry_safe(mq, nmq, &maple_waitq, list) { |
222 | maple_build_block(mq); | 236 | maple_build_block(mq); |
223 | list_move(&mq->list, &maple_sentq); | 237 | list_move(&mq->list, &maple_sentq); |
224 | if (maple_packets++ > MAPLE_MAXPACKETS) | 238 | if (maple_packets++ > MAPLE_MAXPACKETS) |
225 | break; | 239 | break; |
226 | } | 240 | } |
227 | if (maple_packets > 0) { | 241 | if (maple_packets > 0) { |
228 | for (i = 0; i < (1 << MAPLE_DMA_PAGES); i++) | 242 | for (i = 0; i < (1 << MAPLE_DMA_PAGES); i++) |
229 | dma_cache_sync(0, maple_sendbuf + i * PAGE_SIZE, | 243 | dma_cache_sync(0, maple_sendbuf + i * PAGE_SIZE, |
230 | PAGE_SIZE, DMA_BIDIRECTIONAL); | 244 | PAGE_SIZE, DMA_BIDIRECTIONAL); |
231 | } | 245 | } |
232 | } | 246 | } |
233 | 247 | ||
234 | static int attach_matching_maple_driver(struct device_driver *driver, | 248 | static int attach_matching_maple_driver(struct device_driver *driver, |
235 | void *devptr) | 249 | void *devptr) |
236 | { | 250 | { |
237 | struct maple_driver *maple_drv; | 251 | struct maple_driver *maple_drv; |
238 | struct maple_device *mdev; | 252 | struct maple_device *mdev; |
239 | 253 | ||
240 | mdev = devptr; | 254 | mdev = devptr; |
241 | maple_drv = to_maple_driver(driver); | 255 | maple_drv = to_maple_driver(driver); |
242 | if (mdev->devinfo.function & be32_to_cpu(maple_drv->function)) { | 256 | if (mdev->devinfo.function & be32_to_cpu(maple_drv->function)) { |
243 | if (maple_drv->connect(mdev) == 0) { | 257 | if (maple_drv->connect(mdev) == 0) { |
244 | mdev->driver = maple_drv; | 258 | mdev->driver = maple_drv; |
245 | return 1; | 259 | return 1; |
246 | } | 260 | } |
247 | } | 261 | } |
248 | return 0; | 262 | return 0; |
249 | } | 263 | } |
250 | 264 | ||
251 | static void maple_detach_driver(struct maple_device *mdev) | 265 | static void maple_detach_driver(struct maple_device *mdev) |
252 | { | 266 | { |
253 | if (!mdev) | 267 | if (!mdev) |
254 | return; | 268 | return; |
255 | if (mdev->driver) { | 269 | if (mdev->driver) { |
256 | if (mdev->driver->disconnect) | 270 | if (mdev->driver->disconnect) |
257 | mdev->driver->disconnect(mdev); | 271 | mdev->driver->disconnect(mdev); |
258 | } | 272 | } |
259 | mdev->driver = NULL; | 273 | mdev->driver = NULL; |
260 | if (mdev->registered) { | 274 | device_unregister(&mdev->dev); |
261 | maple_release_device(&mdev->dev); | 275 | mdev = NULL; |
262 | device_unregister(&mdev->dev); | ||
263 | } | ||
264 | mdev->registered = 0; | ||
265 | maple_free_dev(mdev); | ||
266 | } | 276 | } |
267 | 277 | ||
268 | /* process initial MAPLE_COMMAND_DEVINFO for each device or port */ | 278 | /* process initial MAPLE_COMMAND_DEVINFO for each device or port */ |
269 | static void maple_attach_driver(struct maple_device *dev) | 279 | static void maple_attach_driver(struct maple_device *mdev) |
270 | { | 280 | { |
271 | char *p; | 281 | char *p, *recvbuf; |
272 | 282 | unsigned long function; | |
273 | char *recvbuf; | 283 | int matched, retval; |
274 | unsigned long function; | 284 | |
275 | int matched, retval; | 285 | recvbuf = mdev->mq->recvbuf; |
276 | 286 | /* copy the data as individual elements in | |
277 | recvbuf = dev->mq->recvbuf; | 287 | * case of memory optimisation */ |
278 | memcpy(&dev->devinfo, recvbuf + 4, sizeof(dev->devinfo)); | 288 | memcpy(&mdev->devinfo.function, recvbuf + 4, 4); |
279 | memcpy(dev->product_name, dev->devinfo.product_name, 30); | 289 | memcpy(&mdev->devinfo.function_data[0], recvbuf + 8, 12); |
280 | memcpy(dev->product_licence, dev->devinfo.product_licence, 60); | 290 | memcpy(&mdev->devinfo.area_code, recvbuf + 20, 1); |
281 | dev->product_name[30] = '\0'; | 291 | memcpy(&mdev->devinfo.connector_direction, recvbuf + 21, 1); |
282 | dev->product_licence[60] = '\0'; | 292 | memcpy(&mdev->devinfo.product_name[0], recvbuf + 22, 30); |
283 | 293 | memcpy(&mdev->devinfo.product_licence[0], recvbuf + 52, 60); | |
284 | for (p = dev->product_name + 29; dev->product_name <= p; p--) | 294 | memcpy(&mdev->devinfo.standby_power, recvbuf + 112, 2); |
285 | if (*p == ' ') | 295 | memcpy(&mdev->devinfo.max_power, recvbuf + 114, 2); |
286 | *p = '\0'; | 296 | memcpy(mdev->product_name, mdev->devinfo.product_name, 30); |
287 | else | 297 | mdev->product_name[30] = '\0'; |
288 | break; | 298 | memcpy(mdev->product_licence, mdev->devinfo.product_licence, 60); |
289 | 299 | mdev->product_licence[60] = '\0'; | |
290 | for (p = dev->product_licence + 59; dev->product_licence <= p; p--) | 300 | |
291 | if (*p == ' ') | 301 | for (p = mdev->product_name + 29; mdev->product_name <= p; p--) |
292 | *p = '\0'; | 302 | if (*p == ' ') |
293 | else | 303 | *p = '\0'; |
294 | break; | 304 | else |
295 | 305 | break; | |
296 | function = be32_to_cpu(dev->devinfo.function); | 306 | for (p = mdev->product_licence + 59; mdev->product_licence <= p; p--) |
297 | 307 | if (*p == ' ') | |
298 | if (function > 0x200) { | 308 | *p = '\0'; |
299 | /* Do this silently - as not a real device */ | 309 | else |
300 | function = 0; | 310 | break; |
301 | dev->driver = &maple_dummy_driver; | 311 | |
302 | sprintf(dev->dev.bus_id, "%d:0.port", dev->port); | 312 | if (realscan) { |
303 | } else { | 313 | printk(KERN_INFO "Maple device detected: %s\n", |
304 | printk(KERN_INFO | 314 | mdev->product_name); |
305 | "Maple bus at (%d, %d): Connected function 0x%lX\n", | 315 | printk(KERN_INFO "Maple device: %s\n", mdev->product_licence); |
306 | dev->port, dev->unit, function); | 316 | } |
307 | 317 | ||
308 | matched = | 318 | function = be32_to_cpu(mdev->devinfo.function); |
309 | bus_for_each_drv(&maple_bus_type, NULL, dev, | 319 | |
310 | attach_matching_maple_driver); | 320 | if (function > 0x200) { |
311 | 321 | /* Do this silently - as not a real device */ | |
312 | if (matched == 0) { | 322 | function = 0; |
313 | /* Driver does not exist yet */ | 323 | mdev->driver = &maple_dummy_driver; |
314 | printk(KERN_INFO | 324 | sprintf(mdev->dev.bus_id, "%d:0.port", mdev->port); |
315 | "No maple driver found for this device\n"); | 325 | } else { |
316 | dev->driver = &maple_dummy_driver; | 326 | if (realscan) |
317 | } | 327 | printk(KERN_INFO |
318 | 328 | "Maple bus at (%d, %d): Function 0x%lX\n", | |
319 | sprintf(dev->dev.bus_id, "%d:0%d.%lX", dev->port, | 329 | mdev->port, mdev->unit, function); |
320 | dev->unit, function); | 330 | |
321 | } | 331 | matched = |
322 | dev->function = function; | 332 | bus_for_each_drv(&maple_bus_type, NULL, mdev, |
323 | dev->dev.bus = &maple_bus_type; | 333 | attach_matching_maple_driver); |
324 | dev->dev.parent = &maple_bus; | 334 | |
325 | dev->dev.release = &maple_release_device; | 335 | if (matched == 0) { |
326 | retval = device_register(&dev->dev); | 336 | /* Driver does not exist yet */ |
327 | if (retval) { | 337 | if (realscan) |
328 | printk(KERN_INFO | 338 | printk(KERN_INFO |
329 | "Maple bus: Attempt to register device (%x, %x) failed.\n", | 339 | "No maple driver found.\n"); |
330 | dev->port, dev->unit); | 340 | mdev->driver = &maple_dummy_driver; |
331 | maple_free_dev(dev); | 341 | } |
332 | } | 342 | sprintf(mdev->dev.bus_id, "%d:0%d.%lX", mdev->port, |
333 | dev->registered = 1; | 343 | mdev->unit, function); |
344 | } | ||
345 | mdev->function = function; | ||
346 | mdev->dev.release = &maple_release_device; | ||
347 | retval = device_register(&mdev->dev); | ||
348 | if (retval) { | ||
349 | printk(KERN_INFO | ||
350 | "Maple bus: Attempt to register device" | ||
351 | " (%x, %x) failed.\n", | ||
352 | mdev->port, mdev->unit); | ||
353 | maple_free_dev(mdev); | ||
354 | mdev = NULL; | ||
355 | return; | ||
356 | } | ||
334 | } | 357 | } |
335 | 358 | ||
336 | /* | 359 | /* |
@@ -340,270 +363,262 @@ static void maple_attach_driver(struct maple_device *dev) | |||
340 | */ | 363 | */ |
341 | static int detach_maple_device(struct device *device, void *portptr) | 364 | static int detach_maple_device(struct device *device, void *portptr) |
342 | { | 365 | { |
343 | struct maple_device_specify *ds; | 366 | struct maple_device_specify *ds; |
344 | struct maple_device *mdev; | 367 | struct maple_device *mdev; |
345 | 368 | ||
346 | ds = portptr; | 369 | ds = portptr; |
347 | mdev = to_maple_dev(device); | 370 | mdev = to_maple_dev(device); |
348 | if (mdev->port == ds->port && mdev->unit == ds->unit) | 371 | if (mdev->port == ds->port && mdev->unit == ds->unit) |
349 | return 1; | 372 | return 1; |
350 | return 0; | 373 | return 0; |
351 | } | 374 | } |
352 | 375 | ||
353 | static int setup_maple_commands(struct device *device, void *ignored) | 376 | static int setup_maple_commands(struct device *device, void *ignored) |
354 | { | 377 | { |
355 | struct maple_device *maple_dev = to_maple_dev(device); | 378 | struct maple_device *maple_dev = to_maple_dev(device); |
356 | 379 | ||
357 | if ((maple_dev->interval > 0) | 380 | if ((maple_dev->interval > 0) |
358 | && time_after(jiffies, maple_dev->when)) { | 381 | && time_after(jiffies, maple_dev->when)) { |
359 | maple_dev->when = jiffies + maple_dev->interval; | 382 | maple_dev->when = jiffies + maple_dev->interval; |
360 | maple_dev->mq->command = MAPLE_COMMAND_GETCOND; | 383 | maple_dev->mq->command = MAPLE_COMMAND_GETCOND; |
361 | maple_dev->mq->sendbuf = &maple_dev->function; | 384 | maple_dev->mq->sendbuf = &maple_dev->function; |
362 | maple_dev->mq->length = 1; | 385 | maple_dev->mq->length = 1; |
363 | maple_add_packet(maple_dev->mq); | 386 | maple_add_packet(maple_dev->mq); |
364 | liststatus++; | 387 | liststatus++; |
365 | } else { | 388 | } else { |
366 | if (time_after(jiffies, maple_pnp_time)) { | 389 | if (time_after(jiffies, maple_pnp_time)) { |
367 | maple_dev->mq->command = MAPLE_COMMAND_DEVINFO; | 390 | maple_dev->mq->command = MAPLE_COMMAND_DEVINFO; |
368 | maple_dev->mq->length = 0; | 391 | maple_dev->mq->length = 0; |
369 | maple_add_packet(maple_dev->mq); | 392 | maple_add_packet(maple_dev->mq); |
370 | liststatus++; | 393 | liststatus++; |
371 | } | 394 | } |
372 | } | 395 | } |
373 | 396 | ||
374 | return 0; | 397 | return 0; |
375 | } | 398 | } |
376 | 399 | ||
377 | /* VBLANK bottom half - implemented via workqueue */ | 400 | /* VBLANK bottom half - implemented via workqueue */ |
378 | static void maple_vblank_handler(struct work_struct *work) | 401 | static void maple_vblank_handler(struct work_struct *work) |
379 | { | 402 | { |
380 | if (!maple_dma_done()) | 403 | if (!maple_dma_done()) |
381 | return; | 404 | return; |
382 | if (!list_empty(&maple_sentq)) | 405 | if (!list_empty(&maple_sentq)) |
383 | return; | 406 | return; |
384 | ctrl_outl(0, MAPLE_ENABLE); | 407 | ctrl_outl(0, MAPLE_ENABLE); |
385 | liststatus = 0; | 408 | liststatus = 0; |
386 | bus_for_each_dev(&maple_bus_type, NULL, NULL, | 409 | bus_for_each_dev(&maple_bus_type, NULL, NULL, |
387 | setup_maple_commands); | 410 | setup_maple_commands); |
388 | if (time_after(jiffies, maple_pnp_time)) | 411 | if (time_after(jiffies, maple_pnp_time)) |
389 | maple_pnp_time = jiffies + MAPLE_PNP_INTERVAL; | 412 | maple_pnp_time = jiffies + MAPLE_PNP_INTERVAL; |
390 | if (liststatus && list_empty(&maple_sentq)) { | 413 | if (liststatus && list_empty(&maple_sentq)) { |
391 | INIT_LIST_HEAD(&maple_sentq); | 414 | INIT_LIST_HEAD(&maple_sentq); |
392 | maple_send(); | 415 | maple_send(); |
393 | } | 416 | } |
394 | maplebus_dma_reset(); | 417 | maplebus_dma_reset(); |
395 | } | 418 | } |
396 | 419 | ||
397 | /* handle devices added via hotplugs - placing them on queue for DEVINFO*/ | 420 | /* handle devices added via hotplugs - placing them on queue for DEVINFO*/ |
398 | static void maple_map_subunits(struct maple_device *mdev, int submask) | 421 | static void maple_map_subunits(struct maple_device *mdev, int submask) |
399 | { | 422 | { |
400 | int retval, k, devcheck; | 423 | int retval, k, devcheck; |
401 | struct maple_device *mdev_add; | 424 | struct maple_device *mdev_add; |
402 | struct maple_device_specify ds; | 425 | struct maple_device_specify ds; |
403 | 426 | ||
404 | for (k = 0; k < 5; k++) { | 427 | for (k = 0; k < 5; k++) { |
405 | ds.port = mdev->port; | 428 | ds.port = mdev->port; |
406 | ds.unit = k + 1; | 429 | ds.unit = k + 1; |
407 | retval = | 430 | retval = |
408 | bus_for_each_dev(&maple_bus_type, NULL, &ds, | 431 | bus_for_each_dev(&maple_bus_type, NULL, &ds, |
409 | detach_maple_device); | 432 | detach_maple_device); |
410 | if (retval) { | 433 | if (retval) { |
411 | submask = submask >> 1; | 434 | submask = submask >> 1; |
412 | continue; | 435 | continue; |
413 | } | 436 | } |
414 | devcheck = submask & 0x01; | 437 | devcheck = submask & 0x01; |
415 | if (devcheck) { | 438 | if (devcheck) { |
416 | mdev_add = maple_alloc_dev(mdev->port, k + 1); | 439 | mdev_add = maple_alloc_dev(mdev->port, k + 1); |
417 | if (!mdev_add) | 440 | if (!mdev_add) |
418 | return; | 441 | return; |
419 | mdev_add->mq->command = MAPLE_COMMAND_DEVINFO; | 442 | mdev_add->mq->command = MAPLE_COMMAND_DEVINFO; |
420 | mdev_add->mq->length = 0; | 443 | mdev_add->mq->length = 0; |
421 | maple_add_packet(mdev_add->mq); | 444 | maple_add_packet(mdev_add->mq); |
422 | scanning = 1; | 445 | scanning = 1; |
423 | } | 446 | } |
424 | submask = submask >> 1; | 447 | submask = submask >> 1; |
425 | } | 448 | } |
426 | } | 449 | } |
427 | 450 | ||
428 | /* mark a device as removed */ | 451 | /* mark a device as removed */ |
429 | static void maple_clean_submap(struct maple_device *mdev) | 452 | static void maple_clean_submap(struct maple_device *mdev) |
430 | { | 453 | { |
431 | int killbit; | 454 | int killbit; |
432 | 455 | ||
433 | killbit = (mdev->unit > 0 ? (1 << (mdev->unit - 1)) & 0x1f : 0x20); | 456 | killbit = (mdev->unit > 0 ? (1 << (mdev->unit - 1)) & 0x1f : 0x20); |
434 | killbit = ~killbit; | 457 | killbit = ~killbit; |
435 | killbit &= 0xFF; | 458 | killbit &= 0xFF; |
436 | subdevice_map[mdev->port] = subdevice_map[mdev->port] & killbit; | 459 | subdevice_map[mdev->port] = subdevice_map[mdev->port] & killbit; |
437 | } | 460 | } |
438 | 461 | ||
439 | /* handle empty port or hotplug removal */ | 462 | /* handle empty port or hotplug removal */ |
440 | static void maple_response_none(struct maple_device *mdev, | 463 | static void maple_response_none(struct maple_device *mdev, |
441 | struct mapleq *mq) | 464 | struct mapleq *mq) |
442 | { | 465 | { |
443 | if (mdev->unit != 0) { | 466 | if (mdev->unit != 0) { |
444 | list_del(&mq->list); | 467 | list_del(&mq->list); |
445 | maple_clean_submap(mdev); | 468 | maple_clean_submap(mdev); |
446 | printk(KERN_INFO | 469 | printk(KERN_INFO |
447 | "Maple bus device detaching at (%d, %d)\n", | 470 | "Maple bus device detaching at (%d, %d)\n", |
448 | mdev->port, mdev->unit); | 471 | mdev->port, mdev->unit); |
449 | maple_detach_driver(mdev); | 472 | maple_detach_driver(mdev); |
450 | return; | 473 | return; |
451 | } | 474 | } |
452 | if (!started) { | 475 | if (!started) { |
453 | printk(KERN_INFO "No maple devices attached to port %d\n", | 476 | printk(KERN_INFO "No maple devices attached to port %d\n", |
454 | mdev->port); | 477 | mdev->port); |
455 | return; | 478 | return; |
456 | } | 479 | } |
457 | maple_clean_submap(mdev); | 480 | maple_clean_submap(mdev); |
458 | } | 481 | } |
459 | 482 | ||
460 | /* preprocess hotplugs or scans */ | 483 | /* preprocess hotplugs or scans */ |
461 | static void maple_response_devinfo(struct maple_device *mdev, | 484 | static void maple_response_devinfo(struct maple_device *mdev, |
462 | char *recvbuf) | 485 | char *recvbuf) |
463 | { | 486 | { |
464 | char submask; | 487 | char submask; |
465 | if ((!started) || (scanning == 2)) { | 488 | if ((!started) || (scanning == 2)) { |
466 | maple_attach_driver(mdev); | 489 | maple_attach_driver(mdev); |
467 | return; | 490 | return; |
468 | } | 491 | } |
469 | if (mdev->unit == 0) { | 492 | if (mdev->unit == 0) { |
470 | submask = recvbuf[2] & 0x1F; | 493 | submask = recvbuf[2] & 0x1F; |
471 | if (submask ^ subdevice_map[mdev->port]) { | 494 | if (submask ^ subdevice_map[mdev->port]) { |
472 | maple_map_subunits(mdev, submask); | 495 | maple_map_subunits(mdev, submask); |
473 | subdevice_map[mdev->port] = submask; | 496 | subdevice_map[mdev->port] = submask; |
474 | } | 497 | } |
475 | } | 498 | } |
476 | } | 499 | } |
477 | 500 | ||
478 | /* maple dma end bottom half - implemented via workqueue */ | 501 | /* maple dma end bottom half - implemented via workqueue */ |
479 | static void maple_dma_handler(struct work_struct *work) | 502 | static void maple_dma_handler(struct work_struct *work) |
480 | { | 503 | { |
481 | struct mapleq *mq, *nmq; | 504 | struct mapleq *mq, *nmq; |
482 | struct maple_device *dev; | 505 | struct maple_device *dev; |
483 | char *recvbuf; | 506 | char *recvbuf; |
484 | enum maple_code code; | 507 | enum maple_code code; |
485 | 508 | ||
486 | if (!maple_dma_done()) | 509 | if (!maple_dma_done()) |
487 | return; | 510 | return; |
488 | ctrl_outl(0, MAPLE_ENABLE); | 511 | ctrl_outl(0, MAPLE_ENABLE); |
489 | if (!list_empty(&maple_sentq)) { | 512 | if (!list_empty(&maple_sentq)) { |
490 | list_for_each_entry_safe(mq, nmq, &maple_sentq, list) { | 513 | list_for_each_entry_safe(mq, nmq, &maple_sentq, list) { |
491 | recvbuf = mq->recvbuf; | 514 | recvbuf = mq->recvbuf; |
492 | code = recvbuf[0]; | 515 | code = recvbuf[0]; |
493 | dev = mq->dev; | 516 | dev = mq->dev; |
494 | switch (code) { | 517 | switch (code) { |
495 | case MAPLE_RESPONSE_NONE: | 518 | case MAPLE_RESPONSE_NONE: |
496 | maple_response_none(dev, mq); | 519 | maple_response_none(dev, mq); |
497 | break; | 520 | break; |
498 | 521 | ||
499 | case MAPLE_RESPONSE_DEVINFO: | 522 | case MAPLE_RESPONSE_DEVINFO: |
500 | maple_response_devinfo(dev, recvbuf); | 523 | maple_response_devinfo(dev, recvbuf); |
501 | break; | 524 | break; |
502 | 525 | ||
503 | case MAPLE_RESPONSE_DATATRF: | 526 | case MAPLE_RESPONSE_DATATRF: |
504 | if (dev->callback) | 527 | if (dev->callback) |
505 | dev->callback(mq); | 528 | dev->callback(mq); |
506 | break; | 529 | break; |
507 | 530 | ||
508 | case MAPLE_RESPONSE_FILEERR: | 531 | case MAPLE_RESPONSE_FILEERR: |
509 | case MAPLE_RESPONSE_AGAIN: | 532 | case MAPLE_RESPONSE_AGAIN: |
510 | case MAPLE_RESPONSE_BADCMD: | 533 | case MAPLE_RESPONSE_BADCMD: |
511 | case MAPLE_RESPONSE_BADFUNC: | 534 | case MAPLE_RESPONSE_BADFUNC: |
512 | printk(KERN_DEBUG | 535 | printk(KERN_DEBUG |
513 | "Maple non-fatal error 0x%X\n", | 536 | "Maple non-fatal error 0x%X\n", |
514 | code); | 537 | code); |
515 | break; | 538 | break; |
516 | 539 | ||
517 | case MAPLE_RESPONSE_ALLINFO: | 540 | case MAPLE_RESPONSE_ALLINFO: |
518 | printk(KERN_DEBUG | 541 | printk(KERN_DEBUG |
519 | "Maple - extended device information not supported\n"); | 542 | "Maple - extended device information" |
520 | break; | 543 | " not supported\n"); |
521 | 544 | break; | |
522 | case MAPLE_RESPONSE_OK: | 545 | |
523 | break; | 546 | case MAPLE_RESPONSE_OK: |
524 | 547 | break; | |
525 | default: | 548 | |
526 | break; | 549 | default: |
527 | } | 550 | break; |
528 | } | 551 | } |
529 | INIT_LIST_HEAD(&maple_sentq); | 552 | } |
530 | if (scanning == 1) { | 553 | INIT_LIST_HEAD(&maple_sentq); |
531 | maple_send(); | 554 | if (scanning == 1) { |
532 | scanning = 2; | 555 | maple_send(); |
533 | } else | 556 | scanning = 2; |
534 | scanning = 0; | 557 | } else |
535 | 558 | scanning = 0; | |
536 | if (started == 0) | 559 | |
537 | started = 1; | 560 | if (started == 0) |
538 | } | 561 | started = 1; |
539 | maplebus_dma_reset(); | 562 | } |
563 | maplebus_dma_reset(); | ||
540 | } | 564 | } |
541 | 565 | ||
542 | static irqreturn_t maplebus_dma_interrupt(int irq, void *dev_id) | 566 | static irqreturn_t maplebus_dma_interrupt(int irq, void *dev_id) |
543 | { | 567 | { |
544 | /* Load everything into the bottom half */ | 568 | /* Load everything into the bottom half */ |
545 | schedule_work(&maple_dma_process); | 569 | schedule_work(&maple_dma_process); |
546 | return IRQ_HANDLED; | 570 | return IRQ_HANDLED; |
547 | } | 571 | } |
548 | 572 | ||
549 | static irqreturn_t maplebus_vblank_interrupt(int irq, void *dev_id) | 573 | static irqreturn_t maplebus_vblank_interrupt(int irq, void *dev_id) |
550 | { | 574 | { |
551 | schedule_work(&maple_vblank_process); | 575 | schedule_work(&maple_vblank_process); |
552 | return IRQ_HANDLED; | 576 | return IRQ_HANDLED; |
553 | } | 577 | } |
554 | 578 | ||
555 | static struct irqaction maple_dma_irq = { | ||
556 | .name = "maple bus DMA handler", | ||
557 | .handler = maplebus_dma_interrupt, | ||
558 | .flags = IRQF_SHARED, | ||
559 | }; | ||
560 | |||
561 | static struct irqaction maple_vblank_irq = { | ||
562 | .name = "maple bus VBLANK handler", | ||
563 | .handler = maplebus_vblank_interrupt, | ||
564 | .flags = IRQF_SHARED, | ||
565 | }; | ||
566 | |||
567 | static int maple_set_dma_interrupt_handler(void) | 579 | static int maple_set_dma_interrupt_handler(void) |
568 | { | 580 | { |
569 | return setup_irq(HW_EVENT_MAPLE_DMA, &maple_dma_irq); | 581 | return request_irq(HW_EVENT_MAPLE_DMA, maplebus_dma_interrupt, |
582 | IRQF_SHARED, "maple bus DMA", &maple_dummy_driver); | ||
570 | } | 583 | } |
571 | 584 | ||
572 | static int maple_set_vblank_interrupt_handler(void) | 585 | static int maple_set_vblank_interrupt_handler(void) |
573 | { | 586 | { |
574 | return setup_irq(HW_EVENT_VSYNC, &maple_vblank_irq); | 587 | return request_irq(HW_EVENT_VSYNC, maplebus_vblank_interrupt, |
588 | IRQF_SHARED, "maple bus VBLANK", &maple_dummy_driver); | ||
575 | } | 589 | } |
576 | 590 | ||
577 | static int maple_get_dma_buffer(void) | 591 | static int maple_get_dma_buffer(void) |
578 | { | 592 | { |
579 | maple_sendbuf = | 593 | maple_sendbuf = |
580 | (void *) __get_free_pages(GFP_KERNEL | __GFP_ZERO, | 594 | (void *) __get_free_pages(GFP_KERNEL | __GFP_ZERO, |
581 | MAPLE_DMA_PAGES); | 595 | MAPLE_DMA_PAGES); |
582 | if (!maple_sendbuf) | 596 | if (!maple_sendbuf) |
583 | return -ENOMEM; | 597 | return -ENOMEM; |
584 | return 0; | 598 | return 0; |
585 | } | 599 | } |
586 | 600 | ||
587 | static int match_maple_bus_driver(struct device *devptr, | 601 | static int match_maple_bus_driver(struct device *devptr, |
588 | struct device_driver *drvptr) | 602 | struct device_driver *drvptr) |
589 | { | 603 | { |
590 | struct maple_driver *maple_drv; | 604 | struct maple_driver *maple_drv; |
591 | struct maple_device *maple_dev; | 605 | struct maple_device *maple_dev; |
592 | 606 | ||
593 | maple_drv = container_of(drvptr, struct maple_driver, drv); | 607 | maple_drv = container_of(drvptr, struct maple_driver, drv); |
594 | maple_dev = container_of(devptr, struct maple_device, dev); | 608 | maple_dev = container_of(devptr, struct maple_device, dev); |
595 | /* Trap empty port case */ | 609 | /* Trap empty port case */ |
596 | if (maple_dev->devinfo.function == 0xFFFFFFFF) | 610 | if (maple_dev->devinfo.function == 0xFFFFFFFF) |
597 | return 0; | 611 | return 0; |
598 | else if (maple_dev->devinfo.function & | 612 | else if (maple_dev->devinfo.function & |
599 | be32_to_cpu(maple_drv->function)) | 613 | be32_to_cpu(maple_drv->function)) |
600 | return 1; | 614 | return 1; |
601 | return 0; | 615 | return 0; |
602 | } | 616 | } |
603 | 617 | ||
604 | static int maple_bus_uevent(struct device *dev, struct kobj_uevent_env *env) | 618 | static int maple_bus_uevent(struct device *dev, |
619 | struct kobj_uevent_env *env) | ||
605 | { | 620 | { |
606 | return 0; | 621 | return 0; |
607 | } | 622 | } |
608 | 623 | ||
609 | static void maple_bus_release(struct device *dev) | 624 | static void maple_bus_release(struct device *dev) |
@@ -611,124 +626,122 @@ static void maple_bus_release(struct device *dev) | |||
611 | } | 626 | } |
612 | 627 | ||
613 | static struct maple_driver maple_dummy_driver = { | 628 | static struct maple_driver maple_dummy_driver = { |
614 | .drv = { | 629 | .drv = { |
615 | .name = "maple_dummy_driver", | 630 | .name = "maple_dummy_driver", |
616 | .bus = &maple_bus_type, | 631 | .bus = &maple_bus_type, |
617 | }, | 632 | }, |
618 | }; | 633 | }; |
619 | 634 | ||
620 | struct bus_type maple_bus_type = { | 635 | struct bus_type maple_bus_type = { |
621 | .name = "maple", | 636 | .name = "maple", |
622 | .match = match_maple_bus_driver, | 637 | .match = match_maple_bus_driver, |
623 | .uevent = maple_bus_uevent, | 638 | .uevent = maple_bus_uevent, |
624 | }; | 639 | }; |
625 | EXPORT_SYMBOL_GPL(maple_bus_type); | 640 | EXPORT_SYMBOL_GPL(maple_bus_type); |
626 | 641 | ||
627 | static struct device maple_bus = { | 642 | static struct device maple_bus = { |
628 | .bus_id = "maple", | 643 | .bus_id = "maple", |
629 | .release = maple_bus_release, | 644 | .release = maple_bus_release, |
630 | }; | 645 | }; |
631 | 646 | ||
632 | static int __init maple_bus_init(void) | 647 | static int __init maple_bus_init(void) |
633 | { | 648 | { |
634 | int retval, i; | 649 | int retval, i; |
635 | struct maple_device *mdev[MAPLE_PORTS]; | 650 | struct maple_device *mdev[MAPLE_PORTS]; |
636 | ctrl_outl(0, MAPLE_STATE); | 651 | ctrl_outl(0, MAPLE_STATE); |
637 | 652 | ||
638 | retval = device_register(&maple_bus); | 653 | retval = device_register(&maple_bus); |
639 | if (retval) | 654 | if (retval) |
640 | goto cleanup; | 655 | goto cleanup; |
641 | 656 | ||
642 | retval = bus_register(&maple_bus_type); | 657 | retval = bus_register(&maple_bus_type); |
643 | if (retval) | 658 | if (retval) |
644 | goto cleanup_device; | 659 | goto cleanup_device; |
645 | 660 | ||
646 | retval = driver_register(&maple_dummy_driver.drv); | 661 | retval = driver_register(&maple_dummy_driver.drv); |
647 | 662 | if (retval) | |
648 | if (retval) | 663 | goto cleanup_bus; |
649 | goto cleanup_bus; | 664 | |
650 | 665 | /* allocate memory for maple bus dma */ | |
651 | /* allocate memory for maple bus dma */ | 666 | retval = maple_get_dma_buffer(); |
652 | retval = maple_get_dma_buffer(); | 667 | if (retval) { |
653 | if (retval) { | 668 | printk(KERN_INFO |
654 | printk(KERN_INFO | 669 | "Maple bus: Failed to allocate Maple DMA buffers\n"); |
655 | "Maple bus: Failed to allocate Maple DMA buffers\n"); | 670 | goto cleanup_basic; |
656 | goto cleanup_basic; | 671 | } |
657 | } | 672 | |
658 | 673 | /* set up DMA interrupt handler */ | |
659 | /* set up DMA interrupt handler */ | 674 | retval = maple_set_dma_interrupt_handler(); |
660 | retval = maple_set_dma_interrupt_handler(); | 675 | if (retval) { |
661 | if (retval) { | 676 | printk(KERN_INFO |
662 | printk(KERN_INFO | 677 | "Maple bus: Failed to grab maple DMA IRQ\n"); |
663 | "Maple bus: Failed to grab maple DMA IRQ\n"); | 678 | goto cleanup_dma; |
664 | goto cleanup_dma; | 679 | } |
665 | } | 680 | |
666 | 681 | /* set up VBLANK interrupt handler */ | |
667 | /* set up VBLANK interrupt handler */ | 682 | retval = maple_set_vblank_interrupt_handler(); |
668 | retval = maple_set_vblank_interrupt_handler(); | 683 | if (retval) { |
669 | if (retval) { | 684 | printk(KERN_INFO "Maple bus: Failed to grab VBLANK IRQ\n"); |
670 | printk(KERN_INFO "Maple bus: Failed to grab VBLANK IRQ\n"); | 685 | goto cleanup_irq; |
671 | goto cleanup_irq; | 686 | } |
672 | } | 687 | |
673 | 688 | maple_queue_cache = | |
674 | maple_queue_cache = | 689 | kmem_cache_create("maple_queue_cache", 0x400, 0, |
675 | kmem_cache_create("maple_queue_cache", 0x400, 0, | 690 | SLAB_POISON|SLAB_HWCACHE_ALIGN, NULL); |
676 | SLAB_HWCACHE_ALIGN, NULL); | 691 | |
677 | 692 | if (!maple_queue_cache) | |
678 | if (!maple_queue_cache) | 693 | goto cleanup_bothirqs; |
679 | goto cleanup_bothirqs; | 694 | |
680 | 695 | /* setup maple ports */ | |
681 | /* setup maple ports */ | 696 | for (i = 0; i < MAPLE_PORTS; i++) { |
682 | for (i = 0; i < MAPLE_PORTS; i++) { | 697 | mdev[i] = maple_alloc_dev(i, 0); |
683 | mdev[i] = maple_alloc_dev(i, 0); | 698 | if (!mdev[i]) { |
684 | if (!mdev[i]) { | 699 | while (i-- > 0) |
685 | while (i-- > 0) | 700 | maple_free_dev(mdev[i]); |
686 | maple_free_dev(mdev[i]); | 701 | goto cleanup_cache; |
687 | goto cleanup_cache; | 702 | } |
688 | } | 703 | mdev[i]->mq->command = MAPLE_COMMAND_DEVINFO; |
689 | mdev[i]->registered = 0; | 704 | mdev[i]->mq->length = 0; |
690 | mdev[i]->mq->command = MAPLE_COMMAND_DEVINFO; | 705 | maple_add_packet(mdev[i]->mq); |
691 | mdev[i]->mq->length = 0; | 706 | /* delay aids hardware detection */ |
692 | maple_attach_driver(mdev[i]); | 707 | mdelay(5); |
693 | maple_add_packet(mdev[i]->mq); | 708 | subdevice_map[i] = 0; |
694 | subdevice_map[i] = 0; | 709 | } |
695 | } | 710 | |
696 | 711 | realscan = 1; | |
697 | /* setup maplebus hardware */ | 712 | /* setup maplebus hardware */ |
698 | maplebus_dma_reset(); | 713 | maplebus_dma_reset(); |
699 | 714 | /* initial detection */ | |
700 | /* initial detection */ | 715 | maple_send(); |
701 | maple_send(); | 716 | maple_pnp_time = jiffies; |
702 | 717 | printk(KERN_INFO "Maple bus core now registered.\n"); | |
703 | maple_pnp_time = jiffies; | 718 | |
704 | 719 | return 0; | |
705 | printk(KERN_INFO "Maple bus core now registered.\n"); | ||
706 | |||
707 | return 0; | ||
708 | 720 | ||
709 | cleanup_cache: | 721 | cleanup_cache: |
710 | kmem_cache_destroy(maple_queue_cache); | 722 | kmem_cache_destroy(maple_queue_cache); |
711 | 723 | ||
712 | cleanup_bothirqs: | 724 | cleanup_bothirqs: |
713 | free_irq(HW_EVENT_VSYNC, 0); | 725 | free_irq(HW_EVENT_VSYNC, 0); |
714 | 726 | ||
715 | cleanup_irq: | 727 | cleanup_irq: |
716 | free_irq(HW_EVENT_MAPLE_DMA, 0); | 728 | free_irq(HW_EVENT_MAPLE_DMA, 0); |
717 | 729 | ||
718 | cleanup_dma: | 730 | cleanup_dma: |
719 | free_pages((unsigned long) maple_sendbuf, MAPLE_DMA_PAGES); | 731 | free_pages((unsigned long) maple_sendbuf, MAPLE_DMA_PAGES); |
720 | 732 | ||
721 | cleanup_basic: | 733 | cleanup_basic: |
722 | driver_unregister(&maple_dummy_driver.drv); | 734 | driver_unregister(&maple_dummy_driver.drv); |
723 | 735 | ||
724 | cleanup_bus: | 736 | cleanup_bus: |
725 | bus_unregister(&maple_bus_type); | 737 | bus_unregister(&maple_bus_type); |
726 | 738 | ||
727 | cleanup_device: | 739 | cleanup_device: |
728 | device_unregister(&maple_bus); | 740 | device_unregister(&maple_bus); |
729 | 741 | ||
730 | cleanup: | 742 | cleanup: |
731 | printk(KERN_INFO "Maple bus registration failed\n"); | 743 | printk(KERN_INFO "Maple bus registration failed\n"); |
732 | return retval; | 744 | return retval; |
733 | } | 745 | } |
734 | subsys_initcall(maple_bus_init); | 746 | /* Push init to later to ensure hardware gets detected */ |
747 | fs_initcall(maple_bus_init); | ||