staging: fsl-mc: improve naming of source files
authorStuart Yoder <stuart.yoder@nxp.com>
Tue, 23 Aug 2016 22:13:12 +0000 (17:13 -0500)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 1 Sep 2016 15:57:25 +0000 (17:57 +0200)
The mc- prefix on the source files names of some internal components
of the fsl-mc bus driver makes things less clear that they could be.
The string "mc" generally refers to hardware-- the physical DPAA
'management complex'.  Names like "mc-allocator.c" have nothing to
with the "MC" hardware per se.  Improve clarity by using the prefix
string "fsl-mc" instead which is what we are calling this bus.

Signed-off-by: Stuart Yoder <stuart.yoder@nxp.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/fsl-mc/bus/Makefile
drivers/staging/fsl-mc/bus/fsl-mc-allocator.c [new file with mode: 0644]
drivers/staging/fsl-mc/bus/fsl-mc-bus.c [new file with mode: 0644]
drivers/staging/fsl-mc/bus/fsl-mc-msi.c [new file with mode: 0644]
drivers/staging/fsl-mc/bus/mc-allocator.c [deleted file]
drivers/staging/fsl-mc/bus/mc-bus.c [deleted file]
drivers/staging/fsl-mc/bus/mc-msi.c [deleted file]

index e7315170b7a378fb49724ac57bd8395683c88b5a..5fb4c14b084db02d63abf7580ebb6b07efd91379 100644 (file)
@@ -7,13 +7,13 @@
 #
 obj-$(CONFIG_FSL_MC_BUS) += mc-bus-driver.o
 
-mc-bus-driver-objs := mc-bus.o \
+mc-bus-driver-objs := fsl-mc-bus.o \
                      mc-sys.o \
                      dprc.o \
                      dpmng.o \
                      dprc-driver.o \
-                     mc-allocator.o \
-                     mc-msi.o \
+                     fsl-mc-allocator.o \
+                     fsl-mc-msi.o \
                      irq-gic-v3-its-fsl-mc-msi.o \
                      dpmcp.o \
                      dpbp.o
