diff options
Diffstat (limited to 'arch/powerpc/kernel/vio.c')
-rw-r--r-- | arch/powerpc/kernel/vio.c | 1033 |
1 files changed, 1027 insertions, 6 deletions
diff --git a/arch/powerpc/kernel/vio.c b/arch/powerpc/kernel/vio.c index b77f8af7ddde..ade8aeaa2e70 100644 --- a/arch/powerpc/kernel/vio.c +++ b/arch/powerpc/kernel/vio.c | |||
@@ -1,11 +1,12 @@ | |||
1 | /* | 1 | /* |
2 | * IBM PowerPC Virtual I/O Infrastructure Support. | 2 | * IBM PowerPC Virtual I/O Infrastructure Support. |
3 | * | 3 | * |
4 | * Copyright (c) 2003-2005 IBM Corp. | 4 | * Copyright (c) 2003,2008 IBM Corp. |
5 | * Dave Engebretsen engebret@us.ibm.com | 5 | * Dave Engebretsen engebret@us.ibm.com |
6 | * Santiago Leon santil@us.ibm.com | 6 | * Santiago Leon santil@us.ibm.com |
7 | * Hollis Blanchard <hollisb@us.ibm.com> | 7 | * Hollis Blanchard <hollisb@us.ibm.com> |
8 | * Stephen Rothwell | 8 | * Stephen Rothwell |
9 | * Robert Jennings <rcjenn@us.ibm.com> | ||
9 | * | 10 | * |
10 | * This program is free software; you can redistribute it and/or | 11 | * This program is free software; you can redistribute it and/or |
11 | * modify it under the terms of the GNU General Public License | 12 | * modify it under the terms of the GNU General Public License |
@@ -46,6 +47,996 @@ static struct vio_dev vio_bus_device = { /* fake "parent" device */ | |||
46 | .dev.bus = &vio_bus_type, | 47 | .dev.bus = &vio_bus_type, |
47 | }; | 48 | }; |
48 | 49 | ||
50 | #ifdef CONFIG_PPC_SMLPAR | ||
51 | /** | ||
52 | * vio_cmo_pool - A pool of IO memory for CMO use | ||
53 | * | ||
54 | * @size: The size of the pool in bytes | ||
55 | * @free: The amount of free memory in the pool | ||
56 | */ | ||
57 | struct vio_cmo_pool { | ||
58 | size_t size; | ||
59 | size_t free; | ||
60 | }; | ||
61 | |||
62 | /* How many ms to delay queued balance work */ | ||
63 | #define VIO_CMO_BALANCE_DELAY 100 | ||
64 | |||
65 | /* Portion out IO memory to CMO devices by this chunk size */ | ||
66 | #define VIO_CMO_BALANCE_CHUNK 131072 | ||
67 | |||
68 | /** | ||
69 | * vio_cmo_dev_entry - A device that is CMO-enabled and requires entitlement | ||
70 | * | ||
71 | * @vio_dev: struct vio_dev pointer | ||
72 | * @list: pointer to other devices on bus that are being tracked | ||
73 | */ | ||
74 | struct vio_cmo_dev_entry { | ||
75 | struct vio_dev *viodev; | ||
76 | struct list_head list; | ||
77 | }; | ||
78 | |||
79 | /** | ||
80 | * vio_cmo - VIO bus accounting structure for CMO entitlement | ||
81 | * | ||
82 | * @lock: spinlock for entire structure | ||
83 | * @balance_q: work queue for balancing system entitlement | ||
84 | * @device_list: list of CMO-enabled devices requiring entitlement | ||
85 | * @entitled: total system entitlement in bytes | ||
86 | * @reserve: pool of memory from which devices reserve entitlement, incl. spare | ||
87 | * @excess: pool of excess entitlement not needed for device reserves or spare | ||
88 | * @spare: IO memory for device hotplug functionality | ||
89 | * @min: minimum necessary for system operation | ||
90 | * @desired: desired memory for system operation | ||
91 | * @curr: bytes currently allocated | ||
92 | * @high: high water mark for IO data usage | ||
93 | */ | ||
94 | struct vio_cmo { | ||
95 | spinlock_t lock; | ||
96 | struct delayed_work balance_q; | ||
97 | struct list_head device_list; | ||
98 | size_t entitled; | ||
99 | struct vio_cmo_pool reserve; | ||
100 | struct vio_cmo_pool excess; | ||
101 | size_t spare; | ||
102 | size_t min; | ||
103 | size_t desired; | ||
104 | size_t curr; | ||
105 | size_t high; | ||
106 | } vio_cmo; | ||
107 | |||
108 | /** | ||
109 | * vio_cmo_OF_devices - Count the number of OF devices that have DMA windows | ||
110 | */ | ||
111 | static int vio_cmo_num_OF_devs(void) | ||
112 | { | ||
113 | struct device_node *node_vroot; | ||
114 | int count = 0; | ||
115 | |||
116 | /* | ||
117 | * Count the number of vdevice entries with an | ||
118 | * ibm,my-dma-window OF property | ||
119 | */ | ||
120 | node_vroot = of_find_node_by_name(NULL, "vdevice"); | ||
121 | if (node_vroot) { | ||
122 | struct device_node *of_node; | ||
123 | struct property *prop; | ||
124 | |||
125 | for_each_child_of_node(node_vroot, of_node) { | ||
126 | prop = of_find_property(of_node, "ibm,my-dma-window", | ||
127 | NULL); | ||
128 | if (prop) | ||
129 | count++; | ||
130 | } | ||
131 | } | ||
132 | of_node_put(node_vroot); | ||
133 | return count; | ||
134 | } | ||
135 | |||
136 | /** | ||
137 | * vio_cmo_alloc - allocate IO memory for CMO-enable devices | ||
138 | * | ||
139 | * @viodev: VIO device requesting IO memory | ||
140 | * @size: size of allocation requested | ||
141 | * | ||
142 | * Allocations come from memory reserved for the devices and any excess | ||
143 | * IO memory available to all devices. The spare pool used to service | ||
144 | * hotplug must be equal to %VIO_CMO_MIN_ENT for the excess pool to be | ||
145 | * made available. | ||
146 | * | ||
147 | * Return codes: | ||
148 | * 0 for successful allocation and -ENOMEM for a failure | ||
149 | */ | ||
150 | static inline int vio_cmo_alloc(struct vio_dev *viodev, size_t size) | ||
151 | { | ||
152 | unsigned long flags; | ||
153 | size_t reserve_free = 0; | ||
154 | size_t excess_free = 0; | ||
155 | int ret = -ENOMEM; | ||
156 | |||
157 | spin_lock_irqsave(&vio_cmo.lock, flags); | ||
158 | |||
159 | /* Determine the amount of free entitlement available in reserve */ | ||
160 | if (viodev->cmo.entitled > viodev->cmo.allocated) | ||
161 | reserve_free = viodev->cmo.entitled - viodev->cmo.allocated; | ||
162 | |||
163 | /* If spare is not fulfilled, the excess pool can not be used. */ | ||
164 | if (vio_cmo.spare >= VIO_CMO_MIN_ENT) | ||
165 | excess_free = vio_cmo.excess.free; | ||
166 | |||
167 | /* The request can be satisfied */ | ||
168 | if ((reserve_free + excess_free) >= size) { | ||
169 | vio_cmo.curr += size; | ||
170 | if (vio_cmo.curr > vio_cmo.high) | ||
171 | vio_cmo.high = vio_cmo.curr; | ||
172 | viodev->cmo.allocated += size; | ||
173 | size -= min(reserve_free, size); | ||
174 | vio_cmo.excess.free -= size; | ||
175 | ret = 0; | ||
176 | } | ||
177 | |||
178 | spin_unlock_irqrestore(&vio_cmo.lock, flags); | ||
179 | return ret; | ||
180 | } | ||
181 | |||
182 | /** | ||
183 | * vio_cmo_dealloc - deallocate IO memory from CMO-enable devices | ||
184 | * @viodev: VIO device freeing IO memory | ||
185 | * @size: size of deallocation | ||
186 | * | ||
187 | * IO memory is freed by the device back to the correct memory pools. | ||
188 | * The spare pool is replenished first from either memory pool, then | ||
189 | * the reserve pool is used to reduce device entitlement, the excess | ||
190 | * pool is used to increase the reserve pool toward the desired entitlement | ||
191 | * target, and then the remaining memory is returned to the pools. | ||
192 | * | ||
193 | */ | ||
194 | static inline void vio_cmo_dealloc(struct vio_dev *viodev, size_t size) | ||
195 | { | ||
196 | unsigned long flags; | ||
197 | size_t spare_needed = 0; | ||
198 | size_t excess_freed = 0; | ||
199 | size_t reserve_freed = size; | ||
200 | size_t tmp; | ||
201 | int balance = 0; | ||
202 | |||
203 | spin_lock_irqsave(&vio_cmo.lock, flags); | ||
204 | vio_cmo.curr -= size; | ||
205 | |||
206 | /* Amount of memory freed from the excess pool */ | ||
207 | if (viodev->cmo.allocated > viodev->cmo.entitled) { | ||
208 | excess_freed = min(reserve_freed, (viodev->cmo.allocated - | ||
209 | viodev->cmo.entitled)); | ||
210 | reserve_freed -= excess_freed; | ||
211 | } | ||
212 | |||
213 | /* Remove allocation from device */ | ||
214 | viodev->cmo.allocated -= (reserve_freed + excess_freed); | ||
215 | |||
216 | /* Spare is a subset of the reserve pool, replenish it first. */ | ||
217 | spare_needed = VIO_CMO_MIN_ENT - vio_cmo.spare; | ||
218 | |||
219 | /* | ||
220 | * Replenish the spare in the reserve pool from the excess pool. | ||
221 | * This moves entitlement into the reserve pool. | ||
222 | */ | ||
223 | if (spare_needed && excess_freed) { | ||
224 | tmp = min(excess_freed, spare_needed); | ||
225 | vio_cmo.excess.size -= tmp; | ||
226 | vio_cmo.reserve.size += tmp; | ||
227 | vio_cmo.spare += tmp; | ||
228 | excess_freed -= tmp; | ||
229 | spare_needed -= tmp; | ||
230 | balance = 1; | ||
231 | } | ||
232 | |||
233 | /* | ||
234 | * Replenish the spare in the reserve pool from the reserve pool. | ||
235 | * This removes entitlement from the device down to VIO_CMO_MIN_ENT, | ||
236 | * if needed, and gives it to the spare pool. The amount of used | ||
237 | * memory in this pool does not change. | ||
238 | */ | ||
239 | if (spare_needed && reserve_freed) { | ||
240 | tmp = min(spare_needed, min(reserve_freed, | ||
241 | (viodev->cmo.entitled - | ||
242 | VIO_CMO_MIN_ENT))); | ||
243 | |||
244 | vio_cmo.spare += tmp; | ||
245 | viodev->cmo.entitled -= tmp; | ||
246 | reserve_freed -= tmp; | ||
247 | spare_needed -= tmp; | ||
248 | balance = 1; | ||
249 | } | ||
250 | |||
251 | /* | ||
252 | * Increase the reserve pool until the desired allocation is met. | ||
253 | * Move an allocation freed from the excess pool into the reserve | ||
254 | * pool and schedule a balance operation. | ||
255 | */ | ||
256 | if (excess_freed && (vio_cmo.desired > vio_cmo.reserve.size)) { | ||
257 | tmp = min(excess_freed, (vio_cmo.desired - vio_cmo.reserve.size)); | ||
258 | |||
259 | vio_cmo.excess.size -= tmp; | ||
260 | vio_cmo.reserve.size += tmp; | ||
261 | excess_freed -= tmp; | ||
262 | balance = 1; | ||
263 | } | ||
264 | |||
265 | /* Return memory from the excess pool to that pool */ | ||
266 | if (excess_freed) | ||
267 | vio_cmo.excess.free += excess_freed; | ||
268 | |||
269 | if (balance) | ||
270 | schedule_delayed_work(&vio_cmo.balance_q, VIO_CMO_BALANCE_DELAY); | ||
271 | spin_unlock_irqrestore(&vio_cmo.lock, flags); | ||
272 | } | ||
273 | |||
274 | /** | ||
275 | * vio_cmo_entitlement_update - Manage system entitlement changes | ||
276 | * | ||
277 | * @new_entitlement: new system entitlement to attempt to accommodate | ||
278 | * | ||
279 | * Increases in entitlement will be used to fulfill the spare entitlement | ||
280 | * and the rest is given to the excess pool. Decreases, if they are | ||
281 | * possible, come from the excess pool and from unused device entitlement | ||
282 | * | ||
283 | * Returns: 0 on success, -ENOMEM when change can not be made | ||
284 | */ | ||
285 | int vio_cmo_entitlement_update(size_t new_entitlement) | ||
286 | { | ||
287 | struct vio_dev *viodev; | ||
288 | struct vio_cmo_dev_entry *dev_ent; | ||
289 | unsigned long flags; | ||
290 | size_t avail, delta, tmp; | ||
291 | |||
292 | spin_lock_irqsave(&vio_cmo.lock, flags); | ||
293 | |||
294 | /* Entitlement increases */ | ||
295 | if (new_entitlement > vio_cmo.entitled) { | ||
296 | delta = new_entitlement - vio_cmo.entitled; | ||
297 | |||
298 | /* Fulfill spare allocation */ | ||
299 | if (vio_cmo.spare < VIO_CMO_MIN_ENT) { | ||
300 | tmp = min(delta, (VIO_CMO_MIN_ENT - vio_cmo.spare)); | ||
301 | vio_cmo.spare += tmp; | ||
302 | vio_cmo.reserve.size += tmp; | ||
303 | delta -= tmp; | ||
304 | } | ||
305 | |||
306 | /* Remaining new allocation goes to the excess pool */ | ||
307 | vio_cmo.entitled += delta; | ||
308 | vio_cmo.excess.size += delta; | ||
309 | vio_cmo.excess.free += delta; | ||
310 | |||
311 | goto out; | ||
312 | } | ||
313 | |||
314 | /* Entitlement decreases */ | ||
315 | delta = vio_cmo.entitled - new_entitlement; | ||
316 | avail = vio_cmo.excess.free; | ||
317 | |||
318 | /* | ||
319 | * Need to check how much unused entitlement each device can | ||
320 | * sacrifice to fulfill entitlement change. | ||
321 | */ | ||
322 | list_for_each_entry(dev_ent, &vio_cmo.device_list, list) { | ||
323 | if (avail >= delta) | ||
324 | break; | ||
325 | |||
326 | viodev = dev_ent->viodev; | ||
327 | if ((viodev->cmo.entitled > viodev->cmo.allocated) && | ||
328 | (viodev->cmo.entitled > VIO_CMO_MIN_ENT)) | ||
329 | avail += viodev->cmo.entitled - | ||
330 | max_t(size_t, viodev->cmo.allocated, | ||
331 | VIO_CMO_MIN_ENT); | ||
332 | } | ||
333 | |||
334 | if (delta <= avail) { | ||
335 | vio_cmo.entitled -= delta; | ||
336 | |||
337 | /* Take entitlement from the excess pool first */ | ||
338 | tmp = min(vio_cmo.excess.free, delta); | ||
339 | vio_cmo.excess.size -= tmp; | ||
340 | vio_cmo.excess.free -= tmp; | ||
341 | delta -= tmp; | ||
342 | |||
343 | /* | ||
344 | * Remove all but VIO_CMO_MIN_ENT bytes from devices | ||
345 | * until entitlement change is served | ||
346 | */ | ||
347 | list_for_each_entry(dev_ent, &vio_cmo.device_list, list) { | ||
348 | if (!delta) | ||
349 | break; | ||
350 | |||
351 | viodev = dev_ent->viodev; | ||
352 | tmp = 0; | ||
353 | if ((viodev->cmo.entitled > viodev->cmo.allocated) && | ||
354 | (viodev->cmo.entitled > VIO_CMO_MIN_ENT)) | ||
355 | tmp = viodev->cmo.entitled - | ||
356 | max_t(size_t, viodev->cmo.allocated, | ||
357 | VIO_CMO_MIN_ENT); | ||
358 | viodev->cmo.entitled -= min(tmp, delta); | ||
359 | delta -= min(tmp, delta); | ||
360 | } | ||
361 | } else { | ||
362 | spin_unlock_irqrestore(&vio_cmo.lock, flags); | ||
363 | return -ENOMEM; | ||
364 | } | ||
365 | |||
366 | out: | ||
367 | schedule_delayed_work(&vio_cmo.balance_q, 0); | ||
368 | spin_unlock_irqrestore(&vio_cmo.lock, flags); | ||
369 | return 0; | ||
370 | } | ||
371 | |||
372 | /** | ||
373 | * vio_cmo_balance - Balance entitlement among devices | ||
374 | * | ||
375 | * @work: work queue structure for this operation | ||
376 | * | ||
377 | * Any system entitlement above the minimum needed for devices, or | ||
378 | * already allocated to devices, can be distributed to the devices. | ||
379 | * The list of devices is iterated through to recalculate the desired | ||
380 | * entitlement level and to determine how much entitlement above the | ||
381 | * minimum entitlement is allocated to devices. | ||
382 | * | ||
383 | * Small chunks of the available entitlement are given to devices until | ||
384 | * their requirements are fulfilled or there is no entitlement left to give. | ||
385 | * Upon completion sizes of the reserve and excess pools are calculated. | ||
386 | * | ||
387 | * The system minimum entitlement level is also recalculated here. | ||
388 | * Entitlement will be reserved for devices even after vio_bus_remove to | ||
389 | * accommodate reloading the driver. The OF tree is walked to count the | ||
390 | * number of devices present and this will remove entitlement for devices | ||
391 | * that have actually left the system after having vio_bus_remove called. | ||
392 | */ | ||
393 | static void vio_cmo_balance(struct work_struct *work) | ||
394 | { | ||
395 | struct vio_cmo *cmo; | ||
396 | struct vio_dev *viodev; | ||
397 | struct vio_cmo_dev_entry *dev_ent; | ||
398 | unsigned long flags; | ||
399 | size_t avail = 0, level, chunk, need; | ||
400 | int devcount = 0, fulfilled; | ||
401 | |||
402 | cmo = container_of(work, struct vio_cmo, balance_q.work); | ||
403 | |||
404 | spin_lock_irqsave(&vio_cmo.lock, flags); | ||
405 | |||
406 | /* Calculate minimum entitlement and fulfill spare */ | ||
407 | cmo->min = vio_cmo_num_OF_devs() * VIO_CMO_MIN_ENT; | ||
408 | BUG_ON(cmo->min > cmo->entitled); | ||
409 | cmo->spare = min_t(size_t, VIO_CMO_MIN_ENT, (cmo->entitled - cmo->min)); | ||
410 | cmo->min += cmo->spare; | ||
411 | cmo->desired = cmo->min; | ||
412 | |||
413 | /* | ||
414 | * Determine how much entitlement is available and reset device | ||
415 | * entitlements | ||
416 | */ | ||
417 | avail = cmo->entitled - cmo->spare; | ||
418 | list_for_each_entry(dev_ent, &vio_cmo.device_list, list) { | ||
419 | viodev = dev_ent->viodev; | ||
420 | devcount++; | ||
421 | viodev->cmo.entitled = VIO_CMO_MIN_ENT; | ||
422 | cmo->desired += (viodev->cmo.desired - VIO_CMO_MIN_ENT); | ||
423 | avail -= max_t(size_t, viodev->cmo.allocated, VIO_CMO_MIN_ENT); | ||
424 | } | ||
425 | |||
426 | /* | ||
427 | * Having provided each device with the minimum entitlement, loop | ||
428 | * over the devices portioning out the remaining entitlement | ||
429 | * until there is nothing left. | ||
430 | */ | ||
431 | level = VIO_CMO_MIN_ENT; | ||
432 | while (avail) { | ||
433 | fulfilled = 0; | ||
434 | list_for_each_entry(dev_ent, &vio_cmo.device_list, list) { | ||
435 | viodev = dev_ent->viodev; | ||
436 | |||
437 | if (viodev->cmo.desired <= level) { | ||
438 | fulfilled++; | ||
439 | continue; | ||
440 | } | ||
441 | |||
442 | /* | ||
443 | * Give the device up to VIO_CMO_BALANCE_CHUNK | ||
444 | * bytes of entitlement, but do not exceed the | ||
445 | * desired level of entitlement for the device. | ||
446 | */ | ||
447 | chunk = min_t(size_t, avail, VIO_CMO_BALANCE_CHUNK); | ||
448 | chunk = min(chunk, (viodev->cmo.desired - | ||
449 | viodev->cmo.entitled)); | ||
450 | viodev->cmo.entitled += chunk; | ||
451 | |||
452 | /* | ||
453 | * If the memory for this entitlement increase was | ||
454 | * already allocated to the device it does not come | ||
455 | * from the available pool being portioned out. | ||
456 | */ | ||
457 | need = max(viodev->cmo.allocated, viodev->cmo.entitled)- | ||
458 | max(viodev->cmo.allocated, level); | ||
459 | avail -= need; | ||
460 | |||
461 | } | ||
462 | if (fulfilled == devcount) | ||
463 | break; | ||
464 | level += VIO_CMO_BALANCE_CHUNK; | ||
465 | } | ||
466 | |||
467 | /* Calculate new reserve and excess pool sizes */ | ||
468 | cmo->reserve.size = cmo->min; | ||
469 | cmo->excess.free = 0; | ||
470 | cmo->excess.size = 0; | ||
471 | need = 0; | ||
472 | list_for_each_entry(dev_ent, &vio_cmo.device_list, list) { | ||
473 | viodev = dev_ent->viodev; | ||
474 | /* Calculated reserve size above the minimum entitlement */ | ||
475 | if (viodev->cmo.entitled) | ||
476 | cmo->reserve.size += (viodev->cmo.entitled - | ||
477 | VIO_CMO_MIN_ENT); | ||
478 | /* Calculated used excess entitlement */ | ||
479 | if (viodev->cmo.allocated > viodev->cmo.entitled) | ||
480 | need += viodev->cmo.allocated - viodev->cmo.entitled; | ||
481 | } | ||
482 | cmo->excess.size = cmo->entitled - cmo->reserve.size; | ||
483 | cmo->excess.free = cmo->excess.size - need; | ||
484 | |||
485 | cancel_delayed_work(container_of(work, struct delayed_work, work)); | ||
486 | spin_unlock_irqrestore(&vio_cmo.lock, flags); | ||
487 | } | ||
488 | |||
489 | static void *vio_dma_iommu_alloc_coherent(struct device *dev, size_t size, | ||
490 | dma_addr_t *dma_handle, gfp_t flag) | ||
491 | { | ||
492 | struct vio_dev *viodev = to_vio_dev(dev); | ||
493 | void *ret; | ||
494 | |||
495 | if (vio_cmo_alloc(viodev, roundup(size, IOMMU_PAGE_SIZE))) { | ||
496 | atomic_inc(&viodev->cmo.allocs_failed); | ||
497 | return NULL; | ||
498 | } | ||
499 | |||
500 | ret = dma_iommu_ops.alloc_coherent(dev, size, dma_handle, flag); | ||
501 | if (unlikely(ret == NULL)) { | ||
502 | vio_cmo_dealloc(viodev, roundup(size, IOMMU_PAGE_SIZE)); | ||
503 | atomic_inc(&viodev->cmo.allocs_failed); | ||
504 | } | ||
505 | |||
506 | return ret; | ||
507 | } | ||
508 | |||
509 | static void vio_dma_iommu_free_coherent(struct device *dev, size_t size, | ||
510 | void *vaddr, dma_addr_t dma_handle) | ||
511 | { | ||
512 | struct vio_dev *viodev = to_vio_dev(dev); | ||
513 | |||
514 | dma_iommu_ops.free_coherent(dev, size, vaddr, dma_handle); | ||
515 | |||
516 | vio_cmo_dealloc(viodev, roundup(size, IOMMU_PAGE_SIZE)); | ||
517 | } | ||
518 | |||
519 | static dma_addr_t vio_dma_iommu_map_single(struct device *dev, void *vaddr, | ||
520 | size_t size, | ||
521 | enum dma_data_direction direction, | ||
522 | struct dma_attrs *attrs) | ||
523 | { | ||
524 | struct vio_dev *viodev = to_vio_dev(dev); | ||
525 | dma_addr_t ret = DMA_ERROR_CODE; | ||
526 | |||
527 | if (vio_cmo_alloc(viodev, roundup(size, IOMMU_PAGE_SIZE))) { | ||
528 | atomic_inc(&viodev->cmo.allocs_failed); | ||
529 | return ret; | ||
530 | } | ||
531 | |||
532 | ret = dma_iommu_ops.map_single(dev, vaddr, size, direction, attrs); | ||
533 | if (unlikely(dma_mapping_error(ret))) { | ||
534 | vio_cmo_dealloc(viodev, roundup(size, IOMMU_PAGE_SIZE)); | ||
535 | atomic_inc(&viodev->cmo.allocs_failed); | ||
536 | } | ||
537 | |||
538 | return ret; | ||
539 | } | ||
540 | |||
541 | static void vio_dma_iommu_unmap_single(struct device *dev, | ||
542 | dma_addr_t dma_handle, size_t size, | ||
543 | enum dma_data_direction direction, | ||
544 | struct dma_attrs *attrs) | ||
545 | { | ||
546 | struct vio_dev *viodev = to_vio_dev(dev); | ||
547 | |||
548 | dma_iommu_ops.unmap_single(dev, dma_handle, size, direction, attrs); | ||
549 | |||
550 | vio_cmo_dealloc(viodev, roundup(size, IOMMU_PAGE_SIZE)); | ||
551 | } | ||
552 | |||
553 | static int vio_dma_iommu_map_sg(struct device *dev, struct scatterlist *sglist, | ||
554 | int nelems, enum dma_data_direction direction, | ||
555 | struct dma_attrs *attrs) | ||
556 | { | ||
557 | struct vio_dev *viodev = to_vio_dev(dev); | ||
558 | struct scatterlist *sgl; | ||
559 | int ret, count = 0; | ||
560 | size_t alloc_size = 0; | ||
561 | |||
562 | for (sgl = sglist; count < nelems; count++, sgl++) | ||
563 | alloc_size += roundup(sgl->length, IOMMU_PAGE_SIZE); | ||
564 | |||
565 | if (vio_cmo_alloc(viodev, alloc_size)) { | ||
566 | atomic_inc(&viodev->cmo.allocs_failed); | ||
567 | return 0; | ||
568 | } | ||
569 | |||
570 | ret = dma_iommu_ops.map_sg(dev, sglist, nelems, direction, attrs); | ||
571 | |||
572 | if (unlikely(!ret)) { | ||
573 | vio_cmo_dealloc(viodev, alloc_size); | ||
574 | atomic_inc(&viodev->cmo.allocs_failed); | ||
575 | } | ||
576 | |||
577 | for (sgl = sglist, count = 0; count < ret; count++, sgl++) | ||
578 | alloc_size -= roundup(sgl->dma_length, IOMMU_PAGE_SIZE); | ||
579 | if (alloc_size) | ||
580 | vio_cmo_dealloc(viodev, alloc_size); | ||
581 | |||
582 | return ret; | ||
583 | } | ||
584 | |||
585 | static void vio_dma_iommu_unmap_sg(struct device *dev, | ||
586 | struct scatterlist *sglist, int nelems, | ||
587 | enum dma_data_direction direction, | ||
588 | struct dma_attrs *attrs) | ||
589 | { | ||
590 | struct vio_dev *viodev = to_vio_dev(dev); | ||
591 | struct scatterlist *sgl; | ||
592 | size_t alloc_size = 0; | ||
593 | int count = 0; | ||
594 | |||
595 | for (sgl = sglist; count < nelems; count++, sgl++) | ||
596 | alloc_size += roundup(sgl->dma_length, IOMMU_PAGE_SIZE); | ||
597 | |||
598 | dma_iommu_ops.unmap_sg(dev, sglist, nelems, direction, attrs); | ||
599 | |||
600 | vio_cmo_dealloc(viodev, alloc_size); | ||
601 | } | ||
602 | |||
603 | struct dma_mapping_ops vio_dma_mapping_ops = { | ||
604 | .alloc_coherent = vio_dma_iommu_alloc_coherent, | ||
605 | .free_coherent = vio_dma_iommu_free_coherent, | ||
606 | .map_single = vio_dma_iommu_map_single, | ||
607 | .unmap_single = vio_dma_iommu_unmap_single, | ||
608 | .map_sg = vio_dma_iommu_map_sg, | ||
609 | .unmap_sg = vio_dma_iommu_unmap_sg, | ||
610 | }; | ||
611 | |||
612 | /** | ||
613 | * vio_cmo_set_dev_desired - Set desired entitlement for a device | ||
614 | * | ||
615 | * @viodev: struct vio_dev for device to alter | ||
616 | * @new_desired: new desired entitlement level in bytes | ||
617 | * | ||
618 | * For use by devices to request a change to their entitlement at runtime or | ||
619 | * through sysfs. The desired entitlement level is changed and a balancing | ||
620 | * of system resources is scheduled to run in the future. | ||
621 | */ | ||
622 | void vio_cmo_set_dev_desired(struct vio_dev *viodev, size_t desired) | ||
623 | { | ||
624 | unsigned long flags; | ||
625 | struct vio_cmo_dev_entry *dev_ent; | ||
626 | int found = 0; | ||
627 | |||
628 | if (!firmware_has_feature(FW_FEATURE_CMO)) | ||
629 | return; | ||
630 | |||
631 | spin_lock_irqsave(&vio_cmo.lock, flags); | ||
632 | if (desired < VIO_CMO_MIN_ENT) | ||
633 | desired = VIO_CMO_MIN_ENT; | ||
634 | |||
635 | /* | ||
636 | * Changes will not be made for devices not in the device list. | ||
637 | * If it is not in the device list, then no driver is loaded | ||
638 | * for the device and it can not receive entitlement. | ||
639 | */ | ||
640 | list_for_each_entry(dev_ent, &vio_cmo.device_list, list) | ||
641 | if (viodev == dev_ent->viodev) { | ||
642 | found = 1; | ||
643 | break; | ||
644 | } | ||
645 | if (!found) | ||
646 | return; | ||
647 | |||
648 | /* Increase/decrease in desired device entitlement */ | ||
649 | if (desired >= viodev->cmo.desired) { | ||
650 | /* Just bump the bus and device values prior to a balance*/ | ||
651 | vio_cmo.desired += desired - viodev->cmo.desired; | ||
652 | viodev->cmo.desired = desired; | ||
653 | } else { | ||
654 | /* Decrease bus and device values for desired entitlement */ | ||
655 | vio_cmo.desired -= viodev->cmo.desired - desired; | ||
656 | viodev->cmo.desired = desired; | ||
657 | /* | ||
658 | * If less entitlement is desired than current entitlement, move | ||
659 | * any reserve memory in the change region to the excess pool. | ||
660 | */ | ||
661 | if (viodev->cmo.entitled > desired) { | ||
662 | vio_cmo.reserve.size -= viodev->cmo.entitled - desired; | ||
663 | vio_cmo.excess.size += viodev->cmo.entitled - desired; | ||
664 | /* | ||
665 | * If entitlement moving from the reserve pool to the | ||
666 | * excess pool is currently unused, add to the excess | ||
667 | * free counter. | ||
668 | */ | ||
669 | if (viodev->cmo.allocated < viodev->cmo.entitled) | ||
670 | vio_cmo.excess.free += viodev->cmo.entitled - | ||
671 | max(viodev->cmo.allocated, desired); | ||
672 | viodev->cmo.entitled = desired; | ||
673 | } | ||
674 | } | ||
675 | schedule_delayed_work(&vio_cmo.balance_q, 0); | ||
676 | spin_unlock_irqrestore(&vio_cmo.lock, flags); | ||
677 | } | ||
678 | |||
679 | /** | ||
680 | * vio_cmo_bus_probe - Handle CMO specific bus probe activities | ||
681 | * | ||
682 | * @viodev - Pointer to struct vio_dev for device | ||
683 | * | ||
684 | * Determine the devices IO memory entitlement needs, attempting | ||
685 | * to satisfy the system minimum entitlement at first and scheduling | ||
686 | * a balance operation to take care of the rest at a later time. | ||
687 | * | ||
688 | * Returns: 0 on success, -EINVAL when device doesn't support CMO, and | ||
689 | * -ENOMEM when entitlement is not available for device or | ||
690 | * device entry. | ||
691 | * | ||
692 | */ | ||
693 | static int vio_cmo_bus_probe(struct vio_dev *viodev) | ||
694 | { | ||
695 | struct vio_cmo_dev_entry *dev_ent; | ||
696 | struct device *dev = &viodev->dev; | ||
697 | struct vio_driver *viodrv = to_vio_driver(dev->driver); | ||
698 | unsigned long flags; | ||
699 | size_t size; | ||
700 | |||
701 | /* | ||
702 | * Check to see that device has a DMA window and configure | ||
703 | * entitlement for the device. | ||
704 | */ | ||
705 | if (of_get_property(viodev->dev.archdata.of_node, | ||
706 | "ibm,my-dma-window", NULL)) { | ||
707 | /* Check that the driver is CMO enabled and get desired DMA */ | ||
708 | if (!viodrv->get_desired_dma) { | ||
709 | dev_err(dev, "%s: device driver does not support CMO\n", | ||
710 | __func__); | ||
711 | return -EINVAL; | ||
712 | } | ||
713 | |||
714 | viodev->cmo.desired = IOMMU_PAGE_ALIGN(viodrv->get_desired_dma(viodev)); | ||
715 | if (viodev->cmo.desired < VIO_CMO_MIN_ENT) | ||
716 | viodev->cmo.desired = VIO_CMO_MIN_ENT; | ||
717 | size = VIO_CMO_MIN_ENT; | ||
718 | |||
719 | dev_ent = kmalloc(sizeof(struct vio_cmo_dev_entry), | ||
720 | GFP_KERNEL); | ||
721 | if (!dev_ent) | ||
722 | return -ENOMEM; | ||
723 | |||
724 | dev_ent->viodev = viodev; | ||
725 | spin_lock_irqsave(&vio_cmo.lock, flags); | ||
726 | list_add(&dev_ent->list, &vio_cmo.device_list); | ||
727 | } else { | ||
728 | viodev->cmo.desired = 0; | ||
729 | size = 0; | ||
730 | spin_lock_irqsave(&vio_cmo.lock, flags); | ||
731 | } | ||
732 | |||
733 | /* | ||
734 | * If the needs for vio_cmo.min have not changed since they | ||
735 | * were last set, the number of devices in the OF tree has | ||
736 | * been constant and the IO memory for this is already in | ||
737 | * the reserve pool. | ||
738 | */ | ||
739 | if (vio_cmo.min == ((vio_cmo_num_OF_devs() + 1) * | ||
740 | VIO_CMO_MIN_ENT)) { | ||
741 | /* Updated desired entitlement if device requires it */ | ||
742 | if (size) | ||
743 | vio_cmo.desired += (viodev->cmo.desired - | ||
744 | VIO_CMO_MIN_ENT); | ||
745 | } else { | ||
746 | size_t tmp; | ||
747 | |||
748 | tmp = vio_cmo.spare + vio_cmo.excess.free; | ||
749 | if (tmp < size) { | ||
750 | dev_err(dev, "%s: insufficient free " | ||
751 | "entitlement to add device. " | ||
752 | "Need %lu, have %lu\n", __func__, | ||
753 | size, (vio_cmo.spare + tmp)); | ||
754 | spin_unlock_irqrestore(&vio_cmo.lock, flags); | ||
755 | return -ENOMEM; | ||
756 | } | ||
757 | |||
758 | /* Use excess pool first to fulfill request */ | ||
759 | tmp = min(size, vio_cmo.excess.free); | ||
760 | vio_cmo.excess.free -= tmp; | ||
761 | vio_cmo.excess.size -= tmp; | ||
762 | vio_cmo.reserve.size += tmp; | ||
763 | |||
764 | /* Use spare if excess pool was insufficient */ | ||
765 | vio_cmo.spare -= size - tmp; | ||
766 | |||
767 | /* Update bus accounting */ | ||
768 | vio_cmo.min += size; | ||
769 | vio_cmo.desired += viodev->cmo.desired; | ||
770 | } | ||
771 | spin_unlock_irqrestore(&vio_cmo.lock, flags); | ||
772 | return 0; | ||
773 | } | ||
774 | |||
775 | /** | ||
776 | * vio_cmo_bus_remove - Handle CMO specific bus removal activities | ||
777 | * | ||
778 | * @viodev - Pointer to struct vio_dev for device | ||
779 | * | ||
780 | * Remove the device from the cmo device list. The minimum entitlement | ||
781 | * will be reserved for the device as long as it is in the system. The | ||
782 | * rest of the entitlement the device had been allocated will be returned | ||
783 | * to the system. | ||
784 | */ | ||
785 | static void vio_cmo_bus_remove(struct vio_dev *viodev) | ||
786 | { | ||
787 | struct vio_cmo_dev_entry *dev_ent; | ||
788 | unsigned long flags; | ||
789 | size_t tmp; | ||
790 | |||
791 | spin_lock_irqsave(&vio_cmo.lock, flags); | ||
792 | if (viodev->cmo.allocated) { | ||
793 | dev_err(&viodev->dev, "%s: device had %lu bytes of IO " | ||
794 | "allocated after remove operation.\n", | ||
795 | __func__, viodev->cmo.allocated); | ||
796 | BUG(); | ||
797 | } | ||
798 | |||
799 | /* | ||
800 | * Remove the device from the device list being maintained for | ||
801 | * CMO enabled devices. | ||
802 | */ | ||
803 | list_for_each_entry(dev_ent, &vio_cmo.device_list, list) | ||
804 | if (viodev == dev_ent->viodev) { | ||
805 | list_del(&dev_ent->list); | ||
806 | kfree(dev_ent); | ||
807 | break; | ||
808 | } | ||
809 | |||
810 | /* | ||
811 | * Devices may not require any entitlement and they do not need | ||
812 | * to be processed. Otherwise, return the device's entitlement | ||
813 | * back to the pools. | ||
814 | */ | ||
815 | if (viodev->cmo.entitled) { | ||
816 | /* | ||
817 | * This device has not yet left the OF tree, it's | ||
818 | * minimum entitlement remains in vio_cmo.min and | ||
819 | * vio_cmo.desired | ||
820 | */ | ||
821 | vio_cmo.desired -= (viodev->cmo.desired - VIO_CMO_MIN_ENT); | ||
822 | |||
823 | /* | ||
824 | * Save min allocation for device in reserve as long | ||
825 | * as it exists in OF tree as determined by later | ||
826 | * balance operation | ||
827 | */ | ||
828 | viodev->cmo.entitled -= VIO_CMO_MIN_ENT; | ||
829 | |||
830 | /* Replenish spare from freed reserve pool */ | ||
831 | if (viodev->cmo.entitled && (vio_cmo.spare < VIO_CMO_MIN_ENT)) { | ||
832 | tmp = min(viodev->cmo.entitled, (VIO_CMO_MIN_ENT - | ||
833 | vio_cmo.spare)); | ||
834 | vio_cmo.spare += tmp; | ||
835 | viodev->cmo.entitled -= tmp; | ||
836 | } | ||
837 | |||
838 | /* Remaining reserve goes to excess pool */ | ||
839 | vio_cmo.excess.size += viodev->cmo.entitled; | ||
840 | vio_cmo.excess.free += viodev->cmo.entitled; | ||
841 | vio_cmo.reserve.size -= viodev->cmo.entitled; | ||
842 | |||
843 | /* | ||
844 | * Until the device is removed it will keep a | ||
845 | * minimum entitlement; this will guarantee that | ||
846 | * a module unload/load will result in a success. | ||
847 | */ | ||
848 | viodev->cmo.entitled = VIO_CMO_MIN_ENT; | ||
849 | viodev->cmo.desired = VIO_CMO_MIN_ENT; | ||
850 | atomic_set(&viodev->cmo.allocs_failed, 0); | ||
851 | } | ||
852 | |||
853 | spin_unlock_irqrestore(&vio_cmo.lock, flags); | ||
854 | } | ||
855 | |||
856 | static void vio_cmo_set_dma_ops(struct vio_dev *viodev) | ||
857 | { | ||
858 | vio_dma_mapping_ops.dma_supported = dma_iommu_ops.dma_supported; | ||
859 | viodev->dev.archdata.dma_ops = &vio_dma_mapping_ops; | ||
860 | } | ||
861 | |||
862 | /** | ||
863 | * vio_cmo_bus_init - CMO entitlement initialization at bus init time | ||
864 | * | ||
865 | * Set up the reserve and excess entitlement pools based on available | ||
866 | * system entitlement and the number of devices in the OF tree that | ||
867 | * require entitlement in the reserve pool. | ||
868 | */ | ||
869 | static void vio_cmo_bus_init(void) | ||
870 | { | ||
871 | struct hvcall_mpp_data mpp_data; | ||
872 | int err; | ||
873 | |||
874 | memset(&vio_cmo, 0, sizeof(struct vio_cmo)); | ||
875 | spin_lock_init(&vio_cmo.lock); | ||
876 | INIT_LIST_HEAD(&vio_cmo.device_list); | ||
877 | INIT_DELAYED_WORK(&vio_cmo.balance_q, vio_cmo_balance); | ||
878 | |||
879 | /* Get current system entitlement */ | ||
880 | err = h_get_mpp(&mpp_data); | ||
881 | |||
882 | /* | ||
883 | * On failure, continue with entitlement set to 0, will panic() | ||
884 | * later when spare is reserved. | ||
885 | */ | ||
886 | if (err != H_SUCCESS) { | ||
887 | printk(KERN_ERR "%s: unable to determine system IO "\ | ||
888 | "entitlement. (%d)\n", __func__, err); | ||
889 | vio_cmo.entitled = 0; | ||
890 | } else { | ||
891 | vio_cmo.entitled = mpp_data.entitled_mem; | ||
892 | } | ||
893 | |||
894 | /* Set reservation and check against entitlement */ | ||
895 | vio_cmo.spare = VIO_CMO_MIN_ENT; | ||
896 | vio_cmo.reserve.size = vio_cmo.spare; | ||
897 | vio_cmo.reserve.size += (vio_cmo_num_OF_devs() * | ||
898 | VIO_CMO_MIN_ENT); | ||
899 | if (vio_cmo.reserve.size > vio_cmo.entitled) { | ||
900 | printk(KERN_ERR "%s: insufficient system entitlement\n", | ||
901 | __func__); | ||
902 | panic("%s: Insufficient system entitlement", __func__); | ||
903 | } | ||
904 | |||
905 | /* Set the remaining accounting variables */ | ||
906 | vio_cmo.excess.size = vio_cmo.entitled - vio_cmo.reserve.size; | ||
907 | vio_cmo.excess.free = vio_cmo.excess.size; | ||
908 | vio_cmo.min = vio_cmo.reserve.size; | ||
909 | vio_cmo.desired = vio_cmo.reserve.size; | ||
910 | } | ||
911 | |||
912 | /* sysfs device functions and data structures for CMO */ | ||
913 | |||
914 | #define viodev_cmo_rd_attr(name) \ | ||
915 | static ssize_t viodev_cmo_##name##_show(struct device *dev, \ | ||
916 | struct device_attribute *attr, \ | ||
917 | char *buf) \ | ||
918 | { \ | ||
919 | return sprintf(buf, "%lu\n", to_vio_dev(dev)->cmo.name); \ | ||
920 | } | ||
921 | |||
922 | static ssize_t viodev_cmo_allocs_failed_show(struct device *dev, | ||
923 | struct device_attribute *attr, char *buf) | ||
924 | { | ||
925 | struct vio_dev *viodev = to_vio_dev(dev); | ||
926 | return sprintf(buf, "%d\n", atomic_read(&viodev->cmo.allocs_failed)); | ||
927 | } | ||
928 | |||
929 | static ssize_t viodev_cmo_allocs_failed_reset(struct device *dev, | ||
930 | struct device_attribute *attr, const char *buf, size_t count) | ||
931 | { | ||
932 | struct vio_dev *viodev = to_vio_dev(dev); | ||
933 | atomic_set(&viodev->cmo.allocs_failed, 0); | ||
934 | return count; | ||
935 | } | ||
936 | |||
937 | static ssize_t viodev_cmo_desired_set(struct device *dev, | ||
938 | struct device_attribute *attr, const char *buf, size_t count) | ||
939 | { | ||
940 | struct vio_dev *viodev = to_vio_dev(dev); | ||
941 | size_t new_desired; | ||
942 | int ret; | ||
943 | |||
944 | ret = strict_strtoul(buf, 10, &new_desired); | ||
945 | if (ret) | ||
946 | return ret; | ||
947 | |||
948 | vio_cmo_set_dev_desired(viodev, new_desired); | ||
949 | return count; | ||
950 | } | ||
951 | |||
952 | viodev_cmo_rd_attr(desired); | ||
953 | viodev_cmo_rd_attr(entitled); | ||
954 | viodev_cmo_rd_attr(allocated); | ||
955 | |||
956 | static ssize_t name_show(struct device *, struct device_attribute *, char *); | ||
957 | static ssize_t devspec_show(struct device *, struct device_attribute *, char *); | ||
958 | static struct device_attribute vio_cmo_dev_attrs[] = { | ||
959 | __ATTR_RO(name), | ||
960 | __ATTR_RO(devspec), | ||
961 | __ATTR(cmo_desired, S_IWUSR|S_IRUSR|S_IWGRP|S_IRGRP|S_IROTH, | ||
962 | viodev_cmo_desired_show, viodev_cmo_desired_set), | ||
963 | __ATTR(cmo_entitled, S_IRUGO, viodev_cmo_entitled_show, NULL), | ||
964 | __ATTR(cmo_allocated, S_IRUGO, viodev_cmo_allocated_show, NULL), | ||
965 | __ATTR(cmo_allocs_failed, S_IWUSR|S_IRUSR|S_IWGRP|S_IRGRP|S_IROTH, | ||
966 | viodev_cmo_allocs_failed_show, viodev_cmo_allocs_failed_reset), | ||
967 | __ATTR_NULL | ||
968 | }; | ||
969 | |||
970 | /* sysfs bus functions and data structures for CMO */ | ||
971 | |||
972 | #define viobus_cmo_rd_attr(name) \ | ||
973 | static ssize_t \ | ||
974 | viobus_cmo_##name##_show(struct bus_type *bt, char *buf) \ | ||
975 | { \ | ||
976 | return sprintf(buf, "%lu\n", vio_cmo.name); \ | ||
977 | } | ||
978 | |||
979 | #define viobus_cmo_pool_rd_attr(name, var) \ | ||
980 | static ssize_t \ | ||
981 | viobus_cmo_##name##_pool_show_##var(struct bus_type *bt, char *buf) \ | ||
982 | { \ | ||
983 | return sprintf(buf, "%lu\n", vio_cmo.name.var); \ | ||
984 | } | ||
985 | |||
986 | static ssize_t viobus_cmo_high_reset(struct bus_type *bt, const char *buf, | ||
987 | size_t count) | ||
988 | { | ||
989 | unsigned long flags; | ||
990 | |||
991 | spin_lock_irqsave(&vio_cmo.lock, flags); | ||
992 | vio_cmo.high = vio_cmo.curr; | ||
993 | spin_unlock_irqrestore(&vio_cmo.lock, flags); | ||
994 | |||
995 | return count; | ||
996 | } | ||
997 | |||
998 | viobus_cmo_rd_attr(entitled); | ||
999 | viobus_cmo_pool_rd_attr(reserve, size); | ||
1000 | viobus_cmo_pool_rd_attr(excess, size); | ||
1001 | viobus_cmo_pool_rd_attr(excess, free); | ||
1002 | viobus_cmo_rd_attr(spare); | ||
1003 | viobus_cmo_rd_attr(min); | ||
1004 | viobus_cmo_rd_attr(desired); | ||
1005 | viobus_cmo_rd_attr(curr); | ||
1006 | viobus_cmo_rd_attr(high); | ||
1007 | |||
1008 | static struct bus_attribute vio_cmo_bus_attrs[] = { | ||
1009 | __ATTR(cmo_entitled, S_IRUGO, viobus_cmo_entitled_show, NULL), | ||
1010 | __ATTR(cmo_reserve_size, S_IRUGO, viobus_cmo_reserve_pool_show_size, NULL), | ||
1011 | __ATTR(cmo_excess_size, S_IRUGO, viobus_cmo_excess_pool_show_size, NULL), | ||
1012 | __ATTR(cmo_excess_free, S_IRUGO, viobus_cmo_excess_pool_show_free, NULL), | ||
1013 | __ATTR(cmo_spare, S_IRUGO, viobus_cmo_spare_show, NULL), | ||
1014 | __ATTR(cmo_min, S_IRUGO, viobus_cmo_min_show, NULL), | ||
1015 | __ATTR(cmo_desired, S_IRUGO, viobus_cmo_desired_show, NULL), | ||
1016 | __ATTR(cmo_curr, S_IRUGO, viobus_cmo_curr_show, NULL), | ||
1017 | __ATTR(cmo_high, S_IWUSR|S_IRUSR|S_IWGRP|S_IRGRP|S_IROTH, | ||
1018 | viobus_cmo_high_show, viobus_cmo_high_reset), | ||
1019 | __ATTR_NULL | ||
1020 | }; | ||
1021 | |||
1022 | static void vio_cmo_sysfs_init(void) | ||
1023 | { | ||
1024 | vio_bus_type.dev_attrs = vio_cmo_dev_attrs; | ||
1025 | vio_bus_type.bus_attrs = vio_cmo_bus_attrs; | ||
1026 | } | ||
1027 | #else /* CONFIG_PPC_SMLPAR */ | ||
1028 | /* Dummy functions for iSeries platform */ | ||
1029 | int vio_cmo_entitlement_update(size_t new_entitlement) { return 0; } | ||
1030 | void vio_cmo_set_dev_desired(struct vio_dev *viodev, size_t desired) {} | ||
1031 | static int vio_cmo_bus_probe(struct vio_dev *viodev) { return 0; } | ||
1032 | static void vio_cmo_bus_remove(struct vio_dev *viodev) {} | ||
1033 | static void vio_cmo_set_dma_ops(struct vio_dev *viodev) {} | ||
1034 | static void vio_cmo_bus_init() {} | ||
1035 | static void vio_cmo_sysfs_init() { } | ||
1036 | #endif /* CONFIG_PPC_SMLPAR */ | ||
1037 | EXPORT_SYMBOL(vio_cmo_entitlement_update); | ||
1038 | EXPORT_SYMBOL(vio_cmo_set_dev_desired); | ||
1039 | |||
49 | static struct iommu_table *vio_build_iommu_table(struct vio_dev *dev) | 1040 | static struct iommu_table *vio_build_iommu_table(struct vio_dev *dev) |
50 | { | 1041 | { |
51 | const unsigned char *dma_window; | 1042 | const unsigned char *dma_window; |
@@ -114,8 +1105,17 @@ static int vio_bus_probe(struct device *dev) | |||
114 | return error; | 1105 | return error; |
115 | 1106 | ||
116 | id = vio_match_device(viodrv->id_table, viodev); | 1107 | id = vio_match_device(viodrv->id_table, viodev); |
117 | if (id) | 1108 | if (id) { |
1109 | memset(&viodev->cmo, 0, sizeof(viodev->cmo)); | ||
1110 | if (firmware_has_feature(FW_FEATURE_CMO)) { | ||
1111 | error = vio_cmo_bus_probe(viodev); | ||
1112 | if (error) | ||
1113 | return error; | ||
1114 | } | ||
118 | error = viodrv->probe(viodev, id); | 1115 | error = viodrv->probe(viodev, id); |
1116 | if (error) | ||
1117 | vio_cmo_bus_remove(viodev); | ||
1118 | } | ||
119 | 1119 | ||
120 | return error; | 1120 | return error; |
121 | } | 1121 | } |
@@ -125,12 +1125,23 @@ static int vio_bus_remove(struct device *dev) | |||
125 | { | 1125 | { |
126 | struct vio_dev *viodev = to_vio_dev(dev); | 1126 | struct vio_dev *viodev = to_vio_dev(dev); |
127 | struct vio_driver *viodrv = to_vio_driver(dev->driver); | 1127 | struct vio_driver *viodrv = to_vio_driver(dev->driver); |
1128 | struct device *devptr; | ||
1129 | int ret = 1; | ||
1130 | |||
1131 | /* | ||
1132 | * Hold a reference to the device after the remove function is called | ||
1133 | * to allow for CMO accounting cleanup for the device. | ||
1134 | */ | ||
1135 | devptr = get_device(dev); | ||
128 | 1136 | ||
129 | if (viodrv->remove) | 1137 | if (viodrv->remove) |
130 | return viodrv->remove(viodev); | 1138 | ret = viodrv->remove(viodev); |
1139 | |||
1140 | if (!ret && firmware_has_feature(FW_FEATURE_CMO)) | ||
1141 | vio_cmo_bus_remove(viodev); | ||
131 | 1142 | ||
132 | /* driver can't remove */ | 1143 | put_device(devptr); |
133 | return 1; | 1144 | return ret; |
134 | } | 1145 | } |
135 | 1146 | ||
136 | /** | 1147 | /** |
@@ -215,7 +1226,11 @@ struct vio_dev *vio_register_device_node(struct device_node *of_node) | |||
215 | viodev->unit_address = *unit_address; | 1226 | viodev->unit_address = *unit_address; |
216 | } | 1227 | } |
217 | viodev->dev.archdata.of_node = of_node_get(of_node); | 1228 | viodev->dev.archdata.of_node = of_node_get(of_node); |
218 | viodev->dev.archdata.dma_ops = &dma_iommu_ops; | 1229 | |
1230 | if (firmware_has_feature(FW_FEATURE_CMO)) | ||
1231 | vio_cmo_set_dma_ops(viodev); | ||
1232 | else | ||
1233 | viodev->dev.archdata.dma_ops = &dma_iommu_ops; | ||
219 | viodev->dev.archdata.dma_data = vio_build_iommu_table(viodev); | 1234 | viodev->dev.archdata.dma_data = vio_build_iommu_table(viodev); |
220 | viodev->dev.archdata.numa_node = of_node_to_nid(of_node); | 1235 | viodev->dev.archdata.numa_node = of_node_to_nid(of_node); |
221 | 1236 | ||
@@ -245,6 +1260,9 @@ static int __init vio_bus_init(void) | |||
245 | int err; | 1260 | int err; |
246 | struct device_node *node_vroot; | 1261 | struct device_node *node_vroot; |
247 | 1262 | ||
1263 | if (firmware_has_feature(FW_FEATURE_CMO)) | ||
1264 | vio_cmo_sysfs_init(); | ||
1265 | |||
248 | err = bus_register(&vio_bus_type); | 1266 | err = bus_register(&vio_bus_type); |
249 | if (err) { | 1267 | if (err) { |
250 | printk(KERN_ERR "failed to register VIO bus\n"); | 1268 | printk(KERN_ERR "failed to register VIO bus\n"); |
@@ -262,6 +1280,9 @@ static int __init vio_bus_init(void) | |||
262 | return err; | 1280 | return err; |
263 | } | 1281 | } |
264 | 1282 | ||
1283 | if (firmware_has_feature(FW_FEATURE_CMO)) | ||
1284 | vio_cmo_bus_init(); | ||
1285 | |||
265 | node_vroot = of_find_node_by_name(NULL, "vdevice"); | 1286 | node_vroot = of_find_node_by_name(NULL, "vdevice"); |
266 | if (node_vroot) { | 1287 | if (node_vroot) { |
267 | struct device_node *of_node; | 1288 | struct device_node *of_node; |