Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild

[linux-2.6-omap-h63xx.git] / arch / powerpc / kernel / vio.c

diff --git a/arch/powerpc/kernel/vio.c b/arch/powerpc/kernel/vio.c
index eaf7f6992a2f943764b6ef5234ebcf9db659fac2..19a5656001c080f8da3f3f5a9050c03a80fb1746 100644 (file)
--- a/arch/powerpc/kernel/vio.c
+++ b/arch/powerpc/kernel/vio.c
@@ -48,61 +48,33 @@ static struct vio_dev vio_bus_device  = { /* fake "parent" device */
        .dev.bus = &vio_bus_type,
 };
 
-#ifdef CONFIG_PPC_ISERIES
-static struct iommu_table veth_iommu_table;
-struct iommu_table vio_iommu_table;
-
-static void __init iommu_vio_init(void)
-{
-       iommu_table_getparms_iSeries(255, 0, 0xff, &veth_iommu_table);
-       veth_iommu_table.it_size /= 2;
-       vio_iommu_table = veth_iommu_table;
-       vio_iommu_table.it_offset += veth_iommu_table.it_size;
-
-       if (!iommu_init_table(&veth_iommu_table, -1))
-               printk("Virtual Bus VETH TCE table failed.\n");
-       if (!iommu_init_table(&vio_iommu_table, -1))
-               printk("Virtual Bus VIO TCE table failed.\n");
-}
-#else
-static void __init iommu_vio_init(void)
-{
-}
-#endif
-
 static struct iommu_table *vio_build_iommu_table(struct vio_dev *dev)
 {
-#ifdef CONFIG_PPC_ISERIES
-       if (firmware_has_feature(FW_FEATURE_ISERIES)) {
-               if (strcmp(dev->type, "network") == 0)
-                       return &veth_iommu_table;
-               return &vio_iommu_table;
-       } else
-#endif
-       {
-               const unsigned char *dma_window;
-               struct iommu_table *tbl;
-               unsigned long offset, size;
-
-               dma_window = of_get_property(dev->dev.archdata.of_node,
-                                         "ibm,my-dma-window", NULL);
-               if (!dma_window)
-                       return NULL;
-
-               tbl = kmalloc(sizeof(*tbl), GFP_KERNEL);
-
-               of_parse_dma_window(dev->dev.archdata.of_node, dma_window,
-                                   &tbl->it_index, &offset, &size);
-
-               /* TCE table size - measured in tce entries */
-               tbl->it_size = size >> IOMMU_PAGE_SHIFT;
-               /* offset for VIO should always be 0 */
-               tbl->it_offset = offset >> IOMMU_PAGE_SHIFT;
-               tbl->it_busno = 0;
-               tbl->it_type = TCE_VB;
-
-               return iommu_init_table(tbl, -1);
-       }
+       const unsigned char *dma_window;
+       struct iommu_table *tbl;
+       unsigned long offset, size;
+
+       if (firmware_has_feature(FW_FEATURE_ISERIES))
+               return vio_build_iommu_table_iseries(dev);
+
+       dma_window = of_get_property(dev->dev.archdata.of_node,
+                                 "ibm,my-dma-window", NULL);
+       if (!dma_window)
+               return NULL;
+
+       tbl = kmalloc(sizeof(*tbl), GFP_KERNEL);
+
+       of_parse_dma_window(dev->dev.archdata.of_node, dma_window,
+                           &tbl->it_index, &offset, &size);
+
+       /* TCE table size - measured in tce entries */
+       tbl->it_size = size >> IOMMU_PAGE_SHIFT;
+       /* offset for VIO should always be 0 */
+       tbl->it_offset = offset >> IOMMU_PAGE_SHIFT;
+       tbl->it_busno = 0;
+       tbl->it_type = TCE_VB;
+
+       return iommu_init_table(tbl, -1);
 }
 
 /**
@@ -275,9 +247,6 @@ static int __init vio_bus_init(void)
        int err;
        struct device_node *node_vroot;
 
-       if (firmware_has_feature(FW_FEATURE_ISERIES))
-               iommu_vio_init();
-
        err = bus_register(&vio_bus_type);
        if (err) {
                printk(KERN_ERR "failed to register VIO bus\n");
@@ -348,30 +317,20 @@ static int vio_bus_match(struct device *dev, struct device_driver *drv)
        return (ids != NULL) && (vio_match_device(ids, vio_dev) != NULL);
 }
 
-static int vio_hotplug(struct device *dev, char **envp, int num_envp,
-                       char *buffer, int buffer_size)
+static int vio_hotplug(struct device *dev, struct kobj_uevent_env *env)
 {
        const struct vio_dev *vio_dev = to_vio_dev(dev);
        struct device_node *dn;
        const char *cp;
-       int length;
-
-       if (!num_envp)
-               return -ENOMEM;
 
        dn = dev->archdata.of_node;
        if (!dn)
                return -ENODEV;
-       cp = of_get_property(dn, "compatible", &length);
+       cp = of_get_property(dn, "compatible", NULL);
        if (!cp)
                return -ENODEV;
 
-       envp[0] = buffer;
-       length = scnprintf(buffer, buffer_size, "MODALIAS=vio:T%sS%s",
-                               vio_dev->type, cp);
-       if ((buffer_size - length) <= 0)
-               return -ENOMEM;
-       envp[1] = NULL;
+       add_uevent_var(env, "MODALIAS=vio:T%sS%s", vio_dev->type, cp);
        return 0;
 }