diff --git a/drivers/staging/fsl-mc/bus/fsl-mc-allocator.c b/drivers/staging/fsl-mc/bus/fsl-mc-allocator.c
new file mode 100644 (file)
index 0000000..3ebaecb
--- /dev/null
@@ -0,0 +1,755 @@
+/*
+ * Freescale MC object device allocator driver
+ *
+ * Copyright (C) 2013 Freescale Semiconductor, Inc.
+ *
+ * This file is licensed under the terms of the GNU General Public
+ * License version 2. This program is licensed "as is" without any
+ * warranty of any kind, whether express or implied.
+ */
+
+#include "../include/mc-bus.h"
+#include "../include/mc-sys.h"
+#include <linux/module.h>
+#include "../include/dpbp-cmd.h"
+#include "../include/dpcon-cmd.h"
+#include "dpmcp-cmd.h"
+#include "dpmcp.h"
+#include <linux/msi.h>
+
+/**
+ * fsl_mc_resource_pool_add_device - add allocatable device to a resource
+ * pool of a given MC bus
+ *
+ * @mc_bus: pointer to the MC bus
+ * @pool_type: MC bus pool type
+ * @mc_dev: Pointer to allocatable MC object device
+ *
+ * It adds an allocatable MC object device to a container's resource pool of
+ * the given resource type
+ */
+static int __must_check fsl_mc_resource_pool_add_device(struct fsl_mc_bus
+                                                               *mc_bus,
+                                                       enum fsl_mc_pool_type
+                                                               pool_type,
+                                                       struct fsl_mc_device
+                                                               *mc_dev)
+{
+       struct fsl_mc_resource_pool *res_pool;
+       struct fsl_mc_resource *resource;
+       struct fsl_mc_device *mc_bus_dev = &mc_bus->mc_dev;
+       int error = -EINVAL;
+
+       if (WARN_ON(pool_type < 0 || pool_type >= FSL_MC_NUM_POOL_TYPES))
+               goto out;
+       if (WARN_ON(!FSL_MC_IS_ALLOCATABLE(mc_dev->obj_desc.type)))
+               goto out;
+       if (WARN_ON(mc_dev->resource))
+               goto out;
+
+       res_pool = &mc_bus->resource_pools[pool_type];
+       if (WARN_ON(res_pool->type != pool_type))
+               goto out;
+       if (WARN_ON(res_pool->mc_bus != mc_bus))
+               goto out;
+
+       mutex_lock(&res_pool->mutex);
+
+       if (WARN_ON(res_pool->max_count < 0))
+               goto out_unlock;
+       if (WARN_ON(res_pool->free_count < 0 ||
+                   res_pool->free_count > res_pool->max_count))
+               goto out_unlock;
+
+       resource = devm_kzalloc(&mc_bus_dev->dev, sizeof(*resource),
+                               GFP_KERNEL);
+       if (!resource) {
+               error = -ENOMEM;
+               dev_err(&mc_bus_dev->dev,
+                       "Failed to allocate memory for fsl_mc_resource\n");
+               goto out_unlock;
+       }
+
+       resource->type = pool_type;
+       resource->id = mc_dev->obj_desc.id;
+       resource->data = mc_dev;
+       resource->parent_pool = res_pool;
+       INIT_LIST_HEAD(&resource->node);
+       list_add_tail(&resource->node, &res_pool->free_list);
+       mc_dev->resource = resource;
+       res_pool->free_count++;
+       res_pool->max_count++;
+       error = 0;
+out_unlock:
+       mutex_unlock(&res_pool->mutex);
+out:
+       return error;
+}
+
+/**
+ * fsl_mc_resource_pool_remove_device - remove an allocatable device from a
+ * resource pool
+ *
+ * @mc_dev: Pointer to allocatable MC object device
+ *
+ * It permanently removes an allocatable MC object device from the resource
+ * pool, the device is currently in, as long as it is in the pool's free list.
+ */
+static int __must_check fsl_mc_resource_pool_remove_device(struct fsl_mc_device
+                                                                  *mc_dev)
+{
+       struct fsl_mc_device *mc_bus_dev;
+       struct fsl_mc_bus *mc_bus;
+       struct fsl_mc_resource_pool *res_pool;
+       struct fsl_mc_resource *resource;
+       int error = -EINVAL;
+
+       if (WARN_ON(!FSL_MC_IS_ALLOCATABLE(mc_dev->obj_desc.type)))
+               goto out;
+
+       resource = mc_dev->resource;
+       if (WARN_ON(!resource || resource->data != mc_dev))
+               goto out;
+
+       mc_bus_dev = to_fsl_mc_device(mc_dev->dev.parent);
+       mc_bus = to_fsl_mc_bus(mc_bus_dev);
+       res_pool = resource->parent_pool;
+       if (WARN_ON(res_pool != &mc_bus->resource_pools[resource->type]))
+               goto out;
+
+       mutex_lock(&res_pool->mutex);
+
+       if (WARN_ON(res_pool->max_count <= 0))
+               goto out_unlock;
+       if (WARN_ON(res_pool->free_count <= 0 ||
+                   res_pool->free_count > res_pool->max_count))
+               goto out_unlock;
+
+       /*
+        * If the device is currently allocated, its resource is not
+        * in the free list and thus, the device cannot be removed.
+        */
+       if (list_empty(&resource->node)) {
+               error = -EBUSY;
+               dev_err(&mc_bus_dev->dev,
+                       "Device %s cannot be removed from resource pool\n",
+                       dev_name(&mc_dev->dev));
+               goto out_unlock;
+       }
+
+       list_del(&resource->node);
+       INIT_LIST_HEAD(&resource->node);
+       res_pool->free_count--;
+       res_pool->max_count--;
+
+       devm_kfree(&mc_bus_dev->dev, resource);
+       mc_dev->resource = NULL;
+       error = 0;
+out_unlock:
+       mutex_unlock(&res_pool->mutex);
+out:
+       return error;
+}
+
+static const char *const fsl_mc_pool_type_strings[] = {
+       [FSL_MC_POOL_DPMCP] = "dpmcp",
+       [FSL_MC_POOL_DPBP] = "dpbp",
+       [FSL_MC_POOL_DPCON] = "dpcon",
+       [FSL_MC_POOL_IRQ] = "irq",
+};
+
+static int __must_check object_type_to_pool_type(const char *object_type,
+                                                enum fsl_mc_pool_type
+                                                               *pool_type)
+{
+       unsigned int i;
+
+       for (i = 0; i < ARRAY_SIZE(fsl_mc_pool_type_strings); i++) {
+               if (strcmp(object_type, fsl_mc_pool_type_strings[i]) == 0) {
+                       *pool_type = i;
+                       return 0;
+               }
+       }
+
+       return -EINVAL;
+}
+
+int __must_check fsl_mc_resource_allocate(struct fsl_mc_bus *mc_bus,
+                                         enum fsl_mc_pool_type pool_type,
+                                         struct fsl_mc_resource **new_resource)
+{
+       struct fsl_mc_resource_pool *res_pool;
+       struct fsl_mc_resource *resource;
+       struct fsl_mc_device *mc_bus_dev = &mc_bus->mc_dev;
+       int error = -EINVAL;
+
+       BUILD_BUG_ON(ARRAY_SIZE(fsl_mc_pool_type_strings) !=
+                    FSL_MC_NUM_POOL_TYPES);
+
+       *new_resource = NULL;
+       if (WARN_ON(pool_type < 0 || pool_type >= FSL_MC_NUM_POOL_TYPES))
+               goto out;
+
+       res_pool = &mc_bus->resource_pools[pool_type];
+       if (WARN_ON(res_pool->mc_bus != mc_bus))
+               goto out;
+
+       mutex_lock(&res_pool->mutex);
+       resource = list_first_entry_or_null(&res_pool->free_list,
+                                           struct fsl_mc_resource, node);
+
+       if (!resource) {
+               WARN_ON(res_pool->free_count != 0);
+               error = -ENXIO;
+               dev_err(&mc_bus_dev->dev,
+                       "No more resources of type %s left\n",
+                       fsl_mc_pool_type_strings[pool_type]);
+               goto out_unlock;
+       }
+
+       if (WARN_ON(resource->type != pool_type))
+               goto out_unlock;
+       if (WARN_ON(resource->parent_pool != res_pool))
+               goto out_unlock;
+       if (WARN_ON(res_pool->free_count <= 0 ||
+                   res_pool->free_count > res_pool->max_count))
+               goto out_unlock;
+
+       list_del(&resource->node);
+       INIT_LIST_HEAD(&resource->node);
+
+       res_pool->free_count--;
+       error = 0;
+out_unlock:
+       mutex_unlock(&res_pool->mutex);
+       *new_resource = resource;
+out:
+       return error;
+}
+EXPORT_SYMBOL_GPL(fsl_mc_resource_allocate);
+
+void fsl_mc_resource_free(struct fsl_mc_resource *resource)
+{
+       struct fsl_mc_resource_pool *res_pool;
+
+       res_pool = resource->parent_pool;
+       if (WARN_ON(resource->type != res_pool->type))
+               return;
+
+       mutex_lock(&res_pool->mutex);
+       if (WARN_ON(res_pool->free_count < 0 ||
+                   res_pool->free_count >= res_pool->max_count))
+               goto out_unlock;
+
+       if (WARN_ON(!list_empty(&resource->node)))
+               goto out_unlock;
+
+       list_add_tail(&resource->node, &res_pool->free_list);
+       res_pool->free_count++;
+out_unlock:
+       mutex_unlock(&res_pool->mutex);
+}
+EXPORT_SYMBOL_GPL(fsl_mc_resource_free);
+
+/**
+ * fsl_mc_portal_allocate - Allocates an MC portal
+ *
+ * @mc_dev: MC device for which the MC portal is to be allocated
+ * @mc_io_flags: Flags for the fsl_mc_io object that wraps the allocated
+ * MC portal.
+ * @new_mc_io: Pointer to area where the pointer to the fsl_mc_io object
+ * that wraps the allocated MC portal is to be returned
+ *
+ * This function allocates an MC portal from the device's parent DPRC,
+ * from the corresponding MC bus' pool of MC portals and wraps
+ * it in a new fsl_mc_io object. If 'mc_dev' is a DPRC itself, the
+ * portal is allocated from its own MC bus.
+ */
+int __must_check fsl_mc_portal_allocate(struct fsl_mc_device *mc_dev,
+                                       u16 mc_io_flags,
+                                       struct fsl_mc_io **new_mc_io)
+{
+       struct fsl_mc_device *mc_bus_dev;
+       struct fsl_mc_bus *mc_bus;
+       phys_addr_t mc_portal_phys_addr;
+       size_t mc_portal_size;
+       struct fsl_mc_device *dpmcp_dev;
+       int error = -EINVAL;
+       struct fsl_mc_resource *resource = NULL;
+       struct fsl_mc_io *mc_io = NULL;
+
+       if (mc_dev->flags & FSL_MC_IS_DPRC) {
+               mc_bus_dev = mc_dev;
+       } else {
+               if (WARN_ON(!dev_is_fsl_mc(mc_dev->dev.parent)))
+                       return error;
+
+               mc_bus_dev = to_fsl_mc_device(mc_dev->dev.parent);
+       }
+
+       mc_bus = to_fsl_mc_bus(mc_bus_dev);
+       *new_mc_io = NULL;
+       error = fsl_mc_resource_allocate(mc_bus, FSL_MC_POOL_DPMCP, &resource);
+       if (error < 0)
+               return error;
+
+       error = -EINVAL;
+       dpmcp_dev = resource->data;
+       if (WARN_ON(!dpmcp_dev))
+               goto error_cleanup_resource;
+
+       if (dpmcp_dev->obj_desc.ver_major < DPMCP_MIN_VER_MAJOR ||
+           (dpmcp_dev->obj_desc.ver_major == DPMCP_MIN_VER_MAJOR &&
+            dpmcp_dev->obj_desc.ver_minor < DPMCP_MIN_VER_MINOR)) {
+               dev_err(&dpmcp_dev->dev,
+                       "ERROR: Version %d.%d of DPMCP not supported.\n",
+                       dpmcp_dev->obj_desc.ver_major,
+                       dpmcp_dev->obj_desc.ver_minor);
+               error = -ENOTSUPP;
+               goto error_cleanup_resource;
+       }
+
+       if (WARN_ON(dpmcp_dev->obj_desc.region_count == 0))
+               goto error_cleanup_resource;
+
+       mc_portal_phys_addr = dpmcp_dev->regions[0].start;
+       mc_portal_size = dpmcp_dev->regions[0].end -
+                        dpmcp_dev->regions[0].start + 1;
+
+       if (WARN_ON(mc_portal_size != mc_bus_dev->mc_io->portal_size))
+               goto error_cleanup_resource;
+
+       error = fsl_create_mc_io(&mc_bus_dev->dev,
+                                mc_portal_phys_addr,
+                                mc_portal_size, dpmcp_dev,
+                                mc_io_flags, &mc_io);
+       if (error < 0)
+               goto error_cleanup_resource;
+
+       *new_mc_io = mc_io;
+       return 0;
+
+error_cleanup_resource:
+       fsl_mc_resource_free(resource);
+       return error;
+}
+EXPORT_SYMBOL_GPL(fsl_mc_portal_allocate);
+
+/**
+ * fsl_mc_portal_free - Returns an MC portal to the pool of free MC portals
+ * of a given MC bus
+ *
+ * @mc_io: Pointer to the fsl_mc_io object that wraps the MC portal to free
+ */
+void fsl_mc_portal_free(struct fsl_mc_io *mc_io)
+{
+       struct fsl_mc_device *dpmcp_dev;
+       struct fsl_mc_resource *resource;
+
+       /*
+        * Every mc_io obtained by calling fsl_mc_portal_allocate() is supposed
+        * to have a DPMCP object associated with.
+        */
+       dpmcp_dev = mc_io->dpmcp_dev;
+       if (WARN_ON(!dpmcp_dev))
+               return;
+
+       resource = dpmcp_dev->resource;
+       if (WARN_ON(!resource || resource->type != FSL_MC_POOL_DPMCP))
+               return;
+
+       if (WARN_ON(resource->data != dpmcp_dev))
+               return;
+
+       fsl_destroy_mc_io(mc_io);
+       fsl_mc_resource_free(resource);
+}
+EXPORT_SYMBOL_GPL(fsl_mc_portal_free);
+
+/**
+ * fsl_mc_portal_reset - Resets the dpmcp object for a given fsl_mc_io object
+ *
+ * @mc_io: Pointer to the fsl_mc_io object that wraps the MC portal to free
+ */
+int fsl_mc_portal_reset(struct fsl_mc_io *mc_io)
+{
+       int error;
+       struct fsl_mc_device *dpmcp_dev = mc_io->dpmcp_dev;
+
+       if (WARN_ON(!dpmcp_dev))
+               return -EINVAL;
+
+       error = dpmcp_reset(mc_io, 0, dpmcp_dev->mc_handle);
+       if (error < 0) {
+               dev_err(&dpmcp_dev->dev, "dpmcp_reset() failed: %d\n", error);
+               return error;
+       }
+
+       return 0;
+}
+EXPORT_SYMBOL_GPL(fsl_mc_portal_reset);
+
+/**
+ * fsl_mc_object_allocate - Allocates a MC object device of the given
+ * pool type from a given MC bus
+ *
+ * @mc_dev: MC device for which the MC object device is to be allocated
+ * @pool_type: MC bus resource pool type
+ * @new_mc_dev: Pointer to area where the pointer to the allocated
+ * MC object device is to be returned
+ *
+ * This function allocates a MC object device from the device's parent DPRC,
+ * from the corresponding MC bus' pool of allocatable MC object devices of
+ * the given resource type. mc_dev cannot be a DPRC itself.
+ *
+ * NOTE: pool_type must be different from FSL_MC_POOL_MCP, since MC
+ * portals are allocated using fsl_mc_portal_allocate(), instead of
+ * this function.
+ */
+int __must_check fsl_mc_object_allocate(struct fsl_mc_device *mc_dev,
+                                       enum fsl_mc_pool_type pool_type,
+                                       struct fsl_mc_device **new_mc_adev)
+{
+       struct fsl_mc_device *mc_bus_dev;
+       struct fsl_mc_bus *mc_bus;
+       struct fsl_mc_device *mc_adev;
+       int error = -EINVAL;
+       struct fsl_mc_resource *resource = NULL;
+
+       *new_mc_adev = NULL;
+       if (WARN_ON(mc_dev->flags & FSL_MC_IS_DPRC))
+               goto error;
+
+       if (WARN_ON(!dev_is_fsl_mc(mc_dev->dev.parent)))
+               goto error;
+
+       if (WARN_ON(pool_type == FSL_MC_POOL_DPMCP))
+               goto error;
+
+       mc_bus_dev = to_fsl_mc_device(mc_dev->dev.parent);
+       mc_bus = to_fsl_mc_bus(mc_bus_dev);
+       error = fsl_mc_resource_allocate(mc_bus, pool_type, &resource);
+       if (error < 0)
+               goto error;
+
+       mc_adev = resource->data;
+       if (WARN_ON(!mc_adev))
+               goto error;
+
+       *new_mc_adev = mc_adev;
+       return 0;
+error:
+       if (resource)
+               fsl_mc_resource_free(resource);
+
+       return error;
+}
+EXPORT_SYMBOL_GPL(fsl_mc_object_allocate);
+
+/**
+ * fsl_mc_object_free - Returns an allocatable MC object device to the
+ * corresponding resource pool of a given MC bus.
+ *
+ * @mc_adev: Pointer to the MC object device
+ */
+void fsl_mc_object_free(struct fsl_mc_device *mc_adev)
+{
+       struct fsl_mc_resource *resource;
+
+       resource = mc_adev->resource;
+       if (WARN_ON(resource->type == FSL_MC_POOL_DPMCP))
+               return;
+       if (WARN_ON(resource->data != mc_adev))
+               return;
+
+       fsl_mc_resource_free(resource);
+}
+EXPORT_SYMBOL_GPL(fsl_mc_object_free);
+
+/*
+ * Initialize the interrupt pool associated with a MC bus.
+ * It allocates a block of IRQs from the GIC-ITS
+ */
+int fsl_mc_populate_irq_pool(struct fsl_mc_bus *mc_bus,
+                            unsigned int irq_count)
+{
+       unsigned int i;
+       struct msi_desc *msi_desc;
+       struct fsl_mc_device_irq *irq_resources;
+       struct fsl_mc_device_irq *mc_dev_irq;
+       int error;
+       struct fsl_mc_device *mc_bus_dev = &mc_bus->mc_dev;
+       struct fsl_mc_resource_pool *res_pool =
+                       &mc_bus->resource_pools[FSL_MC_POOL_IRQ];
+
+       if (WARN_ON(irq_count == 0 ||
+                   irq_count > FSL_MC_IRQ_POOL_MAX_TOTAL_IRQS))
+               return -EINVAL;
+
+       error = fsl_mc_msi_domain_alloc_irqs(&mc_bus_dev->dev, irq_count);
+       if (error < 0)
+               return error;
+
+       irq_resources = devm_kzalloc(&mc_bus_dev->dev,
+                                    sizeof(*irq_resources) * irq_count,
+                                    GFP_KERNEL);
+       if (!irq_resources) {
+               error = -ENOMEM;
+               goto cleanup_msi_irqs;
+       }
+
+       for (i = 0; i < irq_count; i++) {
+               mc_dev_irq = &irq_resources[i];
+
+               /*
+                * NOTE: This mc_dev_irq's MSI addr/value pair will be set
+                * by the fsl_mc_msi_write_msg() callback
+                */
+               mc_dev_irq->resource.type = res_pool->type;
+               mc_dev_irq->resource.data = mc_dev_irq;
+               mc_dev_irq->resource.parent_pool = res_pool;
+               INIT_LIST_HEAD(&mc_dev_irq->resource.node);
+               list_add_tail(&mc_dev_irq->resource.node, &res_pool->free_list);
+       }
+
+       for_each_msi_entry(msi_desc, &mc_bus_dev->dev) {
+               mc_dev_irq = &irq_resources[msi_desc->fsl_mc.msi_index];
+               mc_dev_irq->msi_desc = msi_desc;
+               mc_dev_irq->resource.id = msi_desc->irq;
+       }
+
+       res_pool->max_count = irq_count;
+       res_pool->free_count = irq_count;
+       mc_bus->irq_resources = irq_resources;
+       return 0;
+
+cleanup_msi_irqs:
+       fsl_mc_msi_domain_free_irqs(&mc_bus_dev->dev);
+       return error;
+}
+EXPORT_SYMBOL_GPL(fsl_mc_populate_irq_pool);
+
+/**
+ * Teardown the interrupt pool associated with an MC bus.
+ * It frees the IRQs that were allocated to the pool, back to the GIC-ITS.
+ */
+void fsl_mc_cleanup_irq_pool(struct fsl_mc_bus *mc_bus)
+{
+       struct fsl_mc_device *mc_bus_dev = &mc_bus->mc_dev;
+       struct fsl_mc_resource_pool *res_pool =
+                       &mc_bus->resource_pools[FSL_MC_POOL_IRQ];
+
+       if (WARN_ON(!mc_bus->irq_resources))
+               return;
+
+       if (WARN_ON(res_pool->max_count == 0))
+               return;
+
+       if (WARN_ON(res_pool->free_count != res_pool->max_count))
+               return;
+
+       INIT_LIST_HEAD(&res_pool->free_list);
+       res_pool->max_count = 0;
+       res_pool->free_count = 0;
+       mc_bus->irq_resources = NULL;
+       fsl_mc_msi_domain_free_irqs(&mc_bus_dev->dev);
+}
+EXPORT_SYMBOL_GPL(fsl_mc_cleanup_irq_pool);
+
+/**
+ * It allocates the IRQs required by a given MC object device. The
+ * IRQs are allocated from the interrupt pool associated with the
+ * MC bus that contains the device, if the device is not a DPRC device.
+ * Otherwise, the IRQs are allocated from the interrupt pool associated
+ * with the MC bus that represents the DPRC device itself.
+ */
+int __must_check fsl_mc_allocate_irqs(struct fsl_mc_device *mc_dev)
+{
+       int i;
+       int irq_count;
+       int res_allocated_count = 0;
+       int error = -EINVAL;
+       struct fsl_mc_device_irq **irqs = NULL;
+       struct fsl_mc_bus *mc_bus;
+       struct fsl_mc_resource_pool *res_pool;
+
+       if (WARN_ON(mc_dev->irqs))
+               return -EINVAL;
+
+       irq_count = mc_dev->obj_desc.irq_count;
+       if (WARN_ON(irq_count == 0))
+               return -EINVAL;
+
+       if (strcmp(mc_dev->obj_desc.type, "dprc") == 0)
+               mc_bus = to_fsl_mc_bus(mc_dev);
+       else
+               mc_bus = to_fsl_mc_bus(to_fsl_mc_device(mc_dev->dev.parent));
+
+       if (WARN_ON(!mc_bus->irq_resources))
+               return -EINVAL;
+
+       res_pool = &mc_bus->resource_pools[FSL_MC_POOL_IRQ];
+       if (res_pool->free_count < irq_count) {
+               dev_err(&mc_dev->dev,
+                       "Not able to allocate %u irqs for device\n", irq_count);
+               return -ENOSPC;
+       }
+
+       irqs = devm_kzalloc(&mc_dev->dev, irq_count * sizeof(irqs[0]),
+                           GFP_KERNEL);
+       if (!irqs)
+               return -ENOMEM;
+
+       for (i = 0; i < irq_count; i++) {
+               struct fsl_mc_resource *resource;
+
+               error = fsl_mc_resource_allocate(mc_bus, FSL_MC_POOL_IRQ,
+                                                &resource);
+               if (error < 0)
+                       goto error_resource_alloc;
+
+               irqs[i] = to_fsl_mc_irq(resource);
+               res_allocated_count++;
+
+               WARN_ON(irqs[i]->mc_dev);
+               irqs[i]->mc_dev = mc_dev;
+               irqs[i]->dev_irq_index = i;
+       }
+
+       mc_dev->irqs = irqs;
+       return 0;
+
+error_resource_alloc:
+       for (i = 0; i < res_allocated_count; i++) {
+               irqs[i]->mc_dev = NULL;
+               fsl_mc_resource_free(&irqs[i]->resource);
+       }
+
+       return error;
+}
+EXPORT_SYMBOL_GPL(fsl_mc_allocate_irqs);
+
+/*
+ * It frees the IRQs that were allocated for a MC object device, by
+ * returning them to the corresponding interrupt pool.
+ */
+void fsl_mc_free_irqs(struct fsl_mc_device *mc_dev)
+{
+       int i;
+       int irq_count;
+       struct fsl_mc_bus *mc_bus;
+       struct fsl_mc_device_irq **irqs = mc_dev->irqs;
+
+       if (WARN_ON(!irqs))
+               return;
+
+       irq_count = mc_dev->obj_desc.irq_count;
+
+       if (strcmp(mc_dev->obj_desc.type, "dprc") == 0)
+               mc_bus = to_fsl_mc_bus(mc_dev);
+       else
+               mc_bus = to_fsl_mc_bus(to_fsl_mc_device(mc_dev->dev.parent));
+
+       if (WARN_ON(!mc_bus->irq_resources))
+               return;
+
+       for (i = 0; i < irq_count; i++) {
+               WARN_ON(!irqs[i]->mc_dev);
+               irqs[i]->mc_dev = NULL;
+               fsl_mc_resource_free(&irqs[i]->resource);
+       }
+
+       mc_dev->irqs = NULL;
+}
+EXPORT_SYMBOL_GPL(fsl_mc_free_irqs);
+
+/**
+ * fsl_mc_allocator_probe - callback invoked when an allocatable device is
+ * being added to the system
+ */
+static int fsl_mc_allocator_probe(struct fsl_mc_device *mc_dev)
+{
+       enum fsl_mc_pool_type pool_type;
+       struct fsl_mc_device *mc_bus_dev;
+       struct fsl_mc_bus *mc_bus;
+       int error;
+
+       if (WARN_ON(!FSL_MC_IS_ALLOCATABLE(mc_dev->obj_desc.type)))
+               return -EINVAL;
+
+       mc_bus_dev = to_fsl_mc_device(mc_dev->dev.parent);
+       if (WARN_ON(!dev_is_fsl_mc(&mc_bus_dev->dev)))
+               return -EINVAL;
+
+       mc_bus = to_fsl_mc_bus(mc_bus_dev);
+       error = object_type_to_pool_type(mc_dev->obj_desc.type, &pool_type);
+       if (error < 0)
+               return error;
+
+       error = fsl_mc_resource_pool_add_device(mc_bus, pool_type, mc_dev);
+       if (error < 0)
+               return error;
+
+       dev_dbg(&mc_dev->dev,
+               "Allocatable MC object device bound to fsl_mc_allocator driver");
+       return 0;
+}
+
+/**
+ * fsl_mc_allocator_remove - callback invoked when an allocatable device is
+ * being removed from the system
+ */
+static int fsl_mc_allocator_remove(struct fsl_mc_device *mc_dev)
+{
+       int error;
+
+       if (WARN_ON(!FSL_MC_IS_ALLOCATABLE(mc_dev->obj_desc.type)))
+               return -EINVAL;
+
+       if (mc_dev->resource) {
+               error = fsl_mc_resource_pool_remove_device(mc_dev);
+               if (error < 0)
+                       return error;
+       }
+
+       dev_dbg(&mc_dev->dev,
+               "Allocatable MC object device unbound from fsl_mc_allocator driver");
+       return 0;
+}
+
+static const struct fsl_mc_device_id match_id_table[] = {
+       {
+        .vendor = FSL_MC_VENDOR_FREESCALE,
+        .obj_type = "dpbp",
+       },
+       {
+        .vendor = FSL_MC_VENDOR_FREESCALE,
+        .obj_type = "dpmcp",
+       },
+       {
+        .vendor = FSL_MC_VENDOR_FREESCALE,
+        .obj_type = "dpcon",
+       },
+       {.vendor = 0x0},
+};
+
+static struct fsl_mc_driver fsl_mc_allocator_driver = {
+       .driver = {
+                  .name = "fsl_mc_allocator",
+                  .owner = THIS_MODULE,
+                  .pm = NULL,
+                  },
+       .match_id_table = match_id_table,
+       .probe = fsl_mc_allocator_probe,
+       .remove = fsl_mc_allocator_remove,
+};
+
+int __init fsl_mc_allocator_driver_init(void)
+{
+       return fsl_mc_driver_register(&fsl_mc_allocator_driver);
+}
+
+void fsl_mc_allocator_driver_exit(void)
+{
+       fsl_mc_driver_unregister(&fsl_mc_allocator_driver);
+}
diff --git a/drivers/staging/fsl-mc/bus/fsl-mc-bus.c b/drivers/staging/fsl-mc/bus/fsl-mc-bus.c
new file mode 100644 (file)
index 0000000..975d30b
--- /dev/null
@@ -0,0 +1,890 @@
+/*
+ * Freescale Management Complex (MC) bus driver
+ *
+ * Copyright (C) 2014 Freescale Semiconductor, Inc.
+ * Author: German Rivera <German.Rivera@freescale.com>
+ *
+ * This file is licensed under the terms of the GNU General Public
+ * License version 2. This program is licensed "as is" without any
+ * warranty of any kind, whether express or implied.
+ */
+
+#include "../include/mc-bus.h"
+#include <linux/module.h>
+#include <linux/of_device.h>
+#include <linux/of_address.h>
+#include <linux/ioport.h>
+#include <linux/slab.h>
+#include <linux/limits.h>
+#include <linux/bitops.h>
+#include <linux/msi.h>
+#include "../include/dpmng.h"
+#include "../include/mc-sys.h"
+#include "dprc-cmd.h"
+
+static struct kmem_cache *mc_dev_cache;
+
+/**
+ * fsl_mc_bus_match - device to driver matching callback
+ * @dev: the MC object device structure to match against
+ * @drv: the device driver to search for matching MC object device id
+ * structures
+ *
+ * Returns 1 on success, 0 otherwise.
+ */
+static int fsl_mc_bus_match(struct device *dev, struct device_driver *drv)
+{
+       const struct fsl_mc_device_id *id;
+       struct fsl_mc_device *mc_dev = to_fsl_mc_device(dev);
+       struct fsl_mc_driver *mc_drv = to_fsl_mc_driver(drv);
+       bool found = false;
+
+       if (WARN_ON(!fsl_mc_bus_exists()))
+               goto out;
+
+       if (!mc_drv->match_id_table)
+               goto out;
+
+       /*
+        * If the object is not 'plugged' don't match.
+        * Only exception is the root DPRC, which is a special case.
+        */
+       if ((mc_dev->obj_desc.state & DPRC_OBJ_STATE_PLUGGED) == 0 &&
+           !fsl_mc_is_root_dprc(&mc_dev->dev))
+               goto out;
+
+       /*
+        * Traverse the match_id table of the given driver, trying to find
+        * a matching for the given MC object device.
+        */
+       for (id = mc_drv->match_id_table; id->vendor != 0x0; id++) {
+               if (id->vendor == mc_dev->obj_desc.vendor &&
+                   strcmp(id->obj_type, mc_dev->obj_desc.type) == 0) {
+                       found = true;
+
+                       break;
+               }
+       }
+
+out:
+       dev_dbg(dev, "%smatched\n", found ? "" : "not ");
+       return found;
+}
+
+/**
+ * fsl_mc_bus_uevent - callback invoked when a device is added
+ */
+static int fsl_mc_bus_uevent(struct device *dev, struct kobj_uevent_env *env)
+{
+       struct fsl_mc_device *mc_dev = to_fsl_mc_device(dev);
+
+       if (add_uevent_var(env, "MODALIAS=fsl-mc:v%08Xd%s",
+                          mc_dev->obj_desc.vendor,
+                          mc_dev->obj_desc.type))
+               return -ENOMEM;
+
+       return 0;
+}
+
+static ssize_t modalias_show(struct device *dev, struct device_attribute *attr,
+                            char *buf)
+{
+       struct fsl_mc_device *mc_dev = to_fsl_mc_device(dev);
+
+       return sprintf(buf, "fsl-mc:v%08Xd%s\n", mc_dev->obj_desc.vendor,
+                      mc_dev->obj_desc.type);
+}
+static DEVICE_ATTR_RO(modalias);
+
+static struct attribute *fsl_mc_dev_attrs[] = {
+       &dev_attr_modalias.attr,
+       NULL,
+};
+
+static const struct attribute_group fsl_mc_dev_group = {
+       .attrs = fsl_mc_dev_attrs,
+};
+
+static const struct attribute_group *fsl_mc_dev_groups[] = {
+       &fsl_mc_dev_group,
+       NULL,
+};
+
+struct bus_type fsl_mc_bus_type = {
+       .name = "fsl-mc",
+       .match = fsl_mc_bus_match,
+       .uevent = fsl_mc_bus_uevent,
+       .dev_groups = fsl_mc_dev_groups,
+};
+EXPORT_SYMBOL_GPL(fsl_mc_bus_type);
+
+static atomic_t root_dprc_count = ATOMIC_INIT(0);
+
+static int fsl_mc_driver_probe(struct device *dev)
+{
+       struct fsl_mc_driver *mc_drv;
+       struct fsl_mc_device *mc_dev = to_fsl_mc_device(dev);
+       int error;
+
+       if (WARN_ON(!dev->driver))
+               return -EINVAL;
+
+       mc_drv = to_fsl_mc_driver(dev->driver);
+       if (WARN_ON(!mc_drv->probe))
+               return -EINVAL;
+
+       error = mc_drv->probe(mc_dev);
+       if (error < 0) {
+               dev_err(dev, "MC object device probe callback failed: %d\n",
+                       error);
+               return error;
+       }
+
+       return 0;
+}
+
+static int fsl_mc_driver_remove(struct device *dev)
+{
+       struct fsl_mc_driver *mc_drv = to_fsl_mc_driver(dev->driver);
+       struct fsl_mc_device *mc_dev = to_fsl_mc_device(dev);
+       int error;
+
+       if (WARN_ON(!dev->driver))
+               return -EINVAL;
+
+       error = mc_drv->remove(mc_dev);
+       if (error < 0) {
+               dev_err(dev,
+                       "MC object device remove callback failed: %d\n",
+                       error);
+               return error;
+       }
+
+       return 0;
+}
+
+static void fsl_mc_driver_shutdown(struct device *dev)
+{
+       struct fsl_mc_driver *mc_drv = to_fsl_mc_driver(dev->driver);
+       struct fsl_mc_device *mc_dev = to_fsl_mc_device(dev);
+
+       mc_drv->shutdown(mc_dev);
+}
+
+/**
+ * __fsl_mc_driver_register - registers a child device driver with the
+ * MC bus
+ *
+ * This function is implicitly invoked from the registration function of
+ * fsl_mc device drivers, which is generated by the
+ * module_fsl_mc_driver() macro.
+ */
+int __fsl_mc_driver_register(struct fsl_mc_driver *mc_driver,
+                            struct module *owner)
+{
+       int error;
+
+       mc_driver->driver.owner = owner;
+       mc_driver->driver.bus = &fsl_mc_bus_type;
+
+       if (mc_driver->probe)
+               mc_driver->driver.probe = fsl_mc_driver_probe;
+
+       if (mc_driver->remove)
+               mc_driver->driver.remove = fsl_mc_driver_remove;
+
+       if (mc_driver->shutdown)
+               mc_driver->driver.shutdown = fsl_mc_driver_shutdown;
+
+       error = driver_register(&mc_driver->driver);
+       if (error < 0) {
+               pr_err("driver_register() failed for %s: %d\n",
+                      mc_driver->driver.name, error);
+               return error;
+       }
+
+       pr_info("MC object device driver %s registered\n",
+               mc_driver->driver.name);
+       return 0;
+}
+EXPORT_SYMBOL_GPL(__fsl_mc_driver_register);
+
+/**
+ * fsl_mc_driver_unregister - unregisters a device driver from the
+ * MC bus
+ */
+void fsl_mc_driver_unregister(struct fsl_mc_driver *mc_driver)
+{
+       driver_unregister(&mc_driver->driver);
+}
+EXPORT_SYMBOL_GPL(fsl_mc_driver_unregister);
+
+/**
+ * fsl_mc_bus_exists - check if a root dprc exists
+ */
+bool fsl_mc_bus_exists(void)
+{
+       return atomic_read(&root_dprc_count) > 0;
+}
+EXPORT_SYMBOL_GPL(fsl_mc_bus_exists);
+
+/**
+* fsl_mc_get_root_dprc - function to traverse to the root dprc
+*/
+static void fsl_mc_get_root_dprc(struct device *dev,
+                                struct device **root_dprc_dev)
+{
+       if (WARN_ON(!dev)) {
+               *root_dprc_dev = NULL;
+       } else if (WARN_ON(!dev_is_fsl_mc(dev))) {
+               *root_dprc_dev = NULL;
+       } else {
+               *root_dprc_dev = dev;
+               while (dev_is_fsl_mc((*root_dprc_dev)->parent))
+                       *root_dprc_dev = (*root_dprc_dev)->parent;
+       }
+}
+
+static int get_dprc_attr(struct fsl_mc_io *mc_io,
+                        int container_id, struct dprc_attributes *attr)
+{
+       u16 dprc_handle;
+       int error;
+
+       error = dprc_open(mc_io, 0, container_id, &dprc_handle);
+       if (error < 0) {
+               dev_err(mc_io->dev, "dprc_open() failed: %d\n", error);
+               return error;
+       }
+
+       memset(attr, 0, sizeof(struct dprc_attributes));
+       error = dprc_get_attributes(mc_io, 0, dprc_handle, attr);
+       if (error < 0) {
+               dev_err(mc_io->dev, "dprc_get_attributes() failed: %d\n",
+                       error);
+               goto common_cleanup;
+       }
+
+       error = 0;
+
+common_cleanup:
+       (void)dprc_close(mc_io, 0, dprc_handle);
+       return error;
+}
+
+static int get_dprc_icid(struct fsl_mc_io *mc_io,
+                        int container_id, u16 *icid)
+{
+       struct dprc_attributes attr;
+       int error;
+
+       error = get_dprc_attr(mc_io, container_id, &attr);
+       if (error == 0)
+               *icid = attr.icid;
+
+       return error;
+}
+
+static int get_dprc_version(struct fsl_mc_io *mc_io,
+                           int container_id, u16 *major, u16 *minor)
+{
+       struct dprc_attributes attr;
+       int error;
+
+       error = get_dprc_attr(mc_io, container_id, &attr);
+       if (error == 0) {
+               *major = attr.version.major;
+               *minor = attr.version.minor;
+       }
+
+       return error;
+}
+
+static int translate_mc_addr(struct fsl_mc_device *mc_dev,
+                            enum dprc_region_type mc_region_type,
+                            u64 mc_offset, phys_addr_t *phys_addr)
+{
+       int i;
+       struct device *root_dprc_dev;
+       struct fsl_mc *mc;
+
+       fsl_mc_get_root_dprc(&mc_dev->dev, &root_dprc_dev);
+       if (WARN_ON(!root_dprc_dev))
+               return -EINVAL;
+       mc = dev_get_drvdata(root_dprc_dev->parent);
+
+       if (mc->num_translation_ranges == 0) {
+               /*
+                * Do identity mapping:
+                */
+               *phys_addr = mc_offset;
+               return 0;
+       }
+
+       for (i = 0; i < mc->num_translation_ranges; i++) {
+               struct fsl_mc_addr_translation_range *range =
+                       &mc->translation_ranges[i];
+
+               if (mc_region_type == range->mc_region_type &&
+                   mc_offset >= range->start_mc_offset &&
+                   mc_offset < range->end_mc_offset) {
+                       *phys_addr = range->start_phys_addr +
+                                    (mc_offset - range->start_mc_offset);
+                       return 0;
+               }
+       }
+
+       return -EFAULT;
+}
+
+static int fsl_mc_device_get_mmio_regions(struct fsl_mc_device *mc_dev,
+                                         struct fsl_mc_device *mc_bus_dev)
+{
+       int i;
+       int error;
+       struct resource *regions;
+       struct dprc_obj_desc *obj_desc = &mc_dev->obj_desc;
+       struct device *parent_dev = mc_dev->dev.parent;
+       enum dprc_region_type mc_region_type;
+
+       if (strcmp(obj_desc->type, "dprc") == 0 ||
+           strcmp(obj_desc->type, "dpmcp") == 0) {
+               mc_region_type = DPRC_REGION_TYPE_MC_PORTAL;
+       } else if (strcmp(obj_desc->type, "dpio") == 0) {
+               mc_region_type = DPRC_REGION_TYPE_QBMAN_PORTAL;
+       } else {
+               /*
+                * This function should not have been called for this MC object
+                * type, as this object type is not supposed to have MMIO
+                * regions
+                */
+               WARN_ON(true);
+               return -EINVAL;
+       }
+
+       regions = kmalloc_array(obj_desc->region_count,
+                               sizeof(regions[0]), GFP_KERNEL);
+       if (!regions)
+               return -ENOMEM;
+
+       for (i = 0; i < obj_desc->region_count; i++) {
+               struct dprc_region_desc region_desc;
+
+               error = dprc_get_obj_region(mc_bus_dev->mc_io,
+                                           0,
+                                           mc_bus_dev->mc_handle,
+                                           obj_desc->type,
+                                           obj_desc->id, i, &region_desc);
+               if (error < 0) {
+                       dev_err(parent_dev,
+                               "dprc_get_obj_region() failed: %d\n", error);
+                       goto error_cleanup_regions;
+               }
+
+               WARN_ON(region_desc.size == 0);
+               error = translate_mc_addr(mc_dev, mc_region_type,
+                                         region_desc.base_offset,
+                                         &regions[i].start);
+               if (error < 0) {
+                       dev_err(parent_dev,
+                               "Invalid MC offset: %#x (for %s.%d\'s region %d)\n",
+                               region_desc.base_offset,
+                               obj_desc->type, obj_desc->id, i);
+                       goto error_cleanup_regions;
+               }
+
+               regions[i].end = regions[i].start + region_desc.size - 1;
+               regions[i].name = "fsl-mc object MMIO region";
+               regions[i].flags = IORESOURCE_IO;
+               if (region_desc.flags & DPRC_REGION_CACHEABLE)
+                       regions[i].flags |= IORESOURCE_CACHEABLE;
+       }
+
+       mc_dev->regions = regions;
+       return 0;
+
+error_cleanup_regions:
+       kfree(regions);
+       return error;
+}
+
+/**
+ * fsl_mc_is_root_dprc - function to check if a given device is a root dprc
+ */
+bool fsl_mc_is_root_dprc(struct device *dev)
+{
+       struct device *root_dprc_dev;
+
+       fsl_mc_get_root_dprc(dev, &root_dprc_dev);
+       if (!root_dprc_dev)
+               return false;
+       return dev == root_dprc_dev;
+}
+
+/**
+ * Add a newly discovered MC object device to be visible in Linux
+ */
+int fsl_mc_device_add(struct dprc_obj_desc *obj_desc,
+                     struct fsl_mc_io *mc_io,
+                     struct device *parent_dev,
+                     struct fsl_mc_device **new_mc_dev)
+{
+       int error;
+       struct fsl_mc_device *mc_dev = NULL;
+       struct fsl_mc_bus *mc_bus = NULL;
+       struct fsl_mc_device *parent_mc_dev;
+
+       if (dev_is_fsl_mc(parent_dev))
+               parent_mc_dev = to_fsl_mc_device(parent_dev);
+       else
+               parent_mc_dev = NULL;
+
+       if (strcmp(obj_desc->type, "dprc") == 0) {
+               /*
+                * Allocate an MC bus device object:
+                */
+               mc_bus = devm_kzalloc(parent_dev, sizeof(*mc_bus), GFP_KERNEL);
+               if (!mc_bus)
+                       return -ENOMEM;
+
+               mc_dev = &mc_bus->mc_dev;
+       } else {
+               /*
+                * Allocate a regular fsl_mc_device object:
+                */
+               mc_dev = kmem_cache_zalloc(mc_dev_cache, GFP_KERNEL);
+               if (!mc_dev)
+                       return -ENOMEM;
+       }
+
+       mc_dev->obj_desc = *obj_desc;
+       mc_dev->mc_io = mc_io;
+       device_initialize(&mc_dev->dev);
+       mc_dev->dev.parent = parent_dev;
+       mc_dev->dev.bus = &fsl_mc_bus_type;
+       dev_set_name(&mc_dev->dev, "%s.%d", obj_desc->type, obj_desc->id);
+
+       if (strcmp(obj_desc->type, "dprc") == 0) {
+               struct fsl_mc_io *mc_io2;
+
+               mc_dev->flags |= FSL_MC_IS_DPRC;
+
+               /*
+                * To get the DPRC's ICID, we need to open the DPRC
+                * in get_dprc_icid(). For child DPRCs, we do so using the
+                * parent DPRC's MC portal instead of the child DPRC's MC
+                * portal, in case the child DPRC is already opened with
+                * its own portal (e.g., the DPRC used by AIOP).
+                *
+                * NOTE: There cannot be more than one active open for a
+                * given MC object, using the same MC portal.
+                */
+               if (parent_mc_dev) {
+                       /*
+                        * device being added is a child DPRC device
+                        */
+                       mc_io2 = parent_mc_dev->mc_io;
+               } else {
+                       /*
+                        * device being added is the root DPRC device
+                        */
+                       if (WARN_ON(!mc_io)) {
+                               error = -EINVAL;
+                               goto error_cleanup_dev;
+                       }
+
+                       mc_io2 = mc_io;
+
+                       atomic_inc(&root_dprc_count);
+               }
+
+               error = get_dprc_icid(mc_io2, obj_desc->id, &mc_dev->icid);
+               if (error < 0)
+                       goto error_cleanup_dev;
+       } else {
+               /*
+                * A non-DPRC MC object device has to be a child of another
+                * MC object (specifically a DPRC object)
+                */
+               mc_dev->icid = parent_mc_dev->icid;
+               mc_dev->dma_mask = FSL_MC_DEFAULT_DMA_MASK;
+               mc_dev->dev.dma_mask = &mc_dev->dma_mask;
+               dev_set_msi_domain(&mc_dev->dev,
+                                  dev_get_msi_domain(&parent_mc_dev->dev));
+       }
+
+       /*
+        * Get MMIO regions for the device from the MC:
+        *
+        * NOTE: the root DPRC is a special case as its MMIO region is
+        * obtained from the device tree
+        */
+       if (parent_mc_dev && obj_desc->region_count != 0) {
+               error = fsl_mc_device_get_mmio_regions(mc_dev,
+                                                      parent_mc_dev);
+               if (error < 0)
+                       goto error_cleanup_dev;
+       }
+
+       /* Objects are coherent, unless 'no shareability' flag set. */
+       if (!(obj_desc->flags & DPRC_OBJ_FLAG_NO_MEM_SHAREABILITY))
+               arch_setup_dma_ops(&mc_dev->dev, 0, 0, NULL, true);
+
+       /*
+        * The device-specific probe callback will get invoked by device_add()
+        */
+       error = device_add(&mc_dev->dev);
+       if (error < 0) {
+               dev_err(parent_dev,
+                       "device_add() failed for device %s: %d\n",
+                       dev_name(&mc_dev->dev), error);
+               goto error_cleanup_dev;
+       }
+
+       (void)get_device(&mc_dev->dev);
+       dev_dbg(parent_dev, "Added MC object device %s\n",
+               dev_name(&mc_dev->dev));
+
+       *new_mc_dev = mc_dev;
+       return 0;
+
+error_cleanup_dev:
+       kfree(mc_dev->regions);
+       if (mc_bus)
+               devm_kfree(parent_dev, mc_bus);
+       else
+               kmem_cache_free(mc_dev_cache, mc_dev);
+
+       return error;
+}
+EXPORT_SYMBOL_GPL(fsl_mc_device_add);
+
+/**
+ * fsl_mc_device_remove - Remove a MC object device from being visible to
+ * Linux
+ *
+ * @mc_dev: Pointer to a MC object device object
+ */
+void fsl_mc_device_remove(struct fsl_mc_device *mc_dev)
+{
+       struct fsl_mc_bus *mc_bus = NULL;
+
+       kfree(mc_dev->regions);
+
+       /*
+        * The device-specific remove callback will get invoked by device_del()
+        */
+       device_del(&mc_dev->dev);
+       put_device(&mc_dev->dev);
+
+       if (strcmp(mc_dev->obj_desc.type, "dprc") == 0) {
+               mc_bus = to_fsl_mc_bus(mc_dev);
+
+               if (fsl_mc_is_root_dprc(&mc_dev->dev)) {
+                       if (atomic_read(&root_dprc_count) > 0)
+                               atomic_dec(&root_dprc_count);
+                       else
+                               WARN_ON(1);
+               }
+       }
+
+       if (mc_bus)
+               devm_kfree(mc_dev->dev.parent, mc_bus);
+       else
+               kmem_cache_free(mc_dev_cache, mc_dev);
+}
+EXPORT_SYMBOL_GPL(fsl_mc_device_remove);
+
+static int parse_mc_ranges(struct device *dev,
+                          int *paddr_cells,
+                          int *mc_addr_cells,
+                          int *mc_size_cells,
+                          const __be32 **ranges_start,
+                          u8 *num_ranges)
+{
+       const __be32 *prop;
+       int range_tuple_cell_count;
+       int ranges_len;
+       int tuple_len;
+       struct device_node *mc_node = dev->of_node;
+
+       *ranges_start = of_get_property(mc_node, "ranges", &ranges_len);
+       if (!(*ranges_start) || !ranges_len) {
+               dev_warn(dev,
+                        "missing or empty ranges property for device tree node '%s'\n",
+                        mc_node->name);
+
+               *num_ranges = 0;
+               return 0;
+       }
+
+       *paddr_cells = of_n_addr_cells(mc_node);
+
+       prop = of_get_property(mc_node, "#address-cells", NULL);
+       if (prop)
+               *mc_addr_cells = be32_to_cpup(prop);
+       else
+               *mc_addr_cells = *paddr_cells;
+
+       prop = of_get_property(mc_node, "#size-cells", NULL);
+       if (prop)
+               *mc_size_cells = be32_to_cpup(prop);
+       else
+               *mc_size_cells = of_n_size_cells(mc_node);
+
+       range_tuple_cell_count = *paddr_cells + *mc_addr_cells +
+                                *mc_size_cells;
+
+       tuple_len = range_tuple_cell_count * sizeof(__be32);
+       if (ranges_len % tuple_len != 0) {
+               dev_err(dev, "malformed ranges property '%s'\n", mc_node->name);
+               return -EINVAL;
+       }
+
+       *num_ranges = ranges_len / tuple_len;
+       return 0;
+}
+
+static int get_mc_addr_translation_ranges(struct device *dev,
+                                         struct fsl_mc_addr_translation_range
+                                               **ranges,
+                                         u8 *num_ranges)
+{
+       int error;
+       int paddr_cells;
+       int mc_addr_cells;
+       int mc_size_cells;
+       int i;
+       const __be32 *ranges_start;
+       const __be32 *cell;
+
+       error = parse_mc_ranges(dev,
+                               &paddr_cells,
+                               &mc_addr_cells,
+                               &mc_size_cells,
+                               &ranges_start,
+                               num_ranges);
+       if (error < 0)
+               return error;
+
+       if (!(*num_ranges)) {
+               /*
+                * Missing or empty ranges property ("ranges;") for the
+                * 'fsl,qoriq-mc' node. In this case, identity mapping
+                * will be used.
+                */
+               *ranges = NULL;
+               return 0;
+       }
+
+       *ranges = devm_kcalloc(dev, *num_ranges,
+                              sizeof(struct fsl_mc_addr_translation_range),
+                              GFP_KERNEL);
+       if (!(*ranges))
+               return -ENOMEM;
+
+       cell = ranges_start;
+       for (i = 0; i < *num_ranges; ++i) {
+               struct fsl_mc_addr_translation_range *range = &(*ranges)[i];
+
+               range->mc_region_type = of_read_number(cell, 1);
+               range->start_mc_offset = of_read_number(cell + 1,
+                                                       mc_addr_cells - 1);
+               cell += mc_addr_cells;
+               range->start_phys_addr = of_read_number(cell, paddr_cells);
+               cell += paddr_cells;
+               range->end_mc_offset = range->start_mc_offset +
+                                    of_read_number(cell, mc_size_cells);
+
+               cell += mc_size_cells;
+       }
+
+       return 0;
+}
+
+/**
+ * fsl_mc_bus_probe - callback invoked when the root MC bus is being
+ * added
+ */
+static int fsl_mc_bus_probe(struct platform_device *pdev)
+{
+       struct dprc_obj_desc obj_desc;
+       int error;
+       struct fsl_mc *mc;
+       struct fsl_mc_device *mc_bus_dev = NULL;
+       struct fsl_mc_io *mc_io = NULL;
+       int container_id;
+       phys_addr_t mc_portal_phys_addr;
+       u32 mc_portal_size;
+       struct mc_version mc_version;
+       struct resource res;
+
+       dev_info(&pdev->dev, "Root MC bus device probed");
+
+       mc = devm_kzalloc(&pdev->dev, sizeof(*mc), GFP_KERNEL);
+       if (!mc)
+               return -ENOMEM;
+
+       platform_set_drvdata(pdev, mc);
+
+       /*
+        * Get physical address of MC portal for the root DPRC:
+        */
+       error = of_address_to_resource(pdev->dev.of_node, 0, &res);
+       if (error < 0) {
+               dev_err(&pdev->dev,
+                       "of_address_to_resource() failed for %s\n",
+                       pdev->dev.of_node->full_name);
+               return error;
+       }
+
+       mc_portal_phys_addr = res.start;
+       mc_portal_size = resource_size(&res);
+       error = fsl_create_mc_io(&pdev->dev, mc_portal_phys_addr,
+                                mc_portal_size, NULL,
+                                FSL_MC_IO_ATOMIC_CONTEXT_PORTAL, &mc_io);
+       if (error < 0)
+               return error;
+
+       error = mc_get_version(mc_io, 0, &mc_version);
+       if (error != 0) {
+               dev_err(&pdev->dev,
+                       "mc_get_version() failed with error %d\n", error);
+               goto error_cleanup_mc_io;
+       }
+
+       dev_info(&pdev->dev,
+                "Freescale Management Complex Firmware version: %u.%u.%u\n",
+                mc_version.major, mc_version.minor, mc_version.revision);
+
+       error = get_mc_addr_translation_ranges(&pdev->dev,
+                                              &mc->translation_ranges,
+                                              &mc->num_translation_ranges);
+       if (error < 0)
+               goto error_cleanup_mc_io;
+
+       error = dpmng_get_container_id(mc_io, 0, &container_id);
+       if (error < 0) {
+               dev_err(&pdev->dev,
+                       "dpmng_get_container_id() failed: %d\n", error);
+               goto error_cleanup_mc_io;
+       }
+
+       memset(&obj_desc, 0, sizeof(struct dprc_obj_desc));
+       error = get_dprc_version(mc_io, container_id,
+                                &obj_desc.ver_major, &obj_desc.ver_minor);
+       if (error < 0)
+               goto error_cleanup_mc_io;
+
+       obj_desc.vendor = FSL_MC_VENDOR_FREESCALE;
+       strcpy(obj_desc.type, "dprc");
+       obj_desc.id = container_id;
+       obj_desc.irq_count = 1;
+       obj_desc.region_count = 0;
+
+       error = fsl_mc_device_add(&obj_desc, mc_io, &pdev->dev, &mc_bus_dev);
+       if (error < 0)
+               goto error_cleanup_mc_io;
+
+       mc->root_mc_bus_dev = mc_bus_dev;
+       return 0;
+
+error_cleanup_mc_io:
+       fsl_destroy_mc_io(mc_io);
+       return error;
+}
+
+/**
+ * fsl_mc_bus_remove - callback invoked when the root MC bus is being
+ * removed
+ */
+static int fsl_mc_bus_remove(struct platform_device *pdev)
+{
+       struct fsl_mc *mc = platform_get_drvdata(pdev);
+
+       if (WARN_ON(!fsl_mc_is_root_dprc(&mc->root_mc_bus_dev->dev)))
+               return -EINVAL;
+
+       fsl_mc_device_remove(mc->root_mc_bus_dev);
+
+       fsl_destroy_mc_io(mc->root_mc_bus_dev->mc_io);
+       mc->root_mc_bus_dev->mc_io = NULL;
+
+       dev_info(&pdev->dev, "Root MC bus device removed");
+       return 0;
+}
+
+static const struct of_device_id fsl_mc_bus_match_table[] = {
+       {.compatible = "fsl,qoriq-mc",},
+       {},
+};
+
+MODULE_DEVICE_TABLE(of, fsl_mc_bus_match_table);
+
+static struct platform_driver fsl_mc_bus_driver = {
+       .driver = {
+                  .name = "fsl_mc_bus",
+                  .pm = NULL,
+                  .of_match_table = fsl_mc_bus_match_table,
+                  },
+       .probe = fsl_mc_bus_probe,
+       .remove = fsl_mc_bus_remove,
+};
+
+static int __init fsl_mc_bus_driver_init(void)
+{
+       int error;
+
+       mc_dev_cache = kmem_cache_create("fsl_mc_device",
+                                        sizeof(struct fsl_mc_device), 0, 0,
+                                        NULL);
+       if (!mc_dev_cache) {
+               pr_err("Could not create fsl_mc_device cache\n");
+               return -ENOMEM;
+       }
+
+       error = bus_register(&fsl_mc_bus_type);
+       if (error < 0) {
+               pr_err("fsl-mc bus type registration failed: %d\n", error);
+               goto error_cleanup_cache;
+       }
+
+       pr_info("fsl-mc bus type registered\n");
+
+       error = platform_driver_register(&fsl_mc_bus_driver);
+       if (error < 0) {
+               pr_err("platform_driver_register() failed: %d\n", error);
+               goto error_cleanup_bus;
+       }
+
+       error = dprc_driver_init();
+       if (error < 0)
+               goto error_cleanup_driver;
+
+       error = fsl_mc_allocator_driver_init();
+       if (error < 0)
+               goto error_cleanup_dprc_driver;
+
+       error = its_fsl_mc_msi_init();
+       if (error < 0)
+               goto error_cleanup_mc_allocator;
+
+       return 0;
+
+error_cleanup_mc_allocator:
+       fsl_mc_allocator_driver_exit();
+
+error_cleanup_dprc_driver:
+       dprc_driver_exit();
+
+error_cleanup_driver:
+       platform_driver_unregister(&fsl_mc_bus_driver);
+
+error_cleanup_bus:
+       bus_unregister(&fsl_mc_bus_type);
+
+error_cleanup_cache:
+       kmem_cache_destroy(mc_dev_cache);
+       return error;
+}
+postcore_initcall(fsl_mc_bus_driver_init);
diff --git a/drivers/staging/fsl-mc/bus/fsl-mc-msi.c b/drivers/staging/fsl-mc/bus/fsl-mc-msi.c
new file mode 100644 (file)
index 0000000..6e39a98
--- /dev/null
@@ -0,0 +1,287 @@
+/*
+ * Freescale Management Complex (MC) bus driver MSI support
+ *
+ * Copyright (C) 2015 Freescale Semiconductor, Inc.
+ * Author: German Rivera <German.Rivera@freescale.com>
+ *
+ * This file is licensed under the terms of the GNU General Public
+ * License version 2. This program is licensed "as is" without any
+ * warranty of any kind, whether express or implied.
+ */
+
+#include "../include/mc-bus.h"
+#include <linux/of_device.h>
+#include <linux/of_address.h>
+#include <linux/irqchip/arm-gic-v3.h>
+#include <linux/of_irq.h>
+#include <linux/irq.h>
+#include <linux/irqdomain.h>
+#include <linux/msi.h>
+#include "../include/mc-sys.h"
+#include "dprc-cmd.h"
+
+/*
+ * Generate a unique ID identifying the interrupt (only used within the MSI
+ * irqdomain.  Combine the icid with the interrupt index.
+ */
+static irq_hw_number_t fsl_mc_domain_calc_hwirq(struct fsl_mc_device *dev,
+                                               struct msi_desc *desc)
+{
+       /*
+        * Make the base hwirq value for ICID*10000 so it is readable
+        * as a decimal value in /proc/interrupts.
+        */
+       return (irq_hw_number_t)(desc->fsl_mc.msi_index + (dev->icid * 10000));
+}
+
+static void fsl_mc_msi_set_desc(msi_alloc_info_t *arg,
+                               struct msi_desc *desc)
+{
+       arg->desc = desc;
+       arg->hwirq = fsl_mc_domain_calc_hwirq(to_fsl_mc_device(desc->dev),
+                                             desc);
+}
+
+static void fsl_mc_msi_update_dom_ops(struct msi_domain_info *info)
+{
+       struct msi_domain_ops *ops = info->ops;
+
+       if (WARN_ON(!ops))
+               return;
+
+       /*
+        * set_desc should not be set by the caller
+        */
+       if (ops->set_desc == NULL)
+               ops->set_desc = fsl_mc_msi_set_desc;
+}
+
+static void __fsl_mc_msi_write_msg(struct fsl_mc_device *mc_bus_dev,
+                                  struct fsl_mc_device_irq *mc_dev_irq)
+{
+       int error;
+       struct fsl_mc_device *owner_mc_dev = mc_dev_irq->mc_dev;
+       struct msi_desc *msi_desc = mc_dev_irq->msi_desc;
+       struct dprc_irq_cfg irq_cfg;
+
+       /*
+        * msi_desc->msg.address is 0x0 when this function is invoked in
+        * the free_irq() code path. In this case, for the MC, we don't
+        * really need to "unprogram" the MSI, so we just return.
+        */
+       if (msi_desc->msg.address_lo == 0x0 && msi_desc->msg.address_hi == 0x0)
+               return;
+
+       if (WARN_ON(!owner_mc_dev))
+               return;
+
+       irq_cfg.paddr = ((u64)msi_desc->msg.address_hi << 32) |
+                       msi_desc->msg.address_lo;
+       irq_cfg.val = msi_desc->msg.data;
+       irq_cfg.irq_num = msi_desc->irq;
+
+       if (owner_mc_dev == mc_bus_dev) {
+               /*
+                * IRQ is for the mc_bus_dev's DPRC itself
+                */
+               error = dprc_set_irq(mc_bus_dev->mc_io,
+                                    MC_CMD_FLAG_INTR_DIS | MC_CMD_FLAG_PRI,
+                                    mc_bus_dev->mc_handle,
+                                    mc_dev_irq->dev_irq_index,
+                                    &irq_cfg);
+               if (error < 0) {
+                       dev_err(&owner_mc_dev->dev,
+                               "dprc_set_irq() failed: %d\n", error);
+               }
+       } else {
+               /*
+                * IRQ is for for a child device of mc_bus_dev
+                */
+               error = dprc_set_obj_irq(mc_bus_dev->mc_io,
+                                        MC_CMD_FLAG_INTR_DIS | MC_CMD_FLAG_PRI,
+                                        mc_bus_dev->mc_handle,
+                                        owner_mc_dev->obj_desc.type,
+                                        owner_mc_dev->obj_desc.id,
+                                        mc_dev_irq->dev_irq_index,
+                                        &irq_cfg);
+               if (error < 0) {
+                       dev_err(&owner_mc_dev->dev,
+                               "dprc_obj_set_irq() failed: %d\n", error);
+               }
+       }
+}
+
+/*
+ * NOTE: This function is invoked with interrupts disabled
+ */
+static void fsl_mc_msi_write_msg(struct irq_data *irq_data,
+                                struct msi_msg *msg)
+{
+       struct msi_desc *msi_desc = irq_data_get_msi_desc(irq_data);
+       struct fsl_mc_device *mc_bus_dev = to_fsl_mc_device(msi_desc->dev);
+       struct fsl_mc_bus *mc_bus = to_fsl_mc_bus(mc_bus_dev);
+       struct fsl_mc_device_irq *mc_dev_irq =
+               &mc_bus->irq_resources[msi_desc->fsl_mc.msi_index];
+
+       WARN_ON(mc_dev_irq->msi_desc != msi_desc);
+       msi_desc->msg = *msg;
+
+       /*
+        * Program the MSI (paddr, value) pair in the device:
+        */
+       __fsl_mc_msi_write_msg(mc_bus_dev, mc_dev_irq);
+}
+
+static void fsl_mc_msi_update_chip_ops(struct msi_domain_info *info)
+{
+       struct irq_chip *chip = info->chip;
+
+       if (WARN_ON((!chip)))
+               return;
+
+       /*
+        * irq_write_msi_msg should not be set by the caller
+        */
+       if (chip->irq_write_msi_msg == NULL)
+               chip->irq_write_msi_msg = fsl_mc_msi_write_msg;
+}
+
+/**
+ * fsl_mc_msi_create_irq_domain - Create a fsl-mc MSI interrupt domain
+ * @np:                Optional device-tree node of the interrupt controller
+ * @info:      MSI domain info
+ * @parent:    Parent irq domain
+ *
+ * Updates the domain and chip ops and creates a fsl-mc MSI
+ * interrupt domain.
+ *
+ * Returns:
+ * A domain pointer or NULL in case of failure.
+ */
+struct irq_domain *fsl_mc_msi_create_irq_domain(struct fwnode_handle *fwnode,
+                                               struct msi_domain_info *info,
+                                               struct irq_domain *parent)
+{
+       struct irq_domain *domain;
+
+       if (info->flags & MSI_FLAG_USE_DEF_DOM_OPS)
+               fsl_mc_msi_update_dom_ops(info);
+       if (info->flags & MSI_FLAG_USE_DEF_CHIP_OPS)
+               fsl_mc_msi_update_chip_ops(info);
+
+       domain = msi_create_irq_domain(fwnode, info, parent);
+       if (domain)
+               domain->bus_token = DOMAIN_BUS_FSL_MC_MSI;
+
+       return domain;
+}
+
+int fsl_mc_find_msi_domain(struct device *mc_platform_dev,
+                          struct irq_domain **mc_msi_domain)
+{
+       struct irq_domain *msi_domain;
+       struct device_node *mc_of_node = mc_platform_dev->of_node;
+
+       msi_domain = of_msi_get_domain(mc_platform_dev, mc_of_node,
+                                      DOMAIN_BUS_FSL_MC_MSI);
+       if (!msi_domain) {
+               pr_err("Unable to find fsl-mc MSI domain for %s\n",
+                      mc_of_node->full_name);
+
+               return -ENOENT;
+       }
+
+       *mc_msi_domain = msi_domain;
+       return 0;
+}
+
+static void fsl_mc_msi_free_descs(struct device *dev)
+{
+       struct msi_desc *desc, *tmp;
+
+       list_for_each_entry_safe(desc, tmp, dev_to_msi_list(dev), list) {
+               list_del(&desc->list);
+               free_msi_entry(desc);
+       }
+}
+
+static int fsl_mc_msi_alloc_descs(struct device *dev, unsigned int irq_count)
+
+{
+       unsigned int i;
+       int error;
+       struct msi_desc *msi_desc;
+
+       for (i = 0; i < irq_count; i++) {
+               msi_desc = alloc_msi_entry(dev);
+               if (!msi_desc) {
+                       dev_err(dev, "Failed to allocate msi entry\n");
+                       error = -ENOMEM;
+                       goto cleanup_msi_descs;
+               }
+
+               msi_desc->fsl_mc.msi_index = i;
+               msi_desc->nvec_used = 1;
+               INIT_LIST_HEAD(&msi_desc->list);
+               list_add_tail(&msi_desc->list, dev_to_msi_list(dev));
+       }
+
+       return 0;
+
+cleanup_msi_descs:
+       fsl_mc_msi_free_descs(dev);
+       return error;
+}
+
+int fsl_mc_msi_domain_alloc_irqs(struct device *dev,
+                                unsigned int irq_count)
+{
+       struct irq_domain *msi_domain;
+       int error;
+
+       if (WARN_ON(!list_empty(dev_to_msi_list(dev))))
+               return -EINVAL;
+
+       error = fsl_mc_msi_alloc_descs(dev, irq_count);
+       if (error < 0)
+               return error;
+
+       msi_domain = dev_get_msi_domain(dev);
+       if (WARN_ON(!msi_domain)) {
+               error = -EINVAL;
+               goto cleanup_msi_descs;
+       }
+
+       /*
+        * NOTE: Calling this function will trigger the invocation of the
+        * its_fsl_mc_msi_prepare() callback
+        */
+       error = msi_domain_alloc_irqs(msi_domain, dev, irq_count);
+
+       if (error) {
+               dev_err(dev, "Failed to allocate IRQs\n");
+               goto cleanup_msi_descs;
+       }
+
+       return 0;
+
+cleanup_msi_descs:
+       fsl_mc_msi_free_descs(dev);
+       return error;
+}
+
+void fsl_mc_msi_domain_free_irqs(struct device *dev)
+{
+       struct irq_domain *msi_domain;
+
+       msi_domain = dev_get_msi_domain(dev);
+       if (WARN_ON(!msi_domain))
+               return;
+
+       msi_domain_free_irqs(msi_domain, dev);
+
+       if (WARN_ON(list_empty(dev_to_msi_list(dev))))
+               return;
+
+       fsl_mc_msi_free_descs(dev);
+}
diff --git a/drivers/staging/fsl-mc/bus/mc-allocator.c b/drivers/staging/fsl-mc/bus/mc-allocator.c
deleted file mode 100644 (file)
index 3ebaecb..0000000
+++ /dev/null
@@ -1,755 +0,0 @@
-/*
- * Freescale MC object device allocator driver
- *
- * Copyright (C) 2013 Freescale Semiconductor, Inc.
- *
- * This file is licensed under the terms of the GNU General Public
- * License version 2. This program is licensed "as is" without any
- * warranty of any kind, whether express or implied.
- */
-
-#include "../include/mc-bus.h"
-#include "../include/mc-sys.h"
-#include <linux/module.h>
-#include "../include/dpbp-cmd.h"
-#include "../include/dpcon-cmd.h"
-#include "dpmcp-cmd.h"
-#include "dpmcp.h"
-#include <linux/msi.h>
-
-/**
- * fsl_mc_resource_pool_add_device - add allocatable device to a resource
- * pool of a given MC bus
- *
- * @mc_bus: pointer to the MC bus
- * @pool_type: MC bus pool type
- * @mc_dev: Pointer to allocatable MC object device
- *
- * It adds an allocatable MC object device to a container's resource pool of
- * the given resource type
- */
-static int __must_check fsl_mc_resource_pool_add_device(struct fsl_mc_bus
-                                                               *mc_bus,
-                                                       enum fsl_mc_pool_type
-                                                               pool_type,
-                                                       struct fsl_mc_device
-                                                               *mc_dev)
-{
-       struct fsl_mc_resource_pool *res_pool;
-       struct fsl_mc_resource *resource;
-       struct fsl_mc_device *mc_bus_dev = &mc_bus->mc_dev;
-       int error = -EINVAL;
-
-       if (WARN_ON(pool_type < 0 || pool_type >= FSL_MC_NUM_POOL_TYPES))
-               goto out;
-       if (WARN_ON(!FSL_MC_IS_ALLOCATABLE(mc_dev->obj_desc.type)))
-               goto out;
-       if (WARN_ON(mc_dev->resource))
-               goto out;
-
-       res_pool = &mc_bus->resource_pools[pool_type];
-       if (WARN_ON(res_pool->type != pool_type))
-               goto out;
-       if (WARN_ON(res_pool->mc_bus != mc_bus))
-               goto out;
-
-       mutex_lock(&res_pool->mutex);
-
-       if (WARN_ON(res_pool->max_count < 0))
-               goto out_unlock;
-       if (WARN_ON(res_pool->free_count < 0 ||
-                   res_pool->free_count > res_pool->max_count))
-               goto out_unlock;
-
-       resource = devm_kzalloc(&mc_bus_dev->dev, sizeof(*resource),
-                               GFP_KERNEL);
-       if (!resource) {
-               error = -ENOMEM;
-               dev_err(&mc_bus_dev->dev,
-                       "Failed to allocate memory for fsl_mc_resource\n");
-               goto out_unlock;
-       }
-
-       resource->type = pool_type;
-       resource->id = mc_dev->obj_desc.id;
-       resource->data = mc_dev;
-       resource->parent_pool = res_pool;
-       INIT_LIST_HEAD(&resource->node);
-       list_add_tail(&resource->node, &res_pool->free_list);
-       mc_dev->resource = resource;
-       res_pool->free_count++;
-       res_pool->max_count++;
-       error = 0;
-out_unlock:
-       mutex_unlock(&res_pool->mutex);
-out:
-       return error;
-}
-
-/**
- * fsl_mc_resource_pool_remove_device - remove an allocatable device from a
- * resource pool
- *
- * @mc_dev: Pointer to allocatable MC object device
- *
- * It permanently removes an allocatable MC object device from the resource
- * pool, the device is currently in, as long as it is in the pool's free list.
- */
-static int __must_check fsl_mc_resource_pool_remove_device(struct fsl_mc_device
-                                                                  *mc_dev)
-{
-       struct fsl_mc_device *mc_bus_dev;
-       struct fsl_mc_bus *mc_bus;
-       struct fsl_mc_resource_pool *res_pool;
-       struct fsl_mc_resource *resource;
-       int error = -EINVAL;
-
-       if (WARN_ON(!FSL_MC_IS_ALLOCATABLE(mc_dev->obj_desc.type)))
-               goto out;
-
-       resource = mc_dev->resource;
-       if (WARN_ON(!resource || resource->data != mc_dev))
-               goto out;
-
-       mc_bus_dev = to_fsl_mc_device(mc_dev->dev.parent);
-       mc_bus = to_fsl_mc_bus(mc_bus_dev);
-       res_pool = resource->parent_pool;
-       if (WARN_ON(res_pool != &mc_bus->resource_pools[resource->type]))
-               goto out;
-
-       mutex_lock(&res_pool->mutex);
-
-       if (WARN_ON(res_pool->max_count <= 0))
-               goto out_unlock;
-       if (WARN_ON(res_pool->free_count <= 0 ||
-                   res_pool->free_count > res_pool->max_count))
-               goto out_unlock;
-
-       /*
-        * If the device is currently allocated, its resource is not
-        * in the free list and thus, the device cannot be removed.
-        */
-       if (list_empty(&resource->node)) {
-               error = -EBUSY;
-               dev_err(&mc_bus_dev->dev,
-                       "Device %s cannot be removed from resource pool\n",
-                       dev_name(&mc_dev->dev));
-               goto out_unlock;
-       }
-
-       list_del(&resource->node);
-       INIT_LIST_HEAD(&resource->node);
-       res_pool->free_count--;
-       res_pool->max_count--;
-
-       devm_kfree(&mc_bus_dev->dev, resource);
-       mc_dev->resource = NULL;
-       error = 0;
-out_unlock:
-       mutex_unlock(&res_pool->mutex);
-out:
-       return error;
-}
-
-static const char *const fsl_mc_pool_type_strings[] = {
-       [FSL_MC_POOL_DPMCP] = "dpmcp",
-       [FSL_MC_POOL_DPBP] = "dpbp",
-       [FSL_MC_POOL_DPCON] = "dpcon",
-       [FSL_MC_POOL_IRQ] = "irq",
-};
-
-static int __must_check object_type_to_pool_type(const char *object_type,
-                                                enum fsl_mc_pool_type
-                                                               *pool_type)
-{
-       unsigned int i;
-
-       for (i = 0; i < ARRAY_SIZE(fsl_mc_pool_type_strings); i++) {
-               if (strcmp(object_type, fsl_mc_pool_type_strings[i]) == 0) {
-                       *pool_type = i;
-                       return 0;
-               }
-       }
-
-       return -EINVAL;
-}
-
-int __must_check fsl_mc_resource_allocate(struct fsl_mc_bus *mc_bus,
-                                         enum fsl_mc_pool_type pool_type,
-                                         struct fsl_mc_resource **new_resource)
-{
-       struct fsl_mc_resource_pool *res_pool;
-       struct fsl_mc_resource *resource;
-       struct fsl_mc_device *mc_bus_dev = &mc_bus->mc_dev;
-       int error = -EINVAL;
-
-       BUILD_BUG_ON(ARRAY_SIZE(fsl_mc_pool_type_strings) !=
-                    FSL_MC_NUM_POOL_TYPES);
-
-       *new_resource = NULL;
-       if (WARN_ON(pool_type < 0 || pool_type >= FSL_MC_NUM_POOL_TYPES))
-               goto out;
-
-       res_pool = &mc_bus->resource_pools[pool_type];
-       if (WARN_ON(res_pool->mc_bus != mc_bus))
-               goto out;
-
-       mutex_lock(&res_pool->mutex);
-       resource = list_first_entry_or_null(&res_pool->free_list,
-                                           struct fsl_mc_resource, node);
-
-       if (!resource) {
-               WARN_ON(res_pool->free_count != 0);
-               error = -ENXIO;
-               dev_err(&mc_bus_dev->dev,
-                       "No more resources of type %s left\n",
-                       fsl_mc_pool_type_strings[pool_type]);
-               goto out_unlock;
-       }
-
-       if (WARN_ON(resource->type != pool_type))
-               goto out_unlock;
-       if (WARN_ON(resource->parent_pool != res_pool))
-               goto out_unlock;
-       if (WARN_ON(res_pool->free_count <= 0 ||
-                   res_pool->free_count > res_pool->max_count))
-               goto out_unlock;
-
-       list_del(&resource->node);
-       INIT_LIST_HEAD(&resource->node);
-
-       res_pool->free_count--;
-       error = 0;
-out_unlock:
-       mutex_unlock(&res_pool->mutex);
-       *new_resource = resource;
-out:
-       return error;
-}
-EXPORT_SYMBOL_GPL(fsl_mc_resource_allocate);
-
-void fsl_mc_resource_free(struct fsl_mc_resource *resource)
-{
-       struct fsl_mc_resource_pool *res_pool;
-
-       res_pool = resource->parent_pool;
-       if (WARN_ON(resource->type != res_pool->type))
-               return;
-
-       mutex_lock(&res_pool->mutex);
-       if (WARN_ON(res_pool->free_count < 0 ||
-                   res_pool->free_count >= res_pool->max_count))
-               goto out_unlock;
-
-       if (WARN_ON(!list_empty(&resource->node)))
-               goto out_unlock;
-
-       list_add_tail(&resource->node, &res_pool->free_list);
-       res_pool->free_count++;
-out_unlock:
-       mutex_unlock(&res_pool->mutex);
-}
-EXPORT_SYMBOL_GPL(fsl_mc_resource_free);
-
-/**
- * fsl_mc_portal_allocate - Allocates an MC portal
- *
- * @mc_dev: MC device for which the MC portal is to be allocated
- * @mc_io_flags: Flags for the fsl_mc_io object that wraps the allocated
- * MC portal.
- * @new_mc_io: Pointer to area where the pointer to the fsl_mc_io object
- * that wraps the allocated MC portal is to be returned
- *
- * This function allocates an MC portal from the device's parent DPRC,
- * from the corresponding MC bus' pool of MC portals and wraps
- * it in a new fsl_mc_io object. If 'mc_dev' is a DPRC itself, the
- * portal is allocated from its own MC bus.
- */
-int __must_check fsl_mc_portal_allocate(struct fsl_mc_device *mc_dev,
-                                       u16 mc_io_flags,
-                                       struct fsl_mc_io **new_mc_io)
-{
-       struct fsl_mc_device *mc_bus_dev;
-       struct fsl_mc_bus *mc_bus;
-       phys_addr_t mc_portal_phys_addr;
-       size_t mc_portal_size;
-       struct fsl_mc_device *dpmcp_dev;
-       int error = -EINVAL;
-       struct fsl_mc_resource *resource = NULL;
-       struct fsl_mc_io *mc_io = NULL;
-
-       if (mc_dev->flags & FSL_MC_IS_DPRC) {
-               mc_bus_dev = mc_dev;
-       } else {
-               if (WARN_ON(!dev_is_fsl_mc(mc_dev->dev.parent)))
-                       return error;
-
-               mc_bus_dev = to_fsl_mc_device(mc_dev->dev.parent);
-       }
-
-       mc_bus = to_fsl_mc_bus(mc_bus_dev);
-       *new_mc_io = NULL;
-       error = fsl_mc_resource_allocate(mc_bus, FSL_MC_POOL_DPMCP, &resource);
-       if (error < 0)
-               return error;
-
-       error = -EINVAL;
-       dpmcp_dev = resource->data;
-       if (WARN_ON(!dpmcp_dev))
-               goto error_cleanup_resource;
-
-       if (dpmcp_dev->obj_desc.ver_major < DPMCP_MIN_VER_MAJOR ||
-           (dpmcp_dev->obj_desc.ver_major == DPMCP_MIN_VER_MAJOR &&
-            dpmcp_dev->obj_desc.ver_minor < DPMCP_MIN_VER_MINOR)) {
-               dev_err(&dpmcp_dev->dev,
-                       "ERROR: Version %d.%d of DPMCP not supported.\n",
-                       dpmcp_dev->obj_desc.ver_major,
-                       dpmcp_dev->obj_desc.ver_minor);
-               error = -ENOTSUPP;
-               goto error_cleanup_resource;
-       }
-
-       if (WARN_ON(dpmcp_dev->obj_desc.region_count == 0))
-               goto error_cleanup_resource;
-
-       mc_portal_phys_addr = dpmcp_dev->regions[0].start;
-       mc_portal_size = dpmcp_dev->regions[0].end -
-                        dpmcp_dev->regions[0].start + 1;
-
-       if (WARN_ON(mc_portal_size != mc_bus_dev->mc_io->portal_size))
-               goto error_cleanup_resource;
-
-       error = fsl_create_mc_io(&mc_bus_dev->dev,
-                                mc_portal_phys_addr,
-                                mc_portal_size, dpmcp_dev,
-                                mc_io_flags, &mc_io);
-       if (error < 0)
-               goto error_cleanup_resource;
-
-       *new_mc_io = mc_io;
-       return 0;
-
-error_cleanup_resource:
-       fsl_mc_resource_free(resource);
-       return error;
-}
-EXPORT_SYMBOL_GPL(fsl_mc_portal_allocate);
-
-/**
- * fsl_mc_portal_free - Returns an MC portal to the pool of free MC portals
- * of a given MC bus
- *
- * @mc_io: Pointer to the fsl_mc_io object that wraps the MC portal to free
- */
-void fsl_mc_portal_free(struct fsl_mc_io *mc_io)
-{
-       struct fsl_mc_device *dpmcp_dev;
-       struct fsl_mc_resource *resource;
-
-       /*
-        * Every mc_io obtained by calling fsl_mc_portal_allocate() is supposed
-        * to have a DPMCP object associated with.
-        */
-       dpmcp_dev = mc_io->dpmcp_dev;
-       if (WARN_ON(!dpmcp_dev))
-               return;
-
-       resource = dpmcp_dev->resource;
-       if (WARN_ON(!resource || resource->type != FSL_MC_POOL_DPMCP))
-               return;
-
-       if (WARN_ON(resource->data != dpmcp_dev))
-               return;
-
-       fsl_destroy_mc_io(mc_io);
-       fsl_mc_resource_free(resource);
-}
-EXPORT_SYMBOL_GPL(fsl_mc_portal_free);
-
-/**
- * fsl_mc_portal_reset - Resets the dpmcp object for a given fsl_mc_io object
- *
- * @mc_io: Pointer to the fsl_mc_io object that wraps the MC portal to free
- */
-int fsl_mc_portal_reset(struct fsl_mc_io *mc_io)
-{
-       int error;
-       struct fsl_mc_device *dpmcp_dev = mc_io->dpmcp_dev;
-
-       if (WARN_ON(!dpmcp_dev))
-               return -EINVAL;
-
-       error = dpmcp_reset(mc_io, 0, dpmcp_dev->mc_handle);
-       if (error < 0) {
-               dev_err(&dpmcp_dev->dev, "dpmcp_reset() failed: %d\n", error);
-               return error;
-       }
-
-       return 0;
-}
-EXPORT_SYMBOL_GPL(fsl_mc_portal_reset);
-
-/**
- * fsl_mc_object_allocate - Allocates a MC object device of the given
- * pool type from a given MC bus
- *
- * @mc_dev: MC device for which the MC object device is to be allocated
- * @pool_type: MC bus resource pool type
- * @new_mc_dev: Pointer to area where the pointer to the allocated
- * MC object device is to be returned
- *
- * This function allocates a MC object device from the device's parent DPRC,
- * from the corresponding MC bus' pool of allocatable MC object devices of
- * the given resource type. mc_dev cannot be a DPRC itself.
- *
- * NOTE: pool_type must be different from FSL_MC_POOL_MCP, since MC
- * portals are allocated using fsl_mc_portal_allocate(), instead of
- * this function.
- */
-int __must_check fsl_mc_object_allocate(struct fsl_mc_device *mc_dev,
-                                       enum fsl_mc_pool_type pool_type,
-                                       struct fsl_mc_device **new_mc_adev)
-{
-       struct fsl_mc_device *mc_bus_dev;
-       struct fsl_mc_bus *mc_bus;
-       struct fsl_mc_device *mc_adev;
-       int error = -EINVAL;
-       struct fsl_mc_resource *resource = NULL;
-
-       *new_mc_adev = NULL;
-       if (WARN_ON(mc_dev->flags & FSL_MC_IS_DPRC))
-               goto error;
-
-       if (WARN_ON(!dev_is_fsl_mc(mc_dev->dev.parent)))
-               goto error;
-
-       if (WARN_ON(pool_type == FSL_MC_POOL_DPMCP))
-               goto error;
-
-       mc_bus_dev = to_fsl_mc_device(mc_dev->dev.parent);
-       mc_bus = to_fsl_mc_bus(mc_bus_dev);
-       error = fsl_mc_resource_allocate(mc_bus, pool_type, &resource);
-       if (error < 0)
-               goto error;
-
-       mc_adev = resource->data;
-       if (WARN_ON(!mc_adev))
-               goto error;
-
-       *new_mc_adev = mc_adev;
-       return 0;
-error:
-       if (resource)
-               fsl_mc_resource_free(resource);
-
-       return error;
-}
-EXPORT_SYMBOL_GPL(fsl_mc_object_allocate);
-
-/**
- * fsl_mc_object_free - Returns an allocatable MC object device to the
- * corresponding resource pool of a given MC bus.
- *
- * @mc_adev: Pointer to the MC object device
- */
-void fsl_mc_object_free(struct fsl_mc_device *mc_adev)
-{
-       struct fsl_mc_resource *resource;
-
-       resource = mc_adev->resource;
-       if (WARN_ON(resource->type == FSL_MC_POOL_DPMCP))
-               return;
-       if (WARN_ON(resource->data != mc_adev))
-               return;
-
-       fsl_mc_resource_free(resource);
-}
-EXPORT_SYMBOL_GPL(fsl_mc_object_free);
-
-/*
- * Initialize the interrupt pool associated with a MC bus.
- * It allocates a block of IRQs from the GIC-ITS
- */
-int fsl_mc_populate_irq_pool(struct fsl_mc_bus *mc_bus,
-                            unsigned int irq_count)
-{
-       unsigned int i;
-       struct msi_desc *msi_desc;
-       struct fsl_mc_device_irq *irq_resources;
-       struct fsl_mc_device_irq *mc_dev_irq;
-       int error;
-       struct fsl_mc_device *mc_bus_dev = &mc_bus->mc_dev;
-       struct fsl_mc_resource_pool *res_pool =
-                       &mc_bus->resource_pools[FSL_MC_POOL_IRQ];
-
-       if (WARN_ON(irq_count == 0 ||
-                   irq_count > FSL_MC_IRQ_POOL_MAX_TOTAL_IRQS))
-               return -EINVAL;
-
-       error = fsl_mc_msi_domain_alloc_irqs(&mc_bus_dev->dev, irq_count);
-       if (error < 0)
-               return error;
-
-       irq_resources = devm_kzalloc(&mc_bus_dev->dev,
-                                    sizeof(*irq_resources) * irq_count,
-                                    GFP_KERNEL);
-       if (!irq_resources) {
-               error = -ENOMEM;
-               goto cleanup_msi_irqs;
-       }
-
-       for (i = 0; i < irq_count; i++) {
-               mc_dev_irq = &irq_resources[i];
-
-               /*
-                * NOTE: This mc_dev_irq's MSI addr/value pair will be set
-                * by the fsl_mc_msi_write_msg() callback
-                */
-               mc_dev_irq->resource.type = res_pool->type;
-               mc_dev_irq->resource.data = mc_dev_irq;
-               mc_dev_irq->resource.parent_pool = res_pool;
-               INIT_LIST_HEAD(&mc_dev_irq->resource.node);
-               list_add_tail(&mc_dev_irq->resource.node, &res_pool->free_list);
-       }
-
-       for_each_msi_entry(msi_desc, &mc_bus_dev->dev) {
-               mc_dev_irq = &irq_resources[msi_desc->fsl_mc.msi_index];
-               mc_dev_irq->msi_desc = msi_desc;
-               mc_dev_irq->resource.id = msi_desc->irq;
-       }
-
-       res_pool->max_count = irq_count;
-       res_pool->free_count = irq_count;
-       mc_bus->irq_resources = irq_resources;
-       return 0;
-
-cleanup_msi_irqs:
-       fsl_mc_msi_domain_free_irqs(&mc_bus_dev->dev);
-       return error;
-}
-EXPORT_SYMBOL_GPL(fsl_mc_populate_irq_pool);
-
-/**
- * Teardown the interrupt pool associated with an MC bus.
- * It frees the IRQs that were allocated to the pool, back to the GIC-ITS.
- */
-void fsl_mc_cleanup_irq_pool(struct fsl_mc_bus *mc_bus)
-{
-       struct fsl_mc_device *mc_bus_dev = &mc_bus->mc_dev;
-       struct fsl_mc_resource_pool *res_pool =
-                       &mc_bus->resource_pools[FSL_MC_POOL_IRQ];
-
-       if (WARN_ON(!mc_bus->irq_resources))
-               return;
-
-       if (WARN_ON(res_pool->max_count == 0))
-               return;
-
-       if (WARN_ON(res_pool->free_count != res_pool->max_count))
-               return;
-
-       INIT_LIST_HEAD(&res_pool->free_list);
-       res_pool->max_count = 0;
-       res_pool->free_count = 0;
-       mc_bus->irq_resources = NULL;
-       fsl_mc_msi_domain_free_irqs(&mc_bus_dev->dev);
-}
-EXPORT_SYMBOL_GPL(fsl_mc_cleanup_irq_pool);
-
-/**
- * It allocates the IRQs required by a given MC object device. The
- * IRQs are allocated from the interrupt pool associated with the
- * MC bus that contains the device, if the device is not a DPRC device.
- * Otherwise, the IRQs are allocated from the interrupt pool associated
- * with the MC bus that represents the DPRC device itself.
- */
-int __must_check fsl_mc_allocate_irqs(struct fsl_mc_device *mc_dev)
-{
-       int i;
-       int irq_count;
-       int res_allocated_count = 0;
-       int error = -EINVAL;
-       struct fsl_mc_device_irq **irqs = NULL;
-       struct fsl_mc_bus *mc_bus;
-       struct fsl_mc_resource_pool *res_pool;
-
-       if (WARN_ON(mc_dev->irqs))
-               return -EINVAL;
-
-       irq_count = mc_dev->obj_desc.irq_count;
-       if (WARN_ON(irq_count == 0))
-               return -EINVAL;
-
-       if (strcmp(mc_dev->obj_desc.type, "dprc") == 0)
-               mc_bus = to_fsl_mc_bus(mc_dev);
-       else
-               mc_bus = to_fsl_mc_bus(to_fsl_mc_device(mc_dev->dev.parent));
-
-       if (WARN_ON(!mc_bus->irq_resources))
-               return -EINVAL;
-
-       res_pool = &mc_bus->resource_pools[FSL_MC_POOL_IRQ];
-       if (res_pool->free_count < irq_count) {
-               dev_err(&mc_dev->dev,
-                       "Not able to allocate %u irqs for device\n", irq_count);
-               return -ENOSPC;
-       }
-
-       irqs = devm_kzalloc(&mc_dev->dev, irq_count * sizeof(irqs[0]),
-                           GFP_KERNEL);
-       if (!irqs)
-               return -ENOMEM;
-
-       for (i = 0; i < irq_count; i++) {
-               struct fsl_mc_resource *resource;
-
-               error = fsl_mc_resource_allocate(mc_bus, FSL_MC_POOL_IRQ,
-                                                &resource);
-               if (error < 0)
-                       goto error_resource_alloc;
-
-               irqs[i] = to_fsl_mc_irq(resource);
-               res_allocated_count++;
-
-               WARN_ON(irqs[i]->mc_dev);
-               irqs[i]->mc_dev = mc_dev;
-               irqs[i]->dev_irq_index = i;
-       }
-
-       mc_dev->irqs = irqs;
-       return 0;
-
-error_resource_alloc:
-       for (i = 0; i < res_allocated_count; i++) {
-               irqs[i]->mc_dev = NULL;
-               fsl_mc_resource_free(&irqs[i]->resource);
-       }
-
-       return error;
-}
-EXPORT_SYMBOL_GPL(fsl_mc_allocate_irqs);
-
-/*
- * It frees the IRQs that were allocated for a MC object device, by
- * returning them to the corresponding interrupt pool.
- */
-void fsl_mc_free_irqs(struct fsl_mc_device *mc_dev)
-{
-       int i;
-       int irq_count;
-       struct fsl_mc_bus *mc_bus;
-       struct fsl_mc_device_irq **irqs = mc_dev->irqs;
-
-       if (WARN_ON(!irqs))
-               return;
-
-       irq_count = mc_dev->obj_desc.irq_count;
-
-       if (strcmp(mc_dev->obj_desc.type, "dprc") == 0)
-               mc_bus = to_fsl_mc_bus(mc_dev);
-       else
-               mc_bus = to_fsl_mc_bus(to_fsl_mc_device(mc_dev->dev.parent));
-
-       if (WARN_ON(!mc_bus->irq_resources))
-               return;
-
-       for (i = 0; i < irq_count; i++) {
-               WARN_ON(!irqs[i]->mc_dev);
-               irqs[i]->mc_dev = NULL;
-               fsl_mc_resource_free(&irqs[i]->resource);
-       }
-
-       mc_dev->irqs = NULL;
-}
-EXPORT_SYMBOL_GPL(fsl_mc_free_irqs);
-
-/**
- * fsl_mc_allocator_probe - callback invoked when an allocatable device is
- * being added to the system
- */
-static int fsl_mc_allocator_probe(struct fsl_mc_device *mc_dev)
-{
-       enum fsl_mc_pool_type pool_type;
-       struct fsl_mc_device *mc_bus_dev;
-       struct fsl_mc_bus *mc_bus;
-       int error;
-
-       if (WARN_ON(!FSL_MC_IS_ALLOCATABLE(mc_dev->obj_desc.type)))
-               return -EINVAL;
-
-       mc_bus_dev = to_fsl_mc_device(mc_dev->dev.parent);
-       if (WARN_ON(!dev_is_fsl_mc(&mc_bus_dev->dev)))
-               return -EINVAL;
-
-       mc_bus = to_fsl_mc_bus(mc_bus_dev);
-       error = object_type_to_pool_type(mc_dev->obj_desc.type, &pool_type);
-       if (error < 0)
-               return error;
-
-       error = fsl_mc_resource_pool_add_device(mc_bus, pool_type, mc_dev);
-       if (error < 0)
-               return error;
-
-       dev_dbg(&mc_dev->dev,
-               "Allocatable MC object device bound to fsl_mc_allocator driver");
-       return 0;
-}
-
-/**
- * fsl_mc_allocator_remove - callback invoked when an allocatable device is
- * being removed from the system
- */
-static int fsl_mc_allocator_remove(struct fsl_mc_device *mc_dev)
-{
-       int error;
-
-       if (WARN_ON(!FSL_MC_IS_ALLOCATABLE(mc_dev->obj_desc.type)))
-               return -EINVAL;
-
-       if (mc_dev->resource) {
-               error = fsl_mc_resource_pool_remove_device(mc_dev);
-               if (error < 0)
-                       return error;
-       }
-
-       dev_dbg(&mc_dev->dev,
-               "Allocatable MC object device unbound from fsl_mc_allocator driver");
-       return 0;
-}
-
-static const struct fsl_mc_device_id match_id_table[] = {
-       {
-        .vendor = FSL_MC_VENDOR_FREESCALE,
-        .obj_type = "dpbp",
-       },
-       {
-        .vendor = FSL_MC_VENDOR_FREESCALE,
-        .obj_type = "dpmcp",
-       },
-       {
-        .vendor = FSL_MC_VENDOR_FREESCALE,
-        .obj_type = "dpcon",
-       },
-       {.vendor = 0x0},
-};
-
-static struct fsl_mc_driver fsl_mc_allocator_driver = {
-       .driver = {
-                  .name = "fsl_mc_allocator",
-                  .owner = THIS_MODULE,
-                  .pm = NULL,
-                  },
-       .match_id_table = match_id_table,
-       .probe = fsl_mc_allocator_probe,
-       .remove = fsl_mc_allocator_remove,
-};
-
-int __init fsl_mc_allocator_driver_init(void)
-{
-       return fsl_mc_driver_register(&fsl_mc_allocator_driver);
-}
-
-void fsl_mc_allocator_driver_exit(void)
-{
-       fsl_mc_driver_unregister(&fsl_mc_allocator_driver);
-}
diff --git a/drivers/staging/fsl-mc/bus/mc-bus.c b/drivers/staging/fsl-mc/bus/mc-bus.c
deleted file mode 100644 (file)
index 975d30b..0000000
+++ /dev/null
@@ -1,890 +0,0 @@
-/*
- * Freescale Management Complex (MC) bus driver
- *
- * Copyright (C) 2014 Freescale Semiconductor, Inc.
- * Author: German Rivera <German.Rivera@freescale.com>
- *
- * This file is licensed under the terms of the GNU General Public
- * License version 2. This program is licensed "as is" without any
- * warranty of any kind, whether express or implied.
- */
-
-#include "../include/mc-bus.h"
-#include <linux/module.h>
-#include <linux/of_device.h>
-#include <linux/of_address.h>
-#include <linux/ioport.h>
-#include <linux/slab.h>
-#include <linux/limits.h>
-#include <linux/bitops.h>
-#include <linux/msi.h>
-#include "../include/dpmng.h"
-#include "../include/mc-sys.h"
-#include "dprc-cmd.h"
-
-static struct kmem_cache *mc_dev_cache;
-
-/**
- * fsl_mc_bus_match - device to driver matching callback
- * @dev: the MC object device structure to match against
- * @drv: the device driver to search for matching MC object device id
- * structures
- *
- * Returns 1 on success, 0 otherwise.
- */
-static int fsl_mc_bus_match(struct device *dev, struct device_driver *drv)
-{
-       const struct fsl_mc_device_id *id;
-       struct fsl_mc_device *mc_dev = to_fsl_mc_device(dev);
-       struct fsl_mc_driver *mc_drv = to_fsl_mc_driver(drv);
-       bool found = false;
-
-       if (WARN_ON(!fsl_mc_bus_exists()))
-               goto out;
-
-       if (!mc_drv->match_id_table)
-               goto out;
-
-       /*
-        * If the object is not 'plugged' don't match.
-        * Only exception is the root DPRC, which is a special case.
-        */
-       if ((mc_dev->obj_desc.state & DPRC_OBJ_STATE_PLUGGED) == 0 &&
-           !fsl_mc_is_root_dprc(&mc_dev->dev))
-               goto out;
-
-       /*
-        * Traverse the match_id table of the given driver, trying to find
-        * a matching for the given MC object device.
-        */
-       for (id = mc_drv->match_id_table; id->vendor != 0x0; id++) {
-               if (id->vendor == mc_dev->obj_desc.vendor &&
-                   strcmp(id->obj_type, mc_dev->obj_desc.type) == 0) {
-                       found = true;
-
-                       break;
-               }
-       }
-
-out:
-       dev_dbg(dev, "%smatched\n", found ? "" : "not ");
-       return found;
-}
-
-/**
- * fsl_mc_bus_uevent - callback invoked when a device is added
- */
-static int fsl_mc_bus_uevent(struct device *dev, struct kobj_uevent_env *env)
-{
-       struct fsl_mc_device *mc_dev = to_fsl_mc_device(dev);
-
-       if (add_uevent_var(env, "MODALIAS=fsl-mc:v%08Xd%s",
-                          mc_dev->obj_desc.vendor,
-                          mc_dev->obj_desc.type))
-               return -ENOMEM;
-
-       return 0;
-}
-
-static ssize_t modalias_show(struct device *dev, struct device_attribute *attr,
-                            char *buf)
-{
-       struct fsl_mc_device *mc_dev = to_fsl_mc_device(dev);
-
-       return sprintf(buf, "fsl-mc:v%08Xd%s\n", mc_dev->obj_desc.vendor,
-                      mc_dev->obj_desc.type);
-}
-static DEVICE_ATTR_RO(modalias);
-
-static struct attribute *fsl_mc_dev_attrs[] = {
-       &dev_attr_modalias.attr,
-       NULL,
-};
-
-static const struct attribute_group fsl_mc_dev_group = {
-       .attrs = fsl_mc_dev_attrs,
-};
-
-static const struct attribute_group *fsl_mc_dev_groups[] = {
-       &fsl_mc_dev_group,
-       NULL,
-};
-
-struct bus_type fsl_mc_bus_type = {
-       .name = "fsl-mc",
-       .match = fsl_mc_bus_match,
-       .uevent = fsl_mc_bus_uevent,
-       .dev_groups = fsl_mc_dev_groups,
-};
-EXPORT_SYMBOL_GPL(fsl_mc_bus_type);
-
-static atomic_t root_dprc_count = ATOMIC_INIT(0);
-
-static int fsl_mc_driver_probe(struct device *dev)
-{
-       struct fsl_mc_driver *mc_drv;
-       struct fsl_mc_device *mc_dev = to_fsl_mc_device(dev);
-       int error;
-
-       if (WARN_ON(!dev->driver))
-               return -EINVAL;
-
-       mc_drv = to_fsl_mc_driver(dev->driver);
-       if (WARN_ON(!mc_drv->probe))
-               return -EINVAL;
-
-       error = mc_drv->probe(mc_dev);
-       if (error < 0) {
-               dev_err(dev, "MC object device probe callback failed: %d\n",
-                       error);
-               return error;
-       }
-
-       return 0;
-}
-
-static int fsl_mc_driver_remove(struct device *dev)
-{
-       struct fsl_mc_driver *mc_drv = to_fsl_mc_driver(dev->driver);
-       struct fsl_mc_device *mc_dev = to_fsl_mc_device(dev);
-       int error;
-
-       if (WARN_ON(!dev->driver))
-               return -EINVAL;
-
-       error = mc_drv->remove(mc_dev);
-       if (error < 0) {
-               dev_err(dev,
-                       "MC object device remove callback failed: %d\n",
-                       error);
-               return error;
-       }
-
-       return 0;
-}
-
-static void fsl_mc_driver_shutdown(struct device *dev)
-{
-       struct fsl_mc_driver *mc_drv = to_fsl_mc_driver(dev->driver);
-       struct fsl_mc_device *mc_dev = to_fsl_mc_device(dev);
-
-       mc_drv->shutdown(mc_dev);
-}
-
-/**
- * __fsl_mc_driver_register - registers a child device driver with the
- * MC bus
- *
- * This function is implicitly invoked from the registration function of
- * fsl_mc device drivers, which is generated by the
- * module_fsl_mc_driver() macro.
- */
-int __fsl_mc_driver_register(struct fsl_mc_driver *mc_driver,
-                            struct module *owner)
-{
-       int error;
-
-       mc_driver->driver.owner = owner;
-       mc_driver->driver.bus = &fsl_mc_bus_type;
-
-       if (mc_driver->probe)
-               mc_driver->driver.probe = fsl_mc_driver_probe;
-
-       if (mc_driver->remove)
-               mc_driver->driver.remove = fsl_mc_driver_remove;
-
-       if (mc_driver->shutdown)
-               mc_driver->driver.shutdown = fsl_mc_driver_shutdown;
-
-       error = driver_register(&mc_driver->driver);
-       if (error < 0) {
-               pr_err("driver_register() failed for %s: %d\n",
-                      mc_driver->driver.name, error);
-               return error;
-       }
-
-       pr_info("MC object device driver %s registered\n",
-               mc_driver->driver.name);
-       return 0;
-}
-EXPORT_SYMBOL_GPL(__fsl_mc_driver_register);
-
-/**
- * fsl_mc_driver_unregister - unregisters a device driver from the
- * MC bus
- */
-void fsl_mc_driver_unregister(struct fsl_mc_driver *mc_driver)
-{
-       driver_unregister(&mc_driver->driver);
-}
-EXPORT_SYMBOL_GPL(fsl_mc_driver_unregister);
-
-/**
- * fsl_mc_bus_exists - check if a root dprc exists
- */
-bool fsl_mc_bus_exists(void)
-{
-       return atomic_read(&root_dprc_count) > 0;
-}
-EXPORT_SYMBOL_GPL(fsl_mc_bus_exists);
-
-/**
-* fsl_mc_get_root_dprc - function to traverse to the root dprc
-*/
-static void fsl_mc_get_root_dprc(struct device *dev,
-                                struct device **root_dprc_dev)
-{
-       if (WARN_ON(!dev)) {
-               *root_dprc_dev = NULL;
-       } else if (WARN_ON(!dev_is_fsl_mc(dev))) {
-               *root_dprc_dev = NULL;
-       } else {
-               *root_dprc_dev = dev;
-               while (dev_is_fsl_mc((*root_dprc_dev)->parent))
-                       *root_dprc_dev = (*root_dprc_dev)->parent;
-       }
-}
-
-static int get_dprc_attr(struct fsl_mc_io *mc_io,
-                        int container_id, struct dprc_attributes *attr)
-{
-       u16 dprc_handle;
-       int error;
-
-       error = dprc_open(mc_io, 0, container_id, &dprc_handle);
-       if (error < 0) {
-               dev_err(mc_io->dev, "dprc_open() failed: %d\n", error);
-               return error;
-       }
-
-       memset(attr, 0, sizeof(struct dprc_attributes));
-       error = dprc_get_attributes(mc_io, 0, dprc_handle, attr);
-       if (error < 0) {
-               dev_err(mc_io->dev, "dprc_get_attributes() failed: %d\n",
-                       error);
-               goto common_cleanup;
-       }
-
-       error = 0;
-
-common_cleanup:
-       (void)dprc_close(mc_io, 0, dprc_handle);
-       return error;
-}
-
-static int get_dprc_icid(struct fsl_mc_io *mc_io,
-                        int container_id, u16 *icid)
-{
-       struct dprc_attributes attr;
-       int error;
-
-       error = get_dprc_attr(mc_io, container_id, &attr);
-       if (error == 0)
-               *icid = attr.icid;
-
-       return error;
-}
-
-static int get_dprc_version(struct fsl_mc_io *mc_io,
-                           int container_id, u16 *major, u16 *minor)
-{
-       struct dprc_attributes attr;
-       int error;
-
-       error = get_dprc_attr(mc_io, container_id, &attr);
-       if (error == 0) {
-               *major = attr.version.major;
-               *minor = attr.version.minor;
-       }
-
-       return error;
-}
-
-static int translate_mc_addr(struct fsl_mc_device *mc_dev,
-                            enum dprc_region_type mc_region_type,
-                            u64 mc_offset, phys_addr_t *phys_addr)
-{
-       int i;
-       struct device *root_dprc_dev;
-       struct fsl_mc *mc;
-
-       fsl_mc_get_root_dprc(&mc_dev->dev, &root_dprc_dev);
-       if (WARN_ON(!root_dprc_dev))
-               return -EINVAL;
-       mc = dev_get_drvdata(root_dprc_dev->parent);
-
-       if (mc->num_translation_ranges == 0) {
-               /*
-                * Do identity mapping:
-                */
-               *phys_addr = mc_offset;
-               return 0;
-       }
-
-       for (i = 0; i < mc->num_translation_ranges; i++) {
-               struct fsl_mc_addr_translation_range *range =
-                       &mc->translation_ranges[i];
-
-               if (mc_region_type == range->mc_region_type &&
-                   mc_offset >= range->start_mc_offset &&
-                   mc_offset < range->end_mc_offset) {
-                       *phys_addr = range->start_phys_addr +
-                                    (mc_offset - range->start_mc_offset);
-                       return 0;
-               }
-       }
-
-       return -EFAULT;
-}
-
-static int fsl_mc_device_get_mmio_regions(struct fsl_mc_device *mc_dev,
-                                         struct fsl_mc_device *mc_bus_dev)
-{
-       int i;
-       int error;
-       struct resource *regions;
-       struct dprc_obj_desc *obj_desc = &mc_dev->obj_desc;
-       struct device *parent_dev = mc_dev->dev.parent;
-       enum dprc_region_type mc_region_type;
-
-       if (strcmp(obj_desc->type, "dprc") == 0 ||
-           strcmp(obj_desc->type, "dpmcp") == 0) {
-               mc_region_type = DPRC_REGION_TYPE_MC_PORTAL;
-       } else if (strcmp(obj_desc->type, "dpio") == 0) {
-               mc_region_type = DPRC_REGION_TYPE_QBMAN_PORTAL;
-       } else {
-               /*
-                * This function should not have been called for this MC object
-                * type, as this object type is not supposed to have MMIO
-                * regions
-                */
-               WARN_ON(true);
-               return -EINVAL;
-       }
-
-       regions = kmalloc_array(obj_desc->region_count,
-                               sizeof(regions[0]), GFP_KERNEL);
-       if (!regions)
-               return -ENOMEM;
-
-       for (i = 0; i < obj_desc->region_count; i++) {
-               struct dprc_region_desc region_desc;
-
-               error = dprc_get_obj_region(mc_bus_dev->mc_io,
-                                           0,
-                                           mc_bus_dev->mc_handle,
-                                           obj_desc->type,
-                                           obj_desc->id, i, &region_desc);
-               if (error < 0) {
-                       dev_err(parent_dev,
-                               "dprc_get_obj_region() failed: %d\n", error);
-                       goto error_cleanup_regions;
-               }
-
-               WARN_ON(region_desc.size == 0);
-               error = translate_mc_addr(mc_dev, mc_region_type,
-                                         region_desc.base_offset,
-                                         &regions[i].start);
-               if (error < 0) {
-                       dev_err(parent_dev,
-                               "Invalid MC offset: %#x (for %s.%d\'s region %d)\n",
-                               region_desc.base_offset,
-                               obj_desc->type, obj_desc->id, i);
-                       goto error_cleanup_regions;
-               }
-
-               regions[i].end = regions[i].start + region_desc.size - 1;
-               regions[i].name = "fsl-mc object MMIO region";
-               regions[i].flags = IORESOURCE_IO;
-               if (region_desc.flags & DPRC_REGION_CACHEABLE)
-                       regions[i].flags |= IORESOURCE_CACHEABLE;
-       }
-
-       mc_dev->regions = regions;
-       return 0;
-
-error_cleanup_regions:
-       kfree(regions);
-       return error;
-}
-
-/**
- * fsl_mc_is_root_dprc - function to check if a given device is a root dprc
- */
-bool fsl_mc_is_root_dprc(struct device *dev)
-{
-       struct device *root_dprc_dev;
-
-       fsl_mc_get_root_dprc(dev, &root_dprc_dev);
-       if (!root_dprc_dev)
-               return false;
-       return dev == root_dprc_dev;
-}
-
-/**
- * Add a newly discovered MC object device to be visible in Linux
- */
-int fsl_mc_device_add(struct dprc_obj_desc *obj_desc,
-                     struct fsl_mc_io *mc_io,
-                     struct device *parent_dev,
-                     struct fsl_mc_device **new_mc_dev)
-{
-       int error;
-       struct fsl_mc_device *mc_dev = NULL;
-       struct fsl_mc_bus *mc_bus = NULL;
-       struct fsl_mc_device *parent_mc_dev;
-
-       if (dev_is_fsl_mc(parent_dev))
-               parent_mc_dev = to_fsl_mc_device(parent_dev);
-       else
-               parent_mc_dev = NULL;
-
-       if (strcmp(obj_desc->type, "dprc") == 0) {
-               /*
-                * Allocate an MC bus device object:
-                */
-               mc_bus = devm_kzalloc(parent_dev, sizeof(*mc_bus), GFP_KERNEL);
-               if (!mc_bus)
-                       return -ENOMEM;
-
-               mc_dev = &mc_bus->mc_dev;
-       } else {
-               /*
-                * Allocate a regular fsl_mc_device object:
-                */
-               mc_dev = kmem_cache_zalloc(mc_dev_cache, GFP_KERNEL);
-               if (!mc_dev)
-                       return -ENOMEM;
-       }
-
-       mc_dev->obj_desc = *obj_desc;
-       mc_dev->mc_io = mc_io;
-       device_initialize(&mc_dev->dev);
-       mc_dev->dev.parent = parent_dev;
-       mc_dev->dev.bus = &fsl_mc_bus_type;
-       dev_set_name(&mc_dev->dev, "%s.%d", obj_desc->type, obj_desc->id);
-
-       if (strcmp(obj_desc->type, "dprc") == 0) {
-               struct fsl_mc_io *mc_io2;
-
-               mc_dev->flags |= FSL_MC_IS_DPRC;
-
-               /*
-                * To get the DPRC's ICID, we need to open the DPRC
-                * in get_dprc_icid(). For child DPRCs, we do so using the
-                * parent DPRC's MC portal instead of the child DPRC's MC
-                * portal, in case the child DPRC is already opened with
-                * its own portal (e.g., the DPRC used by AIOP).
-                *
-                * NOTE: There cannot be more than one active open for a
-                * given MC object, using the same MC portal.
-                */
-               if (parent_mc_dev) {
-                       /*
-                        * device being added is a child DPRC device
-                        */
-                       mc_io2 = parent_mc_dev->mc_io;
-               } else {
-                       /*
-                        * device being added is the root DPRC device
-                        */
-                       if (WARN_ON(!mc_io)) {
-                               error = -EINVAL;
-                               goto error_cleanup_dev;
-                       }
-
-                       mc_io2 = mc_io;
-
-                       atomic_inc(&root_dprc_count);
-               }
-
-               error = get_dprc_icid(mc_io2, obj_desc->id, &mc_dev->icid);
-               if (error < 0)
-                       goto error_cleanup_dev;
-       } else {
-               /*
-                * A non-DPRC MC object device has to be a child of another
-                * MC object (specifically a DPRC object)
-                */
-               mc_dev->icid = parent_mc_dev->icid;
-               mc_dev->dma_mask = FSL_MC_DEFAULT_DMA_MASK;
-               mc_dev->dev.dma_mask = &mc_dev->dma_mask;
-               dev_set_msi_domain(&mc_dev->dev,
-                                  dev_get_msi_domain(&parent_mc_dev->dev));
-       }
-
-       /*
-        * Get MMIO regions for the device from the MC:
-        *
-        * NOTE: the root DPRC is a special case as its MMIO region is
-        * obtained from the device tree
-        */
-       if (parent_mc_dev && obj_desc->region_count != 0) {
-               error = fsl_mc_device_get_mmio_regions(mc_dev,
-                                                      parent_mc_dev);
-               if (error < 0)
-                       goto error_cleanup_dev;
-       }
-
-       /* Objects are coherent, unless 'no shareability' flag set. */
-       if (!(obj_desc->flags & DPRC_OBJ_FLAG_NO_MEM_SHAREABILITY))
-               arch_setup_dma_ops(&mc_dev->dev, 0, 0, NULL, true);
-
-       /*
-        * The device-specific probe callback will get invoked by device_add()
-        */
-       error = device_add(&mc_dev->dev);
-       if (error < 0) {
-               dev_err(parent_dev,
-                       "device_add() failed for device %s: %d\n",
-                       dev_name(&mc_dev->dev), error);
-               goto error_cleanup_dev;
-       }
-
-       (void)get_device(&mc_dev->dev);
-       dev_dbg(parent_dev, "Added MC object device %s\n",
-               dev_name(&mc_dev->dev));
-
-       *new_mc_dev = mc_dev;
-       return 0;
-
-error_cleanup_dev:
-       kfree(mc_dev->regions);
-       if (mc_bus)
-               devm_kfree(parent_dev, mc_bus);
-       else
-               kmem_cache_free(mc_dev_cache, mc_dev);
-
-       return error;
-}
-EXPORT_SYMBOL_GPL(fsl_mc_device_add);
-
-/**
- * fsl_mc_device_remove - Remove a MC object device from being visible to
- * Linux
- *
- * @mc_dev: Pointer to a MC object device object
- */
-void fsl_mc_device_remove(struct fsl_mc_device *mc_dev)
-{
-       struct fsl_mc_bus *mc_bus = NULL;
-
-       kfree(mc_dev->regions);
-
-       /*
-        * The device-specific remove callback will get invoked by device_del()
-        */
-       device_del(&mc_dev->dev);
-       put_device(&mc_dev->dev);
-
-       if (strcmp(mc_dev->obj_desc.type, "dprc") == 0) {
-               mc_bus = to_fsl_mc_bus(mc_dev);
-
-               if (fsl_mc_is_root_dprc(&mc_dev->dev)) {
-                       if (atomic_read(&root_dprc_count) > 0)
-                               atomic_dec(&root_dprc_count);
-                       else
-                               WARN_ON(1);
-               }
-       }
-
-       if (mc_bus)
-               devm_kfree(mc_dev->dev.parent, mc_bus);
-       else
-               kmem_cache_free(mc_dev_cache, mc_dev);
-}
-EXPORT_SYMBOL_GPL(fsl_mc_device_remove);
-
-static int parse_mc_ranges(struct device *dev,
-                          int *paddr_cells,
-                          int *mc_addr_cells,
-                          int *mc_size_cells,
-                          const __be32 **ranges_start,
-                          u8 *num_ranges)
-{
-       const __be32 *prop;
-       int range_tuple_cell_count;
-       int ranges_len;
-       int tuple_len;
-       struct device_node *mc_node = dev->of_node;
-
-       *ranges_start = of_get_property(mc_node, "ranges", &ranges_len);
-       if (!(*ranges_start) || !ranges_len) {
-               dev_warn(dev,
-                        "missing or empty ranges property for device tree node '%s'\n",
-                        mc_node->name);
-
-               *num_ranges = 0;
-               return 0;
-       }
-
-       *paddr_cells = of_n_addr_cells(mc_node);
-
-       prop = of_get_property(mc_node, "#address-cells", NULL);
-       if (prop)
-               *mc_addr_cells = be32_to_cpup(prop);
-       else
-               *mc_addr_cells = *paddr_cells;
-
-       prop = of_get_property(mc_node, "#size-cells", NULL);
-       if (prop)
-               *mc_size_cells = be32_to_cpup(prop);
-       else
-               *mc_size_cells = of_n_size_cells(mc_node);
-
-       range_tuple_cell_count = *paddr_cells + *mc_addr_cells +
-                                *mc_size_cells;
-
-       tuple_len = range_tuple_cell_count * sizeof(__be32);
-       if (ranges_len % tuple_len != 0) {
-               dev_err(dev, "malformed ranges property '%s'\n", mc_node->name);
-               return -EINVAL;
-       }
-
-       *num_ranges = ranges_len / tuple_len;
-       return 0;
-}
-
-static int get_mc_addr_translation_ranges(struct device *dev,
-                                         struct fsl_mc_addr_translation_range
-                                               **ranges,
-                                         u8 *num_ranges)
-{
-       int error;
-       int paddr_cells;
-       int mc_addr_cells;
-       int mc_size_cells;
-       int i;
-       const __be32 *ranges_start;
-       const __be32 *cell;
-
-       error = parse_mc_ranges(dev,
-                               &paddr_cells,
-                               &mc_addr_cells,
-                               &mc_size_cells,
-                               &ranges_start,
-                               num_ranges);
-       if (error < 0)
-               return error;
-
-       if (!(*num_ranges)) {
-               /*
-                * Missing or empty ranges property ("ranges;") for the
-                * 'fsl,qoriq-mc' node. In this case, identity mapping
-                * will be used.
-                */
-               *ranges = NULL;
-               return 0;
-       }
-
-       *ranges = devm_kcalloc(dev, *num_ranges,
-                              sizeof(struct fsl_mc_addr_translation_range),
-                              GFP_KERNEL);
-       if (!(*ranges))
-               return -ENOMEM;
-
-       cell = ranges_start;
-       for (i = 0; i < *num_ranges; ++i) {
-               struct fsl_mc_addr_translation_range *range = &(*ranges)[i];
-
-               range->mc_region_type = of_read_number(cell, 1);
-               range->start_mc_offset = of_read_number(cell + 1,
-                                                       mc_addr_cells - 1);
-               cell += mc_addr_cells;
-               range->start_phys_addr = of_read_number(cell, paddr_cells);
-               cell += paddr_cells;
-               range->end_mc_offset = range->start_mc_offset +
-                                    of_read_number(cell, mc_size_cells);
-
-               cell += mc_size_cells;
-       }
-
-       return 0;
-}
-
-/**
- * fsl_mc_bus_probe - callback invoked when the root MC bus is being
- * added
- */
-static int fsl_mc_bus_probe(struct platform_device *pdev)
-{
-       struct dprc_obj_desc obj_desc;
-       int error;
-       struct fsl_mc *mc;
-       struct fsl_mc_device *mc_bus_dev = NULL;
-       struct fsl_mc_io *mc_io = NULL;
-       int container_id;
-       phys_addr_t mc_portal_phys_addr;
-       u32 mc_portal_size;
-       struct mc_version mc_version;
-       struct resource res;
-
-       dev_info(&pdev->dev, "Root MC bus device probed");
-
-       mc = devm_kzalloc(&pdev->dev, sizeof(*mc), GFP_KERNEL);
-       if (!mc)
-               return -ENOMEM;
-
-       platform_set_drvdata(pdev, mc);
-
-       /*
-        * Get physical address of MC portal for the root DPRC:
-        */
-       error = of_address_to_resource(pdev->dev.of_node, 0, &res);
-       if (error < 0) {
-               dev_err(&pdev->dev,
-                       "of_address_to_resource() failed for %s\n",
-                       pdev->dev.of_node->full_name);
-               return error;
-       }
-
-       mc_portal_phys_addr = res.start;
-       mc_portal_size = resource_size(&res);
-       error = fsl_create_mc_io(&pdev->dev, mc_portal_phys_addr,
-                                mc_portal_size, NULL,
-                                FSL_MC_IO_ATOMIC_CONTEXT_PORTAL, &mc_io);
-       if (error < 0)
-               return error;
-
-       error = mc_get_version(mc_io, 0, &mc_version);
-       if (error != 0) {
-               dev_err(&pdev->dev,
-                       "mc_get_version() failed with error %d\n", error);
-               goto error_cleanup_mc_io;
-       }
-
-       dev_info(&pdev->dev,
-                "Freescale Management Complex Firmware version: %u.%u.%u\n",
-                mc_version.major, mc_version.minor, mc_version.revision);
-
-       error = get_mc_addr_translation_ranges(&pdev->dev,
-                                              &mc->translation_ranges,
-                                              &mc->num_translation_ranges);
-       if (error < 0)
-               goto error_cleanup_mc_io;
-
-       error = dpmng_get_container_id(mc_io, 0, &container_id);
-       if (error < 0) {
-               dev_err(&pdev->dev,
-                       "dpmng_get_container_id() failed: %d\n", error);
-               goto error_cleanup_mc_io;
-       }
-
-       memset(&obj_desc, 0, sizeof(struct dprc_obj_desc));
-       error = get_dprc_version(mc_io, container_id,
-                                &obj_desc.ver_major, &obj_desc.ver_minor);
-       if (error < 0)
-               goto error_cleanup_mc_io;
-
-       obj_desc.vendor = FSL_MC_VENDOR_FREESCALE;
-       strcpy(obj_desc.type, "dprc");
-       obj_desc.id = container_id;
-       obj_desc.irq_count = 1;
-       obj_desc.region_count = 0;
-
-       error = fsl_mc_device_add(&obj_desc, mc_io, &pdev->dev, &mc_bus_dev);
-       if (error < 0)
-               goto error_cleanup_mc_io;
-
-       mc->root_mc_bus_dev = mc_bus_dev;
-       return 0;
-
-error_cleanup_mc_io:
-       fsl_destroy_mc_io(mc_io);
-       return error;
-}
-
-/**
- * fsl_mc_bus_remove - callback invoked when the root MC bus is being
- * removed
- */
-static int fsl_mc_bus_remove(struct platform_device *pdev)
-{
-       struct fsl_mc *mc = platform_get_drvdata(pdev);
-
-       if (WARN_ON(!fsl_mc_is_root_dprc(&mc->root_mc_bus_dev->dev)))
-               return -EINVAL;
-
-       fsl_mc_device_remove(mc->root_mc_bus_dev);
-
-       fsl_destroy_mc_io(mc->root_mc_bus_dev->mc_io);
-       mc->root_mc_bus_dev->mc_io = NULL;
-
-       dev_info(&pdev->dev, "Root MC bus device removed");
-       return 0;
-}
-
-static const struct of_device_id fsl_mc_bus_match_table[] = {
-       {.compatible = "fsl,qoriq-mc",},
-       {},
-};
-
-MODULE_DEVICE_TABLE(of, fsl_mc_bus_match_table);
-
-static struct platform_driver fsl_mc_bus_driver = {
-       .driver = {
-                  .name = "fsl_mc_bus",
-                  .pm = NULL,
-                  .of_match_table = fsl_mc_bus_match_table,
-                  },
-       .probe = fsl_mc_bus_probe,
-       .remove = fsl_mc_bus_remove,
-};
-
-static int __init fsl_mc_bus_driver_init(void)
-{
-       int error;
-
-       mc_dev_cache = kmem_cache_create("fsl_mc_device",
-                                        sizeof(struct fsl_mc_device), 0, 0,
-                                        NULL);
-       if (!mc_dev_cache) {
-               pr_err("Could not create fsl_mc_device cache\n");
-               return -ENOMEM;
-       }
-
-       error = bus_register(&fsl_mc_bus_type);
-       if (error < 0) {
-               pr_err("fsl-mc bus type registration failed: %d\n", error);
-               goto error_cleanup_cache;
-       }
-
-       pr_info("fsl-mc bus type registered\n");
-
-       error = platform_driver_register(&fsl_mc_bus_driver);
-       if (error < 0) {
-               pr_err("platform_driver_register() failed: %d\n", error);
-               goto error_cleanup_bus;
-       }
-
-       error = dprc_driver_init();
-       if (error < 0)
-               goto error_cleanup_driver;
-
-       error = fsl_mc_allocator_driver_init();
-       if (error < 0)
-               goto error_cleanup_dprc_driver;
-
-       error = its_fsl_mc_msi_init();
-       if (error < 0)
-               goto error_cleanup_mc_allocator;
-
-       return 0;
-
-error_cleanup_mc_allocator:
-       fsl_mc_allocator_driver_exit();
-
-error_cleanup_dprc_driver:
-       dprc_driver_exit();
-
-error_cleanup_driver:
-       platform_driver_unregister(&fsl_mc_bus_driver);
-
-error_cleanup_bus:
-       bus_unregister(&fsl_mc_bus_type);
-
-error_cleanup_cache:
-       kmem_cache_destroy(mc_dev_cache);
-       return error;
-}
-postcore_initcall(fsl_mc_bus_driver_init);
diff --git a/drivers/staging/fsl-mc/bus/mc-msi.c b/drivers/staging/fsl-mc/bus/mc-msi.c
deleted file mode 100644 (file)
index 6e39a98..0000000
+++ /dev/null
@@ -1,287 +0,0 @@
-/*
- * Freescale Management Complex (MC) bus driver MSI support
- *
- * Copyright (C) 2015 Freescale Semiconductor, Inc.
- * Author: German Rivera <German.Rivera@freescale.com>
- *
- * This file is licensed under the terms of the GNU General Public
- * License version 2. This program is licensed "as is" without any
- * warranty of any kind, whether express or implied.
- */
-
-#include "../include/mc-bus.h"
-#include <linux/of_device.h>
-#include <linux/of_address.h>
-#include <linux/irqchip/arm-gic-v3.h>
-#include <linux/of_irq.h>
-#include <linux/irq.h>
-#include <linux/irqdomain.h>
-#include <linux/msi.h>
-#include "../include/mc-sys.h"
-#include "dprc-cmd.h"
-
-/*
- * Generate a unique ID identifying the interrupt (only used within the MSI
- * irqdomain.  Combine the icid with the interrupt index.
- */
-static irq_hw_number_t fsl_mc_domain_calc_hwirq(struct fsl_mc_device *dev,
-                                               struct msi_desc *desc)
-{
-       /*
-        * Make the base hwirq value for ICID*10000 so it is readable
-        * as a decimal value in /proc/interrupts.
-        */
-       return (irq_hw_number_t)(desc->fsl_mc.msi_index + (dev->icid * 10000));
-}
-
-static void fsl_mc_msi_set_desc(msi_alloc_info_t *arg,
-                               struct msi_desc *desc)
-{
-       arg->desc = desc;
-       arg->hwirq = fsl_mc_domain_calc_hwirq(to_fsl_mc_device(desc->dev),
-                                             desc);
-}
-
-static void fsl_mc_msi_update_dom_ops(struct msi_domain_info *info)
-{
-       struct msi_domain_ops *ops = info->ops;
-
-       if (WARN_ON(!ops))
-               return;
-
-       /*
-        * set_desc should not be set by the caller
-        */
-       if (ops->set_desc == NULL)
-               ops->set_desc = fsl_mc_msi_set_desc;
-}
-
-static void __fsl_mc_msi_write_msg(struct fsl_mc_device *mc_bus_dev,
-                                  struct fsl_mc_device_irq *mc_dev_irq)
-{
-       int error;
-       struct fsl_mc_device *owner_mc_dev = mc_dev_irq->mc_dev;
-       struct msi_desc *msi_desc = mc_dev_irq->msi_desc;
-       struct dprc_irq_cfg irq_cfg;
-
-       /*
-        * msi_desc->msg.address is 0x0 when this function is invoked in
-        * the free_irq() code path. In this case, for the MC, we don't
-        * really need to "unprogram" the MSI, so we just return.
-        */
-       if (msi_desc->msg.address_lo == 0x0 && msi_desc->msg.address_hi == 0x0)
-               return;
-
-       if (WARN_ON(!owner_mc_dev))
-               return;
-
-       irq_cfg.paddr = ((u64)msi_desc->msg.address_hi << 32) |
-                       msi_desc->msg.address_lo;
-       irq_cfg.val = msi_desc->msg.data;
-       irq_cfg.irq_num = msi_desc->irq;
-
-       if (owner_mc_dev == mc_bus_dev) {
-               /*
-                * IRQ is for the mc_bus_dev's DPRC itself
-                */
-               error = dprc_set_irq(mc_bus_dev->mc_io,
-                                    MC_CMD_FLAG_INTR_DIS | MC_CMD_FLAG_PRI,
-                                    mc_bus_dev->mc_handle,
-                                    mc_dev_irq->dev_irq_index,
-                                    &irq_cfg);
-               if (error < 0) {
-                       dev_err(&owner_mc_dev->dev,
-                               "dprc_set_irq() failed: %d\n", error);
-               }
-       } else {
-               /*
-                * IRQ is for for a child device of mc_bus_dev
-                */
-               error = dprc_set_obj_irq(mc_bus_dev->mc_io,
-                                        MC_CMD_FLAG_INTR_DIS | MC_CMD_FLAG_PRI,
-                                        mc_bus_dev->mc_handle,
-                                        owner_mc_dev->obj_desc.type,
-                                        owner_mc_dev->obj_desc.id,
-                                        mc_dev_irq->dev_irq_index,
-                                        &irq_cfg);
-               if (error < 0) {
-                       dev_err(&owner_mc_dev->dev,
-                               "dprc_obj_set_irq() failed: %d\n", error);
-               }
-       }
-}
-
-/*
- * NOTE: This function is invoked with interrupts disabled
- */
-static void fsl_mc_msi_write_msg(struct irq_data *irq_data,
-                                struct msi_msg *msg)
-{
-       struct msi_desc *msi_desc = irq_data_get_msi_desc(irq_data);
-       struct fsl_mc_device *mc_bus_dev = to_fsl_mc_device(msi_desc->dev);
-       struct fsl_mc_bus *mc_bus = to_fsl_mc_bus(mc_bus_dev);
-       struct fsl_mc_device_irq *mc_dev_irq =
-               &mc_bus->irq_resources[msi_desc->fsl_mc.msi_index];
-
-       WARN_ON(mc_dev_irq->msi_desc != msi_desc);
-       msi_desc->msg = *msg;
-
-       /*
-        * Program the MSI (paddr, value) pair in the device:
-        */
-       __fsl_mc_msi_write_msg(mc_bus_dev, mc_dev_irq);
-}
-
-static void fsl_mc_msi_update_chip_ops(struct msi_domain_info *info)
-{
-       struct irq_chip *chip = info->chip;
-
-       if (WARN_ON((!chip)))
-               return;
-
-       /*
-        * irq_write_msi_msg should not be set by the caller
-        */
-       if (chip->irq_write_msi_msg == NULL)
-               chip->irq_write_msi_msg = fsl_mc_msi_write_msg;
-}
-
-/**
- * fsl_mc_msi_create_irq_domain - Create a fsl-mc MSI interrupt domain
- * @np:                Optional device-tree node of the interrupt controller
- * @info:      MSI domain info
- * @parent:    Parent irq domain
- *
- * Updates the domain and chip ops and creates a fsl-mc MSI
- * interrupt domain.
- *
- * Returns:
- * A domain pointer or NULL in case of failure.
- */
-struct irq_domain *fsl_mc_msi_create_irq_domain(struct fwnode_handle *fwnode,
-                                               struct msi_domain_info *info,
-                                               struct irq_domain *parent)
-{
-       struct irq_domain *domain;
-
-       if (info->flags & MSI_FLAG_USE_DEF_DOM_OPS)
-               fsl_mc_msi_update_dom_ops(info);
-       if (info->flags & MSI_FLAG_USE_DEF_CHIP_OPS)
-               fsl_mc_msi_update_chip_ops(info);
-
-       domain = msi_create_irq_domain(fwnode, info, parent);
-       if (domain)
-               domain->bus_token = DOMAIN_BUS_FSL_MC_MSI;
-
-       return domain;
-}
-
-int fsl_mc_find_msi_domain(struct device *mc_platform_dev,
-                          struct irq_domain **mc_msi_domain)
-{
-       struct irq_domain *msi_domain;
-       struct device_node *mc_of_node = mc_platform_dev->of_node;
-
-       msi_domain = of_msi_get_domain(mc_platform_dev, mc_of_node,
-                                      DOMAIN_BUS_FSL_MC_MSI);
-       if (!msi_domain) {
-               pr_err("Unable to find fsl-mc MSI domain for %s\n",
-                      mc_of_node->full_name);
-
-               return -ENOENT;
-       }
-
-       *mc_msi_domain = msi_domain;
-       return 0;
-}
-
-static void fsl_mc_msi_free_descs(struct device *dev)
-{
-       struct msi_desc *desc, *tmp;
-
-       list_for_each_entry_safe(desc, tmp, dev_to_msi_list(dev), list) {
-               list_del(&desc->list);
-               free_msi_entry(desc);
-       }
-}
-
-static int fsl_mc_msi_alloc_descs(struct device *dev, unsigned int irq_count)
-
-{
-       unsigned int i;
-       int error;
-       struct msi_desc *msi_desc;
-
-       for (i = 0; i < irq_count; i++) {
-               msi_desc = alloc_msi_entry(dev);
-               if (!msi_desc) {
-                       dev_err(dev, "Failed to allocate msi entry\n");
-                       error = -ENOMEM;
-                       goto cleanup_msi_descs;
-               }
-
-               msi_desc->fsl_mc.msi_index = i;
-               msi_desc->nvec_used = 1;
-               INIT_LIST_HEAD(&msi_desc->list);
-               list_add_tail(&msi_desc->list, dev_to_msi_list(dev));
-       }
-
-       return 0;
-
-cleanup_msi_descs:
-       fsl_mc_msi_free_descs(dev);
-       return error;
-}
-
-int fsl_mc_msi_domain_alloc_irqs(struct device *dev,
-                                unsigned int irq_count)
-{
-       struct irq_domain *msi_domain;
-       int error;
-
-       if (WARN_ON(!list_empty(dev_to_msi_list(dev))))
-               return -EINVAL;
-
-       error = fsl_mc_msi_alloc_descs(dev, irq_count);
-       if (error < 0)
-               return error;
-
-       msi_domain = dev_get_msi_domain(dev);
-       if (WARN_ON(!msi_domain)) {
-               error = -EINVAL;
-               goto cleanup_msi_descs;
-       }
-
-       /*
-        * NOTE: Calling this function will trigger the invocation of the
-        * its_fsl_mc_msi_prepare() callback
-        */
-       error = msi_domain_alloc_irqs(msi_domain, dev, irq_count);
-
-       if (error) {
-               dev_err(dev, "Failed to allocate IRQs\n");
-               goto cleanup_msi_descs;
-       }
-
-       return 0;
-
-cleanup_msi_descs:
-       fsl_mc_msi_free_descs(dev);
-       return error;
-}
-
-void fsl_mc_msi_domain_free_irqs(struct device *dev)
-{
-       struct irq_domain *msi_domain;
-
-       msi_domain = dev_get_msi_domain(dev);
-       if (WARN_ON(!msi_domain))
-               return;
-
-       msi_domain_free_irqs(msi_domain, dev);
-
-       if (WARN_ON(list_empty(dev_to_msi_list(dev))))
-               return;
-
-       fsl_mc_msi_free_descs(dev);
-}
This page took 0.066561 seconds and 5 git commands to generate.