Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp

Conflicts:
	litmus/sched_cedf.c

1 files changed, 20 insertions, 9 deletions

diff --git a/arch/powerpc/kernel/vio.c b/arch/powerpc/kernel/vio.c
index fa3469ddaef8..1b695fdc362b 100644
--- a/arch/powerpc/kernel/vio.c
+++ b/arch/powerpc/kernel/vio.c
@@ -238,9 +238,7 @@ static inline void vio_cmo_dealloc(struct vio_dev *viodev, size_t size)
          * memory in this pool does not change.
          */
         if (spare_needed && reserve_freed) {
-                tmp = min(spare_needed, min(reserve_freed,
-                                            (viodev->cmo.entitled -
-                                             VIO_CMO_MIN_ENT)));
+                tmp = min3(spare_needed, reserve_freed, (viodev->cmo.entitled - VIO_CMO_MIN_ENT));
 
                 vio_cmo.spare += tmp;
                 viodev->cmo.entitled -= tmp;
@@ -602,6 +600,11 @@ static void vio_dma_iommu_unmap_sg(struct device *dev,
         vio_cmo_dealloc(viodev, alloc_size);
 }
 
+static int vio_dma_iommu_dma_supported(struct device *dev, u64 mask)
+{
+        return dma_iommu_ops.dma_supported(dev, mask);
+}
+
 struct dma_map_ops vio_dma_mapping_ops = {
         .alloc_coherent = vio_dma_iommu_alloc_coherent,
         .free_coherent  = vio_dma_iommu_free_coherent,
@@ -609,6 +612,7 @@ struct dma_map_ops vio_dma_mapping_ops = {
         .unmap_sg       = vio_dma_iommu_unmap_sg,
         .map_page       = vio_dma_iommu_map_page,
         .unmap_page     = vio_dma_iommu_unmap_page,
+        .dma_supported  = vio_dma_iommu_dma_supported,
 
 };
 
@@ -860,8 +864,7 @@ static void vio_cmo_bus_remove(struct vio_dev *viodev)
 
 static void vio_cmo_set_dma_ops(struct vio_dev *viodev)
 {
-        vio_dma_mapping_ops.dma_supported = dma_iommu_ops.dma_supported;
-        viodev->dev.archdata.dma_ops = &vio_dma_mapping_ops;
+        set_dma_ops(&viodev->dev, &vio_dma_mapping_ops);
 }
 
 /**
@@ -1184,7 +1187,12 @@ EXPORT_SYMBOL(vio_unregister_driver);
 /* vio_dev refcount hit 0 */
 static void __devinit vio_dev_release(struct device *dev)
 {
-        /* XXX should free TCE table */
+        struct iommu_table *tbl = get_iommu_table_base(dev);
+
+        /* iSeries uses a common table for all vio devices */
+        if (!firmware_has_feature(FW_FEATURE_ISERIES) && tbl)
+                iommu_free_table(tbl, dev->of_node ?
+                        dev->of_node->full_name : dev_name(dev));
         of_node_put(dev->of_node);
         kfree(to_vio_dev(dev));
 }
@@ -1241,7 +1249,7 @@ struct vio_dev *vio_register_device_node(struct device_node *of_node)
         if (firmware_has_feature(FW_FEATURE_CMO))
                 vio_cmo_set_dma_ops(viodev);
         else
-                viodev->dev.archdata.dma_ops = &dma_iommu_ops;
+                set_dma_ops(&viodev->dev, &dma_iommu_ops);
         set_iommu_table_base(&viodev->dev, vio_build_iommu_table(viodev));
         set_dev_node(&viodev->dev, of_node_to_nid(of_node));
 
@@ -1249,13 +1257,16 @@ struct vio_dev *vio_register_device_node(struct device_node *of_node)
         viodev->dev.parent = &vio_bus_device.dev;
         viodev->dev.bus = &vio_bus_type;
         viodev->dev.release = vio_dev_release;
+        /* needed to ensure proper operation of coherent allocations
+         * later, in case driver doesn't set it explicitly */
+        dma_set_mask(&viodev->dev, DMA_BIT_MASK(64));
+        dma_set_coherent_mask(&viodev->dev, DMA_BIT_MASK(64));
 
         /* register with generic device framework */
         if (device_register(&viodev->dev)) {
                 printk(KERN_ERR "%s: failed to register device %s\n",
                                 __func__, dev_name(&viodev->dev));
-                /* XXX free TCE table */
-                kfree(viodev);
+                put_device(&viodev->dev);
                 return NULL;
         }