remoteproc: create vdev subdevice with specific dma memory pool

This patch creates a dedicated vdev subdevice for each vdev declared
in firmware resource table and associates carveout named "vdev%dbuffer"
(with %d vdev index in resource table) if any as dma coherent memory pool.

Then vdev subdevice is used as parent for virtio device.

Signed-off-by: Loic Pallardy <loic.pallardy@st.com>
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>

diff --git a/drivers/remoteproc/remoteproc_core.c b/drivers/remoteproc/remoteproc_core.c
index 54ec38fc5dca621ad5d4d2b10e4f7fc0afa647b4..821dbedef18ee96496017ba8af368d1c11ef3e4e 100644 (file)
--- a/drivers/remoteproc/remoteproc_core.c
+++ b/drivers/remoteproc/remoteproc_core.c
@@ -39,9 +39,11 @@
 #include <linux/idr.h>
 #include <linux/elf.h>
 #include <linux/crc32.h>
+#include <linux/of_reserved_mem.h>
 #include <linux/virtio_ids.h>
 #include <linux/virtio_ring.h>
 #include <asm/byteorder.h>
+#include <linux/platform_device.h>
 
 #include "remoteproc_internal.h"
 
@@ -145,7 +147,7 @@ static void rproc_disable_iommu(struct rproc *rproc)
        iommu_domain_free(domain);
 }
 
-static phys_addr_t rproc_va_to_pa(void *cpu_addr)
+phys_addr_t rproc_va_to_pa(void *cpu_addr)
 {
        /*
         * Return physical address according to virtual address location
@@ -160,6 +162,7 @@ static phys_addr_t rproc_va_to_pa(void *cpu_addr)
        WARN_ON(!virt_addr_valid(cpu_addr));
        return virt_to_phys(cpu_addr);
 }
+EXPORT_SYMBOL(rproc_va_to_pa);
 
 /**
  * rproc_da_to_va() - lookup the kernel virtual address for a remoteproc address
@@ -422,6 +425,20 @@ static void rproc_vdev_do_stop(struct rproc_subdev *subdev, bool crashed)
        rproc_remove_virtio_dev(rvdev);
 }
 
+/**
+ * rproc_rvdev_release() - release the existence of a rvdev
+ *
+ * @dev: the subdevice's dev
+ */
+static void rproc_rvdev_release(struct device *dev)
+{
+       struct rproc_vdev *rvdev = container_of(dev, struct rproc_vdev, dev);
+
+       of_reserved_mem_device_release(dev);
+
+       kfree(rvdev);
+}
+
 /**
  * rproc_handle_vdev() - handle a vdev fw resource
  * @rproc: the remote processor
@@ -455,6 +472,7 @@ static int rproc_handle_vdev(struct rproc *rproc, struct fw_rsc_vdev *rsc,
        struct device *dev = &rproc->dev;
        struct rproc_vdev *rvdev;
        int i, ret;
+       char name[16];
 
        /* make sure resource isn't truncated */
        if (sizeof(*rsc) + rsc->num_of_vrings * sizeof(struct fw_rsc_vdev_vring)
@@ -488,6 +506,29 @@ static int rproc_handle_vdev(struct rproc *rproc, struct fw_rsc_vdev *rsc,
        rvdev->rproc = rproc;
        rvdev->index = rproc->nb_vdev++;
 
+       /* Initialise vdev subdevice */
+       snprintf(name, sizeof(name), "vdev%dbuffer", rvdev->index);
+       rvdev->dev.parent = rproc->dev.parent;
+       rvdev->dev.release = rproc_rvdev_release;
+       dev_set_name(&rvdev->dev, "%s#%s", dev_name(rvdev->dev.parent), name);
+       dev_set_drvdata(&rvdev->dev, rvdev);
+
+       ret = device_register(&rvdev->dev);
+       if (ret) {
+               put_device(&rvdev->dev);
+               return ret;
+       }
+       /* Make device dma capable by inheriting from parent's capabilities */
+       set_dma_ops(&rvdev->dev, get_dma_ops(rproc->dev.parent));
+
+       ret = dma_coerce_mask_and_coherent(&rvdev->dev,
+                                          dma_get_mask(rproc->dev.parent));
+       if (ret) {
+               dev_warn(dev,
+                        "Failed to set DMA mask %llx. Trying to continue... %x\n",
+                        dma_get_mask(rproc->dev.parent), ret);
+       }
+
        /* parse the vrings */
        for (i = 0; i < rsc->num_of_vrings; i++) {
                ret = rproc_parse_vring(rvdev, rsc, i);
@@ -518,7 +559,7 @@ unwind_vring_allocations:
        for (i--; i >= 0; i--)
                rproc_free_vring(&rvdev->vring[i]);
 free_rvdev:
-       kfree(rvdev);
+       device_unregister(&rvdev->dev);
        return ret;
 }
 
@@ -536,7 +577,7 @@ void rproc_vdev_release(struct kref *ref)
 
        rproc_remove_subdev(rproc, &rvdev->subdev);
        list_del(&rvdev->node);
-       kfree(rvdev);
+       device_unregister(&rvdev->dev);
 }
 
 /**

diff --git a/drivers/remoteproc/remoteproc_internal.h b/drivers/remoteproc/remoteproc_internal.h
index f6cad243d7cac9a7255be1107db5981d5ab3eff2..bfeacfd4094754c82cd579825de04908078a506c 100644 (file)
--- a/drivers/remoteproc/remoteproc_internal.h
+++ b/drivers/remoteproc/remoteproc_internal.h
@@ -52,6 +52,7 @@ void rproc_free_vring(struct rproc_vring *rvring);
 int rproc_alloc_vring(struct rproc_vdev *rvdev, int i);
 
 void *rproc_da_to_va(struct rproc *rproc, u64 da, int len);
+phys_addr_t rproc_va_to_pa(void *cpu_addr);
 int rproc_trigger_recovery(struct rproc *rproc);
 
 int rproc_elf_sanity_check(struct rproc *rproc, const struct firmware *fw);

diff --git a/drivers/remoteproc/remoteproc_virtio.c b/drivers/remoteproc/remoteproc_virtio.c
index 183fc42a510a73e5f41c1c8221bea032bbbfbc81..d08b2cfd875b5435abf721cddae0e094fc70584d 100644 (file)
--- a/drivers/remoteproc/remoteproc_virtio.c
+++ b/drivers/remoteproc/remoteproc_virtio.c
@@ -17,7 +17,9 @@
  * GNU General Public License for more details.
  */
 
+#include <linux/dma-mapping.h>
 #include <linux/export.h>
+#include <linux/of_reserved_mem.h>
 #include <linux/remoteproc.h>
 #include <linux/virtio.h>
 #include <linux/virtio_config.h>
@@ -328,10 +330,48 @@ static void rproc_virtio_dev_release(struct device *dev)
 int rproc_add_virtio_dev(struct rproc_vdev *rvdev, int id)
 {
        struct rproc *rproc = rvdev->rproc;
-       struct device *dev = &rproc->dev;
+       struct device *dev = &rvdev->dev;
        struct virtio_device *vdev = &rvdev->vdev;
+       struct rproc_mem_entry *mem;
        int ret;
 
+       /* Try to find dedicated vdev buffer carveout */
+       mem = rproc_find_carveout_by_name(rproc, "vdev%dbuffer", rvdev->index);
+       if (mem) {
+               phys_addr_t pa;
+
+               if (mem->of_resm_idx != -1) {
+                       struct device_node *np = rproc->dev.parent->of_node;
+
+                       /* Associate reserved memory to vdev device */
+                       ret = of_reserved_mem_device_init_by_idx(dev, np,
+                                                                mem->of_resm_idx);
+                       if (ret) {
+                               dev_err(dev, "Can't associate reserved memory\n");
+                               goto out;
+                       }
+               } else {
+                       if (mem->va) {
+                               dev_warn(dev, "vdev %d buffer already mapped\n",
+                                        rvdev->index);
+                               pa = rproc_va_to_pa(mem->va);
+                       } else {
+                               /* Use dma address as carveout no memmapped yet */
+                               pa = (phys_addr_t)mem->dma;
+                       }
+
+                       /* Associate vdev buffer memory pool to vdev subdev */
+                       ret = dma_declare_coherent_memory(dev, pa,
+                                                          mem->da,
+                                                          mem->len,
+                                                          DMA_MEMORY_EXCLUSIVE);
+                       if (ret < 0) {
+                               dev_err(dev, "Failed to associate buffer\n");
+                               goto out;
+                       }
+               }
+       }
+
        vdev->id.device = id,
        vdev->config = &rproc_virtio_config_ops,
        vdev->dev.parent = dev;

diff --git a/include/linux/remoteproc.h b/include/linux/remoteproc.h
index 68e72f33c705e13dea5f5ec390f2da3f6f50bcb0..82cb77ad37c7151d9e383b89a01d0a753747eed0 100644 (file)
--- a/include/linux/remoteproc.h
+++ b/include/linux/remoteproc.h
@@ -554,6 +554,7 @@ struct rproc_vdev {
        struct kref refcount;
 
        struct rproc_subdev subdev;
+       struct device dev;
 
        unsigned int id;
        struct list_head node;